diff options
| author | Justin Erenkrantz <jerenkrantz@apache.org> | 2009-01-03 19:02:36 +0100 |
|---|---|---|
| committer | Justin Erenkrantz <jerenkrantz@apache.org> | 2009-01-03 19:02:36 +0100 |
| commit | 44f5378465968dc415ef40c32d918b801de750ff (patch) | |
| tree | 6f2794d44382921ed539027ae6f8aab3c10169ea /configure.in | |
| parent | Fix format type warning in mod_example_ipc.c. (diff) | |
| download | apache2-44f5378465968dc415ef40c32d918b801de750ff.tar.xz apache2-44f5378465968dc415ef40c32d918b801de750ff.zip | |
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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@731058 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rw-r--r-- | configure.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 2566faf8b6..6c53154d25 100644 --- a/configure.in +++ b/configure.in @@ -181,7 +181,7 @@ if test "$PCRE_CONFIG" != "false"; then 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_ADDTO(INCLUDES, [-I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/server/mpm/ # 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}" |