You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@apache.org on 2001/07/08 05:27:19 UTC
cvs commit: httpd-2.0 configure.in
rbb 01/07/07 20:27:18
Modified: . configure.in
Log:
We need to pass the prefix to APR, APR-util, and PCRE. If we don't
pass that information, then all three libraries will install themselves
into their default locations.
PR: 7750
Revision Changes Path
1.164 +11 -10 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -b -w -u -r1.163 -r1.164
--- configure.in 2001/06/12 12:55:20 1.163
+++ configure.in 2001/07/08 03:27:18 1.164
@@ -33,19 +33,27 @@
nl='
'
+
+dnl XXX we can't just use AC_PREFIX_DEFAULT because that isn't subbed in
+dnl by configure until it is too late. Is that how it should be or not?
+dnl Something seems broken here.
+AC_PREFIX_DEFAULT(/usr/local/apache2)
+test "$prefix" = "NONE" && prefix='/usr/local/apache2'
+test "$exec_prefix" = "NONE" && exec_prefix='${prefix}'
+
dnl ## Run configure for packages Apache uses
echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"
-APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --disable-shared")
+APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --disable-shared --prefix=$prefix")
echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
-APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --disable-shared")
+APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --disable-shared --prefix=$prefix")
echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
-APR_SUBDIR_CONFIG(srclib/pcre)
+APR_SUBDIR_CONFIG(srclib/pcre, "--prefix=$prefix")
echo $ac_n "${nl}Configuring Apache httpd ...${nl}"
@@ -65,13 +73,6 @@
EXTRA_LDFLAGS=
EXTRA_LIBS=
EXTRA_INCLUDES=
-
-dnl XXX we can't just use AC_PREFIX_DEFAULT because that isn't subbed in
-dnl by configure until it is too late. Is that how it should be or not?
-dnl Something seems broken here.
-AC_PREFIX_DEFAULT(/usr/local/apache2)
-test "$prefix" = "NONE" && prefix='/usr/local/apache2'
-test "$exec_prefix" = "NONE" && exec_prefix='${prefix}'
dnl Absolute source/build directory
abs_srcdir=`(cd $srcdir && pwd)`