httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Thom May <t...@planetarytramp.net>
Subject Re: --enable-layout and overriding --prefix
Date Wed, 27 Feb 2002 15:41:09 GMT
* Aaron Bannert (aaron@clove.org) wrote :
> On Wed, Feb 27, 2002 at 12:29:49AM -0800, Justin Erenkrantz wrote:
> > I think as I pointed out in IRC, we need to pass all of the
> > --libdir, etc flags to APR/apr-util/pcre as well.  I don't think
> > does this.  Can you please resumbit with a patch that does this?
> > 
Attached.
> 
-Thom


Index: acinclude.m4
===================================================================
RCS file: /home/cvspublic/httpd-2.0/acinclude.m4,v
retrieving revision 1.110
diff -u -u -r1.110 acinclude.m4
--- acinclude.m4	26 Feb 2002 21:31:45 -0000	1.110
+++ acinclude.m4	27 Feb 2002 15:38:52 -0000
@@ -325,23 +325,6 @@
   done
   changequote([,])
 ])dnl
-dnl
-dnl APACHE_ENABLE_LAYOUT
-dnl
-AC_DEFUN(APACHE_ENABLE_LAYOUT,[
-AC_ARG_ENABLE(layout,
-APACHE_HELP_STRING(--enable-layout=LAYOUT,Default file layout),[
-  LAYOUT=$enableval
-])
-
-if test -z "$LAYOUT"; then
-  LAYOUT="Apache"
-fi
-APACHE_LAYOUT($srcdir/config.layout, $LAYOUT)
-
-AC_MSG_CHECKING(for chosen layout)
-AC_MSG_RESULT($layout_name)
-])
 
 dnl
 dnl APACHE_ENABLE_MODULES
Index: configure.in
===================================================================
RCS file: /home/cvspublic/httpd-2.0/configure.in,v
retrieving revision 1.200
diff -u -u -r1.200 configure.in
--- configure.in	1 Feb 2002 23:22:29 -0000	1.200
+++ configure.in	27 Feb 2002 15:38:52 -0000
@@ -18,6 +18,21 @@
 sinclude(srclib/apr/build/apr_threads.m4)
 sinclude(acinclude.m4)
 
+dnl Get the layout here, so we can pass the required variables to apr
+dnl APACHE_ENABLE_LAYOUT
+AC_ARG_ENABLE(layout,
+APACHE_HELP_STRING(--enable-layout=LAYOUT,Default file layout),[
+  LAYOUT=$enableval
+  APACHE_LAYOUT($srcdir/config.layout, $LAYOUT)
+])
+
+AC_MSG_CHECKING(for chosen layout)
+if test -z "$LAYOUT"; then
+  AC_MSG_RESULT([Autoconf Defaults])
+else
+  AC_MSG_RESULT($layout_name)
+fi
+
 dnl Save user-defined environment settings for later restoration
 dnl
 APR_SAVE_THE_ENVIRONMENT(CPPFLAGS)
@@ -52,15 +67,15 @@
 
 echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"
 
-APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --prefix=$prefix")
+APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix
--libdir=$libdir --bindir=$bindir")
 
 echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
 
-APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --prefix=$prefix")
+APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix
--libdir=$libdir --bindir=$bindir")
 
 echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
 
-APR_SUBDIR_CONFIG(srclib/pcre, "--prefix=$prefix")
+APR_SUBDIR_CONFIG(srclib/pcre, "--prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir
--bindir=$bindir")
 
 echo $ac_n "${nl}Configuring Apache httpd ...${nl}"
 

Mime
View raw message