httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0 configure.in
Date Fri, 13 Aug 2004 12:35:47 GMT
jorton      2004/08/13 05:35:47

  Modified:    .        configure.in
  Log:
  * configure.in: Ensure that apr and apr-util exported include
  directories are later than local source directories in INCLUDES.
  
  PR: 18959
  
  Revision  Changes    Path
  1.266     +6 -2      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.265
  retrieving revision 1.266
  diff -d -w -u -r1.265 -r1.266
  --- configure.in	13 Aug 2004 11:18:33 -0000	1.265
  +++ configure.in	13 Aug 2004 12:35:47 -0000	1.266
  @@ -81,7 +81,6 @@
   APR_ADDTO(CFLAGS, `$apr_config --cflags`)
   APR_ADDTO(CPPFLAGS, `$apr_config --cppflags`)
   APR_ADDTO(LDFLAGS, `$apr_config --ldflags`)
  -APR_ADDTO(INCLUDES, `$apr_config --includes`)
   SHLIBPATH_VAR=`$apr_config --shlib-path-var`
   APR_BINDIR=`$apr_config --bindir`
   APR_INCLUDEDIR=`$apr_config --includedir`
  @@ -106,7 +105,6 @@
   fi
   
   APR_ADDTO(LDFLAGS, `$apu_config --ldflags`)
  -APR_ADDTO(INCLUDES, `$apu_config --includes`)
   APU_BINDIR=`$apu_config --bindir`
   APU_INCLUDEDIR=`$apu_config --includedir`
   APU_VERSION=`$apu_config --version`
  @@ -139,6 +137,12 @@
   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 -I\$(top_srcdir)/modules/generators -I\$(top_srcdir)/modules/mappers])
  +
  +# apr/apr-util --includes may pick up system paths for dependent
  +# libraries, so ensure these are later in INCLUDES than local source
  +# directories.
  +APR_ADDTO(INCLUDES, `$apr_config --includes`)
  +APR_ADDTO(INCLUDES, `$apu_config --includes`)
   
   echo $ac_n "${nl}Applying OS-specific hints for httpd ...${nl}"
   
  
  
  

Mime
View raw message