Menu
▾
▴
[Wired-commits] wired configure,1.14,1.15
|
From: Pierre-Jean L. <pj-...@us...> - 2005-10-22 15:23:48
|
Update of /cvsroot/wired/wired In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2244 Modified Files: configure Log Message: added many depedencies check Index: configure =================================================================== RCS file: /cvsroot/wired/wired/configure,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** configure 3 Oct 2005 12:57:06 -0000 1.14 --- configure 22 Oct 2005 15:23:40 -0000 1.15 *************** *** 21078,21092 **** # Checks for libraries. ! # FIXME: Replace `main' with a function in `-lasound': ! #AC_CHECK_LIB([asound], [main]) # FIXME: Replace `main' with a function in `-lm': #AC_CHECK_LIB([m], [main]) ! # FIXME: Replace `main' with a function in `-lportaudio': ! #AC_CHECK_LIB([portaudio], [main]) ! # FIXME: Replace `main' with a function in `-lportmidi': - # FIXME: Replace `main' with a function in `-lpthread': - #AC_CHECK_LIB([pthread], [main]) - # FIXME: Replace `main' with a function in `-lsndfile': echo "$as_me:$LINENO: checking for sf_open in -lsndfile" >&5 echo $ECHO_N "checking for sf_open in -lsndfile... $ECHO_C" >&6 --- 21078,21296 ---- # Checks for libraries. ! echo "$as_me:$LINENO: checking for snd_asoundlib_version in -lasound" >&5 ! echo $ECHO_N "checking for snd_asoundlib_version in -lasound... $ECHO_C" >&6 ! if test "${ac_cv_lib_asound_snd_asoundlib_version+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! ac_check_lib_save_LIBS=$LIBS ! LIBS="-lasound $LIBS" ! cat >conftest.$ac_ext <<_ACEOF ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ ! ! /* Override any gcc2 internal prototype to avoid an error. */ ! #ifdef __cplusplus ! extern "C" ! #endif ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char snd_asoundlib_version (); ! int ! main () ! { ! snd_asoundlib_version (); ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>conftest.er1 ! ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err ! rm -f conftest.er1 ! cat conftest.err >&5 ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! ac_cv_lib_asound_snd_asoundlib_version=yes ! else ! echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ! ac_cv_lib_asound_snd_asoundlib_version=no ! fi ! rm -f conftest.err conftest.$ac_objext \ ! conftest$ac_exeext conftest.$ac_ext ! LIBS=$ac_check_lib_save_LIBS ! fi ! echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_asoundlib_version" >&5 ! echo "${ECHO_T}$ac_cv_lib_asound_snd_asoundlib_version" >&6 ! if test $ac_cv_lib_asound_snd_asoundlib_version = yes; then ! ASOUND='yes' ! else ! { { echo "$as_me:$LINENO: error: Couldn't find libasound" >&5 ! echo "$as_me: error: Couldn't find libasound" >&2;} ! { (exit 1); exit 1; }; } ! fi ! # FIXME: Replace `main' with a function in `-lm': #AC_CHECK_LIB([m], [main]) ! echo "$as_me:$LINENO: checking for Pa_Sleep in -lportaudio" >&5 ! echo $ECHO_N "checking for Pa_Sleep in -lportaudio... $ECHO_C" >&6 ! if test "${ac_cv_lib_portaudio_Pa_Sleep+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! ac_check_lib_save_LIBS=$LIBS ! LIBS="-lportaudio $LIBS" ! cat >conftest.$ac_ext <<_ACEOF ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ ! ! /* Override any gcc2 internal prototype to avoid an error. */ ! #ifdef __cplusplus ! extern "C" ! #endif ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char Pa_Sleep (); ! int ! main () ! { ! Pa_Sleep (); ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>conftest.er1 ! ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err ! rm -f conftest.er1 ! cat conftest.err >&5 ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! ac_cv_lib_portaudio_Pa_Sleep=yes ! else ! echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ! ac_cv_lib_portaudio_Pa_Sleep=no ! fi ! rm -f conftest.err conftest.$ac_objext \ ! conftest$ac_exeext conftest.$ac_ext ! LIBS=$ac_check_lib_save_LIBS ! fi ! echo "$as_me:$LINENO: result: $ac_cv_lib_portaudio_Pa_Sleep" >&5 ! echo "${ECHO_T}$ac_cv_lib_portaudio_Pa_Sleep" >&6 ! if test $ac_cv_lib_portaudio_Pa_Sleep = yes; then ! PORTAUDIO='yes' ! else ! { { echo "$as_me:$LINENO: error: Couldn't find portaudio" >&5 ! echo "$as_me: error: Couldn't find portaudio" >&2;} ! { (exit 1); exit 1; }; } ! fi ! ! echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 ! echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 ! if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! ac_check_lib_save_LIBS=$LIBS ! LIBS="-lpthread $LIBS" ! cat >conftest.$ac_ext <<_ACEOF ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ ! ! /* Override any gcc2 internal prototype to avoid an error. */ ! #ifdef __cplusplus ! extern "C" ! #endif ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char pthread_create (); ! int ! main () ! { ! pthread_create (); ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>conftest.er1 ! ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err ! rm -f conftest.er1 ! cat conftest.err >&5 ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! ac_cv_lib_pthread_pthread_create=yes ! else ! echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ! ac_cv_lib_pthread_pthread_create=no ! fi ! rm -f conftest.err conftest.$ac_objext \ ! conftest$ac_exeext conftest.$ac_ext ! LIBS=$ac_check_lib_save_LIBS ! fi ! echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 ! echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 ! if test $ac_cv_lib_pthread_pthread_create = yes; then ! PTHREAD='yes' ! else ! { { echo "$as_me:$LINENO: error: Couldn't find libpthread" >&5 ! echo "$as_me: error: Couldn't find libpthread" >&2;} ! { (exit 1); exit 1; }; } ! fi echo "$as_me:$LINENO: checking for sf_open in -lsndfile" >&5 echo $ECHO_N "checking for sf_open in -lsndfile... $ECHO_C" >&6 *************** *** 21160,21164 **** fi - # FIXME: Replace `main' with a function in `-lsndfile': echo "$as_me:$LINENO: checking for soundtouch_ac_test in -lSoundTouch" >&5 echo $ECHO_N "checking for soundtouch_ac_test in -lSoundTouch... $ECHO_C" >&6 --- 21364,21367 ---- *************** *** 21232,21237 **** fi ! #AC_CHECK_LIB([ltdl], [lt_dlopen]) ! echo "$as_me:$LINENO: checking for FLAC__file_decoder_init in -lFLAC++" >&5 echo $ECHO_N "checking for FLAC__file_decoder_init in -lFLAC++... $ECHO_C" >&6 --- 21435,21439 ---- fi ! #AC_CHECK_LIB([ltdl], [lt_dlmutex_lock], [LTDL='yes'], AC_MSG_ERROR([Couldn't find lib libtool or ltdl ])) echo "$as_me:$LINENO: checking for FLAC__file_decoder_init in -lFLAC++" >&5 echo $ECHO_N "checking for FLAC__file_decoder_init in -lFLAC++... $ECHO_C" >&6 *************** *** 21305,21309 **** fi - echo "$as_me:$LINENO: checking for vorbis_info_init in -lvorbis" >&5 echo $ECHO_N "checking for vorbis_info_init in -lvorbis... $ECHO_C" >&6 --- 21507,21510 ---- *************** *** 21377,21381 **** fi - echo "$as_me:$LINENO: checking for xmlParseMemory in -lxml2" >&5 echo $ECHO_N "checking for xmlParseMemory in -lxml2... $ECHO_C" >&6 --- 21578,21581 ---- *************** *** 21449,21452 **** --- 21649,21723 ---- fi + echo "$as_me:$LINENO: checking for src_new in -lsamplerate" >&5 + echo $ECHO_N "checking for src_new in -lsamplerate... $ECHO_C" >&6 + if test "${ac_cv_lib_samplerate_src_new+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsamplerate $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char src_new (); + int + main () + { + src_new (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_samplerate_src_new=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_samplerate_src_new=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_samplerate_src_new" >&5 + echo "${ECHO_T}$ac_cv_lib_samplerate_src_new" >&6 + if test $ac_cv_lib_samplerate_src_new = yes; then + SRC='yes' + else + { { echo "$as_me:$LINENO: error: Couldn't find libsamplerate" >&5 + echo "$as_me: error: Couldn't find libsamplerate" >&2;} + { (exit 1); exit 1; }; } + fi + # Checks for header files. *************** *** 21947,21951 **** ! for ac_header in fcntl.h netinet/in.h stdlib.h string.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --- 22218,22243 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! for ac_header in fcntl.h netinet/in.h stdlib.h string.h unistd.h math.h sys/types.h sys/stat.h dlfcn.h stdint.h stdio.h dirent.h alsa/seq_event.h cmath wx/wx.h sndfile.h portaudio.h byteswap.h list.h alsa/asoundlib.h errno.h soundtouch/SoundTouch.h assert.h samplerate.h io.h direct.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` *************** *** 22208,22211 **** --- 22500,22506 ---- if test -n "$PKG_CONFIG"; then + if test -n "$SAMPLERATE_CFLAGS"; then + pkg_cv_SAMPLERATE_CFLAGS="$SAMPLERATE_CFLAGS" + else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"samplerate >= 0.0.15\"") >&5 *************** *** 22218,22225 **** --- 22513,22524 ---- pkg_failed=yes fi + fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then + if test -n "$SAMPLERATE_LIBS"; then + pkg_cv_SAMPLERATE_LIBS="$SAMPLERATE_LIBS" + else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"samplerate >= 0.0.15\"") >&5 *************** *** 22232,22243 **** pkg_failed=yes fi else pkg_failed=untried fi if test $pkg_failed = yes; then ! SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "samplerate >= 0.0.15"` # Put the nasty error message in config.log where it belongs ! echo "$SAMPLERATE_PKG_ERRORS" 1>&5 ac_cv_samplerate=0 --- 22531,22555 ---- pkg_failed=yes fi + fi else pkg_failed=untried fi + + if test $pkg_failed = yes; then ! ! if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ! _pkg_short_errors_supported=yes ! else ! _pkg_short_errors_supported=no ! fi ! if test $_pkg_short_errors_supported = yes; then ! SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "samplerate >= 0.0.15"` ! else ! SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "samplerate >= 0.0.15"` ! fi # Put the nasty error message in config.log where it belongs ! echo "$SAMPLERATE_PKG_ERRORS" >&5 ac_cv_samplerate=0 *************** *** 23628,23632 **** ! for ac_func in floor ftime getcwd memmove memset pow select sqrt strdup do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --- 23940,23946 ---- ! ! ! for ac_func in floor ftime getcwd memmove memset pow select sqrt strdup bzero open do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` *************** *** 23754,23758 **** fi ! ac_config_files="$ac_config_files Makefile src/Makefile src/audio/Makefile src/editmidi/Makefile src/engine/Makefile src/fileloader/Makefile src/gui/Makefile src/midi/Makefile src/midi/portmidi/Makefile src/midi/portmidi/porttime/Makefile src/mixer/Makefile src/plugins/Makefile src/plugins/beatbox/Makefile src/plugins/compressor/Makefile src/plugins/crusher/Makefile src/plugins/delay/Makefile src/plugins/filter/Makefile src/plugins/loop_sampler/Makefile src/plugins/akai_sampler/Makefile src/plugins/reverb/Makefile src/plugins/synth/Makefile src/plugins/chorus/Makefile src/plugins/wahwah/Makefile src/plugins/test/Makefile src/redist/Makefile src/sequencer/Makefile src/undo/Makefile src/libs/Makefile src/libs/WiredWidgets/Makefile src/libs/WiredWidgets/src/Makefile src/libs/WiredAkai/Makefile src/libs/WiredAkai/src/Makefile src/data/Makefile src/data/ihm/Makefile src/data/ihm/mixer/Makefile src/data/ihm/opt/Makefile src/data/ihm/player/Makefile src/data/ihm/seqtrack/Makefile src/data/ihm/splash/Makefile src/data/ihm/toolbar/Makefile src/data/ihm/widgets/Makefile src/data/plugins/Makefile src/data/plugins/akaisampler/Makefile src/data/plugins/beatbox/Makefile src/data/plugins/compressor/Makefile src/data/plugins/crusher/Makefile src/data/plugins/delay/Makefile src/data/plugins/filter/Makefile src/data/plugins/loopsampler/Makefile src/data/plugins/reverb/Makefile src/data/plugins/wahwah/Makefile src/data/plugins/chorus/Makefile src/conf/Makefile src/xml/Makefile src/dssi/Makefile src/samplerate/Makefile src/data/dssi/Makefile src/codec/Makefile src/codec/wiredcodec/Makefile src/codec/wiredcodec/flac/Makefile src/codec/wiredcodec/mpeg/Makefile" --- 24068,24072 ---- fi ! ac_config_files="$ac_config_files Makefile src/Makefile src/audio/Makefile src/editmidi/Makefile src/engine/Makefile src/fileloader/Makefile src/gui/Makefile src/midi/Makefile src/midi/portmidi/Makefile src/midi/portmidi/porttime/Makefile src/mixer/Makefile src/plugins/Makefile src/plugins/beatbox/Makefile src/plugins/compressor/Makefile src/plugins/crusher/Makefile src/plugins/delay/Makefile src/plugins/filter/Makefile src/plugins/loop_sampler/Makefile src/plugins/akai_sampler/Makefile src/plugins/reverb/Makefile src/plugins/synth/Makefile src/plugins/chorus/Makefile src/plugins/wahwah/Makefile src/plugins/test/Makefile src/redist/Makefile src/sequencer/Makefile src/undo/Makefile src/libs/Makefile src/libs/WiredWidgets/Makefile src/libs/WiredWidgets/src/Makefile src/libs/WiredAkai/Makefile src/libs/WiredAkai/src/Makefile src/data/Makefile src/data/ihm/Makefile src/data/ihm/mixer/Makefile src/data/ihm/opt/Makefile src/data/ihm/player/Makefile src/data/ihm/seqtrack/Makefile src/data/ihm/splash/Makefile src/data/ihm/toolbar/Makefile src/data/ihm/widgets/Makefile src/data/plugins/Makefile src/data/plugins/akaisampler/Makefile src/data/plugins/beatbox/Makefile src/data/plugins/compressor/Makefile src/data/plugins/crusher/Makefile src/data/plugins/delay/Makefile src/data/plugins/filter/Makefile src/data/plugins/loopsampler/Makefile src/data/plugins/reverb/Makefile src/data/plugins/wahwah/Makefile src/data/plugins/chorus/Makefile src/conf/Makefile src/xml/Makefile src/dssi/Makefile src/samplerate/Makefile src/data/dssi/Makefile src/codec/Makefile src/codec/wiredcodec/Makefile src/codec/wiredcodec/flac/Makefile src/codec/wiredcodec/mpeg/Makefile src/codec/wiredcodec/vorbis/Makefile" *************** *** 24374,24377 **** --- 24688,24692 ---- "src/codec/wiredcodec/flac/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/codec/wiredcodec/flac/Makefile" ;; "src/codec/wiredcodec/mpeg/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/codec/wiredcodec/mpeg/Makefile" ;; + "src/codec/wiredcodec/vorbis/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/codec/wiredcodec/vorbis/Makefile" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "src/include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/include/config.h" ;; |