jim 97/09/10 05:13:30
Modified: src Configure Log: Final cleanup: Remember our assumption that Configure must only use capabilities of the Ver7 shell. We should reconsider this for 2.0 Revision Changes Path 1.152 +5 -3 apachen/src/Configure Index: Configure =================================================================== RCS file: /export/home/cvs/apachen/src/Configure,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- Configure 1997/09/09 22:33:53 1.151 +++ Configure 1997/09/10 12:13:29 1.152 @@ -763,7 +763,7 @@ for modfile in $MODFILES ; do # echo Trying to find $modfile rm -f $tmpfile2 $tmpfile3 - modname= + modname='' ext=`echo $modfile | sed 's/^.*\.//'` modbase=`echo $modfile | sed 's/\.[^.]*$//'` @@ -777,10 +777,11 @@ if [ -r $modbase.module ] ; then cat $modbase.module > $tmpfile2 - elif [ -f $modbase.c ] ; then + else + if [ -f $modbase.c ] ; then # Guess module structure name in case there is not # module definition in this file - modname=`grep '^module .*;' $modbase.c | head -1 |\ + modname=`egrep '^module .*;' $modbase.c | head -1 |\ sed 's/^module.*[ ][ ]*//' | \ sed 's/[ ]*;[ ]*$//'` # Get any module definition part @@ -789,6 +790,7 @@ sed '1,/MODULE-DEFINITION-START/d;/MODULE-DEFINITION-END/,$d' \ > $tmpfile2 fi + fi fi if [ -r $tmpfile2 ] ; then # Read a module definition from .module or .c