httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject svn commit: r731058 - /httpd/httpd/trunk/configure.in
Date Sat, 03 Jan 2009 18:02:36 GMT
Author: jerenkrantz
Date: Sat Jan  3 10:02:36 2009
New Revision: 731058

URL: http://svn.apache.org/viewvc?rev=731058&view=rev
Log:
pcre-config --cflags actually emits include paths not cflags, so add it to
correct variable.  Also, reuse APR_INCLUDES/APU_INCLUDES variables so as to
save an extra invocation of config files.

* configure.in: Add PCRE_CONFIG --cflags to INCLUDES; reuse AP{RU}_INCLUDES
  variables.

Modified:
    httpd/httpd/trunk/configure.in

Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=731058&r1=731057&r2=731058&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Sat Jan  3 10:02:36 2009
@@ -181,7 +181,7 @@
     AC_MSG_ERROR([Did not find pcre-config script at $PCRE_CONFIG])
   fi
   AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG])
-  APR_ADDTO(CFLAGS, [`$PCRE_CONFIG --cflags`])
+  APR_ADDTO(PCRE_INCLUDES, [`$PCRE_CONFIG --cflags`])
   APR_ADDTO(PCRE_LIBS, [`$PCRE_CONFIG --libs`])
 else
   AC_MSG_ERROR([pcre-config for libpcre not found. PCRE is required and available from http://pcre.org/])
@@ -207,8 +207,11 @@
 # 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`)
+APR_ADDTO(INCLUDES, $APR_INCLUDES)
+APR_ADDTO(INCLUDES, $APU_INCLUDES)
+
+dnl Add in path to PCRE includes
+APR_ADDTO(INCLUDES, $PCRE_INCLUDES)
 
 echo $ac_n "${nl}Applying OS-specific hints for httpd ...${nl}"
 



Mime
View raw message