Commit b1d263e1 authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

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.


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

configure.in

+3 −2
Changes for configure.in: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ fi 
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 @@ dnl then we are running in VPATH mode. 


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}"