diff --git a/configure.ac b/configure.ac index 842f2f0c8..09ce5b7cb 100644 --- a/configure.ac +++ b/configure.ac @@ -490,9 +490,7 @@ for lib in $LIBRARIES ; do eval BUILD_LDFLAGS=\"\$BUILD_LDFLAGS \$${lib}_LOCAL_LDFLAGS\" eval OPTOBJS=\"$OPTOBJS \$${lib}_LOCAL_OPTOBJS\" eval CXXFLAGS=\"\$CXXFLAGS \$${lib}_LOCAL_CXXFLAGS\" - eval CONFIG_SUBDIRS=\"\$${lib}_LOCAL_CONFIG_SUBDIRS\" eval ac_configure_args=\"\$ac_configure_args \$${lib}_LOCAL_CONFIGURE_ARGS\" - AC_CONFIG_SUBDIRS($CONFIG_SUBDIRS) eval CPPSYMBOLS=\"\$${lib}_LOCAL_CPPSYMBOLS\" for symbol in $CPPSYMBOLS ; do @@ -511,6 +509,22 @@ for lib in $LIBRARIES ; do fi done +AUDACITY_CONFIG_SUBDIRS_LIBFLAC +AUDACITY_CONFIG_SUBDIRS_LIBID3TAG +AUDACITY_CONFIG_SUBDIRS_LIBMAD +AUDACITY_CONFIG_SUBDIRS_LIBNYQUIST +AUDACITY_CONFIG_SUBDIRS_LIBRESAMPLE +AUDACITY_CONFIG_SUBDIRS_LIBSAMPLERATE +AUDACITY_CONFIG_SUBDIRS_LIBSBSMS +AUDACITY_CONFIG_SUBDIRS_LIBSNDFILE +AUDACITY_CONFIG_SUBDIRS_LIBSOUNDTOUCH +AUDACITY_CONFIG_SUBDIRS_LIBSOXR +AUDACITY_CONFIG_SUBDIRS_LIBTWOLAME +AUDACITY_CONFIG_SUBDIRS_LIBVAMP +AUDACITY_CONFIG_SUBDIRS_LIBVORBIS +AUDACITY_CONFIG_SUBDIRS_PORTAUDIO +AUDACITY_CONFIG_SUBDIRS_PORTSMF + dnl " This is included purely to close an otherwise endless string in vim diff --git a/m4/audacity_checklib_libflac.m4 b/m4/audacity_checklib_libflac.m4 index bfae89d5a..31bf8f763 100644 --- a/m4/audacity_checklib_libflac.m4 +++ b/m4/audacity_checklib_libflac.m4 @@ -62,7 +62,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [ LIBFLAC_LOCAL_CPPSYMBOLS="USE_LIBFLAC" # this file shouldn't be built at if no libflac is available LIBFLAC_LOCAL_OPTOBJS="ondemand/ODDecodeFlacTask.o" - LIBFLAC_LOCAL_CONFIG_SUBDIRS="lib-src/libflac" LIBFLAC_LOCAL_CONFIGURE_ARGS="--disable-xmms-plugin --disable-doxygen-docs --disable-thorough-tests" AC_MSG_NOTICE([FLAC libraries are available in this source tree]) @@ -73,3 +72,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [ LIBFLAC_MIMETYPES="audio/flac;audio/x-flac;" ]) +AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBFLAC], [ + if test "$LIBFLAC_USE_LOCAL" = yes; then + AC_CONFIG_SUBDIRS([lib-src/libflac]) + fi +]) diff --git a/m4/audacity_checklib_libid3tag.m4 b/m4/audacity_checklib_libid3tag.m4 index 35a478486..6d8ce36ac 100644 --- a/m4/audacity_checklib_libid3tag.m4 +++ b/m4/audacity_checklib_libid3tag.m4 @@ -49,7 +49,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBID3TAG], [ LIBID3TAG_LOCAL_LIBS="libid3tag.a" LIBID3TAG_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libid3tag' LIBID3TAG_LOCAL_CPPSYMBOLS="USE_LIBID3TAG" - LIBID3TAG_LOCAL_CONFIG_SUBDIRS="lib-src/libid3tag" AC_MSG_NOTICE([libid3tag libraries are available in the local tree]) else LIBID3TAG_LOCAL_AVAILABLE="no" @@ -57,3 +56,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBID3TAG], [ fi ]) +AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBID3TAG], [ + if test "$LIBID3TAG_USE_LOCAL" = yes; then + AC_CONFIG_SUBDIRS([lib-src/libid3tag]) + fi +]) diff --git a/m4/audacity_checklib_liblrdf.m4 b/m4/audacity_checklib_liblrdf.m4 index d45468ad1..ef424223b 100644 --- a/m4/audacity_checklib_liblrdf.m4 +++ b/m4/audacity_checklib_liblrdf.m4 @@ -46,9 +46,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBLRDF], [ LIBLRDF_LOCAL_LIBS="liblrdf.a" LIBLRDF_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/liblrdf' LIBLRDF_LOCAL_CPPSYMBOLS="USE_LIBLRDF" - if test ! -f lib-src/liblrdf/Makefile ; then - LIBLRDF_LOCAL_CONFIG_SUBDIRS="lib-src/liblrdf" - fi AC_MSG_NOTICE([liblrdf is available in the local tree]) else LIBLRDF_LOCAL_AVAILABLE="no" @@ -56,3 +53,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBLRDF], [ fi ]) +AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBLRDF], [ + if test "$LIBLRDF_USE_LOCAL" = yes; then + AC_CONFIG_SUBDIRS([lib-src/liblrdf]) + fi +]) diff --git a/m4/audacity_checklib_libmad.m4 b/m4/audacity_checklib_libmad.m4 index d92c90909..a45b9d6b4 100644 --- a/m4/audacity_checklib_libmad.m4 +++ b/m4/audacity_checklib_libmad.m4 @@ -53,7 +53,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBMAD], [ LIBMAD_LOCAL_LIBS="libmad.a" LIBMAD_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libmad' LIBMAD_LOCAL_CPPSYMBOLS="USE_LIBMAD" - LIBMAD_LOCAL_CONFIG_SUBDIRS="lib-src/libmad" AC_MSG_NOTICE([libmad libraries are available in the local tree]) else LIBMAD_LOCAL_AVAILABLE="no" @@ -62,3 +61,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBMAD], [ LIBMAD_MIMETYPES="audio/mpeg;" ]) +AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBMAD], [ + if test "$LIBMAD_USE_LOCAL" = yes; then + AC_CONFIG_SUBDIRS([lib-src/libmad]) + fi +]) diff --git a/m4/audacity_checklib_libnyquist.m4 b/m4/audacity_checklib_libnyquist.m4 index 4eb7dadda..e21608fa7 100644 --- a/m4/audacity_checklib_libnyquist.m4 +++ b/m4/audacity_checklib_libnyquist.m4 @@ -34,8 +34,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBNYQUIST], [ LIBNYQUIST_LOCAL_OPTOBJS="effects/nyquist/Nyquist.o" LIBNYQUIST_LOCAL_OPTOBJS="$LIBNYQUIST_LOCAL_OPTOBJS effects/nyquist/LoadNyquist.o" - LIBNYQUIST_LOCAL_CONFIG_SUBDIRS="lib-src/libnyquist" - AC_MSG_NOTICE([nyquist libraries are available in the local tree]) else LIBNYQUIST_LOCAL_AVAILABLE="no" @@ -43,3 +41,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBNYQUIST], [ fi ]) +AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBNYQUIST], [ + if test "$LIBNYQUIST_USE_LOCAL" = yes; then + AC_CONFIG_SUBDIRS([lib-src/libnyquist]) + fi +]) diff --git a/m4/audacity_checklib_libraptor.m4 b/m4/audacity_checklib_libraptor.m4 index 4d7139129..6b875c508 100644 --- a/m4/audacity_checklib_libraptor.m4 +++ b/m4/audacity_checklib_libraptor.m4 @@ -36,9 +36,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBRAPTOR], [ LIBRAPTOR_LOCAL_AVAILABLE="yes" LIBRAPTOR_LOCAL_LIBS="libraptor.a" LIBRAPTOR_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libraptor/src' - if test ! -f lib-src/libraptor/Makefile ; then - LIBRAPTOR_LOCAL_CONFIG_SUBDIRS="lib-src/libraptor" - fi AC_MSG_NOTICE([libraptor is available in the local tree]) if test "x$LIBEXPAT_SYSTEM_AVAILABLE" = "xno" ; then LIBRAPTOR_LOCAL_CONFIGURE_ARGS="\"--with-expat-source=${srcdir}/src/include\"" @@ -50,3 +47,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBRAPTOR], [ fi ]) +AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBRAPTOR], [ + if test "$LIBRAPTOR_USE_LOCAL" = yes; then + AC_CONFIG_SUBDIRS([lib-src/libraptor]) + fi +]) diff --git a/m4/audacity_checklib_libresample.m4 b/m4/audacity_checklib_libresample.m4 index 9935bd7c9..723d64120 100644 --- a/m4/audacity_checklib_libresample.m4 +++ b/m4/audacity_checklib_libresample.m4 @@ -33,7 +33,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBRESAMPLE], [ LIBRESAMPLE_LOCAL_LIBS="libresample.a" LIBRESAMPLE_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libresample/include' LIBRESAMPLE_LOCAL_CPPSYMBOLS="USE_LIBRESAMPLE" - LIBRESAMPLE_LOCAL_CONFIG_SUBDIRS="lib-src/libresample" AC_MSG_NOTICE([libresample libraries are available in the local tree]) else @@ -42,3 +41,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBRESAMPLE], [ fi ]) +AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBRESAMPLE], [ + if test "$LIBRESAMPLE_USE_LOCAL" = yes; then + AC_CONFIG_SUBDIRS([lib-src/libresample]) + fi +]) diff --git a/m4/audacity_checklib_libsamplerate.m4 b/m4/audacity_checklib_libsamplerate.m4 index 9d2ad56e5..95802d67d 100644 --- a/m4/audacity_checklib_libsamplerate.m4 +++ b/m4/audacity_checklib_libsamplerate.m4 @@ -44,10 +44,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSAMPLERATE], [ LIBSAMPLERATE_LOCAL_LIBS="libsamplerate.a" LIBSAMPLERATE_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libsamplerate/src' LIBSAMPLERATE_LOCAL_CPPSYMBOLS="USE_LIBSAMPLERATE" - - if test ! -f lib-src/libsamplerate/Makefile ; then - LIBSAMPLERATE_LOCAL_CONFIG_SUBDIRS="lib-src/libsamplerate" - fi AC_MSG_NOTICE([libsamplerate libraries are available in the local tree]) else LIBSAMPLERATE_LOCAL_AVAILABLE="no" @@ -55,3 +51,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSAMPLERATE], [ fi ]) +AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBSAMPLERATE], [ + if test "$LIBSAMPLERATE_USE_LOCAL" = yes; then + AC_CONFIG_SUBDIRS([lib-src/libsamplerate]) + fi +]) diff --git a/m4/audacity_checklib_libsbsms.m4 b/m4/audacity_checklib_libsbsms.m4 index 2946101cd..7a9480214 100644 --- a/m4/audacity_checklib_libsbsms.m4 +++ b/m4/audacity_checklib_libsbsms.m4 @@ -45,8 +45,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSBSMS], [ LIBSBSMS_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/sbsms/include' LIBSBSMS_LOCAL_CPPSYMBOLS="USE_SBSMS" - dnl set up configuring sbsms - LIBSBSMS_LOCAL_CONFIG_SUBDIRS="lib-src/sbsms" dnl do not build programs we don't need LIBSBSMS_LOCAL_CONFIGURE_ARGS="--disable-programs" @@ -58,3 +56,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSBSMS], [ ]) +AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBSBSMS], [ + if test "$LIBSBSMS_USE_LOCAL" = yes; then + AC_CONFIG_SUBDIRS([lib-src/sbsms]) + fi +]) diff --git a/m4/audacity_checklib_libsndfile.m4 b/m4/audacity_checklib_libsndfile.m4 index 8d8c4fbf7..27a20c76b 100644 --- a/m4/audacity_checklib_libsndfile.m4 +++ b/m4/audacity_checklib_libsndfile.m4 @@ -37,7 +37,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSNDFILE], [ LIBSNDFILE_LOCAL_AVAILABLE="yes" LIBSNDFILE_LOCAL_LIBS="libsndfile.a" LIBSNDFILE_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libsndfile/src' - LIBSNDFILE_LOCAL_CONFIG_SUBDIRS="lib-src/libsndfile" AC_MSG_NOTICE([libsndfile libraries are available in this source tree]) dnl These must be visible so libvamp and sbsms can find us @@ -53,3 +52,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSNDFILE], [ LIBSNDFILE_MIMETYPES="audio/basic;audio/x-aiff;audio/x-wav;" ]) +AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBSNDFILE], [ + if test "$LIBSNDFILE_USE_LOCAL" = yes; then + AC_CONFIG_SUBDIRS([lib-src/libsndfile]) + fi +]) diff --git a/m4/audacity_checklib_libsoundtouch.m4 b/m4/audacity_checklib_libsoundtouch.m4 index a1232ac49..5c9967712 100644 --- a/m4/audacity_checklib_libsoundtouch.m4 +++ b/m4/audacity_checklib_libsoundtouch.m4 @@ -59,7 +59,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOUNDTOUCH], [ LIBSOUNDTOUCH_LOCAL_LIBS="libSoundTouch.a" LIBSOUNDTOUCH_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/soundtouch/include' LIBSOUNDTOUCH_LOCAL_CPPSYMBOLS="USE_SOUNDTOUCH" - LIBSOUNDTOUCH_LOCAL_CONFIG_SUBDIRS="lib-src/soundtouch" LIBSOUNDTOUCH_LOCAL_CONFIGURE_ARGS="--enable-static=yes --enable-shared=no" AC_MSG_NOTICE([libsoundtouch libraries are available in the local tree]) else @@ -69,3 +68,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOUNDTOUCH], [ ]) +AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBSOUNDTOUCH], [ + if test "$LIBSOUNDTOUCH_USE_LOCAL" = yes; then + AC_CONFIG_SUBDIRS([lib-src/soundtouch]) + fi +]) diff --git a/m4/audacity_checklib_libsoxr.m4 b/m4/audacity_checklib_libsoxr.m4 index 5bc415457..3ef82196e 100644 --- a/m4/audacity_checklib_libsoxr.m4 +++ b/m4/audacity_checklib_libsoxr.m4 @@ -48,13 +48,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOXR], [ LIBSOXR_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libsoxr/src' LIBSOXR_LOCAL_CPPSYMBOLS="USE_LIBSOXR" - if test ! -f lib-src/libsoxr/Makefile ; then - LIBSOXR_LOCAL_CONFIG_SUBDIRS="lib-src/libsoxr" - - # Breaks other other libraries in Audacity tree; but why is ./configure - # passing options specific to this library to other libraries? - #LIBSOXR_LOCAL_CONFIGURE_ARGS="\"-DBUILD_SHARED_LIBS=OFF -DWITH_OPENMP=OFF\"" - fi + # Breaks other other libraries in Audacity tree; but why is ./configure + # passing options specific to this library to other libraries? + #LIBSOXR_LOCAL_CONFIGURE_ARGS="\"-DBUILD_SHARED_LIBS=OFF -DWITH_OPENMP=OFF\"" AC_MSG_NOTICE([libsoxr libraries are available in the local tree]) else LIBSOXR_LOCAL_AVAILABLE="no" @@ -62,3 +58,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOXR], [ fi ]) +AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBSOXR], [ + if test "$LIBSOXR_USE_LOCAL" = yes; then + AC_CONFIG_SUBDIRS([lib-src/libsoxr]) + fi +]) diff --git a/m4/audacity_checklib_libtwolame.m4 b/m4/audacity_checklib_libtwolame.m4 index b66284b77..ec29f0cd6 100644 --- a/m4/audacity_checklib_libtwolame.m4 +++ b/m4/audacity_checklib_libtwolame.m4 @@ -45,8 +45,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBTWOLAME], [ LIBTWOLAME_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/twolame/libtwolame' LIBTWOLAME_LOCAL_CPPSYMBOLS="USE_LIBTWOLAME" - dnl request library is configured - LIBTWOLAME_LOCAL_CONFIG_SUBDIRS="lib-src/twolame" dnl disable programs we don't need to build LIBTWOLAME_LOCAL_CONFIGURE_ARGS="--disable-programs" @@ -57,3 +55,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBTWOLAME], [ fi ]) +AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBTWOLAME], [ + if test "$LIBTWOLAME_USE_LOCAL" = yes; then + AC_CONFIG_SUBDIRS([lib-src/twolame]) + fi +]) diff --git a/m4/audacity_checklib_libvamp.m4 b/m4/audacity_checklib_libvamp.m4 index f0b085a8e..87a69efaa 100644 --- a/m4/audacity_checklib_libvamp.m4 +++ b/m4/audacity_checklib_libvamp.m4 @@ -53,8 +53,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVAMP], [ dnl define a pre-processor symbol to tell other code that the vamp host dnl SDK is available LIBVAMP_LOCAL_CPPSYMBOLS="USE_VAMP" - dnl schedule the directory to be configured - LIBVAMP_LOCAL_CONFIG_SUBDIRS="lib-src/libvamp" dnl do not build programs we don't need LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs" @@ -65,3 +63,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVAMP], [ fi ]) +AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBVAMP], [ + if test "$LIBVAMP_USE_LOCAL" = yes; then + AC_CONFIG_SUBDIRS([lib-src/libvamp]) + fi +]) diff --git a/m4/audacity_checklib_libvorbis.m4 b/m4/audacity_checklib_libvorbis.m4 index d004c6cc9..d033b5fb7 100644 --- a/m4/audacity_checklib_libvorbis.m4 +++ b/m4/audacity_checklib_libvorbis.m4 @@ -59,7 +59,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVORBIS], [ LIBVORBIS_LOCAL_CPPSYMBOLS="USE_LIBVORBIS" - LIBVORBIS_LOCAL_CONFIG_SUBDIRS="lib-src/libogg lib-src/libvorbis" LIBVORBIS_LOCAL_CONFIGURE_OPTS="--disable-oggtest" export PKG_CONFIG_PATH="${srcdir}/lib-src/libogg:${PKG_CONFIG_PATH}" @@ -70,3 +69,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVORBIS], [ LIBVORBIS_MIMETYPES="application/ogg;audio/x-vorbis+ogg;" ]) +AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBVORBIS], [ + if test "$LIBVORBIS_USE_LOCAL" = yes; then + AC_CONFIG_SUBDIRS([lib-src/libogg lib-src/libvorbis]) + fi +]) diff --git a/m4/audacity_checklib_portaudio.m4 b/m4/audacity_checklib_portaudio.m4 index 100d4ccdb..a95d286d8 100644 --- a/m4/audacity_checklib_portaudio.m4 +++ b/m4/audacity_checklib_portaudio.m4 @@ -44,7 +44,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTAUDIO], [ PORTAUDIO_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/portaudio-v19/include' dnl set up configuring portaudio - PORTAUDIO_LOCAL_CONFIG_SUBDIRS="lib-src/portaudio-v19" PORTAUDIO_LOCAL_CONFIGURE_ARGS="--with-pa-include=../portaudio-v19/include" AC_MSG_NOTICE([portaudio19 library is available in the local tree]) @@ -54,3 +53,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTAUDIO], [ fi ]) + +AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_PORTAUDIO], [ + if test "$PORTAUDIO_USE_LOCAL" = yes; then + AC_CONFIG_SUBDIRS([lib-src/portaudio-v19]) + fi +]) diff --git a/m4/audacity_checklib_portsmf.m4 b/m4/audacity_checklib_portsmf.m4 index ffb979291..6bc4dbc32 100644 --- a/m4/audacity_checklib_portsmf.m4 +++ b/m4/audacity_checklib_portsmf.m4 @@ -45,10 +45,15 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTSMF], [ PORTSMF_LOCAL_LIBS="libportSMF.a" PORTSMF_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/portsmf' PORTSMF_LOCAL_CPPSYMBOLS="USE_MIDI" - PORTSMF_LOCAL_CONFIG_SUBDIRS="lib-src/portsmf" dnl extra objects we can now compile PORTSMF_LOCAL_OPTOBJS="NoteTrack.o import/ImportMIDI.o" else PORTSMF_LOCAL_AVAILABLE="no" fi ]) + +AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_PORTSMF], [ + if test "$PORTSMF_USE_LOCAL" = yes; then + AC_CONFIG_SUBDIRS([lib-src/portsmf]) + fi +]) diff --git a/m4/audacity_checklib_redland.m4 b/m4/audacity_checklib_redland.m4 index d52e09507..d5674179f 100644 --- a/m4/audacity_checklib_redland.m4 +++ b/m4/audacity_checklib_redland.m4 @@ -34,9 +34,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_REDLAND], [ REDLAND_LOCAL_AVAILABLE="yes" REDLAND_LOCAL_LIBS="librdf.a libraptor.a librasqal.a" REDLAND_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/redland/librdf -I$(top_srcdir)/lib-src/redland/raptor/src -I$(top_srcdir)/lib-src/redland/rasqal/src' - if test ! -f lib-src/redland/Makefile ; then - REDLAND_LOCAL_CONFIG_SUBDIRS="lib-src/redland" - fi if test "x$LIBEXPAT_SYSTEM_AVAILABLE" = "xno" ; then # This is a horrible hack to keep from having to modify the raptor/configure.ac. It makes # the raptor configure think there's a full expat source tree. But, all we have is expat.h @@ -51,3 +48,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_REDLAND], [ fi ]) +AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_REDLAND], [ + if test "$REDLAND_USE_LOCAL" = yes; then + AC_CONFIG_SUBDIRS([lib-src/redland]) + fi +]) diff --git a/m4/audacity_checklib_slv2.m4 b/m4/audacity_checklib_slv2.m4 index 8afefef20..45e848661 100644 --- a/m4/audacity_checklib_slv2.m4 +++ b/m4/audacity_checklib_slv2.m4 @@ -44,9 +44,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_SLV2], [ SLV2_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/slv2' SLV2_LOCAL_CPPSYMBOLS="USE_SLV2" SLV2_LOCAL_OPTOBJS="effects/lv2/LoadLV2.o effects/lv2/LV2Effect.o effects/lv2/LV2PortGroup.o" - if test ! -f lib-src/slv2/Makefile ; then - SLV2_LOCAL_CONFIG_SUBDIRS="lib-src/slv2" - fi AC_MSG_NOTICE([SLV2 is available in the local tree]) else SLV2_LOCAL_AVAILABLE="no" @@ -54,3 +51,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_SLV2], [ fi ]) +AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_SLV2], [ + if test "$SLV2_USE_LOCAL" = yes; then + AC_CONFIG_SUBDIRS([lib-src/slv2]) + fi +]) diff --git a/m4/audacity_checklib_taglib.m4 b/m4/audacity_checklib_taglib.m4 index 9376418ec..52d4010c1 100644 --- a/m4/audacity_checklib_taglib.m4 +++ b/m4/audacity_checklib_taglib.m4 @@ -43,9 +43,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_TAGLIB], [ TAGLIB_LOCAL_LIBS="taglib.a" TAGLIB_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/taglib/taglib' TAGLIB_LOCAL_CPPSYMBOLS="USE_TAGLIB" - - dnl request library is configured - TAGLIB_LOCAL_CONFIG_SUBDIRS="lib-src/taglib" AC_MSG_NOTICE([TagLib library is available in the local tree]) else @@ -54,3 +51,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_TAGLIB], [ fi ]) +AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_TAGLIB], [ + if test "$TAGLIB_USE_LOCAL" = yes; then + AC_CONFIG_SUBDIRS([lib-src/taglib]) + fi +])