From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 16 May 2003 16:01:11 +0000 (+0000)
Subject:   Fix a VPATH build issue - our command lines can sometimes hit the wall
X-Git-Tag: pre_ajp_proxy~1691
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6efb8042707ff917fd5417c554b80322b97b8529;p=thirdparty%2Fapache%2Fhttpd.git

  Fix a VPATH build issue - our command lines can sometimes hit the wall
  against the shell's max command line length.  We had a number of needless
  paths included in VPATH builds; this change will spare us from -I'ncluding
  the module paths with no .h files.


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

diff --git a/configure.in b/configure.in
index 39f7b484b98..0cc511ed264 100644
--- a/configure.in
+++ b/configure.in
@@ -128,13 +128,15 @@ abs_builddir=`pwd`
 dnl If the source dir is not equal to the build dir, 
 dnl then we are running in VPATH mode.
 
+APR_ADDTO(INCLUDES, [-I.])
+
 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_builddir)/modules/proxy -I\$(top_srcdir)/modules/proxy -I\$(top_builddir)/modules/filters -I\$(top_srcdir)/modules/filters -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/filters -I\$(top_srcdir)/modules/proxy -I\$(top_srcdir)/include])
+  APR_ADDTO(INCLUDES, [-I\$(srcdir) -I\$(top_builddir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_builddir)/include])
 fi
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_srcdir)/modules/http -I\$(top_srcdir)/modules/filters -I\$(top_srcdir)/modules/proxy -I\$(top_srcdir)/include])
+
 echo $ac_n "${nl}Applying OS-specific hints for httpd ...${nl}"
 
 case $host in