From a742111fd2c4089a16a7d9532411c6ef36cb5b5d Mon Sep 17 00:00:00 2001
From: nehalmistry <>
Date: Mon, 31 Mar 2003 00:43:00 +0000
Subject: [PATCH] more cleanups; have setup accept CFLAGS and LDFLAGS
---
setup | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/setup b/setup
index a55c5cada..a2347e98e 100755
--- a/setup
+++ b/setup
@@ -28,7 +28,8 @@
##-----------------------------------------------------------------------------
## HERE ARE SOME USER-CONFIGURABLE VARIABLES
-EXTRA_CFLAGS="-DUNIT_ON_MAP -DNEW_AI -DUSE_LIBMODPLUG -DUSE_HP_FOR_XP"
+EXTRA_CFLAGS="$CFLAGS -DUNIT_ON_MAP -DNEW_AI -DUSE_LIBMODPLUG -DUSE_HP_FOR_XP"
+EXTRA_LDFLAGS="$LDFLAGS"
## These could be used for experimental versions
## ---------------------------------------------
@@ -691,7 +692,9 @@ case $ANSWER in
if test "$HAVESDL" = "1" ; then
echo " S - SDL driver (known to have problems with some drives)"
fi
+ if test "$UNIX" = "1" ; then
echo " C - CDDA driver"
+ fi
echo " N - None"
echo
echo -n "Please enter selection: (n) "
@@ -756,22 +759,21 @@ fi
# Display menu
echo "COMPRESSION OPTIONS"
-echo
-echo " N-None"$DEF1
+echo " N - None"$DEF1
if test "$HAVE_LIBZ" = 1 ; then
- echo " G-GZ"$DEF2
+ echo " G - GZ"$DEF2
fi
if test "$HAVE_LIBZ" = 2 ; then
- echo " G-GZ"$DEF2 " (local: $LOCAL_ZLIB)"
+ echo " G - GZ"$DEF2 " (local: $LOCAL_ZLIB)"
fi
if test "$HAVE_LIBBZ2" = 1 ; then
- echo " B-Bzip2"$DEF3
+ echo " B - Bzip2"$DEF3
fi
if (test "$HAVE_LIBZ" = 1 -o "$HAVE_LIBZ" = 2 && test "$HAVE_LIBBZ2" = 1) ; then
- echo " O-Both GZ and Bzip2"$DEF4
+ echo " O - Both GZ and Bzip2"$DEF4
fi
if (test "$HAVE_LIBZ" = 1 -o "$HAVE_LIBZ" = 2 && test "$HAVE_LIBBZ2" = 1 && test "$HAVE_LIBZZIP" = 1 ) ; then
- echo " A-All ZZip and GZ and Bzip2"$DEF5
+ echo " A- All ZZip and GZ and Bzip2"$DEF5
fi
echo
echo -n "Please enter selection ($COMPDEF): "
@@ -1050,7 +1052,8 @@ if [ "$BEOS" != 1 ] ; then
# Libraries needed to build freecraft
echo "CLONELIBS=$CLONELIBS \$(XLDFLAGS) -lpng -lz -lm \\" >> $RULESFILE
echo " \$(THREADLIB) \$(CCLLIB) \$(VIDEOLIB) \$(ZLIBS) \\" >> $RULESFILE
- echo " \$(ARTSCLIB) \$(FLACLIB) \$(OGGLIB) \$(MP3LIB) -lz -lm" >> $RULESFILE
+ echo " \$(ARTSCLIB) \$(FLACLIB) \$(OGGLIB) \$(MP3LIB) \\" >> $RULESFILE
+ echo " $EXTRA_LDFLAGS -lz -lm" >> $RULESFILE
else
# Libraries needed to build tools
echo "TOOLLIBS=\$(XLDFLAGS) -lpng -lz \$(THREADLIB)" >> $RULESFILE