1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-20 14:20:06 +02:00

always do sub-configure - that way madness lies. Try and make the help output both correct and consistent

This commit is contained in:
RichardAsh1981@gmail.com 2013-01-13 20:18:41 +00:00
parent d0abe90304
commit 7ef6c92762
2 changed files with 6 additions and 8 deletions

View File

@ -1,13 +1,13 @@
dnl Add Audacity license? dnl Add Audacity license?
dnl Please increment the serial number below whenever you alter this macro dnl Please increment the serial number below whenever you alter this macro
dnl for the benefit of automatic macro update systems 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_DEFUN([AUDACITY_CHECKLIB_LIBRESAMPLE], [
AC_ARG_WITH(libresample, AC_ARG_WITH(libresample,
[AS_HELP_STRING([--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=$withval,
LIBRESAMPLE_ARGUMENT="unspecified") LIBRESAMPLE_ARGUMENT="unspecified")
@ -33,10 +33,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBRESAMPLE], [
LIBRESAMPLE_LOCAL_LIBS="libresample.a" LIBRESAMPLE_LOCAL_LIBS="libresample.a"
LIBRESAMPLE_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libresample/include' LIBRESAMPLE_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libresample/include'
LIBRESAMPLE_LOCAL_CPPSYMBOLS="USE_LIBRESAMPLE" LIBRESAMPLE_LOCAL_CPPSYMBOLS="USE_LIBRESAMPLE"
LIBRESAMPLE_LOCAL_CONFIG_SUBDIRS="lib-src/libresample"
if test ! -f lib-src/libresample/Makefile ; then
LIBRESAMPLE_LOCAL_CONFIG_SUBDIRS="lib-src/libresample"
fi
AC_MSG_NOTICE([libresample libraries are available in the local tree]) AC_MSG_NOTICE([libresample libraries are available in the local tree])
else else
LIBRESAMPLE_LOCAL_AVAILABLE="no" LIBRESAMPLE_LOCAL_AVAILABLE="no"

View File

@ -1,13 +1,13 @@
dnl Add Audacity / libsamplerate license? dnl Add Audacity / libsamplerate license?
dnl Please increment the serial number below whenever you alter this macro dnl Please increment the serial number below whenever you alter this macro
dnl for the benefit of automatic macro update systems 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_DEFUN([AUDACITY_CHECKLIB_LIBSAMPLERATE], [
AC_ARG_WITH(libsamplerate, AC_ARG_WITH(libsamplerate,
[AS_HELP_STRING([--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=$withval,
LIBSAMPLERATE_ARGUMENT="unspecified") LIBSAMPLERATE_ARGUMENT="unspecified")