You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by aa...@apache.org on 2002/02/27 18:06:34 UTC
cvs commit: httpd-2.0 configure.in acinclude.m4
aaron 02/02/27 09:06:34
Modified: . configure.in acinclude.m4
Log:
Fix --enable-layout to work again.
Fix bug where --sysconfdir and --localstatedir were being ignored by APR.
Caution: When specifying --enable-layout, common arguments like --prefix,
--exec-prefix, etc. will be ignored and the settings from the layout
will be used instead.
PR: 9124, 9888, 9873, 9885
Submitted by: Thom May <th...@planetarytramp.net>, Aaron Bannert
Reviewed by: Justin Erenkrantz
Revision Changes Path
1.201 +15 -4 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- configure.in 1 Feb 2002 23:22:29 -0000 1.200
+++ configure.in 27 Feb 2002 17:06:33 -0000 1.201
@@ -18,6 +18,18 @@
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_MSG_CHECKING(for chosen layout)
+AC_ARG_ENABLE(layout,
+APACHE_HELP_STRING(--enable-layout=LAYOUT,Default file layout),[
+ LAYOUT=$enableval
+ APACHE_LAYOUT($srcdir/config.layout, $LAYOUT)
+ AC_MSG_RESULT($LAYOUT)
+], [
+ AC_MSG_RESULT([Autoconf Defaults])
+])
+
dnl Save user-defined environment settings for later restoration
dnl
APR_SAVE_THE_ENVIRONMENT(CPPFLAGS)
@@ -52,15 +64,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}"
@@ -277,7 +289,6 @@
APR_ADDTO(CPPFLAGS, -DAP_DEBUG)
])dnl
-APACHE_ENABLE_LAYOUT
prefix="$orig_prefix"
APACHE_ENABLE_MODULES
1.111 +0 -17 httpd-2.0/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- acinclude.m4 26 Feb 2002 21:31:45 -0000 1.110
+++ acinclude.m4 27 Feb 2002 17:06:33 -0000 1.111
@@ -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
Re: cvs commit: httpd-2.0 configure.in acinclude.m4
Posted by Aaron Bannert <aa...@clove.org>.
On Wed, Feb 27, 2002 at 01:33:12PM -0500, Jeff Trawick wrote:
> aaron@apache.org writes:
>
> > aaron 02/02/27 09:06:34
> >
> > Modified: . configure.in acinclude.m4
> > Log:
> > Fix --enable-layout to work again.
> > Fix bug where --sysconfdir and --localstatedir were being ignored by APR.
>
> I don't know if this is the commit that did it, but somehow we have
> lost the setting of htdocsdir and some other settings in
> config_vars.mk. "make install" is broken for me using something as
> simple as
>
> ./configure --prefix=/tmp/abc
>
> The failure is at "Installing HTML documents" because we need
> htdocsdir set to something but instead it is set to nothing.
>
> Any clues? A bad default layout or something like that?
I'm seeing this as well. I will fix it shortly.
-aaron
Re: cvs commit: httpd-2.0 configure.in acinclude.m4
Posted by Jeff Trawick <tr...@attglobal.net>.
aaron@apache.org writes:
> aaron 02/02/27 09:06:34
>
> Modified: . configure.in acinclude.m4
> Log:
> Fix --enable-layout to work again.
> Fix bug where --sysconfdir and --localstatedir were being ignored by APR.
I don't know if this is the commit that did it, but somehow we have
lost the setting of htdocsdir and some other settings in
config_vars.mk. "make install" is broken for me using something as
simple as
./configure --prefix=/tmp/abc
The failure is at "Installing HTML documents" because we need
htdocsdir set to something but instead it is set to nothing.
Any clues? A bad default layout or something like that?
--
Jeff Trawick | trawick@attglobal.net | PGP public key at web site:
http://www.geocities.com/SiliconValley/Park/9289/
Born in Roswell... married an alien...
Re: cvs commit: httpd-2.0 configure.in acinclude.m4
Posted by Jeff Trawick <tr...@attglobal.net>.
aaron@apache.org writes:
> aaron 02/02/27 09:06:34
>
> Modified: . configure.in acinclude.m4
> Log:
> Fix --enable-layout to work again.
> Fix bug where --sysconfdir and --localstatedir were being ignored by APR.
I don't know if this is the commit that did it, but somehow we have
lost the setting of htdocsdir and some other settings in
config_vars.mk. "make install" is broken for me using something as
simple as
./configure --prefix=/tmp/abc
The failure is at "Installing HTML documents" because we need
htdocsdir set to something but instead it is set to nothing.
Any clues? A bad default layout or something like that?
--
Jeff Trawick | trawick@attglobal.net | PGP public key at web site:
http://www.geocities.com/SiliconValley/Park/9289/
Born in Roswell... married an alien...