You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2002/05/13 23:23:29 UTC
cvs commit: httpd-2.0 configure.in
jerenkrantz 02/05/13 14:23:29
Modified: . configure.in
Log:
Instead of hardcoding srclib/apr{-util} in the INCLUDES, get the information
from ap{ru}-config --includes which knows how to deal with VPATH builds
itself.
Revision Changes Path
1.218 +3 -2 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- configure.in 13 May 2002 08:39:30 -0000 1.217
+++ configure.in 13 May 2002 21:23:29 -0000 1.218
@@ -79,6 +79,7 @@
APR_ADDTO(CFLAGS, `$apr_config --cflags`)
APR_ADDTO(CPPFLAGS, `$apr_config --cppflags`)
APR_ADDTO(LDFLAGS, `$apr_config --ldflags`)
+APR_ADDTO(INCLUDES, `$apr_config --includes`)
echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
@@ -113,9 +114,9 @@
if test "$abs_builddir" != "$abs_srcdir"; then
USE_VPATH=1
- APR_ADDTO(INCLUDES, [-I. -I\$(srcdir) -I\$(top_builddir)/os/\$(OS_DIR) -I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_builddir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_srcdir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_builddir)/modules/http -I\$(top_srcdir)/modules/http -I\$(top_srcdir)/modules/proxy -I\$(top_builddir)/include -I\$(top_srcdir)/include -I\$(top_builddir)/srclib/apr/include -I\$(top_srcdir)/srclib/apr/include -I\$(top_builddir)/srclib/apr-util/include -I\$(top_srcdir)/srclib/apr-util/include])
+ APR_ADDTO(INCLUDES, [-I. -I\$(srcdir) -I\$(top_builddir)/os/\$(OS_DIR) -I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_builddir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_srcdir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_builddir)/modules/http -I\$(top_srcdir)/modules/http -I\$(top_srcdir)/modules/proxy -I\$(top_builddir)/include -I\$(top_srcdir)/include])
else
- APR_ADDTO(INCLUDES, [-I. -I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_srcdir)/modules/http -I\$(top_srcdir)/modules/proxy -I\$(top_srcdir)/include -I\$(top_srcdir)/srclib/apr/include -I\$(top_srcdir)/srclib/apr-util/include])
+ APR_ADDTO(INCLUDES, [-I. -I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_srcdir)/modules/http -I\$(top_srcdir)/modules/proxy -I\$(top_srcdir)/include])
fi
echo $ac_n "${nl}Applying OS-specific hints for httpd ...${nl}"
Re: cvs commit: httpd-2.0 configure.in
Posted by Greg Stein <gs...@lyra.org>.
On Mon, May 13, 2002 at 09:23:29PM -0000, jerenkrantz@apache.org wrote:
> jerenkrantz 02/05/13 14:23:29
>
> Modified: . configure.in
> Log:
> Instead of hardcoding srclib/apr{-util} in the INCLUDES, get the information
> from ap{ru}-config --includes which knows how to deal with VPATH builds
> itself.
This whole push is quite excellent! Good job, Justin!
Cheers,
-g
--
Greg Stein, http://www.lyra.org/