diff --git a/configure b/configure index d20f77275..785a80b11 100755 --- a/configure +++ b/configure @@ -693,6 +693,8 @@ USE_LOCAL_LIBSAMPLERATE_FALSE USE_LOCAL_LIBSAMPLERATE_TRUE USE_LIBSAMPLERATE_FALSE USE_LIBSAMPLERATE_TRUE +SAMPLERATE_LIBS +SAMPLERATE_CFLAGS USE_LOCAL_LIBRESAMPLE_FALSE USE_LOCAL_LIBRESAMPLE_TRUE USE_LIBRESAMPLE_FALSE @@ -755,8 +757,8 @@ SNDFILE_LIBS SNDFILE_CFLAGS SBSMS_LIBS SBSMS_CFLAGS -SAMPLERATE_LIBS -SAMPLERATE_CFLAGS +LIBSAMPLERATE_SYSTEM_LIBS +LIBSAMPLERATE_SYSTEM_CFLAGS LIBMAD_LIBS LIBMAD_CFLAGS ID3TAG_LIBS @@ -1010,8 +1012,8 @@ ID3TAG_CFLAGS ID3TAG_LIBS LIBMAD_CFLAGS LIBMAD_LIBS -SAMPLERATE_CFLAGS -SAMPLERATE_LIBS +LIBSAMPLERATE_SYSTEM_CFLAGS +LIBSAMPLERATE_SYSTEM_LIBS SBSMS_CFLAGS SBSMS_LIBS SNDFILE_CFLAGS @@ -1731,8 +1733,7 @@ Optional Packages: --with-libid3tag use libid3tag for mp3 id3 tag support --with-libmad use libmad for mp2/3 decoding support --with-libresample use libresample for sample rate conversion - --with-libsamplerate use libsamplerate for sample rate conversion. Do not - use in conjunction with VST plug-in support! + --with-libsamplerate use libsamplerate for sample rate conversion --with-sbsms use libsbsms for pitch and tempo changing --with-libsndfile which libsndfile to use (required): [system,local] --with-soundtouch use libSoundTouch for pitch and tempo changing @@ -1786,10 +1787,10 @@ Some influential environment variables: LIBMAD_CFLAGS C compiler flags for LIBMAD, overriding pkg-config LIBMAD_LIBS linker flags for LIBMAD, overriding pkg-config - SAMPLERATE_CFLAGS - C compiler flags for SAMPLERATE, overriding pkg-config - SAMPLERATE_LIBS - linker flags for SAMPLERATE, overriding pkg-config + LIBSAMPLERATE_SYSTEM_CFLAGS + C compiler flags for LIBSAMPLERATE_SYSTEM, overriding pkg-config + LIBSAMPLERATE_SYSTEM_LIBS + linker flags for LIBSAMPLERATE_SYSTEM, overriding pkg-config SBSMS_CFLAGS C compiler flags for SBSMS, overriding pkg-config SBSMS_LIBS linker flags for SBSMS, overriding pkg-config @@ -2918,7 +2919,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -am__api_version='1.13' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3455,6 +3456,47 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } @@ -4655,6 +4697,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -7404,6 +7505,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -8060,7 +8220,6 @@ CFLAGS="$cflags_save" CPPFLAGS="$cppflags_save" CXXFLAGS="$cxxflags_save" - if test -n "$ac_tool_prefix"; then for ac_prog in ar lib "link -lib" do @@ -8168,12 +8327,18 @@ $as_echo_n "checking the archiver ($AR) interface... " >&6; } if ${am_cv_ar_interface+:} false; then : $as_echo_n "(cached) " >&6 else - am_cv_ar_interface=ar + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + am_cv_ar_interface=ar cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int some_variable = 0; _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO"; then : am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 (eval $am_ar_try) 2>&5 @@ -8199,6 +8364,11 @@ if ac_fn_cxx_try_compile "$LINENO"; then : fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5 @@ -9611,6 +9781,7 @@ test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + if test -n "$ac_tool_prefix"; then for ac_prog in ar do @@ -20986,13 +21157,12 @@ fi - pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SAMPLERATE" >&5 -$as_echo_n "checking for SAMPLERATE... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSAMPLERATE_SYSTEM" >&5 +$as_echo_n "checking for LIBSAMPLERATE_SYSTEM... " >&6; } -if test -n "$SAMPLERATE_CFLAGS"; then - pkg_cv_SAMPLERATE_CFLAGS="$SAMPLERATE_CFLAGS" +if test -n "$LIBSAMPLERATE_SYSTEM_CFLAGS"; then + pkg_cv_LIBSAMPLERATE_SYSTEM_CFLAGS="$LIBSAMPLERATE_SYSTEM_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate >= 0.1.2\""; } >&5 @@ -21000,15 +21170,15 @@ if test -n "$SAMPLERATE_CFLAGS"; then ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate >= 0.1.2" 2>/dev/null` + pkg_cv_LIBSAMPLERATE_SYSTEM_CFLAGS=`$PKG_CONFIG --cflags "samplerate >= 0.1.2" 2>/dev/null` else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$SAMPLERATE_LIBS"; then - pkg_cv_SAMPLERATE_LIBS="$SAMPLERATE_LIBS" +if test -n "$LIBSAMPLERATE_SYSTEM_LIBS"; then + pkg_cv_LIBSAMPLERATE_SYSTEM_LIBS="$LIBSAMPLERATE_SYSTEM_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate >= 0.1.2\""; } >&5 @@ -21016,7 +21186,7 @@ if test -n "$SAMPLERATE_LIBS"; then ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate >= 0.1.2" 2>/dev/null` + pkg_cv_LIBSAMPLERATE_SYSTEM_LIBS=`$PKG_CONFIG --libs "samplerate >= 0.1.2" 2>/dev/null` else pkg_failed=yes fi @@ -21034,12 +21204,12 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "samplerate >= 0.1.2" 2>&1` + LIBSAMPLERATE_SYSTEM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "samplerate >= 0.1.2" 2>&1` else - SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --print-errors "samplerate >= 0.1.2" 2>&1` + LIBSAMPLERATE_SYSTEM_PKG_ERRORS=`$PKG_CONFIG --print-errors "samplerate >= 0.1.2" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$SAMPLERATE_PKG_ERRORS" >&5 + echo "$LIBSAMPLERATE_SYSTEM_PKG_ERRORS" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -21047,14 +21217,13 @@ $as_echo "no" >&6; } elif test $pkg_failed = untried; then LIBSAMPLERATE_SYSTEM_AVAILABLE="no" else - SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS - SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS + LIBSAMPLERATE_SYSTEM_CFLAGS=$pkg_cv_LIBSAMPLERATE_SYSTEM_CFLAGS + LIBSAMPLERATE_SYSTEM_LIBS=$pkg_cv_LIBSAMPLERATE_SYSTEM_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } LIBSAMPLERATE_SYSTEM_AVAILABLE="yes" fi - - if test "$LIBSAMPLERATE_SYSTEM_AVAILABLE" = "yes" ; then + if test "$LIBSAMPLERATE_SYSTEM_AVAILABLE" = "yes" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: Libsamplerate libraries are available as system libraries" >&5 $as_echo "$as_me: Libsamplerate libraries are available as system libraries" >&6;} else @@ -22752,8 +22921,10 @@ _ACEOF done elif test "$LIB_USE_SYSTEM" = "yes" ; then + eval LIB_LIBS=\"\$${lib}_SYSTEM_LIBS\" + { $as_echo "$as_me:${as_lineno-$LINENO}: ${lib}: adding ${LIB_LIBS} to libraries" >&5 +$as_echo "$as_me: ${lib}: adding ${LIB_LIBS} to libraries" >&6;} eval LIBS=\"$LIBS \$${lib}_SYSTEM_LIBS\" - #LIBS="$LIBS $THESE_LIBS" eval CXXFLAGS=\"\$CXXFLAGS \$${lib}_SYSTEM_CXXFLAGS\" eval CPPSYMBOLS=\"\$${lib}_SYSTEM_CPPSYMBOLS\" @@ -23645,6 +23816,8 @@ $as_echo "#define HAVE_GTK 1" >>confdefs.h CPPFLAGS="$CPPFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" fi + + use_vst="no" ;; esac @@ -27127,15 +27300,21 @@ for lib in $LIBRARIES ; do done if [ "$use_ladspa" = "yes" ] ; then - echo "ladspa: enabled" + echo "ladspa plugin support: enabled" else - echo "ladspa: disabled" + echo "ladspa plugin support: disabled" fi if [ "$use_audiounits" = "yes" ] ; then - echo "audiounits: enabled" + echo "audiounit plugin support: enabled" else - echo "audiounits: disabled" + echo "audiounit plugin support: disabled" +fi + +if [ "$use_vst" = "yes" ] ; then + echo "VST plugin support: enabled" +else + echo "VST plugin support: disabled" fi echo "prefix=$prefix"; diff --git a/configure.ac b/configure.ac index 35333ba40..a4cce0e24 100644 --- a/configure.ac +++ b/configure.ac @@ -614,6 +614,10 @@ case "${host_os}" in CPPFLAGS="$CPPFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" fi + + dnl VST support on platforms other than Mac OS and Windows not enabled for + dnl 2.0.6 release + use_vst="no" ;; esac diff --git a/src/configtemplate.h b/src/configtemplate.h index c1f3818fd..105a0ddcc 100644 --- a/src/configtemplate.h +++ b/src/configtemplate.h @@ -128,7 +128,7 @@ */ #undef USE_FFMPEG -/* Define if the gstreamer is present */ +/* Define if GStreamer 1 is present */ #undef USE_GSTREAMER /* Define if LADSPA plug-ins are enabled */ @@ -182,7 +182,7 @@ /* Define if Vamp analysis plugin support should be enabled */ #undef USE_VAMP -/* Define if VST plugin support should be enabled */ +/* Define if VST plug-in support is enabled */ #undef USE_VST /* Version number of package */