[Scummvm-cvs-logs] CVS: scummvm configure,1.67.2.1,1.67.2.2
Max Horn
fingolfin at users.sourceforge.net
Tue Mar 16 17:41:29 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gui browser.cpp,1.20,1.21
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.154,2.155 object.cpp,1.170,1.171 resource.cpp,1.193,1.194 resource_v2.cpp,1.39,1.40 resource_v3.cpp,1.25,1.26 saveload.cpp,1.147,1.148 script_v2.cpp,2.243,2.244 script_v5.cpp,1.232,1.233 script_v6.cpp,1.321,1.322 scumm.h,1.383,1.384
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4462
Modified Files:
Tag: branch-0-6-0
configure
Log Message:
Partial sync with HEAD (this includes the 'echo -n' fix, I hope WooShell is happy now since 0.6.1 should compile on his box ;-) )
Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.67.2.1
retrieving revision 1.67.2.2
diff -u -d -r1.67.2.1 -r1.67.2.2
--- configure 15 Feb 2004 00:42:36 -0000 1.67.2.1
+++ configure 17 Mar 2004 01:28:11 -0000 1.67.2.2
@@ -60,7 +60,7 @@
}
echocheck () {
- echo -n "Checking for $@... "
+ echo_n "Checking for $@... "
}
#
@@ -119,6 +119,14 @@
}
#
+# Function to provide echo -n for bourne shells that don't have it
+#
+echo_n()
+{
+ printf "$@"
+}
+
+#
# Determine a data type with the given length
#
find_type_with_size ()
@@ -197,15 +205,20 @@
Optional Libraries:
--with-alsa-prefix=PFX Prefix where alsa is installed (optional)
--disable-alsa disable ALSA midi sound support [autodetect]
+
--with-ogg-prefix=PFX Prefix where libogg is installed (optional)
--with-vorbis-prefix=PFX Prefix where libvorbis is installed (optional)
--disable-vorbis disable Ogg Vorbis support [autodetect]
+
--with-mad-prefix=PFX Prefix where libmad is installed (optional)
--disable-mad disable libmad (MP3) support [autodetect]
+
--with-zlib-prefix=PFX Prefix where zlib is installed (optional)
--disable-zlib disable zlib (compression) support [autodetect]
- --disable-mpeg2 disable mpeg2 codec for cutscenes [autodetect]
+
--with-mpeg2-prefix=PFX Prefix where libmpeg2 is installed (optional)
+ --disable-mpeg2 disable mpeg2 codec for cutscenes [autodetect]
+
--with-sdl-prefix=PFX Prefix where the sdl-config script is installed
Some influential environment variables:
@@ -277,7 +290,7 @@
DEBFLAGS=""
;;
--enable-release)
- DEBFLAGS=""
+ DEBFLAGS="-O2"
;;
--with-sdl-prefix=*)
arg=`echo $ac_option | cut -d '=' -f 2`
@@ -513,7 +526,7 @@
#
# Check whether memory alignment is required
#
- echo -n "Alignment required... "
+ echo_n "Alignment required... "
cat > $TMPC << EOF
#include <stdlib.h>
#include <signal.h>
@@ -593,6 +606,9 @@
fi
echo "$_mad"
+#
+# Check for ALSA
+#
echocheck "ALSA >= 0.9"
if test "$_alsa" = auto ; then
_alsa=no
@@ -611,6 +627,9 @@
fi
echo "$_alsa"
+#
+# Check for ZLib
+#
echocheck "zlib"
if test "$_zlib" = auto ; then
_zlib=no
@@ -630,6 +649,9 @@
fi
echo "$_zlib"
+#
+# Check for LibMPEG2
+#
echocheck "libmpeg2 >= 0.3.2"
if test "$_mpeg2" = auto ; then
_mpeg2=no
@@ -659,6 +681,9 @@
echo "$_mpeg2"
rm -f $TMPC $TMPO
+#
+# Check which engines ("frontends") are to be built
+#
echo
echo "Engines:"
if test "$_build_scumm" = yes ; then
@@ -671,7 +696,7 @@
echo " Beneath a Steel Sky"
fi
if test "$_build_sword1" = yes ; then
- echo -n " Broken Sword I"
+ echo_n " Broken Sword I"
if test "$_mpeg2" = yes ; then
echo " (w/ mpeg2 cutscenes)"
else
@@ -679,7 +704,7 @@
fi
fi
if test "$_build_sword2" = yes ; then
- echo -n " Broken Sword II"
+ echo_n " Broken Sword II"
if test "$_mpeg2" = yes ; then
echo " (w/ mpeg2 cutscenes)"
else
@@ -691,7 +716,7 @@
fi
echo
-echo -n "Backend... "
+echo_n "Backend... "
echo "$_backend"
#
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gui browser.cpp,1.20,1.21
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.154,2.155 object.cpp,1.170,1.171 resource.cpp,1.193,1.194 resource_v2.cpp,1.39,1.40 resource_v3.cpp,1.25,1.26 saveload.cpp,1.147,1.148 script_v2.cpp,2.243,2.244 script_v5.cpp,1.232,1.233 script_v6.cpp,1.321,1.322 scumm.h,1.383,1.384
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list