Fix the interaction between --prefix and --with-layout. We were

over-writing the specified prefix during --with-layout processing.  By
keeping a copy of the specified prefix, and resetting it after the
layout processing, this is fixed.
PR:	7755

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

diff --git a/configure.in b/configure.in
index 19027d4fcf3539a01e347e51c7dedda9fd66122d..61e8fb8126979c49e4a7e09d8cdb15fb1677f10f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -43,6 +43,8 @@ test "$exec_prefix" = "NONE" && exec_prefix='${prefix}'
 
 dnl ## Run configure for packages Apache uses
 
+orig_prefix="$prefix"
+
 echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"
 
 APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --prefix=$prefix")
@@ -239,6 +241,7 @@ AC_ARG_ENABLE(maintainer-mode,[  --enable-maintainer-mode  Turn on debugging and
 ])dnl
 
 APACHE_ENABLE_LAYOUT
+prefix="$orig_prefix"
 APACHE_ENABLE_MODULES
 
 dnl reading config stubs