Update of /cvsroot/audacity/audacity-src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv28374
Modified Files:
acinclude.m4 configure.in
Log Message:
Updated configure script source files with consistency changes and more
accurate help output
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/audacity/audacity-src/acinclude.m4,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- acinclude.m4 30 Jul 2007 20:53:21 -0000 1.20
+++ acinclude.m4 30 Jul 2007 21:43:34 -0000 1.21
@@ -1,9 +1,9 @@
AC_DEFUN([AUDACITY_CHECKLIB_LIBNYQUIST], [
- AC_ARG_WITH(nyquist,
- [AC_HELP_STRING([--with-nyquist],
+ AC_ARG_ENABLE(nyquist,
+ [AC_HELP_STRING([--enable-nyquist],
[enable Nyquist plug-in support
[default=yes]])],
- LIBNYQUIST_ARGUMENT=$withval,
+ LIBNYQUIST_ARGUMENT=$enableval,
LIBNYQUIST_ARGUMENT="unspecified")
if false ; then
@@ -77,7 +77,7 @@
AC_DEFUN([AUDACITY_CHECKLIB_LIBSOUNDTOUCH], [
AC_ARG_WITH(soundtouch,
[AC_HELP_STRING([--with-soundtouch],
- [use libSoundTouch for pitch and tempo changing]],
+ [use libSoundTouch for pitch and tempo changing])],
LIBSOUNDTOUCH_ARGUMENT=$withval,
LIBSOUNDTOUCH_ARGUMENT="unspecified")
@@ -131,7 +131,7 @@
AC_ARG_WITH(libresample,
[AC_HELP_STRING([--with-libresample],
- [use libresample for sample rate conversion:
[yes no]])],
+ [use libresample for sample rate conversion:
[yes,no]])],
LIBRESAMPLE_ARGUMENT=$withval,
LIBRESAMPLE_ARGUMENT="unspecified")
@@ -281,7 +281,7 @@
AC_ARG_WITH(libsndfile,
[AC_HELP_STRING([--with-libsndfile],
- [which libsndfile to use (required): [local
system]])],
+ [which libsndfile to use (required):
[system,local]])],
LIBSNDFILE_ARGUMENT=$withval,
LIBSNDFILE_ARGUMENT="unspecified")
@@ -519,7 +519,7 @@
AC_ARG_WITH(expat,
[AC_HELP_STRING([--with-expat],
- [which expat to use for XML file support:
[system, local]])],
+ [which expat to use for XML file support:
[system,local]])],
LIBEXPAT_ARGUMENT=$withval,
LIBEXPAT_ARGUMENT="unspecified")
Index: configure.in
===================================================================
RCS file: /cvsroot/audacity/audacity-src/configure.in,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- configure.in 30 Jul 2007 20:50:26 -0000 1.104
+++ configure.in 30 Jul 2007 21:43:34 -0000 1.105
@@ -131,7 +131,7 @@
AC_ARG_WITH(wx-version,
[AC_HELP_STRING([--with-wx-version],
- [override default wxWidgets version [2.6,2.8]])],
+ [select wxWidgets version (if both installed)
[2.6,2.8]])],
wx_preference="--version=$withval",
wx_preference="")
@@ -141,16 +141,16 @@
AC_MSG_NOTICE([Determining what libraries are available in this tree and on
the system])
+AUDACITY_CHECKLIB_LIBSNDFILE
+AUDACITY_CHECKLIB_LIBEXPAT
+AUDACITY_CHECKLIB_LIBSAMPLERATE
+AUDACITY_CHECKLIB_LIBRESAMPLE
AUDACITY_CHECKLIB_LIBVORBIS
AUDACITY_CHECKLIB_LIBMAD
AUDACITY_CHECKLIB_LIBFLAC
-AUDACITY_CHECKLIB_LIBSNDFILE
AUDACITY_CHECKLIB_LIBID3TAG
-AUDACITY_CHECKLIB_LIBSAMPLERATE
-AUDACITY_CHECKLIB_LIBRESAMPLE
AUDACITY_CHECKLIB_LIBSOUNDTOUCH
AUDACITY_CHECKLIB_LIBNYQUIST
-AUDACITY_CHECKLIB_LIBEXPAT
AUDACITY_CHECKLIB_LIBTWOLAME
dnl Decide what libraries to build with, and whether to use system or local
libraries
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
