diff options
Diffstat (limited to 'usr.sbin/httpd/configure')
| -rw-r--r-- | usr.sbin/httpd/configure | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/usr.sbin/httpd/configure b/usr.sbin/httpd/configure index 9e019641128..0c9099622ef 100644 --- a/usr.sbin/httpd/configure +++ b/usr.sbin/httpd/configure @@ -127,8 +127,8 @@ PLATFORM="`sh $aux/GuessOS`" ## if [ "x$quiet" = "xno" ]; then APV=`cat $src/include/httpd.h |\ - grep "#define SERVER_BASEVERSION" |\ - sed -e 's/^[^"]*"//' -e 's/".*$//' -e 's/^Apache\///'` + grep "#define SERVER_BASEREVISION" |\ + sed -e 's/^[^"]*"//' -e 's/".*$//' -e 's/^\///'` echo "Configuring for Apache, Version $APV" fi @@ -342,8 +342,8 @@ case $PLATFORM in iflags_core="${iflags_core} -S \"-S\"" iflags_dso="${iflags_dso} -S \"-S\"" ;; - *-apple-macos*) - default_layout="Mac OS X Server" + *-apple-darwin*) + default_layout="Darwin" iflags_core="${iflags_core} -S \"-S\"" iflags_dso="${iflags_dso} -S \"-S\"" ;; @@ -353,9 +353,9 @@ case $PLATFORM in iflags_core="${iflags_core} -e .exe" ;; *MPE/iX* ) - default_layout="Apache" - iflags_program="-m 755" - ;; + default_layout="Apache" + iflags_program="-m 755" + ;; *) default_layout="Apache" ;; @@ -493,12 +493,13 @@ do echo "configure:Error: Path layout definition file $file not found" 1>&2 exit 1 fi + (echo ''; cat $file; echo '') |\ sed -e "1,/[ ]*<[Ll]ayout[ ]*$name[ ]*>[ ]*/d" \ -e '/[ ]*<\/Layout>[ ]*/,$d' \ -e "s/^[ ]*//g" \ -e "s/:[ ]*/=\'/g" \ -e "s/[ ]*$/'/g" \ - $file >$pldconf + >$pldconf . $pldconf OOIFS="$IFS" # most likely not needed: jmj IFS="$DIFS" # ditto @@ -1047,7 +1048,7 @@ echo "## restoring your configuration. Additional parameters can be supplied." echo "##" >>$configstatus echo "" >>$configstatus for var in CC CPP OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \ - LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET EAPI_MM SSL_BASE RSA_BASE; do + LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET EAPI_MM SSL_BASE; do eval "val=\"\$$var\"" if [ "x$val" != "x" ]; then echo "$var=$val" |\ @@ -1382,7 +1383,7 @@ touch $sedsubst OIFS="$IFS" IFS="$DIFS" for var in CC CPP OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \ - LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET EAPI_MM SSL_BASE RSA_BASE; do + LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET EAPI_MM SSL_BASE; do eval "val=\"\$$var\""; if [ "x$val" != "x" ]; then case $var in |