Update of /cvsroot/audacity/audacity-src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv9289
Modified Files:
configure.in configure
Log Message:
Updated configure script to handle libresample the way the help says it does.
Also fixed a typo in the help for the --enable-debug option. Rebuilt
configure using autoconf 2.61
Index: configure
===================================================================
RCS file: /cvsroot/audacity/audacity-src/configure,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- configure 19 Nov 2006 02:21:01 -0000 1.101
+++ configure 21 Jan 2007 16:27:03 -0000 1.102
@@ -1,25 +1,54 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
+# Generated by GNU Autoconf 2.61.
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
[...9491 lines suppressed...]
- { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args
--cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-echo "$as_me: running $ac_sub_configure $ac_sub_configure_args
--cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+ { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure
$ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
+echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args
--cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
# The eval makes quoting arguments work.
- eval $ac_sub_configure $ac_sub_configure_args \
- --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
+ eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
+ --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
{ { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir"
>&5
echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
{ (exit 1); exit 1; }; }
fi
- cd $ac_popdir
+ cd "$ac_popdir"
done
fi
Index: configure.in
===================================================================
RCS file: /cvsroot/audacity/audacity-src/configure.in,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- configure.in 21 Jan 2007 15:22:01 -0000 1.94
+++ configure.in 21 Jan 2007 16:27:03 -0000 1.95
@@ -120,7 +120,7 @@
AC_ARG_ENABLE(debug,
[AC_HELP_STRING([--enable-debug],
- [enable unicode support (default=none)])],
+ [enable debug support (default=none)])],
debug_preference="--debug=$enableval",
debug_preference="")
@@ -218,9 +218,30 @@
fi
fi
-if test "$LIBRESAMPLE_USE_LOCAL" = "yes" || test "$LIBRESAMPLE_USE_SYSTEM" =
"yes" ; then
- LIBSAMPLERATE_USE_LOCAL="no"
- LIBSAMPLERATE_USE_SYSTEM="no"
+dnl we can only have one sample rate conversion library used.
+dnl by now we will have both enabled if they are present, regardless of whether
+dnl they were requested, unless one was specifically disabled.
+dnl we would like to honour requests at this stage, so need to know about
+dnl the original options, not just which LIB_USE variables have been set.
+if ( test "$LIBRESAMPLE_USE_LOCAL" = "yes" || test "$LIBRESAMPLE_USE_SYSTEM" =
"yes") && ( test "$LIBSAMPLERATE_USE_LOCAL" = "yes" || test
"$LIBSAMPLERATE_USE_SYSTEM" = "yes"); then
+ dnl if we get here, both libraries are available to us.
+ AC_MSG_NOTICE([Both libresample and libsamplerate are available])
+ AC_MSG_NOTICE([deciding which to use based on arguments ...])
+ if test x"$LIBSAMPLERATE_ARGUMENT" = x"unspecified" ; then
+ dnl they didn't ask for libsamplerate, they don't get it
+ LIBSAMPLERATE_USE_LOCAL="no"
+ LIBSAMPLERATE_USE_SYSTEM="no"
+ dnl done - we are using libresample
+ AC_MSG_NOTICE([Libsamplerate not explicity requested, using libresample])
+ else
+ dnl if we get here, then libsample rate has been explicity specified.
+ dnl could that be disabling it? No, because it wouldn't then have been
+ dnl enabled above.
+ LIBRESAMPLE_USE_LOCAL="no"
+ LIBRESAMPLE_USE_SYSTEM="no"
+ dnl done - we are using libsamplerate
+ AC_MSG_NOTICE([Using libsamplerate as requested])
+ fi
fi
#
@@ -322,10 +343,10 @@
dnl --- check for required libraries ---
-dnl wxWindows -- we assume that if wx-config is found, wxWindows is
successfully installed.
+dnl wxWidgets -- we assume that if wx-config is found, wxWidgets is
successfully installed.
AC_PATH_PROG(WX_CONFIG, wx-config, no, $PATH:/usr/local/bin )
if [[ "$WX_CONFIG" = "no" ]] ; then
- AC_MSG_ERROR("Could not find wx-config: is wxWindows installed? is
wx-config in your path?")
+ AC_MSG_ERROR("Could not find wx-config: is wxWidgets installed? is
wx-config in your path?")
fi
dnl Check that the wx version is at least 2.6.x
@@ -342,7 +363,8 @@
wx_list=`${WX_CONFIG} --list`
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
+install the package for your distribution or download the latest version of
+wxWidgets
from http://wxwidgets.org.
${wx_list}])
esac
-------------------------------------------------------------------------
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
