Apache 1.3.23+mod_ssl-2.8.6-1.3.23 merge

1 files changed, 19 insertions, 7 deletions

diff --git a/usr.sbin/httpd/configure b/usr.sbin/httpd/configure
index ceb2ad792ed..f54d78d4f2f 100644
--- a/usr.sbin/httpd/configure
+++ b/usr.sbin/httpd/configure
@@ -433,7 +433,8 @@ do
             echo " --sysconfdir=DIR       install configuration files in DIR"
             echo " --datadir=DIR          install read-only data files in DIR"
             echo " --iconsdir=DIR         install read-only icon files in DIR"
-            echo " --htdocsdir=DIR        install read-only document files in DIR"
+            echo " --htdocsdir=DIR        install read-only welcome pages in DIR"
+            echo " --manualdir=DIR        install read-only on-line documentation in DIR"
             echo " --cgidir=DIR           install read-only cgi files in DIR"
             echo " --includedir=DIR       install includes files in DIR"
             echo " --localstatedir=DIR    install modifiable data files in DIR"
@@ -506,8 +507,9 @@ do
             OOIFS="$IFS"  # most likely not needed: jmj
             IFS="$DIFS"   # ditto
             for var in prefix exec_prefix bindir sbindir libexecdir mandir \
-                       sysconfdir datadir iconsdir htdocsdir cgidir includedir \
-                       localstatedir runtimedir logfiledir proxycachedir; do
+                       sysconfdir datadir iconsdir htdocsdir manualdir cgidir \
+                       includedir localstatedir runtimedir logfiledir \
+                       proxycachedir; do
                 eval "val=\"\$$var\""
                 case $val in
                     *+ )
@@ -680,6 +682,10 @@ do
             htdocsdir="$apc_optarg" 
             autosuffix_htdocsdir=no
             ;;
+        --manualdir=*) 
+            manualdir="$apc_optarg" 
+            autosuffix_manualdir=no
+            ;;
         --cgidir=*) 
             cgidir="$apc_optarg" 
             autosuffix_cgidir=no
@@ -1113,14 +1119,14 @@ fi
 
 ##
 ##  expand path variables and make sure
-##  they do not end with a backslash
+##  they do not end in a backslash
 ##
 OIFS="$IFS"
 IFS="$DIFS"
 for var in prefix exec_prefix bindir sbindir libexecdir mandir \
-           sysconfdir datadir iconsdir htdocsdir cgidir includedir \
-           localstatedir runtimedir logfiledir proxycachedir \
-           suexec_docroot suexec_logexec ; do
+           sysconfdir datadir iconsdir htdocsdir manualdir cgidir \
+           includedir localstatedir runtimedir logfiledir \
+           proxycachedir suexec_docroot suexec_logexec ; do
     eval "val=\"\$$var\"";
     val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
     eval "$var=\"$val\""
@@ -1247,6 +1253,7 @@ if [ "x$show_layout" = "x1" ]; then
     echo "              datadir: $datadir" 
     echo "             iconsdir: $iconsdir" 
     echo "            htdocsdir: $htdocsdir" 
+    echo "            manualdir: $manualdir" 
     echo "               cgidir: $cgidir" 
     echo "           includedir: $includedir" 
     echo "        localstatedir: $localstatedir" 
@@ -1319,6 +1326,7 @@ sed <Makefile.tmpl >$mkf \
 -e "s%@datadir@%$datadir%g" \
 -e "s%@iconsdir@%$iconsdir%g" \
 -e "s%@htdocsdir@%$htdocsdir%g" \
+-e "s%@manualdir@%$manualdir%g" \
 -e "s%@cgidir@%$cgidir%g" \
 -e "s%@localstatedir@%$localstatedir%g" \
 -e "s%@includedir@%$includedir%g" \
@@ -1550,6 +1558,10 @@ case $PLATFORM in
         echo $SEO "s%/mod_\\(.\\{1,8\\}\\).*\\.so%/\\1\\.dll%" >>$sedsubst
         echo $SEO "s%/\\(lib.*\\)\\.so$%/\\1.dll%" >>$sedsubst
         ;;
+    *cygwin* ) 
+        echo $SEO "s%/\\(mod_.*\\)\\.so$%/\\1.dll%" >>$sedsubst
+        echo $SEO "s%/\\(lib.*\\)\\.so$%/\\1.dll%" >>$sedsubst
+        ;;
 esac
 
 #   split sedsubst into chunks of 50 commands