From 7ef6c92762d618916830179a2930c20f45ab150f Mon Sep 17 00:00:00 2001 From: "RichardAsh1981@gmail.com" Date: Sun, 13 Jan 2013 20:18:41 +0000 Subject: [PATCH] always do sub-configure - that way madness lies. Try and make the help output both correct and consistent --- m4/audacity_checklib_libresample.m4 | 10 ++++------ m4/audacity_checklib_libsamplerate.m4 | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/m4/audacity_checklib_libresample.m4 b/m4/audacity_checklib_libresample.m4 index b161e6b63..9935bd7c9 100644 --- a/m4/audacity_checklib_libresample.m4 +++ b/m4/audacity_checklib_libresample.m4 @@ -1,13 +1,13 @@ dnl Add Audacity license? dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_libresample.m4 serial 1 +# audacity_checklib_libresample.m4 serial 2 AC_DEFUN([AUDACITY_CHECKLIB_LIBRESAMPLE], [ AC_ARG_WITH(libresample, [AS_HELP_STRING([--with-libresample], - [use libresample for variable-rate resampling: [yes,no]])], + [use libresample for sample rate conversion])], LIBRESAMPLE_ARGUMENT=$withval, LIBRESAMPLE_ARGUMENT="unspecified") @@ -33,10 +33,8 @@ 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" - - if test ! -f lib-src/libresample/Makefile ; then - LIBRESAMPLE_LOCAL_CONFIG_SUBDIRS="lib-src/libresample" - fi + LIBRESAMPLE_LOCAL_CONFIG_SUBDIRS="lib-src/libresample" + AC_MSG_NOTICE([libresample libraries are available in the local tree]) else LIBRESAMPLE_LOCAL_AVAILABLE="no" diff --git a/m4/audacity_checklib_libsamplerate.m4 b/m4/audacity_checklib_libsamplerate.m4 index f52ce9e6f..9d2ad56e5 100644 --- a/m4/audacity_checklib_libsamplerate.m4 +++ b/m4/audacity_checklib_libsamplerate.m4 @@ -1,13 +1,13 @@ dnl Add Audacity / libsamplerate license? dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_libsamplerate.m4 serial 1 +# audacity_checklib_libsamplerate.m4 serial 2 AC_DEFUN([AUDACITY_CHECKLIB_LIBSAMPLERATE], [ AC_ARG_WITH(libsamplerate, [AS_HELP_STRING([--with-libsamplerate], - [use libsamplerate instead of libresample for variable-rate resampling. Do not use in conjunction with VST plug-in support!])], + [use libsamplerate for sample rate conversion. Do not use in conjunction with VST plug-in support!])], LIBSAMPLERATE_ARGUMENT=$withval, LIBSAMPLERATE_ARGUMENT="unspecified")