From 8c2d95559bb6e968406ed27585512f308e6aee9d Mon Sep 17 00:00:00 2001 From: "benjamin.drung@gmail.com" Date: Sat, 9 Nov 2013 01:28:56 +0000 Subject: [PATCH] Use pkg-config override facility to specify libogg location to libvorbis. 1) Revert "Reintroduce patch for building local libvorbis with local libogg." (r12914) 2) Remove acinclude.m4 and regenerate autotool files to use a newer pkg-config checking macro to get the override facility. 3) Override pkg-config check for libogg by specifying OGG_CFLAGS and OGG_LIBS. --- configure | 4 +- lib-src/audacity-patches.txt | 3 +- lib-src/libvorbis/Makefile.in | 4 +- lib-src/libvorbis/acinclude.m4 | 161 ----------- lib-src/libvorbis/aclocal.m4 | 2 +- lib-src/libvorbis/configure | 258 +++++++----------- lib-src/libvorbis/configure.ac | 49 +--- lib-src/libvorbis/doc/Makefile.in | 4 +- lib-src/libvorbis/doc/libvorbis/Makefile.in | 4 +- lib-src/libvorbis/doc/vorbisenc/Makefile.in | 4 +- lib-src/libvorbis/doc/vorbisfile/Makefile.in | 4 +- lib-src/libvorbis/examples/Makefile.in | 4 +- lib-src/libvorbis/include/Makefile.in | 4 +- lib-src/libvorbis/include/vorbis/Makefile.in | 4 +- lib-src/libvorbis/lib/Makefile.in | 4 +- lib-src/libvorbis/lib/books/Makefile.in | 4 +- .../libvorbis/lib/books/coupled/Makefile.in | 4 +- lib-src/libvorbis/lib/books/floor/Makefile.in | 4 +- .../libvorbis/lib/books/uncoupled/Makefile.in | 4 +- lib-src/libvorbis/lib/modes/Makefile.in | 4 +- lib-src/libvorbis/m4/Makefile.in | 4 +- lib-src/libvorbis/test/Makefile.in | 4 +- lib-src/libvorbis/vq/Makefile.in | 4 +- m4/audacity_checklib_libvorbis.m4 | 4 +- 24 files changed, 150 insertions(+), 399 deletions(-) delete mode 100644 lib-src/libvorbis/acinclude.m4 diff --git a/configure b/configure index c536824ab..dbedf47ff 100755 --- a/configure +++ b/configure @@ -7897,8 +7897,8 @@ fi LIBVORBIS_LOCAL_CPPSYMBOLS="USE_LIBVORBIS" - LIBVORBIS_LOCAL_CONFIGURE_OPTS="--disable-oggtest" - export PKG_CONFIG_PATH="../libogg:${PKG_CONFIG_PATH}" + libogg_dir="$(pwd)/lib-src/libogg" + LIBVORBIS_LOCAL_CONFIGURE_ARGS="--disable-oggtest OGG_CFLAGS=-I${libogg_dir}/include OGG_LIBS=${libogg_dir}/src/.libs/libogg.a" { $as_echo "$as_me:${as_lineno-$LINENO}: Vorbis libraries are available in this source tree" >&5 $as_echo "$as_me: Vorbis libraries are available in this source tree" >&6;} diff --git a/lib-src/audacity-patches.txt b/lib-src/audacity-patches.txt index 93342568d..a895b2ddd 100644 --- a/lib-src/audacity-patches.txt +++ b/lib-src/audacity-patches.txt @@ -127,10 +127,9 @@ library for endcoding and decoding Xiph.org's high-quality compressed audio format. Version in Audacity SVN: 1.3.3 Patches: autotools.patch: Fix all autotools warnings. - local-libogg.patch: configure patch that lets us build against a - local libogg if there isn't a system one. Upstream Version: 1.3.3 + lib-widget-extra ---------------- diff --git a/lib-src/libvorbis/Makefile.in b/lib-src/libvorbis/Makefile.in index 38b776d1f..0e6cbae1e 100644 --- a/lib-src/libvorbis/Makefile.in +++ b/lib-src/libvorbis/Makefile.in @@ -94,8 +94,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/ogg.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff --git a/lib-src/libvorbis/acinclude.m4 b/lib-src/libvorbis/acinclude.m4 deleted file mode 100644 index e051fe86f..000000000 --- a/lib-src/libvorbis/acinclude.m4 +++ /dev/null @@ -1,161 +0,0 @@ -# acinclude.m4 -# all .m4 files needed that might not be installed go here - -# Configure paths for libogg -# Jack Moffitt 10-21-2000 -# Shamelessly stolen from Owen Taylor and Manish Singh - -dnl XIPH_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS -dnl -AC_DEFUN([XIPH_PATH_OGG], -[dnl -dnl Get the cflags and libraries -dnl -AC_ARG_WITH(ogg,[ --with-ogg=PFX Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="") -AC_ARG_WITH(ogg-libraries,[ --with-ogg-libraries=DIR Directory where libogg library is installed (optional)], ogg_libraries="$withval", ogg_libraries="") -AC_ARG_WITH(ogg-includes,[ --with-ogg-includes=DIR Directory where libogg header files are installed (optional)], ogg_includes="$withval", ogg_includes="") -AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run a test Ogg program],, enable_oggtest=yes) - - if test "x$ogg_libraries" != "x" ; then - OGG_LIBS="-L$ogg_libraries" - elif test "x$ogg_prefix" != "x" ; then - OGG_LIBS="-L$ogg_prefix/lib" - elif test "x$prefix" != "xNONE" ; then - OGG_LIBS="-L$prefix/lib" - fi - - OGG_LIBS="$OGG_LIBS -logg" - - if test "x$ogg_includes" != "x" ; then - OGG_CFLAGS="-I$ogg_includes" - elif test "x$ogg_prefix" != "x" ; then - OGG_CFLAGS="-I$ogg_prefix/include" - elif test "x$prefix" != "xNONE"; then - OGG_CFLAGS="-I$prefix/include" - fi - - AC_MSG_CHECKING(for Ogg) - no_ogg="" - - - if test "x$enable_oggtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $OGG_CFLAGS" - LIBS="$LIBS $OGG_LIBS" -dnl -dnl Now check if the installed Ogg is sufficiently new. -dnl - rm -f conf.oggtest - AC_TRY_RUN([ -#include -#include -#include -#include - -int main () -{ - system("touch conf.oggtest"); - return 0; -} - -],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - - if test "x$no_ogg" = "x" ; then - AC_MSG_RESULT(yes) - ifelse([$1], , :, [$1]) - else - AC_MSG_RESULT(no) - if test -f conf.oggtest ; then - : - else - echo "*** Could not run Ogg test program, checking why..." - CFLAGS="$CFLAGS $OGG_CFLAGS" - LIBS="$LIBS $OGG_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding Ogg or finding the wrong" - echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means Ogg was incorrectly installed" - echo "*** or that you have moved Ogg since it was installed. In the latter case, you" - echo "*** may want to edit the ogg-config script: $OGG_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - OGG_CFLAGS="" - OGG_LIBS="" - ifelse([$2], , :, [$2]) - fi - AC_SUBST(OGG_CFLAGS) - AC_SUBST(OGG_LIBS) - rm -f conf.oggtest -]) - -dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) -dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page -dnl also defines GSTUFF_PKG_ERRORS on error -AC_DEFUN([PKG_CHECK_MODULES], [ - succeeded=no - - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - pkg_config_min_version=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then - AC_MSG_CHECKING(for $2) - - if $PKG_CONFIG --exists "$2" ; then - AC_MSG_RESULT(yes) - succeeded=yes - - AC_MSG_CHECKING($1_CFLAGS) - $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` - AC_MSG_RESULT($$1_CFLAGS) - - AC_MSG_CHECKING($1_LIBS) - $1_LIBS=`$PKG_CONFIG --libs "$2"` - AC_MSG_RESULT($$1_LIBS) - else - $1_CFLAGS="" - $1_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - ifelse([$4], ,echo $$1_PKG_ERRORS,) - fi - - AC_SUBST($1_CFLAGS) - AC_SUBST($1_LIBS) - else - echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi - - if test $succeeded = yes; then - ifelse([$3], , :, [$3]) - else - ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) - fi -]) diff --git a/lib-src/libvorbis/aclocal.m4 b/lib-src/libvorbis/aclocal.m4 index 00c0fd02d..416eee3ea 100644 --- a/lib-src/libvorbis/aclocal.m4 +++ b/lib-src/libvorbis/aclocal.m4 @@ -1140,5 +1140,5 @@ m4_include([m4/ltoptions.m4]) m4_include([m4/ltsugar.m4]) m4_include([m4/ltversion.m4]) m4_include([m4/lt~obsolete.m4]) +m4_include([m4/ogg.m4]) m4_include([m4/pkg.m4]) -m4_include([acinclude.m4]) diff --git a/lib-src/libvorbis/configure b/lib-src/libvorbis/configure index 33a0017d2..2626aeb64 100755 --- a/lib-src/libvorbis/configure +++ b/lib-src/libvorbis/configure @@ -812,7 +812,9 @@ LDFLAGS LIBS CPPFLAGS CPP -PKG_CONFIG' +PKG_CONFIG +OGG_CFLAGS +OGG_LIBS' # Initialize some variables set by options. @@ -1458,9 +1460,12 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). - --with-ogg=PFX Prefix where libogg is installed (optional) - --with-ogg-libraries=DIR Directory where libogg library is installed (optional) - --with-ogg-includes=DIR Directory where libogg header files are installed (optional) + --with-ogg=PFX Prefix where libogg is installed (optional) + --with-ogg-libraries=DIR + Directory where libogg library is installed + (optional) + --with-ogg-includes=DIR Directory where libogg header files are installed + (optional) Some influential environment variables: CC C compiler command @@ -1472,6 +1477,8 @@ Some influential environment variables: you have headers in a nonstandard directory CPP C preprocessor PKG_CONFIG path to pkg-config utility + OGG_CFLAGS C compiler flags for OGG, overriding pkg-config + OGG_LIBS linker flags for OGG, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -12600,164 +12607,82 @@ $as_echo "no" >&6; } fi HAVE_OGG=no +if test "x$PKG_CONFIG" != "x" +then -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ../libogg/include/ogg/ogg.h" >&5 -$as_echo_n "checking for ../libogg/include/ogg/ogg.h... " >&6; } -if ${ac_cv_file____libogg_include_ogg_ogg_h+:} false; then : - $as_echo_n "(cached) " >&6 -else - test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "../libogg/include/ogg/ogg.h"; then - ac_cv_file____libogg_include_ogg_ogg_h=yes -else - ac_cv_file____libogg_include_ogg_ogg_h=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file____libogg_include_ogg_ogg_h" >&5 -$as_echo "$ac_cv_file____libogg_include_ogg_ogg_h" >&6; } -if test "x$ac_cv_file____libogg_include_ogg_ogg_h" = xyes; then : - ogg_h_available="yes" -else - ogg_h_available="no" -fi +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OGG" >&5 +$as_echo_n "checking for OGG... " >&6; } - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ../libogg/Makefile" >&5 -$as_echo_n "checking for ../libogg/Makefile... " >&6; } -if ${ac_cv_file____libogg_Makefile+:} false; then : - $as_echo_n "(cached) " >&6 -else - test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "../libogg/Makefile"; then - ac_cv_file____libogg_Makefile=yes -else - ac_cv_file____libogg_Makefile=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file____libogg_Makefile" >&5 -$as_echo "$ac_cv_file____libogg_Makefile" >&6; } -if test "x$ac_cv_file____libogg_Makefile" = xyes; then : - ogg_configured="yes" -else - ogg_configured="no" -fi - - -if test "x$ogg_configured" = "xyes" && test "x$ogg_h_available" = "xyes" ; then - echo "Using local libogg library from Audacity lib-src directory." - - - - - OGG_LIBS="-L../.. -logg" - LIBS="-L../.. -logg" - OGG_CFLAGS="-I../../libogg/include" - -else - if test "x$PKG_CONFIG" != "x" - then - - succeeded=no - - if test -z "$PKG_CONFIG"; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + if test -n "$OGG_CFLAGS"; then + pkg_cv_OGG_CFLAGS="$OGG_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_OGG_CFLAGS=`$PKG_CONFIG --cflags "ogg >= 1.0" 2>/dev/null` else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$OGG_LIBS"; then + pkg_cv_OGG_LIBS="$OGG_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_OGG_LIBS=`$PKG_CONFIG --libs "ogg >= 1.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried fi - fi - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - pkg_config_min_version=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ogg >= 1.0" >&5 -$as_echo_n "checking for ogg >= 1.0... " >&6; } +if test $pkg_failed = yes; then - if $PKG_CONFIG --exists "ogg >= 1.0" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - succeeded=yes - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking OGG_CFLAGS" >&5 -$as_echo_n "checking OGG_CFLAGS... " >&6; } - OGG_CFLAGS=`$PKG_CONFIG --cflags "ogg >= 1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OGG_CFLAGS" >&5 -$as_echo "$OGG_CFLAGS" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking OGG_LIBS" >&5 -$as_echo_n "checking OGG_LIBS... " >&6; } - OGG_LIBS=`$PKG_CONFIG --libs "ogg >= 1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OGG_LIBS" >&5 -$as_echo "$OGG_LIBS" >&6; } +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 + OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ogg >= 1.0"` else - OGG_CFLAGS="" - OGG_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - OGG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ogg >= 1.0"` - + OGG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ogg >= 1.0"` fi + # Put the nasty error message in config.log where it belongs + echo "$OGG_PKG_ERRORS" >&5 - - - else - echo "*** Your version of pkg-config is too old. You need version $pkg_config_min_version or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi - - if test $succeeded = yes; then - HAVE_OGG=yes - else - HAVE_OGG=no - fi - - fi - if test "x$HAVE_OGG" = "xno" - then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + HAVE_OGG=no +elif test $pkg_failed = untried; then + HAVE_OGG=no +else + OGG_CFLAGS=$pkg_cv_OGG_CFLAGS + OGG_LIBS=$pkg_cv_OGG_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + HAVE_OGG=yes +fi +fi +if test "x$HAVE_OGG" = "xno" +then # Check whether --with-ogg was given. if test "${with_ogg+set}" = set; then : @@ -12792,16 +12717,22 @@ fi if test "x$ogg_libraries" != "x" ; then OGG_LIBS="-L$ogg_libraries" + elif test "x$ogg_prefix" = "xno" || test "x$ogg_prefix" = "xyes" ; then + OGG_LIBS="" elif test "x$ogg_prefix" != "x" ; then OGG_LIBS="-L$ogg_prefix/lib" elif test "x$prefix" != "xNONE" ; then OGG_LIBS="-L$prefix/lib" fi - OGG_LIBS="$OGG_LIBS -logg" + if test "x$ogg_prefix" != "xno" ; then + OGG_LIBS="$OGG_LIBS -logg" + fi if test "x$ogg_includes" != "x" ; then OGG_CFLAGS="-I$ogg_includes" + elif test "x$ogg_prefix" = "xno" || test "x$ogg_prefix" = "xyes" ; then + OGG_CFLAGS="" elif test "x$ogg_prefix" != "x" ; then OGG_CFLAGS="-I$ogg_prefix/include" elif test "x$prefix" != "xNONE"; then @@ -12810,7 +12741,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ogg" >&5 $as_echo_n "checking for Ogg... " >&6; } - no_ogg="" + if test "x$ogg_prefix" = "xno" ; then + no_ogg="disabled" + enable_oggtest="no" + else + no_ogg="" + fi if test "x$enable_oggtest" = "xyes" ; then @@ -12851,7 +12787,11 @@ fi LIBS="$ac_save_LIBS" fi - if test "x$no_ogg" = "x" ; then + if test "x$no_ogg" = "xdisabled" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "must have Ogg installed!" "$LINENO" 5 + elif test "x$no_ogg" = "x" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } : @@ -12891,8 +12831,7 @@ if ac_fn_c_try_link "$LINENO"; then : else echo "*** The test program failed to compile or link. See the file config.log for the" echo "*** exact error that occured. This usually means Ogg was incorrectly installed" - echo "*** or that you have moved Ogg since it was installed. In the latter case, you" - echo "*** may want to edit the ogg-config script: $OGG_CONFIG" + echo "*** or that you have moved Ogg since it was installed." fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -12907,17 +12846,16 @@ rm -f core conftest.err conftest.$ac_objext \ rm -f conf.oggtest - libs_save=$LIBS - LIBS="$OGG_LIBS $VORBIS_LIBS" - ac_fn_c_check_func "$LINENO" "oggpack_writealign" "ac_cv_func_oggpack_writealign" + libs_save=$LIBS + LIBS="$OGG_LIBS $VORBIS_LIBS" + ac_fn_c_check_func "$LINENO" "oggpack_writealign" "ac_cv_func_oggpack_writealign" if test "x$ac_cv_func_oggpack_writealign" = xyes; then : else as_fn_error $? "Ogg >= 1.0 required !" "$LINENO" 5 fi - LIBS=$libs_save - fi + LIBS=$libs_save fi diff --git a/lib-src/libvorbis/configure.ac b/lib-src/libvorbis/configure.ac index b8f103038..ab1a97e85 100644 --- a/lib-src/libvorbis/configure.ac +++ b/lib-src/libvorbis/configure.ac @@ -236,43 +236,18 @@ AC_CHECK_LIB(pthread, pthread_create, pthread_lib="-lpthread", :) PKG_PROG_PKG_CONFIG HAVE_OGG=no - -dnl Audacity-specific code by dmazzoni: -dnl If libogg is in the same parent directory and it has been -dnl configured already, then we assume that libogg is going to -dnl be built, too. -AC_CHECK_FILE(../libogg/include/ogg/ogg.h, - ogg_h_available="yes", - ogg_h_available="no") - -AC_CHECK_FILE(../libogg/Makefile, - ogg_configured="yes", - ogg_configured="no") - -if test "x$ogg_configured" = "xyes" && test "x$ogg_h_available" = "xyes" ; then - echo "Using local libogg library from Audacity lib-src directory." - - AC_SUBST(OGG_CFLAGS) - AC_SUBST(OGG_LIBS) - - OGG_LIBS="-L../.. -logg" - LIBS="-L../.. -logg" - OGG_CFLAGS="-I../../libogg/include" - -else - if test "x$PKG_CONFIG" != "x" - then - PKG_CHECK_MODULES(OGG, ogg >= 1.0, HAVE_OGG=yes, HAVE_OGG=no) - fi - if test "x$HAVE_OGG" = "xno" - then - dnl fall back to the old school test - XIPH_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!)) - libs_save=$LIBS - LIBS="$OGG_LIBS $VORBIS_LIBS" - AC_CHECK_FUNC(oggpack_writealign, , AC_MSG_ERROR(Ogg >= 1.0 required !)) - LIBS=$libs_save - fi +if test "x$PKG_CONFIG" != "x" +then + PKG_CHECK_MODULES(OGG, ogg >= 1.0, HAVE_OGG=yes, HAVE_OGG=no) +fi +if test "x$HAVE_OGG" = "xno" +then + dnl fall back to the old school test + XIPH_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!)) + libs_save=$LIBS + LIBS="$OGG_LIBS $VORBIS_LIBS" + AC_CHECK_FUNC(oggpack_writealign, , AC_MSG_ERROR(Ogg >= 1.0 required !)) + LIBS=$libs_save fi dnl -------------------------------------------------- diff --git a/lib-src/libvorbis/doc/Makefile.in b/lib-src/libvorbis/doc/Makefile.in index 2c57f6179..0daad683a 100644 --- a/lib-src/libvorbis/doc/Makefile.in +++ b/lib-src/libvorbis/doc/Makefile.in @@ -86,8 +86,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/ogg.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/lib-src/libvorbis/doc/libvorbis/Makefile.in b/lib-src/libvorbis/doc/libvorbis/Makefile.in index 6ba933d2e..6ee8fdc45 100644 --- a/lib-src/libvorbis/doc/libvorbis/Makefile.in +++ b/lib-src/libvorbis/doc/libvorbis/Makefile.in @@ -85,8 +85,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/ogg.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/lib-src/libvorbis/doc/vorbisenc/Makefile.in b/lib-src/libvorbis/doc/vorbisenc/Makefile.in index dff2ec9de..1a000bfb4 100644 --- a/lib-src/libvorbis/doc/vorbisenc/Makefile.in +++ b/lib-src/libvorbis/doc/vorbisenc/Makefile.in @@ -85,8 +85,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/ogg.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/lib-src/libvorbis/doc/vorbisfile/Makefile.in b/lib-src/libvorbis/doc/vorbisfile/Makefile.in index 67fc42df5..467b01083 100644 --- a/lib-src/libvorbis/doc/vorbisfile/Makefile.in +++ b/lib-src/libvorbis/doc/vorbisfile/Makefile.in @@ -85,8 +85,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/ogg.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/lib-src/libvorbis/examples/Makefile.in b/lib-src/libvorbis/examples/Makefile.in index 77af727c5..569b01187 100644 --- a/lib-src/libvorbis/examples/Makefile.in +++ b/lib-src/libvorbis/examples/Makefile.in @@ -89,8 +89,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/ogg.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/lib-src/libvorbis/include/Makefile.in b/lib-src/libvorbis/include/Makefile.in index 4424ae6f1..4b14758ce 100644 --- a/lib-src/libvorbis/include/Makefile.in +++ b/lib-src/libvorbis/include/Makefile.in @@ -84,8 +84,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/ogg.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/lib-src/libvorbis/include/vorbis/Makefile.in b/lib-src/libvorbis/include/vorbis/Makefile.in index 193248db4..66ec29884 100644 --- a/lib-src/libvorbis/include/vorbis/Makefile.in +++ b/lib-src/libvorbis/include/vorbis/Makefile.in @@ -86,8 +86,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/ogg.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/lib-src/libvorbis/lib/Makefile.in b/lib-src/libvorbis/lib/Makefile.in index c922e4648..4bb9a8dfe 100644 --- a/lib-src/libvorbis/lib/Makefile.in +++ b/lib-src/libvorbis/lib/Makefile.in @@ -89,8 +89,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/ogg.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/lib-src/libvorbis/lib/books/Makefile.in b/lib-src/libvorbis/lib/books/Makefile.in index f25208c11..ec37bb021 100644 --- a/lib-src/libvorbis/lib/books/Makefile.in +++ b/lib-src/libvorbis/lib/books/Makefile.in @@ -84,8 +84,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/ogg.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/lib-src/libvorbis/lib/books/coupled/Makefile.in b/lib-src/libvorbis/lib/books/coupled/Makefile.in index 509a8932e..8bfc1e952 100644 --- a/lib-src/libvorbis/lib/books/coupled/Makefile.in +++ b/lib-src/libvorbis/lib/books/coupled/Makefile.in @@ -84,8 +84,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/ogg.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/lib-src/libvorbis/lib/books/floor/Makefile.in b/lib-src/libvorbis/lib/books/floor/Makefile.in index c04031a94..8324c1360 100644 --- a/lib-src/libvorbis/lib/books/floor/Makefile.in +++ b/lib-src/libvorbis/lib/books/floor/Makefile.in @@ -84,8 +84,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/ogg.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/lib-src/libvorbis/lib/books/uncoupled/Makefile.in b/lib-src/libvorbis/lib/books/uncoupled/Makefile.in index ac69c6cbf..1fb1a4f6c 100644 --- a/lib-src/libvorbis/lib/books/uncoupled/Makefile.in +++ b/lib-src/libvorbis/lib/books/uncoupled/Makefile.in @@ -84,8 +84,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/ogg.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/lib-src/libvorbis/lib/modes/Makefile.in b/lib-src/libvorbis/lib/modes/Makefile.in index c589fafbf..f2a645f10 100644 --- a/lib-src/libvorbis/lib/modes/Makefile.in +++ b/lib-src/libvorbis/lib/modes/Makefile.in @@ -84,8 +84,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/ogg.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/lib-src/libvorbis/m4/Makefile.in b/lib-src/libvorbis/m4/Makefile.in index 5637037ec..359472b90 100644 --- a/lib-src/libvorbis/m4/Makefile.in +++ b/lib-src/libvorbis/m4/Makefile.in @@ -84,8 +84,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/ogg.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/lib-src/libvorbis/test/Makefile.in b/lib-src/libvorbis/test/Makefile.in index b465de89c..f00e4ac60 100644 --- a/lib-src/libvorbis/test/Makefile.in +++ b/lib-src/libvorbis/test/Makefile.in @@ -86,8 +86,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/ogg.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/lib-src/libvorbis/vq/Makefile.in b/lib-src/libvorbis/vq/Makefile.in index 4b57c68c0..8309e1283 100644 --- a/lib-src/libvorbis/vq/Makefile.in +++ b/lib-src/libvorbis/vq/Makefile.in @@ -87,8 +87,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/ogg.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/m4/audacity_checklib_libvorbis.m4 b/m4/audacity_checklib_libvorbis.m4 index 232c78c19..2dc8f3c77 100644 --- a/m4/audacity_checklib_libvorbis.m4 +++ b/m4/audacity_checklib_libvorbis.m4 @@ -59,8 +59,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVORBIS], [ LIBVORBIS_LOCAL_CPPSYMBOLS="USE_LIBVORBIS" - LIBVORBIS_LOCAL_CONFIGURE_OPTS="--disable-oggtest" - export PKG_CONFIG_PATH="../libogg:${PKG_CONFIG_PATH}" + libogg_dir="$(pwd)/lib-src/libogg" + LIBVORBIS_LOCAL_CONFIGURE_ARGS="--disable-oggtest OGG_CFLAGS=-I${libogg_dir}/include OGG_LIBS=${libogg_dir}/src/.libs/libogg.a" AC_MSG_NOTICE([Vorbis libraries are available in this source tree]) else