jim 99/02/07 15:26:54
Modified: src Configure
src/helpers GuessOS PrintPath TestCompile buildinfo.sh
find-dbm-lib slo.sh
Log:
Some areas where the "string protect shell hack"
wasn't finished
Revision Changes Path
1.329 +28 -28 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -r1.328 -r1.329
--- Configure 1999/01/17 10:48:30 1.328
+++ Configure 1999/02/07 23:26:49 1.329
@@ -228,7 +228,7 @@
####################################################################
## Rule SHARED_CORE implies required DSO support
##
-if [ "$RULE_SHARED_CORE" = "yes" ]; then
+if [ "x$RULE_SHARED_CORE" = "xyes" ]; then
using_shlib=1
fi
@@ -371,7 +371,7 @@
echo "but if you would care to port to 64-bit, send us the patches."
DEF_WANTHSREGEX=yes
DBM_LIB=""
- if [ "$RULE_IRIXNIS" = "yes" ]; then
+ if [ "x$RULE_IRIXNIS" = "xyes" ]; then
OS='SGI IRIX-64 w/NIS'
CFLAGS="$CFLAGS -DIRIX"
LIBS="$LIBS -lsun"
@@ -383,14 +383,14 @@
*-sgi-irix32)
DEF_WANTHSREGEX=yes
DBM_LIB=""
- if [ "$RULE_IRIXN32" = "yes" ]; then
- if [ "$RULE_IRIXNIS" = "yes" ]; then
+ if [ "x$RULE_IRIXN32" = "xyes" ]; then
+ if [ "x$RULE_IRIXNIS" = "xyes" ]; then
OS='SGI IRIX-32 w/NIS'
else
OS='SGI IRIX-32'
fi
else
- if [ "$RULE_IRIXNIS" = "yes" ]; then
+ if [ "x$RULE_IRIXNIS" = "xyes" ]; then
OS='SGI IRIX w/NIS'
else
OS='SGI IRIX'
@@ -402,7 +402,7 @@
*-sgi-irix)
DEF_WANTHSREGEX=yes
DBM_LIB=""
- if [ "$RULE_IRIXNIS" = "yes" ]; then
+ if [ "x$RULE_IRIXNIS" = "xyes" ]; then
OS='SGI IRIX w/NIS'
CFLAGS="$CFLAGS -DIRIX"
LIBS="$LIBS -lsun"
@@ -779,7 +779,7 @@
####################################################################
## And adjust/override WANTHSREGEX as needed
##
-if [ "$RULE_WANTHSREGEX" = "default" ]; then
+if [ "x$RULE_WANTHSREGEX" = "xdefault" ]; then
if [ "x$DEF_WANTHSREGEX" = "x" ]; then
RULE_WANTHSREGEX=yes
else
@@ -1022,7 +1022,7 @@
N32FLAG="-n32"
;;
esac
- if [ "$RULE_IRIXN32" = "yes" ]; then
+ if [ "x$RULE_IRIXN32" = "xyes" ]; then
LDFLAGS_SHLIB="$N32FLAG -shared"
else
LDFLAGS_SHLIB="-shared"
@@ -1040,7 +1040,7 @@
N32FLAG="-n32"
;;
esac
- if [ "$RULE_IRIXN32" = "yes" ]; then
+ if [ "x$RULE_IRIXN32" = "xyes" ]; then
LDFLAGS_SHLIB="$N32FLAG -shared"
else
LDFLAGS_SHLIB="-shared"
@@ -1254,7 +1254,7 @@
esac
;;
*IRIX-64*)
- if [ "$RULE_IRIXN32" = "yes" ]; then
+ if [ "x$RULE_IRIXN32" = "xyes" ]; then
case "$CC" in
*/cc|cc )
CFLAGS="$CFLAGS -n32"
@@ -1264,7 +1264,7 @@
fi
;;
*IRIX-32*)
- if [ "$RULE_IRIXN32" = "yes" ]; then
+ if [ "x$RULE_IRIXN32" = "xyes" ]; then
case "$CC" in
*/cc|cc )
CFLAGS="$CFLAGS -n32"
@@ -1333,7 +1333,7 @@
# We assume that if they are using SOCKS4, then they've
# adjusted EXTRA_LIBS and/or EXTRA_LDFLAGS as required,
# otherwise we assume "-L/usr/local/lib -lsocks"
-if [ "$RULE_SOCKS4" = "yes" ]; then
+if [ "x$RULE_SOCKS4" = "xyes" ]; then
echo " + enabling SOCKS4 support"
CFLAGS="$CFLAGS -DSOCKS -DSOCKS4"
CFLAGS="$CFLAGS -Dconnect=Rconnect -Dselect=Rselect"
@@ -1352,7 +1352,7 @@
# We assume that if they are using SOCKS5, then they've
# adjusted EXTRA_LIBS and/or EXTRA_LDFLAGS as required,
# otherwise we assume "-L/usr/local/lib -lsocks5"
-if [ "$RULE_SOCKS5" = "yes" ]; then
+if [ "x$RULE_SOCKS5" = "xyes" ]; then
echo " + enabling SOCKS5 support"
CFLAGS="$CFLAGS -DSOCKS -DSOCKS5"
CFLAGS="$CFLAGS -Dconnect=SOCKSconnect -Dselect=SOCKSselect"
@@ -1495,13 +1495,13 @@
sed '1,/ConfigStart/d;/ConfigEnd/,$d' $tmpfile2 > \
$tmpfile3
echo " o $modname uses ConfigStart/End"
- if [ "$RULE_PARANOID" = "yes" ]; then
+ if [ "x$RULE_PARANOID" = "xyes" ]; then
sed 's/^/>> /' $tmpfile3
fi
. ./$tmpfile3
fi
rm -f $tmpfile2 $tmpfile3
- if [ "$ext" != "so" ]; then
+ if [ "x$ext" != "xso" ]; then
ext=o
fi
fi
@@ -1509,11 +1509,11 @@
modname=`echo $modbase | sed 's/^.*\///' | \
sed 's/^mod_//' | sed 's/^lib//' | sed 's/$/_module/'`
fi
- if [ "$ext" != "so" ]; then
+ if [ "x$ext" != "xso" ]; then
echo "Module $modname $modbase.$ext" >>$tmpfile
fi
# optionally generate export file for some linkers
- if [ "$ext" = "so" -a "$SHLIB_EXPORT_FILES" = "yes" ]; then
+ if [ "x$ext" = "xso" -a "x$SHLIB_EXPORT_FILES" = "xyes" ]; then
echo "$modname" >$modbase.exp
fi
done
@@ -1523,7 +1523,7 @@
## Now HS's POSIX regex implementation if needed/wanted. We do it
## now since AddModule may have changed it
##
-if [ "$RULE_WANTHSREGEX" = "yes" ]; then
+if [ "x$RULE_WANTHSREGEX" = "xyes" ]; then
REGLIB="regex/libregex.a"
SUBDIRS="regex $SUBDIRS"
CFLAGS="$CFLAGS -DUSE_HSREGEX"
@@ -1534,10 +1534,10 @@
##
LIBS_SHLIB=''
if [ "x$using_shlib" = "x1" ] ; then
- if [ "$RULE_SHARED_CHAIN" = "default" ] ; then
+ if [ "x$RULE_SHARED_CHAIN" = "xdefault" ] ; then
RULE_SHARED_CHAIN=$DEF_SHARED_CHAIN
fi
- if [ "$RULE_SHARED_CHAIN" = "yes" ]; then
+ if [ "x$RULE_SHARED_CHAIN" = "xyes" ]; then
echo " + enabling DSO files to be linked against others"
# determine libraries which can be safely linked
# to our DSO files, i.e. PIC libraries and shared libraries
@@ -1552,10 +1552,10 @@
## Now the SHARED_CORE stuff
##
if [ "x$using_shlib" = "x1" ] ; then
- if [ "$RULE_SHARED_CORE" = "default" ] ; then
+ if [ "x$RULE_SHARED_CORE" = "xdefault" ] ; then
RULE_SHARED_CORE=$DEF_SHARED_CORE
fi
- if [ "$RULE_SHARED_CORE" = "yes" ]; then
+ if [ "x$RULE_SHARED_CORE" = "xyes" ]; then
echo " + enabling generation of Apache core as DSO"
# shuffle compiler flags from shlib variant to standard
CFLAGS="$CFLAGS $CFLAGS_SHLIB"
@@ -1566,19 +1566,19 @@
SUBTARGET=target_shared
# determine additional suffixes for libhttpd.so
V=1 R=3 P=5
- if [ "$SHLIB_SUFFIX_DEPTH" = "0" ]; then
+ if [ "x$SHLIB_SUFFIX_DEPTH" = "x0" ]; then
SHLIB_SUFFIX_LIST=""
fi
- if [ "$SHLIB_SUFFIX_DEPTH" = "1" ]; then
+ if [ "x$SHLIB_SUFFIX_DEPTH" = "x1" ]; then
SHLIB_SUFFIX_LIST="$V"
fi
- if [ "$SHLIB_SUFFIX_DEPTH" = "2" ]; then
+ if [ "x$SHLIB_SUFFIX_DEPTH" = "x2" ]; then
SHLIB_SUFFIX_LIST="$V.$R"
fi
- if [ "$SHLIB_SUFFIX_DEPTH" = "3" ]; then
+ if [ "x$SHLIB_SUFFIX_DEPTH" = "x3" ]; then
SHLIB_SUFFIX_LIST="$V.$R.$P"
fi
- if [ "$SHLIB_SUFFIX_DEPTH" = "all" ]; then
+ if [ "x$SHLIB_SUFFIX_DEPTH" = "xall" ]; then
SHLIB_SUFFIX_LIST="$V $V.$R $V.$R.$P"
fi
fi
@@ -1857,7 +1857,7 @@
## check
##
-if [ "$OS" = "TPF" ] ; then
+if [ "x$OS" = "xTPF" ] ; then
:
else
echo " + doing sanity check on compiler and options"
1.57 +1 -1 apache-1.3/src/helpers/GuessOS
Index: GuessOS
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/helpers/GuessOS,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- GuessOS 1999/01/15 22:39:55 1.56
+++ GuessOS 1999/02/07 23:26:51 1.57
@@ -274,7 +274,7 @@
# Apache is not compiled on the TPF platform
# therefore an environment variable is used
-if [ "$TPF" = "YES" ]; then
+if [ "x$TPF" = "xYES" ]; then
echo "TPF"
exit 0
fi
1.17 +1 -1 apache-1.3/src/helpers/PrintPath
Index: PrintPath
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/helpers/PrintPath,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- PrintPath 1999/01/15 22:39:55 1.16
+++ PrintPath 1999/02/07 23:26:51 1.17
@@ -91,7 +91,7 @@
do
if [ $test_exec_flag $path/${program}${ext} ] && \
[ ! -d $path/${program}${ext} ]; then
- if [ "$echo" = "yes" ]; then
+ if [ "x$echo" = "xyes" ]; then
echo $path/${program}${ext}
fi
exit 0
1.25 +4 -4 apache-1.3/src/helpers/TestCompile
Index: TestCompile
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/helpers/TestCompile,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- TestCompile 1999/01/15 22:39:55 1.24
+++ TestCompile 1999/02/07 23:26:51 1.25
@@ -62,7 +62,7 @@
exit
fi
TLIB="-l$2"
- if [ "$VERBOSE" = "yes" ]; then
+ if [ "x$VERBOSE" = "xyes" ]; then
ERRDIR=""
else
ERRDIR='2>/dev/null'
@@ -76,7 +76,7 @@
;;
"sanity")
TLIB=""
- if [ "$VERBOSE" = "no" ]; then
+ if [ "x$VERBOSE" = "xno" ]; then
ERRDIR='2>/dev/null'
else
ERRDIR=""
@@ -88,7 +88,7 @@
exit
fi
TLIB=""
- if [ "$VERBOSE" = "yes" ]; then
+ if [ "x$VERBOSE" = "xyes" ]; then
ERRDIR=""
else
ERRDIR='2>/dev/null'
@@ -106,7 +106,7 @@
exit
fi
TLIB=""
- if [ "$VERBOSE" = "yes" ]; then
+ if [ "x$VERBOSE" = "xyes" ]; then
ERRDIR=""
else
ERRDIR='2>/dev/null'
1.7 +1 -1 apache-1.3/src/helpers/buildinfo.sh
Index: buildinfo.sh
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/helpers/buildinfo.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- buildinfo.sh 1999/01/16 22:00:46 1.6
+++ buildinfo.sh 1999/02/07 23:26:52 1.7
@@ -19,7 +19,7 @@
if [ $# -eq 2 -a "x$1" != "x-n" ]; then
error=yes
fi
-if [ "$error" = "yes" ]; then
+if [ "x$error" = "xyes" ]; then
echo "$0:Error: invalid argument line"
echo "$0:Usage: $0 [-n] <format-string>"
echo "Where <format-string> can contain:"
1.8 +3 -3 apache-1.3/src/helpers/find-dbm-lib
Index: find-dbm-lib
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/helpers/find-dbm-lib,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- find-dbm-lib 1999/01/15 22:39:56 1.7
+++ find-dbm-lib 1999/02/07 23:26:52 1.8
@@ -18,13 +18,13 @@
elif ./helpers/TestCompile lib ndbm dbm_open; then
DBM_LIB="-lndbm"
fi
- if [ "X$DBM_LIB" != "X" ]; then
+ if [ "x$DBM_LIB" != "x" ]; then
LIBS="$LIBS $DBM_LIB"
found_dbm=1
fi
;;
*)
- if [ "X$DBM_LIB" != "X" ]; then
+ if [ "x$DBM_LIB" != "x" ]; then
oldLIBS="$LIBS"
LIBS="$LIBS $DBM_LIB"
if ./helpers/TestCompile func dbm_open; then
@@ -36,7 +36,7 @@
fi
;;
esac
- if [ "X$found_dbm" = "X1" ]; then
+ if [ "x$found_dbm" = "x1" ]; then
echo " + using $DBM_LIB for DBM support"
fi
fi
1.7 +1 -1 apache-1.3/src/helpers/slo.sh
Index: slo.sh
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/helpers/slo.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- slo.sh 1999/01/16 22:00:48 1.6
+++ slo.sh 1999/02/07 23:26:52 1.7
@@ -22,7 +22,7 @@
for opt
do
# concatenate with previous option if exists
- if [ "$optprev" != "" ]; then
+ if [ "x$optprev" != "x" ]; then
opt="${optprev}${opt}";
optprev=''
fi
