rse 98/03/09 04:52:06
Modified: src Configure Log: ConfigStart/End sections were totally ignored for SharedModule Revision Changes Path 1.197 +9 -5 apache-1.3/src/Configure Index: Configure =================================================================== RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.196 retrieving revision 1.197 diff -u -r1.196 -r1.197 --- Configure 1998/03/09 08:41:58 1.196 +++ Configure 1998/03/09 12:52:05 1.197 @@ -815,7 +815,7 @@ # additional hackery. It would be nice to reduce the number of times # we have to awk the $tmpfile, though. -# MODFILES contains a list of module filenames (could be .c, .o, .a +# MODFILES contains a list of module filenames (could be .c, .o, .so, .a # or .module files) from AddModule lines only # MODDIRS contains a list of subdirectories under 'modules' which # contain modules we want to build from both AddModule and Module @@ -823,7 +823,7 @@ echo " + adding selected modules" -MODFILES=`awk <$tmpfile '$1 == "AddModule" { printf "%s ", $2 }'` +MODFILES=`awk <$tmpfile '($1 == "AddModule" || $1 == "SharedModule") { printf "%s ", $2 }'` MODDIRS=`awk < $tmpfile ' ($1 == "Module" && $3 ~ /^modules\//) { split ($3, pp, "/") @@ -892,14 +892,18 @@ . ./$tmpfile3 fi rm -f $tmpfile2 $tmpfile3 - ext=o + if [ $ext != so ]; then + ext=o + fi fi if [ "x$modname" = "x" ] ; then modname=`echo $modbase | sed 's/^.*\///' | \ sed 's/^mod_//' | sed 's/^lib//' | sed 's/$/_module/'` fi -# echo "Adding Module $modname $modbase.$ext" - echo "Module $modname $modbase.$ext" >>$tmpfile + if [ $ext != so ]; then +# echo "Adding Module $modname $modbase.$ext" + echo "Module $modname $modbase.$ext" >>$tmpfile + fi done # $tmpfile now contains Module lines for all the modules we want