| author | Qiang Strony Zhang <strony.zhang@oracle.com> |
| Fri, 09 Oct 2015 11:54:18 -0700 | |
| branch | s11u3-sru |
| changeset 4937 | 8f0976d7e40e |
| parent 3968 | 266f10e491cb |
| permissions | -rw-r--r-- |
|
3968
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
Patch origin: upstream |
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
Patch status: already part of 2.4 and HEAD (bacport to 2.2 is unclear) |
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
|
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
https://svn.apache.org/viewvc?view=revision&revision=731058 |
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
|
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
--- configure.in 2014-03-28 07:05:06.506452975 -0700 |
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
+++ configure.in 2014-03-28 07:08:12.121620041 -0700 |
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
@@ -184,7 +184,7 @@ |
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
|
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
if test "$PCRE_CONFIG" != "false"; then |
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG]) |
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
- APR_ADDTO(CFLAGS, [`$PCRE_CONFIG --cflags`]) |
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
+ APR_ADDTO(PCRE_INCLUDES, [`$PCRE_CONFIG --cflags`]) |
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
APR_ADDTO(LIBS, [`$PCRE_CONFIG --libs`]) |
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
else |
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
# Build the bundled PCRE |
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
@@ -219,6 +219,9 @@ |
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
APR_ADDTO(INCLUDES, `$apr_config --includes`) |
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
APR_ADDTO(INCLUDES, `$apu_config --includes`) |
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
|
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
+dnl Add in path to PCRE includes |
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
+APR_ADDTO(INCLUDES, $PCRE_INCLUDES) |
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
+ |
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
echo $ac_n "${nl}Applying OS-specific hints for httpd ...${nl}"
|
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
|
|
266f10e491cb
18480574 Apache should link against system pcre
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
case $host in |