equal
deleted
inserted
replaced
|
1 Patch origin: upstream |
|
2 Patch status: already part of 2.4 and HEAD (bacport to 2.2 is unclear) |
|
3 |
|
4 https://svn.apache.org/viewvc?view=revision&revision=731058 |
|
5 |
|
6 --- configure.in 2014-03-28 07:05:06.506452975 -0700 |
|
7 +++ configure.in 2014-03-28 07:08:12.121620041 -0700 |
|
8 @@ -184,7 +184,7 @@ |
|
9 |
|
10 if test "$PCRE_CONFIG" != "false"; then |
|
11 AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG]) |
|
12 - APR_ADDTO(CFLAGS, [`$PCRE_CONFIG --cflags`]) |
|
13 + APR_ADDTO(PCRE_INCLUDES, [`$PCRE_CONFIG --cflags`]) |
|
14 APR_ADDTO(LIBS, [`$PCRE_CONFIG --libs`]) |
|
15 else |
|
16 # Build the bundled PCRE |
|
17 @@ -219,6 +219,9 @@ |
|
18 APR_ADDTO(INCLUDES, `$apr_config --includes`) |
|
19 APR_ADDTO(INCLUDES, `$apu_config --includes`) |
|
20 |
|
21 +dnl Add in path to PCRE includes |
|
22 +APR_ADDTO(INCLUDES, $PCRE_INCLUDES) |
|
23 + |
|
24 echo $ac_n "${nl}Applying OS-specific hints for httpd ...${nl}" |
|
25 |
|
26 case $host in |