Update of /cvsroot/audacity/audacity-src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12340
Modified Files:
acinclude.m4 configure configure.in
Log Message:
Add autoconf support for libtwolame (adds MP2 export support to Linux and Mac
builds)
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/audacity/audacity-src/acinclude.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- acinclude.m4 4 Oct 2006 23:30:21 -0000 1.16
+++ acinclude.m4 20 Oct 2006 10:31:59 -0000 1.17
@@ -36,6 +36,40 @@
fi
])
+AC_DEFUN([AUDACITY_CHECKLIB_LIBTWOLAME], [
+ AC_ARG_WITH(libtwolame,
+ [AC_HELP_STRING([--with-libtwolame],
+ [compile with libtwolame (MP2 export) support
[default=yes]])],
+ LIBTWOLAME_ARGUMENT=$withval,
+ LIBTWOLAME_ARGUMENT="unspecified")
+
+ if false ; then
+ AC_DEFINE(USE_LIBTWOLAME, 1,
+ [Define if libtwolame (MP2 export) support should be enabled])
+ fi
+
+ dnl Libtwolame is so new, we should really use our patched local version
for now
+ dnl FIXME: Might want to change this at some point of time in the future...
+ LIBTWOLAME_SYSTEM_AVAILABLE="no"
+
+ dnl see if libtwolame is available locally
+
+ AC_CHECK_FILE(${srcdir}/lib-src/twolame/libtwolame/twolame.h,
+ twolame_h_found="yes",
+ twolame_h_found="no")
+
+ if test "x$twolame_h_found" = "xyes" ; then
+ LIBTWOLAME_LOCAL_AVAILABLE="yes"
+ LIBTWOLAME_LOCAL_LIBS="libtwolame.a"
+ LIBTWOLAME_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/twolame/libtwolame'
+ LIBTWOLAME_LOCAL_CPPSYMBOLS="USE_LIBTWOLAME"
+ AC_MSG_NOTICE([libtwolame library is available in the local tree])
+ else
+ LIBTWOLAME_LOCAL_AVAILABLE="no"
+ AC_MSG_NOTICE([libtwolame library is NOT available in the local tree])
+ fi
+])
+
AC_DEFUN([AUDACITY_CHECKLIB_LIBSOUNDTOUCH], [
AC_ARG_WITH(soundtouch,
[AC_HELP_STRING([--with-soundtouch],
Index: configure
===================================================================
RCS file: /cvsroot/audacity/audacity-src/configure,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- configure 4 Oct 2006 23:30:21 -0000 1.93
+++ configure 20 Oct 2006 10:31:59 -0000 1.94
@@ -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.
## --------------------- ##
[...9203 lines suppressed...]
case $cache_file in
[\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
- *) # Relative name.
- ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
+ *) # Relative path.
+ ac_sub_cache_file=$ac_top_builddir$cache_file ;;
esac
- { 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; }; }
Index: configure.in
===================================================================
RCS file: /cvsroot/audacity/audacity-src/configure.in,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- configure.in 2 Oct 2006 00:37:02 -0000 1.87
+++ configure.in 20 Oct 2006 10:31:59 -0000 1.88
@@ -124,7 +124,7 @@
lib_preference=$withval,
lib_preference="system local")
-LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE
LIBRESAMPLE LIBSOUNDTOUCH LIBNYQUIST LIBEXPAT"
+LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE
LIBRESAMPLE LIBSOUNDTOUCH LIBNYQUIST LIBEXPAT LIBTWOLAME"
AC_MSG_NOTICE([Determining what libraries are available in this tree and on
the system])
@@ -138,6 +138,7 @@
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
dnl Set variables based on choices.
-------------------------------------------------------------------------
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
