Update of /cvsroot/audacity/audacity-src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv6912
Modified Files:
configure.in
Log Message:
Drop RTaudio support options (commented out), and clean up help output to make
it more consistent
Index: configure.in
===================================================================
RCS file: /cvsroot/audacity/audacity-src/configure.in,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- configure.in 19 Jun 2007 00:04:57 -0000 1.103
+++ configure.in 30 Jul 2007 20:50:26 -0000 1.104
@@ -101,32 +101,31 @@
AC_DEFINE_UNQUOTED(INSTALL_PREFIX, "$prefix")
fi
-dnl
-dnl Required sublibraries
-dnl
+dnl Build Options
AC_ARG_ENABLE(static,
[AC_HELP_STRING([--enable-static],
- [link wx statically (default=no)])],
+ [link wx statically [default=no]])],
static_preference="--static=$enableval",
static_preference="")
-
AC_ARG_ENABLE(unicode,
[AC_HELP_STRING([--enable-unicode],
- [enable unicode support (default=no)])],
+ [enable unicode support [default=no]])],
unicode_preference="--unicode=$enableval",
unicode_preference="")
AC_ARG_ENABLE(debug,
[AC_HELP_STRING([--enable-debug],
- [enable debug support (default=none)])],
+ [enable debug support [default=no]])],
debug_preference="--debug=$enableval",
debug_preference="")
+
+
AC_ARG_WITH(lib-preference,
[AC_HELP_STRING([--with-lib-preference],
- [use local and/or system libraries, in preferred
order [system,local]])],
+ [whether to use local and/or system libraries, in
order of preference (default="system local")])],
lib_preference=$withval,
lib_preference="system local")
@@ -293,28 +292,28 @@
dnl Optional sublibraries
dnl
-dnl options
-
-
+dnl build options that don't use libraries - just compile-time on/off
-AC_ARG_WITH(ladspa,
- [AC_HELP_STRING([--with-ladspa],
- [compile with ladspa plug-in support [default=yes]])],
- use_ladspa=$withval,
+AC_ARG_ENABLE(ladspa,
+ [AC_HELP_STRING([--enable-ladspa],
+ [enable LADSPA plug-in support [default=yes]])],
+ use_ladspa=$enableval,
use_ladspa="yes")
-AC_ARG_WITH(audiounits,
- [AC_HELP_STRING([--with-audiounits],
- [compile with audio unit plug-in support [default=auto]])],
- use_audiounits=$withval,
+AC_ARG_ENABLE(audiounits,
+ [AC_HELP_STRING([--enable-audiounits],
+ [enable audio unit plug-in support (Mac OS X only)
+ [default=auto]])], use_audiounits=$enableval,
use_audiounits="auto")
-AC_ARG_WITH(quicktime,
- [AC_HELP_STRING([--with-quicktime],
- [compile with QuickTime import support (Mac OS X only) [default=auto]])],
- use_quicktime=$withval,
+AC_ARG_ENABLE(quicktime,
+ [AC_HELP_STRING([--enable-quicktime],
+ [enable QuickTime import support (Mac OS X only) [default=auto]])],
+ use_quicktime=$enableval,
use_quicktime="auto")
+dnl In-tree libraries (ones we write, so only options are off and local)
+
AC_ARG_WITH(portmixer,
[AC_HELP_STRING([--with-portmixer],
[compile with PortMixer [default=yes]])],
@@ -327,11 +326,12 @@
use_portaudio=$withval,
use_portaudio="v19")
-AC_ARG_WITH(rtaudio,
- [AC_HELP_STRING([--with-rtaudio],
- [compile with RTAudio instead of PortAudio [default=no]])],
- use_rtaudio=$withval,
- use_rtaudio="no")
+dnl RTaudio doesn't work right now, so commenting this out RA 30/07/07
+dnl AC_ARG_WITH(rtaudio,
+dnl [AC_HELP_STRING([--with-rtaudio],
+dnl [compile with RTAudio instead of PortAudio [default=no]])],
+dnl use_rtaudio=$withval,
+dnl use_rtaudio="no")
dnl --- check for required libraries ---
@@ -482,16 +482,17 @@
esac
fi
-if [[ "$use_rtaudio" = "yes" ]] ; then
- AC_CONFIG_SUBDIRS([lib-src/rtaudio])
- AC_DEFINE(USE_RTAUDIO, 1,
- [Define if RTAudio support should be enabled])
- CXXFLAGS="-I\$(top_srcdir)/lib-src/rtaudio $CXXFLAGS"
- CXXFLAGS="\`../lib-src/rtaudio/rtaudio-config --cflags\` $CXXFLAGS"
- BUILDLIBS="$BUILDLIBS rtaudio/librtaudio.a"
- EXTRAOBJS="$EXTRAOBJS ../lib-src/librtaudio.a"
- LIBS = "$LIBS \`../lib-src/rtaudio/rtaudio-config --libs\`"
-fi
+dnl Again, not in use now so disable
+dnl if [[ "$use_rtaudio" = "yes" ]] ; then
+dnl AC_CONFIG_SUBDIRS([lib-src/rtaudio])
+dnl AC_DEFINE(USE_RTAUDIO, 1,
+dnl [Define if RTAudio support should be enabled])
+dnl CXXFLAGS="-I\$(top_srcdir)/lib-src/rtaudio $CXXFLAGS"
+dnl CXXFLAGS="\`../lib-src/rtaudio/rtaudio-config --cflags\` $CXXFLAGS"
+dnl BUILDLIBS="$BUILDLIBS rtaudio/librtaudio.a"
+dnl EXTRAOBJS="$EXTRAOBJS ../lib-src/librtaudio.a"
+dnl LIBS = "$LIBS \`../lib-src/rtaudio/rtaudio-config --libs\`"
+dnl fi
if [[ "$use_portmixer" = "yes" ]] ; then
AC_DEFINE(USE_PORTMIXER, 1,
@@ -629,11 +630,12 @@
fi
done
-if [[ "$use_rtaudio" = "yes" ]] ; then
- echo "RTAudio: enabled"
-else
- echo "RTAudio: disabled"
-fi
+dnl disabled as not working
+dnl if [[ "$use_rtaudio" = "yes" ]] ; then
+dnl echo "RTAudio: enabled"
+dnl else
+dnl echo "RTAudio: disabled"
+dnl fi
if [[ "$use_ladspa" = "yes" ]] ; then
echo "ladspa: enabled"
-------------------------------------------------------------------------
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
