dgaudet 99/01/15 14:40:01
Modified: . configure src CHANGES Configure src/helpers GuessOS PrintPath TestCompile binbuild.sh buildinfo.sh checkheader.sh find-dbm-lib findcpp.sh fmn.sh fp2rp install.sh mkshadow.sh ppl.sh slo.sh Log: Back out jim's recent "x"/"." change. This is a veto and I've given reasons in new-httpd. Revision Changes Path 1.72 +60 -60 apache-1.3/configure Index: configure =================================================================== RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- configure 1999/01/15 22:25:10 1.71 +++ configure 1999/01/15 22:39:50 1.72 @@ -96,7 +96,7 @@ ## ## display version information ## -if [ "$quiet" = "no" ]; then +if [ ".$quiet" = .no ]; then APV=`cat $src/include/httpd.h |\ grep "#define SERVER_BASEVERSION" |\ sed -e 's/^[^"]*"//' -e 's/".*$//' -e 's/^Apache\///'` @@ -119,7 +119,7 @@ ## PERL=no-perl-on-this-system perlpath="`$aux/PrintPath perl5 perl miniperl`" -if [ "$perlpath" != "" ]; then +if [ "x$perlpath" != x ]; then PERL="$perlpath" fi @@ -131,9 +131,9 @@ ## SEO='' # CHANGE THIS VARIABLE HERE IF YOU HAVE PROBLEMS WITH ECHO! bytes=`echo $SEO '\1' | wc -c | awk '{ printf("%s", $1); }'` -if [ "$bytes" != "3" ]; then +if [ ".$bytes" != .3 ]; then bytes=`echo -E '\1' | wc -c | awk '{ printf("%s", $1); }'` - if [ "$bytes" != "3" ]; then + if [ ".$bytes" != .3 ]; then echo " + Warning: Your 'echo' command is slightly broken." echo " + It interprets escape sequences per default. We already" echo " + tried 'echo -E' but had no real success. If errors occur" @@ -152,7 +152,7 @@ ## AWK=awk awkpath="`$aux/PrintPath nawk gawk awk`" -if [ "$awkpath" != "" ]; then +if [ "x$awkpath" != x ]; then AWK="$awkpath" fi @@ -163,7 +163,7 @@ ## TAR=tar tarpath="`$aux/PrintPath gtar gnutar tar`" -if [ "$awkpath" != "" ]; then +if [ "x$awkpath" != x ]; then TAR="$tarpath" fi case "`$TAR --version 2>/dev/null`" in @@ -245,7 +245,7 @@ eval "shared_$module=$share" modules="${modules}:$module" modulelist="${modulelist}:$module=$add" - if [ "$share" = "yes" ]; then + if [ ".$share" = .yes ]; then modulelist="${modulelist}*" fi done @@ -258,7 +258,7 @@ OIFS="$IFS" IFS="$DIFS" for var in CFLAGS LDFLAGS LIBS INCLUDES DEPS; do eval "val=\$EXTRA_$var" - if [ "$val" != "" ]; then + if [ "x$val" != x ]; then eval "$var=\$val" eval "EXTRA_$var=\"\"; export EXTRA_$var" echo " + Hint: please use $var instead of EXTRA_$var next time" @@ -273,7 +273,7 @@ *--with-layout=* ) ;; * ) - if [ "$*" = "" ]; then + if [ "x$*" = x ]; then set -- '--with-layout=Apache' else set -- '--with-layout=Apache' "$@" @@ -293,7 +293,7 @@ for apc_option do # if previous option needs an argument, assign it. - if [ "$apc_prev" != "" ]; then + if [ "x$apc_prev" != x ]; then eval "$apc_prev=\$apc_option" apc_prev="" continue @@ -408,11 +408,11 @@ done IFS="$OIFS" rm -f $pldconf 2>/dev/null - if [ "$prefix" = "UNSET" ]; then + if [ ".$prefix" = .UNSET ]; then echo "configure:Error: Path layout definition not found or incorrect" 1>&2 exit 1 fi - if [ "$quiet" = "no" ]; then + if [ ".$quiet" = .no ]; then echo " + using installation path layout: $name ($file)" fi with_layout=1 @@ -433,7 +433,7 @@ for apc_option do # if previous option needs an argument, assign it. - if [ "$apc_prev" != "" ]; then + if [ "x$apc_prev" != x ]; then eval "$apc_prev=\$apc_option" apc_prev="" continue @@ -461,7 +461,7 @@ case "$apc_option" in --shadow=*) shadow="$apc_optarg" - if [ "$quiet" = "no" ]; then + if [ .$quiet = .no ]; then echo " + creating external package shadow tree ($shadow)" fi rm -rf $shadow 2>/dev/null @@ -469,7 +469,7 @@ for file in $mkf $sedsubst $addconf $tplconf $pldconf $configstatus; do rm -f $shadow/$file 2>/dev/null done - if [ "$quiet" = "no" ]; then + if [ .$quiet = .no ]; then echo " + switching to external package shadow tree ($shadow)" fi cd $shadow @@ -479,14 +479,14 @@ gnutriple=`$aux/GuessOS | sed -e 's:/:-:g' | $AWK '{ printf("%s",$1); }'` # create Makefile wrapper (the first time only) if [ ".`ls $top/src.* 2>/dev/null`" = . ]; then - if [ "$quiet" = "no" ]; then + if [ .$quiet = .no ]; then echo " + creating Makefile (shadow wrapper)" fi echo "##" > Makefile echo "## Apache Makefile (shadow wrapper)" >> Makefile echo "##" >> Makefile echo "" >> Makefile - if [ "$shadow" != "" ]; then + if [ "x$shadow" != x ]; then echo "SHADOW=$shadow" >> Makefile else echo "SHADOW=." >> Makefile @@ -505,7 +505,7 @@ shadowaddconf="src.$gnutriple/.apaci.addconf" shadowtplconf="src.$gnutriple/.apaci.tplconf" # (re)create shadow tree - if [ "$quiet" = "no" ]; then + if [ .$quiet = .no ]; then echo " + creating internal platform shadow tree ($shadowsrc)" fi rm -rf $shadowsrc @@ -588,10 +588,10 @@ fi modfilec=`echo $file | sed -e 's;^.*/;;'` modfileo=`echo $file | sed -e 's;^.*/;;' -e 's;\.c$;.o;'` - if [ "$file" != "$src/modules/extra/$modfilec" ]; then + if [ ".$file" != ".$src/modules/extra/$modfilec" ]; then cp $file $src/modules/extra/$modfilec fi - if [ "$addconf_created" = "0" ]; then + if [ ".$addconf_created" = .0 ]; then addconf_created=1 rm -f $addconf 2>/dev/null touch $addconf 2>/dev/null @@ -609,7 +609,7 @@ eval "shared_$module=no" modules="${modules}:$module" modulelist="${modulelist}:$module=yes" - if [ "$quiet" = "no" ]; then + if [ ".$quiet" = .no ]; then echo " + on-the-fly added and activated $module module (modules/extra/$modfileo)" fi ;; @@ -622,7 +622,7 @@ ;; esac modfile=`echo $file | sed -e 's;^src/;;'` - if [ "$addconf_created" = "0" ]; then + if [ ".$addconf_created" = .0 ]; then addconf_created=1 rm -f $addconf 2>/dev/null touch $addconf 2>/dev/null @@ -640,7 +640,7 @@ eval "shared_$module=no" modules="${modules}:$module" modulelist="${modulelist}:$module=yes" - if [ "$quiet" = "no" ]; then + if [ ".$quiet" = .no ]; then echo " + activated $module module ($modfile)" fi ;; @@ -656,7 +656,7 @@ apc_optarg=`echo "$apc_optarg" | tr "A-Z" "a-z"` apc_optarg_real=`echo "$apc_optarg" | tr "a-z" "A-Z"` eval "exists=\$rule_${apc_optarg}" - if [ "$exists" = "" ]; then + if [ "x$exists" = x ]; then echo "configure:Error: No such rule named '${apc_optarg_real}'" 1>&2 exit 1 fi @@ -686,7 +686,7 @@ ;; * ) eval "exists=\$module_${apc_optarg}" - if [ "$exists" = "" ]; then + if [ "x$exists" = x ]; then echo "configure:Error: No such module named '${apc_optarg}'" 1>&2 exit 1 fi @@ -708,7 +708,7 @@ OIFS="$IFS" IFS=':' for module in $modules; do eval "add=\$module_${module}" - if [ "$add" = "no" ]; then + if [ ".$add" = .no ]; then eval "module_${module}=yes" eval "shared_${module}=yes" fi @@ -718,7 +718,7 @@ ;; * ) eval "exists=\$module_${apc_optarg}" - if [ "$exists" = "" ]; then + if [ "x$exists" = x ]; then echo "configure:Error: No such module named '${apc_optarg}'" 1>&2 exit 1 fi @@ -743,7 +743,7 @@ apc_optarg=`echo "$apc_optarg" | tr "A-Z" "a-z"` apc_optarg_real=`echo "$apc_optarg" | tr "a-z" "A-Z"` eval "exists=\$rule_${apc_optarg}" - if [ "$exists" = "" ]; then + if [ "x$exists" = x ]; then echo "configure:Error: No such rule named '${apc_optarg_real}'" 1>&2 exit 1 fi @@ -760,7 +760,7 @@ ;; * ) eval "exists=\$module_${apc_optarg}" - if [ "$exists" = "" ]; then + if [ "x$exists" = x ]; then echo "configure:Error: No such module named '${apc_optarg}'" 1>&2 exit 1 fi @@ -779,7 +779,7 @@ ;; * ) eval "exists=\$module_${apc_optarg}" - if [ "$exists" = "" ]; then + if [ "x$exists" = x ]; then echo "configure:Error: No such module named '${apc_optarg}'" 1>&2 exit 1 fi @@ -797,7 +797,7 @@ BEGIN|END) ;; *) eval "exists=\$module_${mod}" - if [ "$exists" = "" ]; then + if [ "x$exists" = x ]; then echo "configure:Error: No such module named '${mod}'" 1>&2 exit 1 fi @@ -856,11 +856,11 @@ esac done IFS="$OIFS1" -if [ "$apc_prev" != "" ]; then +if [ "x$apc_prev" != x ]; then echo "configure:Error: missing argument to --`echo $apc_prev | sed 's/_/-/g'`" 1>&2 exit 1 fi -if [ "$addconf_created" = "0" ]; then +if [ ".$addconf_created" = .0 ]; then rm -f $addconf 2>/dev/null touch $addconf 2>/dev/null fi @@ -881,7 +881,7 @@ for var in CC CPP OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \ LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET; do eval "val=\"\$$var\"" - if [ "$val" != "" ]; then + if [ "x$val" != x ]; then echo "$var=$val" |\ sed -e 's:\(["$\\]\):\\\1:g' \ -e 's:\([A-Z]*=\):\1":' \ @@ -903,8 +903,8 @@ ## ## a few errors and warnings ## -if [ "$suexec" = "1" ]; then - if [ "$suexec_ok" = "0" ]; then +if [ ".$suexec" = .1 ]; then + if [ ".$suexec_ok" = .0 ]; then echo "configure:Error: You enabled the suEXEC feature via --enable-suexec but" echo " without explicitly configuring it via at least one" echo " --suexec-xxxxx option. Seems like you are still not" @@ -917,8 +917,8 @@ echo " + root privileges for this, at the latest at the installation step." 1>&2 fi fi -if [ "$PERL" = "no-perl-on-this-system" ]; then - if [ "$quiet" = "no" ]; then +if [ ".$PERL" = .no-perl-on-this-system ]; then + if [ .$quiet = .no ]; then echo " + Warning: no Perl interpreter available for support scripts." echo " + Perhaps you have to select one with --with-perl=FILE." fi @@ -927,7 +927,7 @@ ## ## target name ## -if [ "$TARGET" != "" ]; then +if [ "x$TARGET" != x ]; then thetarget=$TARGET else thetarget=httpd @@ -949,7 +949,7 @@ # add target suffix when requested if [ ".`echo $val | grep $thetarget`" = . ]; then eval "autosuffix=\$autosuffix_$var" - if [ "$autosuffix" = "yes" ]; then + if [ ".$autosuffix" = .yes ]; then eval "$var=\"\$$var/$thetarget\"" fi fi @@ -959,7 +959,7 @@ ## ## determine special configurable Makefile targets ## -if [ "$support" = "1" ]; then +if [ ".$support" = .1 ]; then build_support='build-support' install_support='install-support' clean_support='clean-support' @@ -978,7 +978,7 @@ conf_port="80" conf_serveradmin="[EMAIL PROTECTED]" conf_servername="new.host.name" -if [ "$confadjust" = "1" ]; then +if [ ".$confadjust" = .1 ]; then if [ ".`egrep '^nobody:' /etc/group`" != . ]; then conf_group="nobody" else @@ -1010,7 +1010,7 @@ ## ## check and debug ## -if [ "$show_layout" = "1" ]; then +if [ ".$show_layout" = .1 ]; then echo "" echo "Installation paths:" echo " prefix: $prefix" @@ -1040,7 +1040,7 @@ echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf" echo " RESOURCE_CONFIG_FILE: ${sysconfdir_relative}srm.conf" echo "" - if [ "$suexec" = "1" ]; then + if [ ".$suexec" = .1 ]; then echo "suEXEC setup:" echo " suexec binary: $sbindir/suexec" echo " document root: $suexec_docroot" @@ -1058,7 +1058,7 @@ ## ## create Makefile from Makefile.tmpl ## -if [ "$quiet" = "no" ]; then +if [ .$quiet = .no ]; then echo "Creating $mkf" fi sed <Makefile.tmpl >$mkf \ @@ -1126,7 +1126,7 @@ ## ## create $src/Configuration.apaci file ## -if [ "$quiet" = "no" ]; then +if [ .$quiet = .no ]; then echo "Creating Configuration.apaci in $src" fi rm -f $sedsubst 2>/dev/null @@ -1137,7 +1137,7 @@ for var in CC CPP OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \ LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET; do eval "val=\"\$$var\""; - if [ "$val" != "" ]; then + if [ "x$val" != x ]; then case $var in CFLAGS|LDFLAGS|LIBS|INCLUDES|DEPS) echo $SEO "s%^#*\\(EXTRA_$var=\\).*%\\1$val%g" >>$sedsubst @@ -1157,7 +1157,7 @@ name="`echo $rule | tr "a-z" "A-Z"`" eval "val=\$rule_$rule" echo $SEO "s%^\\(Rule $name=\\).*%\\1$val%g" >>$sedsubst - if [ "$verbose" = "yes" ]; then + if [ $verbose = yes ]; then echo " + Rule $name=$val" fi done @@ -1168,27 +1168,27 @@ OIFS="$IFS" IFS=':' for module in $modules; do eval "share=\$shared_$module" - if [ "$share" = "yes" ]; then + if [ $share = yes ]; then some_shares=1 fi done IFS="$OIFS" -if [ "$some_shares" = "1" ]; then - if [ "$module_so" = "no" ]; then +if [ $some_shares = 1 ]; then + if [ $module_so = no ]; then module_so=yes - if [ "$quiet" = "no" ]; then + if [ .$quiet = .no ]; then echo " + enabling mod_so for DSO support" fi fi fi -if [ "$shared_so" = "yes" ]; then +if [ ".$shared_so" = .yes ]; then shared_so=no echo "configure:Error: Module mod_so cannot be made a DSO itself" 1>&2 exit 1 fi # module permutation support -if [ "$permute" != "" ]; then +if [ "x$permute" != x ]; then sed -e '/## mod_mmap_static/,$d' <src/Configuration.tmpl >$tplconf OIFS="$IFS" IFS=' ' @@ -1263,7 +1263,7 @@ OIFS="$IFS" IFS=':' for module in $modules; do eval "add=\$module_$module" - if [ "$add" = "yes" ]; then + if [ $add = yes ]; then echo $SEO "s%^.*\\(AddModule.*[_b/]$module\\..*\\)%\\1%g" >>$sedsubst echo $SEO "s%^.*\\(SharedModule.*[_b/]$module\\..*\\)%\\1%g" >>$sedsubst m="yes [static]" @@ -1273,11 +1273,11 @@ m=no fi eval "share=\$shared_$module" - if [ "$share" = "yes" ]; then + if [ $share = yes ]; then echo $SEO "s%^\\(.*\\)AddModule\\(.*[_b/]$module\\.\\)[oam].*\\(.*\\)%\\1SharedModule\\2so\\3%g" >>$sedsubst m="yes [shared]" fi - if [ "$verbose" = "yes" ]; then + if [ $verbose = yes ]; then echo " + Module $module: $m" fi done @@ -1318,7 +1318,7 @@ ## create all other Makefiles by running the proprietary ## $src/Configure script with our custom Configuration.apaci file ## -if [ "$quiet" = "yes" ]; then +if [ .$quiet = .yes ]; then (cd $src; ./Configure -file Configuration.apaci >/dev/null); else (cd $src; ./Configure -file Configuration.apaci |\ @@ -1330,8 +1330,8 @@ ## ## final hints ## -if [ "$quiet" = "no" ]; then - if [ "$shadow" != "" ]; then +if [ .$quiet = .no ]; then + if [ "x$shadow" != x ]; then echo "Hint: You now have to build inside $shadow." echo "This can be done either by running the canonical commands" echo " \$ cd $shadow" 1.1216 +0 -7 apache-1.3/src/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1215 retrieving revision 1.1216 diff -u -r1.1215 -r1.1216 --- CHANGES 1999/01/15 22:25:11 1.1215 +++ CHANGES 1999/01/15 22:39:51 1.1216 @@ -1,12 +1,5 @@ Changes with Apache 1.3.5 - *) Shell script style now consistant. For shell string equality tests, - we used to have several different styles to work around old shells. - It's now formally (eg): if [ "$var" = "value" ] (ie: both sides are - wrapped in dbl-quotes). There is one exception: if "value" - has a leading "-" then it should be [ "x$var" = "x-value" ]. - [Jim Jagielski] - *) The status module now prints out both the main server generation as well as the generation of each process. Also, the vhost info is printed with '?notable'. [Jim Jagielski] 1.326 +40 -40 apache-1.3/src/Configure Index: Configure =================================================================== RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.325 retrieving revision 1.326 diff -u -r1.325 -r1.326 --- Configure 1999/01/15 22:25:12 1.325 +++ Configure 1999/01/15 22:39:52 1.326 @@ -82,7 +82,7 @@ ## Now handle any arguments, which, for now, is -file ## to select an alternate Configuration file ## -while [ "$1" != "" ]; do +while [ "x$1" != "x" ]; do if [ "x$1" = "x-file" ] ; then shift 1; file=$1; shift 1 if [ ! -r $file ]; then @@ -143,7 +143,7 @@ using_shlib=`grep '^SharedModule' $tmpfile >/dev/null && echo 1` # But perhaps later via apxs when just mod_so is compiled in! -if [ "$using_shlib" = "" ]; then +if [ "x$using_shlib" = "x" ]; then using_shlib=`grep '^AddModule modules/standard/mod_so.o' $tmpfile >/dev/null && echo 1` fi @@ -172,7 +172,7 @@ ## that the user was using the old default root directory ## and issue a notice about it. ## -if [ "$file" != "Configuration.apaci" ] +if [ $file != "Configuration.apaci" ] then if [ -d /usr/local/etc/httpd/ ] then @@ -757,7 +757,7 @@ #################################################################### ## set this if we haven't ## -if [ "${MAKE}" = "" ]; then +if [ "x${MAKE}" = "x" ]; then MAKE='make'; export MAKE fi @@ -780,7 +780,7 @@ ## And adjust/override WANTHSREGEX as needed ## if [ "$RULE_WANTHSREGEX" = "default" ]; then - if [ "$DEF_WANTHSREGEX" = "" ]; then + if [ "x$DEF_WANTHSREGEX" = "x" ]; then RULE_WANTHSREGEX=yes else RULE_WANTHSREGEX=$DEF_WANTHSREGEX @@ -801,8 +801,8 @@ # If $TCC is null, then no such line exists in Configuration # TCC=`egrep '^CC=' Makefile.config | tail -1 | awk -F= '{print $2}'` -if [ "$TCC" = "" ]; then - if [ "$CC" = "" ]; then +if [ "x$TCC" = "x" ]; then + if [ "x$CC" = "x" ]; then # At this point, CC is not set in Configuration or above, so we # try to find one for compilers in "gcc" "cc" "acc" "c89" @@ -813,7 +813,7 @@ break fi done - if [ "$COMPILER" = "" ]; then + if [ "x$COMPILER" = "x" ]; then echo "Error: could not find any of these C compilers" echo " anywhere in your PATH: $lookedfor" echo "Configure terminated" @@ -831,7 +831,7 @@ ## If there was an entry for it, then set $CC for our own internal ## use. ## -if [ "$TCC" = "" ]; then +if [ "x$TCC" = "x" ]; then echo "CC=$CC" >> Makefile.config else CC=$TCC @@ -841,12 +841,12 @@ ## Now check how we can _directly_ run the C pre-processor ## TCPP=`egrep '^CPP=' Makefile.config | tail -1 | awk -F= '{print $2}'` -if [ "$TCPP" != "" ]; then +if [ "x$TCPP" != "x" ]; then CPP=`CC=$CC CPP=$TCPP ./helpers/findcpp.sh` else CPP=`CC=$CC ./helpers/findcpp.sh` fi -if [ "$TCPP" = "" ]; then +if [ "x$TCPP" = "x" ]; then echo "CPP=$CPP" >> Makefile.config fi echo " + setting C pre-processor to $CPP" @@ -912,13 +912,13 @@ #################################################################### ## Handle TARGET name ## -if [ "$TTARGET" = "" ]; then +if [ "x$TTARGET" = "x" ]; then TARGET=httpd echo "TARGET=$TARGET" >> Makefile.config else TARGET=$TTARGET fi -if [ "$TARGET" != "httpd" ]; then +if [ "x$TARGET" != "xhttpd" ]; then echo " + using custom target name: $TARGET" CFLAGS="$CFLAGS -DTARGET=\\\"$TARGET\\\"" fi @@ -927,7 +927,7 @@ ## We adjust now CFLAGS_SHLIB, LDFLAGS_SHLIB and LDFLAGS_SHLIB_EXPORT as ## required. For more platforms just add the required lines below. ## -if [ "$using_shlib" = "1" ] ; then +if [ "x$using_shlib" = "x1" ] ; then LD_SHLIB="ld" DEF_SHARED_CORE=no DEF_SHARED_CHAIN=no @@ -956,7 +956,7 @@ CFLAGS_SHLIB="-fpic" LDFLAGS_SHLIB="-Bshareable" OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - if [ "$OBJFORMAT" = "elf" ]; then + if [ "x$OBJFORMAT" = "xelf" ]; then LDFLAGS_SHLIB_EXPORT="-Wl,-E" SHLIB_SUFFIX_DEPTH=0 else @@ -1170,9 +1170,9 @@ break fi done - if [ "$PERL" != "" ]; then + if [ "x$PERL" != "x" ]; then # cool, Perl is installed on this platform... - if [ "`$PERL -V:dlsrc 2>/dev/null | grep dlopen`" != "" ]; then + if [ "x`$PERL -V:dlsrc 2>/dev/null | grep dlopen`" != "x" ]; then # ...and actually uses the dlopen-style interface, # so we can guess the flags from its knowledge CFLAGS_SHLIB="`$PERL -V:cccdlflags | cut -d\' -f2`" @@ -1203,9 +1203,9 @@ ## Check if we really have some information to compile ## the shared objects if SharedModule was used. ## -if [ "$using_shlib" = "1" ] ; then - if [ "$TCFLAGS_SHLIB" = "" -a "$CFLAGS_SHLIB" = "" -a \ - "$TLDFLAGS_SHLIB" = "" -a "$LDFLAGS_SHLIB" = "" ]; then +if [ "x$using_shlib" = "x1" ] ; then + if [ "x$TCFLAGS_SHLIB" = "x" -a "x$CFLAGS_SHLIB" = "x" -a \ + "x$TLDFLAGS_SHLIB" = "x" -a "x$LDFLAGS_SHLIB" = "x" ]; then echo "" echo "** FAILURE: Sorry, no shared object support available." echo "** Either compile all modules statically (use AddModule instead" @@ -1285,15 +1285,15 @@ #################################################################### ## OK, now we can write OPTIM ## -if [ "$TOPTIM" = "" ]; then +if [ "x$TOPTIM" = "x" ]; then echo "OPTIM=$OPTIM" >> Makefile.config fi #################################################################### ## OK, now handle RANLIB ## -if [ "$RANLIB" = "" ]; then - if [ "$TRANLIB" != "" ]; then +if [ "x$RANLIB" = "x" ]; then + if [ "x$TRANLIB" != "x" ]; then RANLIB=$TRANLIB else if ./helpers/PrintPath -s ranlib; then @@ -1338,7 +1338,7 @@ CFLAGS="$CFLAGS -DSOCKS -DSOCKS4" CFLAGS="$CFLAGS -Dconnect=Rconnect -Dselect=Rselect" CFLAGS="$CFLAGS -Dgethostbyname=Rgethostbyname" - if [ "`egrep '^EXTRA_L' Makefile.config | grep lsocks`" = "" ]; then + if [ "x`egrep '^EXTRA_L' Makefile.config | grep lsocks`" = "x" ]; then LIBS="$LIBS -L/usr/local/lib -lsocks" fi case $PLAT in @@ -1357,7 +1357,7 @@ CFLAGS="$CFLAGS -DSOCKS -DSOCKS5" CFLAGS="$CFLAGS -Dconnect=SOCKSconnect -Dselect=SOCKSselect" CFLAGS="$CFLAGS -Dgethostbyname=SOCKSgethostbyname -Dclose=SOCKSclose" - if [ "`egrep '^EXTRA_L' Makefile.config | grep lsocks5`" = "" ]; then + if [ "x`egrep '^EXTRA_L' Makefile.config | grep lsocks5`" = "x" ]; then LIBS="$LIBS -L/usr/local/lib -lsocks5" fi case $PLAT in @@ -1464,9 +1464,9 @@ ext=`echo $modfile | sed 's/^.*\.//'` modbase=`echo $modfile | sed 's/\.[^.]*$//'` - if [ "$ext" = "$modfile" ]; then ext=o; modbase=$modfile; modfile=$modbase.o; fi - if [ "$ext" = "" ] ; then ext=o; modbase=$modfile; fi - if [ "$ext" = "c" ] ; then ext=o; fi + if [ "x$ext" = "x$modfile" ]; then ext=o; modbase=$modfile; modfile=$modbase.o; fi + if [ "x$ext" = "x" ] ; then ext=o; modbase=$modfile; fi + if [ "x$ext" = "xc" ] ; then ext=o; fi # modbase is the path+filename without extension, ext is the # extension given, or if none, o @@ -1505,7 +1505,7 @@ ext=o fi fi - if [ "$modname" = "" ] ; then + if [ "x$modname" = "x" ] ; then modname=`echo $modbase | sed 's/^.*\///' | \ sed 's/^mod_//' | sed 's/^lib//' | sed 's/$/_module/'` fi @@ -1533,7 +1533,7 @@ ## Now the SHARED_CHAIN stuff ## LIBS_SHLIB='' -if [ "$using_shlib" = "1" ] ; then +if [ "x$using_shlib" = "x1" ] ; then if [ "$RULE_SHARED_CHAIN" = "default" ] ; then RULE_SHARED_CHAIN=$DEF_SHARED_CHAIN fi @@ -1551,7 +1551,7 @@ #################################################################### ## Now the SHARED_CORE stuff ## -if [ "$using_shlib" = "1" ] ; then +if [ "x$using_shlib" = "x1" ] ; then if [ "$RULE_SHARED_CORE" = "default" ] ; then RULE_SHARED_CORE=$DEF_SHARED_CORE fi @@ -1588,17 +1588,17 @@ ## Set the value of the shared libary flags, if they aren't explicitly ## set in the configuration file ## -if [ "$using_shlib" = "1" ] ; then - if [ "$TCFLAGS_SHLIB" = "" ]; then +if [ "x$using_shlib" = "x1" ] ; then + if [ "x$TCFLAGS_SHLIB" = "x" ]; then echo "CFLAGS_SHLIB=$CFLAGS_SHLIB -DSHARED_MODULE" >> Makefile.config fi - if [ "$TLD_SHLIB" = "" ]; then + if [ "x$TLD_SHLIB" = "x" ]; then echo "LD_SHLIB=$LD_SHLIB" >> Makefile.config fi - if [ "$TLDFLAGS_SHLIB" = "" ]; then + if [ "x$TLDFLAGS_SHLIB" = "x" ]; then echo "LDFLAGS_SHLIB=$LDFLAGS_SHLIB" >> Makefile.config fi - if [ "$TLDFLAGS_SHLIB_EXPORT" = "" ]; then + if [ "x$TLDFLAGS_SHLIB_EXPORT" = "x" ]; then echo "LDFLAGS_SHLIB_EXPORT=$LDFLAGS_SHLIB_EXPORT" >> Makefile.config fi fi @@ -1752,7 +1752,7 @@ ## it uses ugly looking built-in directory walk messages ## while we are already using our own messages ## -if [ "`${MAKE} -v 2>/dev/null | grep 'GNU Make'`" = "" ]; then +if [ "x`${MAKE} -v 2>/dev/null | grep 'GNU Make'`" = "x" ]; then MFLAGS_STATIC= else MFLAGS_STATIC=--no-print-directory @@ -1775,7 +1775,7 @@ ## Some OS-related stuff for the DSO mechanism: ## Finding the vendor DSO functions ## -if [ "$using_shlib" = "1" ] ; then +if [ "x$using_shlib" = "x1" ] ; then DL_LIB="" case $PLAT in *-ibm-aix* ) @@ -1800,7 +1800,7 @@ fi ;; esac - if [ "$DL_LIB" != "" ]; then + if [ "x$DL_LIB" != "x" ]; then LIBS="$LIBS $DL_LIB" echo " + using $DL_LIB for vendor DSO support" fi @@ -1954,7 +1954,7 @@ } '` echo "OBJS=$OBJS" >> $moddir/Makefile - if [ "$OBJS" != "" ]; then + if [ "x$OBJS" != "x" ]; then echo "LIB=lib$basedir.a" >> $moddir/Makefile else # essential! 1.56 +3 -3 apache-1.3/src/helpers/GuessOS Index: GuessOS =================================================================== RCS file: /home/cvs/apache-1.3/src/helpers/GuessOS,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- GuessOS 1999/01/15 20:59:38 1.55 +++ GuessOS 1999/01/15 22:39:55 1.56 @@ -22,7 +22,7 @@ # # We need to work around FreeBSD 1.1.5.1 XREL=`uname -X 2>/dev/null | grep "^Release" | awk '{print $3}'` -if [ "$XREL" != "" ]; then +if [ "x$XREL" != "x" ]; then if [ -f /etc/kconfig ]; then case "$XREL" in 4.0|4.1) @@ -38,9 +38,9 @@ echo "whatever-whatever-sco5"; exit 0 ;; 4.2MP) - if [ "$VERSION" = "2.1.1" ]; then + if [ "x$VERSION" = "x2.1.1" ]; then echo "${MACHINE}-whatever-unixware211"; exit 0 - elif [ "$VERSION" = "2.1.2" ]; then + elif [ "x$VERSION" = "x2.1.2" ]; then echo "${MACHINE}-whatever-unixware212"; exit 0 else echo "${MACHINE}-whatever-unixware2"; exit 0 1.16 +1 -1 apache-1.3/src/helpers/PrintPath Index: PrintPath =================================================================== RCS file: /home/cvs/apache-1.3/src/helpers/PrintPath,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- PrintPath 1999/01/15 20:59:38 1.15 +++ PrintPath 1999/01/15 22:39:55 1.16 @@ -49,7 +49,7 @@ # if test/[] knows about -x, which is the prefered flag. ## -if [ "$os" = "OS/2" ] +if [ "x$os" = "xOS/2" ] then ext=".exe" pathname=`echo -E $pathname | 1.24 +4 -4 apache-1.3/src/helpers/TestCompile Index: TestCompile =================================================================== RCS file: /home/cvs/apache-1.3/src/helpers/TestCompile,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- TestCompile 1999/01/15 20:59:39 1.23 +++ TestCompile 1999/01/15 22:39:55 1.24 @@ -58,7 +58,7 @@ case "$1" in "lib") - if [ "$2" = "" ]; then + if [ "x$2" = "x" ]; then exit fi TLIB="-l$2" @@ -67,7 +67,7 @@ else ERRDIR='2>/dev/null' fi - if [ "$3" = "" ]; then + if [ "x$3" = "x" ]; then TARGET='dummy' else TARGET='testfunc' @@ -84,7 +84,7 @@ TARGET='dummy' ;; "func") - if [ "$2" = "" ]; then + if [ "x$2" = "x" ]; then exit fi TLIB="" @@ -102,7 +102,7 @@ EOF ;; "header") - if [ "$2" = "" ]; then + if [ "x$2" = "x" ]; then exit fi TLIB="" 1.5 +3 -3 apache-1.3/src/helpers/binbuild.sh Index: binbuild.sh =================================================================== RCS file: /home/cvs/apache-1.3/src/helpers/binbuild.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- binbuild.sh 1999/01/15 20:59:39 1.4 +++ binbuild.sh 1999/01/15 22:39:56 1.5 @@ -190,14 +190,14 @@ echo "ERROR: Failed to build Apache. See \"build.log\" for details." exit 1; else - if [ "$GTAR" != "" ] + if [ ".$GTAR" != . ] then $GTAR -zcf ../apache-$VER-$OS.tar.gz -C .. --owner=root --group=root apache-$VER else - if [ "$TAR" != "" ] + if [ ".$TAR" != . ] then $TAR -cf ../apache-$VER-$OS.tar -C .. apache-$VER - if [ "$GZIP" != "" ] + if [ ".$GZIP" != . ] then $GZIP ../apache-$VER-$OS.tar fi 1.5 +10 -10 apache-1.3/src/helpers/buildinfo.sh Index: buildinfo.sh =================================================================== RCS file: /home/cvs/apache-1.3/src/helpers/buildinfo.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- buildinfo.sh 1999/01/15 21:47:14 1.4 +++ buildinfo.sh 1999/01/15 22:39:56 1.5 @@ -55,15 +55,15 @@ # determine username # username="$LOGNAME" -if [ "$username" = "" ]; then +if [ ".$username" = . ]; then username="$USER" - if [ "$username" = "" ]; then + if [ ".$username" = . ]; then username="`whoami 2>/dev/null |\ awk '{ printf("%s", $1); }'`" - if [ "$username" = "" ]; then + if [ ".$username" = . ]; then username="`who am i 2>/dev/null |\ awk '{ printf("%s", $1); }'`" - if [ "$username" = "" ]; then + if [ ".$username" = . ]; then username='unknown' fi fi @@ -75,10 +75,10 @@ # hostname="`uname -n 2>/dev/null |\ awk '{ printf("%s", $1); }'`" -if [ "$hostname" = "" ]; then +if [ ".$hostname" = . ]; then hostname="`hostname 2>/dev/null |\ awk '{ printf("%s", $1); }'`" - if [ "$hostname" = "" ]; then + if [ ".$hostname" = . ]; then hostname='unknown' fi fi @@ -88,14 +88,14 @@ hostname="`echo $hostname | cut -d. -f1`" ;; esac -if [ "$domainname" = "" ]; then +if [ ".$domainname" = . ]; then if [ -f /etc/resolv.conf ]; then domainname="`egrep '^[ ]*domain' /etc/resolv.conf | head -1 |\ sed -e 's/.*domain//' \ -e 's/^[ ]*//' -e 's/^ *//' -e 's/^ *//' \ -e 's/^\.//' -e 's/^/./' |\ awk '{ printf("%s", $1); }'`" - if [ "$domainname" = "" ]; then + if [ ".$domainname" = . ]; then domainname="`egrep '^[ ]*search' /etc/resolv.conf | head -1 |\ sed -e 's/.*search//' \ -e 's/^[ ]*//' -e 's/^ *//' -e 's/^ *//' \ @@ -112,7 +112,7 @@ time_day="`date '+%d' | awk '{ printf("%s", $1); }'`" time_month="`date '+%m' | awk '{ printf("%s", $1); }'`" time_year="`date '+%Y' 2>/dev/null | awk '{ printf("%s", $1); }'`" -if test "$time_year" = "" ; then +if test ".$time_year" = .; then time_year="`date '+%y' | awk '{ printf("%s", $1); }'`" case $time_year in 9[0-9]*) time_year="19$time_year" ;; @@ -137,7 +137,7 @@ # # create result string # -if [ "$newline" = "yes" ]; then +if [ ".$newline" = .yes ]; then echo $format_string |\ sed -e "s;%u;$username;g" \ -e "s;%h;$hostname;g" \ 1.4 +3 -3 apache-1.3/src/helpers/checkheader.sh Index: checkheader.sh =================================================================== RCS file: /home/cvs/apache-1.3/src/helpers/checkheader.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- checkheader.sh 1999/01/15 20:59:39 1.3 +++ checkheader.sh 1999/01/15 22:39:56 1.4 @@ -10,10 +10,10 @@ header=$1 rc=1 -if [ "$CPP" = "" ]; then +if [ ".$CPP" = . ]; then CPP='NOT-AVAILABLE' fi -if [ "$CPP" != "NOT-AVAILABLE" ]; then +if [ ".$CPP" != ".NOT-AVAILABLE" ]; then # create a test C source cat >conftest.c <<EOF #include <$header> @@ -21,7 +21,7 @@ EOF (eval "$CPP conftest.c >/dev/null") 2>conftest.out my_error=`grep -v '^ *+' conftest.out` - if [ "$my_error" = "" ]; then + if [ ".$my_error" = . ]; then rc=0 fi else 1.7 +1 -1 apache-1.3/src/helpers/find-dbm-lib Index: find-dbm-lib =================================================================== RCS file: /home/cvs/apache-1.3/src/helpers/find-dbm-lib,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- find-dbm-lib 1999/01/15 20:59:40 1.6 +++ find-dbm-lib 1999/01/15 22:39:56 1.7 @@ -4,7 +4,7 @@ # we'd end up having to do the work twice... and we'd end up putting # two -ldbm -ldbm into the LIBS variable. -if [ "$found_dbm" = "" ]; then +if [ "x$found_dbm" = "x" ]; then if ./helpers/TestCompile func dbm_open; then found_dbm=1 else 1.5 +9 -9 apache-1.3/src/helpers/findcpp.sh Index: findcpp.sh =================================================================== RCS file: /home/cvs/apache-1.3/src/helpers/findcpp.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- findcpp.sh 1999/01/15 20:59:40 1.4 +++ findcpp.sh 1999/01/15 22:39:57 1.5 @@ -19,16 +19,16 @@ EOF # some braindead systems have a CPP define for a directory :-( -if [ "$CPP" != "" ]; then +if [ ".$CPP" != . ]; then if [ -d "$CPP" ]; then CPP='' fi fi -if [ "$CPP" != "" ]; then +if [ ".$CPP" != . ]; then # case 1: user provided a default CPP variable (we only check) (eval "$CPP conftest.c >/dev/null") 2>conftest.out my_error=`grep -v '^ *+' conftest.out` - if [ "$my_error" != "" ]; then + if [ ".$my_error" != . ]; then CPP='' fi else @@ -37,21 +37,21 @@ CPP="${CC-cc} -E" (eval "$CPP conftest.c >/dev/null") 2>conftest.out my_error=`grep -v '^ *+' conftest.out` - if [ "$my_error" != "" ]; then + if [ ".$my_error" != . ]; then # 2. try the -E option and GCC's -traditional-ccp option CPP="${CC-cc} -E -traditional-cpp" (eval "$CPP conftest.c >/dev/null") 2>conftest.out my_error=`grep -v '^ *+' conftest.out` - if [ "$my_error" != "" ]; then + if [ ".$my_error" != . ]; then # 3. try a standalone cpp command in $PATH and lib dirs CPP="`./helpers/PrintPath cpp`" - if [ "$CPP" = "" ]; then + if [ ".$CPP" = . ]; then CPP="`./helpers/PrintPath -p/lib:/usr/lib:/usr/local/lib cpp`" fi - if [ "$CPP" != "" ]; then + if [ ".$CPP" != . ]; then (eval "$CPP conftest.c >/dev/null") 2>conftest.out my_error=`grep -v '^ *+' conftest.out` - if [ "$my_error" != "" ]; then + if [ ".$my_error" != . ]; then # ok, we gave up... CPP='' fi @@ -64,7 +64,7 @@ rm -f conftest.* # Ok, empty CPP variable now means it's not available -if [ "$CPP" = "" ]; then +if [ ".$CPP" = . ]; then CPP='NOT-AVAILABLE' fi 1.4 +4 -4 apache-1.3/src/helpers/fmn.sh Index: fmn.sh =================================================================== RCS file: /home/cvs/apache-1.3/src/helpers/fmn.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fmn.sh 1999/01/15 20:59:41 1.3 +++ fmn.sh 1999/01/15 22:39:57 1.4 @@ -20,9 +20,9 @@ modname='' ext=`echo $modfile | sed 's/^.*\.//'` modbase=`echo $modfile | sed 's/\.[^.]*$//'` -if [ "$ext" = "$modfile" ]; then ext=o; modbase=$modfile; modfile=$modbase.o; fi -if [ "$ext" = "" ] ; then ext=o; modbase=$modfile; fi -if [ "$ext" = "c" ] ; then ext=o; fi +if [ x$ext = x$modfile ]; then ext=o; modbase=$modfile; modfile=$modbase.o; fi +if [ x$ext = x ] ; then ext=o; modbase=$modfile; fi +if [ x$ext = xc ] ; then ext=o; fi if [ -r $modbase.module ] ; then cat $modbase.module >$tmpfile else @@ -39,7 +39,7 @@ if [ -r $tmpfile ] ; then modname=`grep "Name:" $tmpfile | sed 's/^.*Name:[ ]*//'` fi -if [ "$modname" = "" ] ; then +if [ "x$modname" = "x" ] ; then modname=`echo $modbase | sed 's/^.*\///' | \ sed 's/^mod_//' | sed 's/^lib//' | sed 's/$/_module/'` fi 1.5 +1 -1 apache-1.3/src/helpers/fp2rp Index: fp2rp =================================================================== RCS file: /home/cvs/apache-1.3/src/helpers/fp2rp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fp2rp 1999/01/15 20:59:41 1.4 +++ fp2rp 1999/01/15 22:39:57 1.5 @@ -2,7 +2,7 @@ ## ## fp2rp -- convert a standard forward path to a reverse dotted path ## -if [ "$1" = "." ]; then +if [ "x$1" = x. ]; then rp="." else rp="" 1.4 +8 -8 apache-1.3/src/helpers/install.sh Index: install.sh =================================================================== RCS file: /home/cvs/apache-1.3/src/helpers/install.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- install.sh 1999/01/15 20:59:41 1.3 +++ install.sh 1999/01/15 22:39:57 1.4 @@ -36,7 +36,7 @@ mvcmd="$mvprog" src="" dst="" -while [ "$1" != "" ]; do +while [ ".$1" != . ]; do case $1 in -c) instcmd="$cpprog" shift; continue @@ -52,7 +52,7 @@ ;; -s) stripcmd="$stripprog" shift; continue;; - *) if [ "$src" = "" ]; then + *) if [ ".$src" = . ]; then src=$1 else dst=$1 @@ -61,11 +61,11 @@ ;; esac done -if [ "$src" = "" ]; then +if [ ".$src" = . ]; then echo "install.sh: no input file specified" exit 1 fi -if [ "$dst" = "" ]; then +if [ ".$dst" = . ]; then echo "install.sh: no destination specified" exit 1 fi @@ -87,10 +87,10 @@ $instcmd $src $dsttmp # And set any options; do chmod last to preserve setuid bits -if [ "$chowncmd" != "" ]; then $chowncmd $dsttmp; fi -if [ "$chgrpcmd" != "" ]; then $chgrpcmd $dsttmp; fi -if [ "$stripcmd" != "" ]; then $stripcmd $dsttmp; fi -if [ "$chmodcmd" != "" ]; then $chmodcmd $dsttmp; fi +if [ ".$chowncmd" != . ]; then $chowncmd $dsttmp; fi +if [ ".$chgrpcmd" != . ]; then $chgrpcmd $dsttmp; fi +if [ ".$stripcmd" != . ]; then $stripcmd $dsttmp; fi +if [ ".$chmodcmd" != . ]; then $chmodcmd $dsttmp; fi # Now rename the file to the real destination. $rmcmd $dst 1.6 +3 -3 apache-1.3/src/helpers/mkshadow.sh Index: mkshadow.sh =================================================================== RCS file: /home/cvs/apache-1.3/src/helpers/mkshadow.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mkshadow.sh 1999/01/15 20:59:42 1.5 +++ mkshadow.sh 1999/01/15 22:39:57 1.6 @@ -37,7 +37,7 @@ # determine reverse directory for destination directory dstrevdir='' -if [ "$oneisabs" = "0" ]; then +if [ $oneisabs = 0 ]; then # (inlined fp2rp) OIFS2="$IFS"; IFS='/' for pe in $dst; do @@ -88,8 +88,8 @@ dir=`echo $file | sed -e 's:[^/]*$::' -e 's:/$::' -e 's:$:/:' -e 's:^/$::'` from="$src/$file" to="$dst/$dir$basename" - if [ "$oneisabs" = "0" ]; then - if [ "$dir" != "" ]; then + if [ $oneisabs = 0 ]; then + if [ ".$dir" != . ]; then subdir=`echo $dir | sed -e 's:/$::'` # (inlined fp2rp) revdir='' 1.4 +1 -1 apache-1.3/src/helpers/ppl.sh Index: ppl.sh =================================================================== RCS file: /home/cvs/apache-1.3/src/helpers/ppl.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ppl.sh 1999/01/15 20:59:42 1.3 +++ ppl.sh 1999/01/15 22:39:57 1.4 @@ -16,7 +16,7 @@ list=` IFS=: for entry in $*; do - if [ "$entry" != "" ]; then + if [ ".$entry" != . ]; then echo $entry fi done |\ 1.5 +11 -11 apache-1.3/src/helpers/slo.sh Index: slo.sh =================================================================== RCS file: /home/cvs/apache-1.3/src/helpers/slo.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- slo.sh 1999/01/15 22:25:14 1.4 +++ slo.sh 1999/01/15 22:39:57 1.5 @@ -47,7 +47,7 @@ # set linker default directories # DIRS_DEFAULT='/lib:/usr/lib' -if [ "$LD_LIBRARY_PATH" != "" ]; then +if [ ".$LD_LIBRARY_PATH" != . ]; then DIRS_DEFAULT="$DIRS_DEFAULT:$LD_LIBRARY_PATH" fi @@ -64,7 +64,7 @@ # for each library... OIFS="$IFS" IFS=':' for lib in $LIBS; do - [ "$lib" = "" ] && continue + [ ".$lib" = . ] && continue found='no' found_indefdir='no' @@ -74,14 +74,14 @@ # for each directory... OIFS2="$IFS" IFS=":$DIFS" for dir in ${DIRS} switch-to-defdirs ${DIRS_DEFAULT}; do - [ "$dir" = "" ] && continue - [ "$dir" = "switch-to-defdirs" ] && found_indefdir=yes + [ ".$dir" = . ] && continue + [ ".$dir" = .switch-to-defdirs ] && found_indefdir=yes [ ! -d $dir ] && continue # search the file OIFS3="$IFS" IFS="$DIFS" for file in '' `cd $dir && ls lib${lib}.* 2>/dev/null`; do - [ "$file" = "" ] && continue + [ ".$file" = . ] && continue case $file in *.so|*.so.[0-9]*|*.sl|*.sl.[0-9]* ) found=yes; @@ -93,7 +93,7 @@ found_type=PIC ;; *.a ) - if [ "$found_type" = "" ]; then + if [ ".$found_type" = . ]; then found=yes found_type=OBJ fi @@ -101,15 +101,15 @@ esac done IFS="$OIFS3" - if [ "$found" = "yes" ]; then + if [ ".$found" = .yes ]; then found_dir="$dir" break fi done IFS="$OIFS2" - if [ "$found" = "yes" ]; then - if [ "$found_indefdir" != "yes" ]; then + if [ ".$found" = .yes ]; then + if [ ".$found_indefdir" != .yes ]; then eval "dirlist=\"\${DIRS_${found_type}}:\"" if [ ".`echo \"$dirlist\" | fgrep :$found_dir:`" = . ]; then eval "DIRS_${found_type}=\"\$DIRS_${found_type}:${found_dir}\"" @@ -148,7 +148,7 @@ eval "libs=\"\$LIBS_${type}\"" opts='' for lib in $libs; do - [ "$lib" = "" ] && continue + [ ".$lib" = . ] && continue opts="$opts -l$lib" done eval "LIBS_${type}=\"$opts\"" @@ -156,7 +156,7 @@ eval "dirs=\"\$DIRS_${type}\"" opts='' for dir in $dirs; do - [ "$dir" = "" ] && continue + [ ".$dir" = . ] && continue opts="$opts -L$dir" done eval "DIRS_${type}=\"$opts\""