Add recognition of the --with-port=n (as was added to 1.3), and

	raise an error if --enable-layout is specified but we can't
	find the definition file.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86048 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.in b/Makefile.in
index 6ad8cc8c22a97fbd257c9fdca305337101533432..989fe9741be73167b204e32f56bf48f1f27ba683 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,6 +33,7 @@ install-conf:
        done; \
        for i in *-dist; do \
                sed -e 's#@@ServerRoot@@#$(prefix)#g' \
+                   -e 's#@@Port@@#$(PORT)#g' \
                        < $$i > $(sysconfdir)/$$i; \
                chmod 0644 $(sysconfdir)/$$i; \
                file=`echo $$i|sed s/-dist//`; \

diff --git a/acinclude.m4 b/acinclude.m4
index 878a66520f5d19825bfc576dfb438c4c40e29ca6..8719cf0673a0a09356d5aa7c885c758fa1c7b444 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -75,6 +75,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   APACHE_SUBST(LIBTOOL)
   APACHE_SUBST(SHELL)
   APACHE_SUBST(MODULE_DIRS)
+  APACHE_SUBST(PORT)
 
   abs_srcdir="`(cd $srcdir && pwd)`"
 
@@ -324,6 +325,11 @@ AC_DEFUN(APACHE_MODULE,[
 dnl
 dnl APACHE_LAYOUT(configlayout, layoutname)
 AC_DEFUN(APACHE_LAYOUT,[
+  if test ! -f $srcdir/../config.layout; then
+    echo "** Error: Layout file $srcdir/../config.layout not found"
+    echo "** Error: Cannot use undefined layout '$LAYOUT'"
+    exit 1
+  fi
   pldconf=config.pld
   changequote({,})
   sed -e "1,/[         ]*<[lL]ayout[   ]*$2[   ]*>[    ]*/d" \

diff --git a/configure.in b/configure.in
index 283058df9051ab467b0b6d51e6a9028ebc7c3e6e..48e22b2e6cf49e8fb0b54b882117d9547ffb6e6d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -107,6 +107,10 @@ APACHE_EBCDIC
 AC_ARG_WITH(optim,[  --with-optim="FLAGS"      compiler optimisation flags],
         [OPTIM="$withval"])
 
+AC_ARG_WITH(port,[  --with-port=PORT        Port on which to listen (default is 80)],
+        [PORT="$withval"],
+       [PORT=80])
+
 AC_ARG_WITH(debug,[  --with-debug            Turn on debugging and compile time warnings],
         [if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -g -Wall"; else CFLAGS="$CFLAGS -g"; fi])