Update of /cvsroot/audacity/audacity-src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv22487
Modified Files:
Tag: AUDACITY_1_2
configure configure.in
Log Message:
Don't prebind on Intel Mac
Remove extra brackets to allow recursive configure
Index: configure
===================================================================
RCS file: /cvsroot/audacity/audacity-src/configure,v
retrieving revision 1.62.2.20
retrieving revision 1.62.2.21
diff -u -d -r1.62.2.20 -r1.62.2.21
--- configure 29 Nov 2006 08:20:41 -0000 1.62.2.20
+++ configure 21 Feb 2007 06:05:52 -0000 1.62.2.21
@@ -693,16 +693,16 @@
CCC
CXXCPP
PKG_CONFIG'
-ac_subdirs_all='[lib-src/soundtouch]
-[lib-src/libsndfile]
-[lib-src/libresample]
-[lib-src/libsamplerate]
-[lib-src/libmad]
-[lib-src/libogg]
-[lib-src/libvorbis]
-[lib-src/libid3tag]
-[lib-src/portaudio-v19]
-[lib-src/dlcompat]'
+ac_subdirs_all='lib-src/soundtouch
+lib-src/libsndfile
+lib-src/libresample
+lib-src/libsamplerate
+lib-src/libmad
+lib-src/libogg
+lib-src/libvorbis
+lib-src/libid3tag
+lib-src/portaudio-v19
+lib-src/dlcompat'
# Initialize some variables set by options.
ac_init_help=
@@ -5595,7 +5595,7 @@
if test ! -f "lib-src/soundtouch/Makefile"; then
echo "--- Configuring soundtouch";
- subdirs="$subdirs [lib-src/soundtouch]"
+ subdirs="$subdirs lib-src/soundtouch"
fi
fi
@@ -6111,7 +6111,7 @@
if test ! -f "lib-src/libsndfile/Makefile"; then
echo "--- Configuring libsndfile";
- subdirs="$subdirs [lib-src/libsndfile]"
+ subdirs="$subdirs lib-src/libsndfile"
fi
fi
@@ -6166,7 +6166,7 @@
if test ! -f "lib-src/libresample/Makefile"; then
echo "--- Configuring libresample";
- subdirs="$subdirs [lib-src/libresample]"
+ subdirs="$subdirs lib-src/libresample"
fi
fi
@@ -6183,7 +6183,7 @@
if test ! -f "lib-src/libsamplerate/Makefile"; then
echo "--- Configuring libsamplerate";
- subdirs="$subdirs [lib-src/libsamplerate]"
+ subdirs="$subdirs lib-src/libsamplerate"
fi
fi
@@ -6217,7 +6217,7 @@
if test ! -f "lib-src/libmad/Makefile"; then
echo "--- Configuring libmad";
- subdirs="$subdirs [lib-src/libmad]"
+ subdirs="$subdirs lib-src/libmad"
fi
fi
@@ -6566,13 +6566,13 @@
if test ! -f "lib-src/libogg/Makefile"; then
echo "--- Configuring libogg";
- subdirs="$subdirs [lib-src/libogg]"
+ subdirs="$subdirs lib-src/libogg"
fi
if test ! -f "lib-src/libvorbis/Makefile"; then
echo "--- Configuring libvorbis";
- subdirs="$subdirs [lib-src/libvorbis]"
+ subdirs="$subdirs lib-src/libvorbis"
fi
fi
@@ -6845,7 +6845,7 @@
if test ! -f "lib-src/libid3tag/Makefile"; then
echo "--- Configuring libid3tag";
- subdirs="$subdirs [lib-src/libid3tag]"
+ subdirs="$subdirs lib-src/libid3tag"
fi
fi
@@ -7117,7 +7117,7 @@
#
# if test ! -f "lib-src/libflac/Makefile"; then
# echo "--- Configuring libflac";
-# AC_CONFIG_SUBDIRS([[lib-src/libflac]])
+# AC_CONFIG_SUBDIRS([lib-src/libflac])
# fi
#fi
@@ -7568,7 +7568,7 @@
use_ladspa="yes";
fi
- subdirs="$subdirs [lib-src/portaudio-v19]"
+ subdirs="$subdirs lib-src/portaudio-v19"
else
@@ -8022,7 +8022,7 @@
CXXFLAGS="$CXXFLAGS -I../lib-src/dlcompat"
if test ! -f "lib-src/dlcompat/Makefile"; then
echo "--- Configuring dlcompat";
- subdirs="$subdirs [lib-src/dlcompat]"
+ subdirs="$subdirs lib-src/dlcompat"
fi
fi
Index: configure.in
===================================================================
RCS file: /cvsroot/audacity/audacity-src/configure.in,v
retrieving revision 1.64.2.20
retrieving revision 1.64.2.21
diff -u -d -r1.64.2.20 -r1.64.2.21
--- configure.in 29 Nov 2006 08:20:41 -0000 1.64.2.20
+++ configure.in 21 Feb 2007 06:05:55 -0000 1.64.2.21
@@ -297,7 +297,7 @@
if test ! -f "lib-src/soundtouch/Makefile"; then
echo "--- Configuring soundtouch";
- AC_CONFIG_SUBDIRS([[lib-src/soundtouch]])
+ AC_CONFIG_SUBDIRS([lib-src/soundtouch])
fi
fi
@@ -359,7 +359,7 @@
if test ! -f "lib-src/libsndfile/Makefile"; then
echo "--- Configuring libsndfile";
- AC_CONFIG_SUBDIRS([[lib-src/libsndfile]])
+ AC_CONFIG_SUBDIRS([lib-src/libsndfile])
fi
fi
@@ -416,7 +416,7 @@
if test ! -f "lib-src/libresample/Makefile"; then
echo "--- Configuring libresample";
- AC_CONFIG_SUBDIRS([[lib-src/libresample]])
+ AC_CONFIG_SUBDIRS([lib-src/libresample])
fi
fi
@@ -429,7 +429,7 @@
if test ! -f "lib-src/libsamplerate/Makefile"; then
echo "--- Configuring libsamplerate";
- AC_CONFIG_SUBDIRS([[lib-src/libsamplerate]])
+ AC_CONFIG_SUBDIRS([lib-src/libsamplerate])
fi
fi
@@ -453,7 +453,7 @@
if test ! -f "lib-src/libmad/Makefile"; then
echo "--- Configuring libmad";
- AC_CONFIG_SUBDIRS([[lib-src/libmad]])
+ AC_CONFIG_SUBDIRS([lib-src/libmad])
fi
fi
@@ -506,12 +506,12 @@
if test ! -f "lib-src/libogg/Makefile"; then
echo "--- Configuring libogg";
- AC_CONFIG_SUBDIRS([[lib-src/libogg]])
+ AC_CONFIG_SUBDIRS([lib-src/libogg])
fi
if test ! -f "lib-src/libvorbis/Makefile"; then
echo "--- Configuring libvorbis";
- AC_CONFIG_SUBDIRS([[lib-src/libvorbis]])
+ AC_CONFIG_SUBDIRS([lib-src/libvorbis])
fi
fi
@@ -541,7 +541,7 @@
if test ! -f "lib-src/libid3tag/Makefile"; then
echo "--- Configuring libid3tag";
- AC_CONFIG_SUBDIRS([[lib-src/libid3tag]])
+ AC_CONFIG_SUBDIRS([lib-src/libid3tag])
fi
fi
@@ -572,7 +572,7 @@
#
# if test ! -f "lib-src/libflac/Makefile"; then
# echo "--- Configuring libflac";
-# AC_CONFIG_SUBDIRS([[lib-src/libflac]])
+# AC_CONFIG_SUBDIRS([lib-src/libflac])
# fi
#fi
@@ -693,7 +693,7 @@
use_ladspa="yes";
fi
- AC_CONFIG_SUBDIRS([[lib-src/portaudio-v19]])
+ AC_CONFIG_SUBDIRS([lib-src/portaudio-v19])
else
@@ -796,8 +796,11 @@
gcc3="no"
fi
- echo "Enabling prebinding"
- LIBS="$LIBS -prebind"
+ # Not sure if this should be done on Intel or not so...
+ if [[ `uname -p` = "powerpc" ]] ; then
+ echo "Enabling prebinding"
+ LIBS="$LIBS -prebind"
+ fi
CXXFLAGS="$CXXFLAGS -I${NEXT_ROOT}/Developer/Headers/FlatCarbon"
@@ -834,7 +837,7 @@
CXXFLAGS="$CXXFLAGS -I../lib-src/dlcompat"
if test ! -f "lib-src/dlcompat/Makefile"; then
echo "--- Configuring dlcompat";
- AC_CONFIG_SUBDIRS([[lib-src/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
