Update of /cvsroot/audacity/audacity-src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv29119
Modified Files:
acinclude.m4 configure
Log Message:
Support system library for soundtouch.
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/audacity/audacity-src/acinclude.m4,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- acinclude.m4 21 Oct 2006 18:48:40 -0000 1.18
+++ acinclude.m4 5 Nov 2006 18:49:26 -0000 1.19
@@ -88,12 +88,23 @@
dnl see if soundtouch is installed on the system
- dnl ... TODO: I don't know if stock, unmodified soundtouch is
- dnl suitable for audacity, so I don't allow it
+ PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch-1.0 >= 1.3.1,
+ soundtouch_available_system="yes",
+ soundtouch_available_system="no")
- LIBSOUNDTOUCH_SYSTEM_AVAILABLE="no"
- dnl see if libresample is available locally
+ if test "x$soundtouch_available_system" = "xyes" ; then
+ LIBSOUNDTOUCH_SYSTEM_AVAILABLE="yes"
+ LIBSOUNDTOUCH_SYSTEM_LIBS=$SOUNDTOUCH_LIBS
+ LIBSOUNDTOUCH_SYSTEM_CXXFLAGS=$SOUNDTOUCH_CFLAGS
+ LIBSOUNDTOUCH_SYSTEM_CPPSYMBOLS="USE_SOUNDTOUCH"
+ AC_MSG_NOTICE([Libsoundtouch libraries are available as system
libraries])
+ else
+ LIBSOUNDTOUCH_SYSTEM_AVAILABLE="no"
+ AC_MSG_NOTICE([Libsoundtouch libraries are NOT available as system
libraries])
+ fi
+
+ dnl see if libsoundtouch is available locally
AC_CHECK_FILE(${srcdir}/lib-src/soundtouch/include/SoundTouch.h,
soundtouch_h_found="yes",
@@ -180,6 +191,7 @@
LIBSAMPLERATE_SYSTEM_AVAILABLE="yes"
LIBSAMPLERATE_SYSTEM_LIBS=$SAMPLERATE_LIBS
LIBSAMPLERATE_SYSTEM_CXXFLAGS=$SAMPLERATE_CFLAGS
+ LIBSAMPLERATE_SYSTEM_CPPSYMBOLS="USE_LIBSAMPLERATE"
AC_MSG_NOTICE([Libsamplerate libraries are available as system
libraries])
else
LIBSAMPLERATE_SYSTEM_AVAILABLE="no"
Index: configure
===================================================================
RCS file: /cvsroot/audacity/audacity-src/configure,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- configure 24 Oct 2006 05:08:01 -0000 1.97
+++ configure 5 Nov 2006 18:49:26 -0000 1.98
@@ -1,9 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60a.
+# Generated by GNU Autoconf 2.59.
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
[...9345 lines suppressed...]
- { 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;}
+ { 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;}
# The eval makes quoting arguments work.
- eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
- --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
+ eval $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
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
