Update of /cvsroot/audacity/audacity-src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv19964
Modified Files:
Tag: AUDACITY_1_2
configure.in configure
Log Message:
Updated to latest configure.in from 1.2 main branch
Index: configure
===================================================================
RCS file: /cvsroot/audacity/audacity-src/configure,v
retrieving revision 1.62.2.19
retrieving revision 1.62.2.20
diff -u -d -r1.62.2.19 -r1.62.2.20
--- configure 15 Nov 2006 03:06:39 -0000 1.62.2.19
+++ configure 29 Nov 2006 08:20:41 -0000 1.62.2.20
@@ -1,8 +1,9 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
+# Generated by GNU Autoconf 2.60.
#
-# 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.
## --------------------- ##
[...9833 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.64.2.19
retrieving revision 1.64.2.20
diff -u -d -r1.64.2.19 -r1.64.2.20
--- configure.in 15 Nov 2006 03:06:39 -0000 1.64.2.19
+++ configure.in 29 Nov 2006 08:20:41 -0000 1.64.2.20
@@ -45,7 +45,6 @@
AC_SUBST(CONFIGHEADER)
AC_SUBST(PRECOMP_CFLAGS)
AC_SUBST(EXTRATARGETS)
-AC_SUBST(SOUNDTOUCH_CFLAGS)
dnl allow the user to specify options to configure that change the
dnl name "audacity" anywhere it appears in a pathname. This allows
@@ -173,9 +172,12 @@
default_libsoundtouch="local",
default_libsoundtouch="system")
-AC_CHECK_FILE(lib-src/libflac/include/FLAC/all.h,
- default_libflac="local",
- default_libflac="system")
+
+#AC_CHECK_FILE(lib-src/libflac/include/FLAC/format.h,
+# default_libflac="local",
+# default_libflac="system")
+dnl removed libflac check as the only place it would get used is in
+dnl libsndfile, not audacity itself
dnl If any of the optional sublibraries was not found in lib-src,
dnl we assume the user wants to use a system library. If the
@@ -198,9 +200,9 @@
AC_CHECK_HEADER(soundtouch/SoundTouch.h, , default_libsoundtouch="no")
fi
-if [[ "$default_libflac" = "system" ]] ; then
- AC_CHECK_HEADER(FLAC/all.h, , default_libflac="no")
-fi
+#if [[ "$default_libflac" = "system" ]] ; then
+# AC_CHECK_HEADER(FLAC/format.h, , default_libflac="no")
+#fi
dnl options
@@ -241,10 +243,10 @@
use_libsamplerate="default")
AC_ARG_ENABLE(flac,
- [AC_HELP_STRING([--enable-flac],
- [enable FLAC support in local libsndfile [default=yes]
+ [AC_HELP_STRING([--enable-flac ],
+ [enable FLAC support in local libsndfile [default=no]
This has no effect if you use system libsndfile.])],
- ,default_libflac="no")
+ ,)
dnl this does nothing, because all we are after is passing through the command
dnl line option to the local libsndfile configure
@@ -292,7 +294,6 @@
dnl this is the path we need to make that work
BUILDLIBS="$BUILDLIBS
soundtouch/source/SoundTouch/.libs/libSoundTouch.a"
EXTRAOBJS="$EXTRAOBJS
../lib-src/soundtouch/source/SoundTouch/.libs/libSoundTouch.a"
- AX_CHECK_COMPILER_FLAGS("-msse",[SOUNDTOUCH_CXXFLAGS="-msse"])
if test ! -f "lib-src/soundtouch/Makefile"; then
echo "--- Configuring soundtouch";
@@ -349,20 +350,11 @@
dnl then libsndfile will have detected and linked against them
dnl so we need extra (static) link flags
- if [[ "$enable_flac" != "no" ]] ; then
- if [[ "$default_libflac" = "local" ]] ; then
- EXTRAOBJS="$EXTRAOBJS ../lib-src/libflac/src/libFLAC/.libs/libFLAC.a"
- BUILDLIBS="$BUILDLIBS libflac/src/libFLAC/.libs/libFLAC.a"
- CXXFLAGS="$CXXFLAGS -I../lib-src/libflac/include"
- export CPPFLAGS="$CPPFLAGS -I`pwd`/lib-src/libflac/include"
- if test ! -f "lib-src/libflac/Makefile"; then
- echo "--- Configuring libflac";
- AC_CONFIG_SUBDIRS([[lib-src/libflac]])
- fi
- else
- LIBS="$LIBS -lFLAC"
- fi
- fi
+ AC_CHECK_HEADERS(FLAC/all.h)
+ if test x$ac_cv_header_FLAC_all_h = xyes ;
+ then
+ LIBS="$LIBS -lFLAC"
+ fi
if test ! -f "lib-src/libsndfile/Makefile"; then
@@ -807,6 +799,8 @@
echo "Enabling prebinding"
LIBS="$LIBS -prebind"
+ CXXFLAGS="$CXXFLAGS -I${NEXT_ROOT}/Developer/Headers/FlatCarbon"
+
;;
*)
dnl For all other Unix systems, we want to check for lrint/lrintf
@@ -821,18 +815,28 @@
PRECOMP_CFLAGS="-include AudacityHeaders.h"
fi
+AC_CHECK_HEADER(dlfcn.h, have_dlopen="yes", have_dlopen="no")
+if [[ "$MACOSX_DEPLOYMENT_TARGET" = "10.2" ]] ; then
+ have_dlopen="no"
+fi
+
dnl Special configuration for LADSPA on Mac OS X
if [[ "$use_ladspa" = "yes" ]] ; then
case "$host_os" in
darwin* | rhapsody*)
- EXTRAOBJS="$EXTRAOBJS ../lib-src/dlcompat/libdl.a"
- BUILDLIBS="$BUILDLIBS dlcompat/libdl.a"
- CXXFLAGS="$CXXFLAGS -I../lib-src/dlcompat"
- if test ! -f "lib-src/dlcompat/Makefile"; then
- echo "--- Configuring dlcompat";
- AC_CONFIG_SUBDIRS([[lib-src/dlcompat]])
- fi
+ if [[ "$have_dlopen" = "yes" ]] ; then
+ echo "--- Already have dlopen, don't need dlcompat"
+ else
+ echo "Using dlcompat"
+ EXTRAOBJS="$EXTRAOBJS ../lib-src/dlcompat/libdl.a"
+ BUILDLIBS="$BUILDLIBS dlcompat/libdl.a"
+ CXXFLAGS="$CXXFLAGS -I../lib-src/dlcompat"
+ if test ! -f "lib-src/dlcompat/Makefile"; then
+ echo "--- Configuring dlcompat";
+ AC_CONFIG_SUBDIRS([[lib-src/dlcompat]])
+ fi
+ fi
;;
*)
-------------------------------------------------------------------------
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
