Update of /cvsroot/audacity/audacity-src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv25755
Modified Files:
configure configure.in
Log Message:
Add support for wxWidgets 2.8.
Add --enable-debug option.
Index: configure
===================================================================
RCS file: /cvsroot/audacity/audacity-src/configure,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- configure 5 Nov 2006 18:59:22 -0000 1.99
+++ configure 18 Nov 2006 08:05:20 -0000 1.100
@@ -905,6 +905,7 @@
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-static link wx statically (default=no)
--enable-unicode enable unicode support (default=no)
+ --enable-debug enable unicode support (default=none)
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -3407,6 +3408,14 @@
unicode_preference=""
fi;
+# Check whether --enable-debug or --disable-debug was given.
+if test "${enable_debug+set}" = set; then
+ enableval="$enable_debug"
+ debug_preference="--debug=$enableval"
+else
+ debug_preference=""
+fi;
+
# Check whether --with-lib-preference or --without-lib-preference was given.
if test "${with_lib_preference+set}" = set; then
@@ -5409,9 +5418,6 @@
- LIBSOUNDTOUCH_SYSTEM_AVAILABLE="no"
-
-
pkg_failed=no
echo "$as_me:$LINENO: checking for SOUNDTOUCH" >&5
echo $ECHO_N "checking for SOUNDTOUCH... $ECHO_C" >&6
@@ -6237,14 +6243,14 @@
fi
-wx_version=`${WX_CONFIG} $static_preference $unicode_preference --version`
+wx_version=`${WX_CONFIG} $static_preference $unicode_preference
$debug_preference --version`
-{ echo "$as_me:$LINENO: Checking that the installed version of wxWidgets is
2.6.x" >&5
-echo "$as_me: Checking that the installed version of wxWidgets is 2.6.x" >&6;}
+{ echo "$as_me:$LINENO: Checking that the installed version of wxWidgets is at
least 2.6.x" >&5
+echo "$as_me: Checking that the installed version of wxWidgets is at least
2.6.x" >&6;}
case "${wx_version}" in
- 2.6.*)
- echo "Great, you're using wxWidgets 2.6.x!"
+ 2.6.*|2.7.*|2.8.*)
+ echo "Great, you're using wxWidgets ${wx_version}!"
;;
*)
wx_list=`${WX_CONFIG} --list`
@@ -6262,8 +6268,8 @@
esac
-LIBS="$LIBS `$WX_CONFIG $static_preference $unicode_preference --libs`"
-CPPFLAGS="$CPPFLAGS `$WX_CONFIG $static_preference $unicode_preference
--cxxflags`"
+LIBS="$LIBS `$WX_CONFIG $static_preference $unicode_preference
$debug_preference --libs`"
+CPPFLAGS="$CPPFLAGS `$WX_CONFIG $static_preference $unicode_preference
$debug_preference --cxxflags`"
# Make sure we can run config.sub.
$ac_config_sub sun4 >/dev/null 2>&1 ||
Index: configure.in
===================================================================
RCS file: /cvsroot/audacity/audacity-src/configure.in,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- configure.in 5 Nov 2006 18:59:22 -0000 1.91
+++ configure.in 18 Nov 2006 08:05:20 -0000 1.92
@@ -118,6 +118,12 @@
unicode_preference="--unicode=$enableval",
unicode_preference="")
+AC_ARG_ENABLE(debug,
+ [AC_HELP_STRING([--enable-debug],
+ [enable unicode support (default=none)])],
+ 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]])],
@@ -316,19 +322,19 @@
AC_MSG_ERROR("Could not find wx-config: is wxWindows installed? is
wx-config in your path?")
fi
-dnl Check that the wx version is 2.6.x
+dnl Check that the wx version is at least 2.6.x
-wx_version=`${WX_CONFIG} $static_preference $unicode_preference --version`
+wx_version=`${WX_CONFIG} $static_preference $unicode_preference
$debug_preference --version`
-AC_MSG_NOTICE([Checking that the installed version of wxWidgets is 2.6.x])
+AC_MSG_NOTICE([Checking that the installed version of wxWidgets is at least
2.6.x])
case "${wx_version}" in
- 2.6.*)
- echo "Great, you're using wxWidgets 2.6.x!"
+ 2.6.*|2.7.*|2.8.*)
+ echo "Great, you're using wxWidgets ${wx_version}!"
;;
*)
wx_list=`${WX_CONFIG} --list`
- AC_MSG_ERROR([Unable to locate a suitable configuration of wxWidgets v2.6.x.
+ AC_MSG_ERROR([Unable to locate a suitable configuration of wxWidgets v2.6.x
or higher.
The currently available configurations are listed below. If necessary, either
install the package for your distribution or download the latest version of
wxWidgets
from http://wxwidgets.org.
@@ -337,8 +343,8 @@
dnl Gather wx arguments
-LIBS="$LIBS `$WX_CONFIG $static_preference $unicode_preference --libs`"
-CPPFLAGS="$CPPFLAGS `$WX_CONFIG $static_preference $unicode_preference
--cxxflags`"
+LIBS="$LIBS `$WX_CONFIG $static_preference $unicode_preference
$debug_preference --libs`"
+CPPFLAGS="$CPPFLAGS `$WX_CONFIG $static_preference $unicode_preference
$debug_preference --cxxflags`"
AC_CANONICAL_HOST
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
