Merge r1825169 from trunk:

Propose backportable fix to accept libxml2 path in the
base form or the absolute path to include tree form.

Nowhere does the --with-libxml2= arg suggest the path
is that of the include tree, and disagrees with httpd's
use of --with- syntax for package location.

Submitted by: wrowe
Reviewed by: wrowe, ylavic, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1825720 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 378eb1a234ebf2389f8f2a8c092857fa2a289710..8490cfdc0f3a7906f35ba6cf3aff8dc2093004a2 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -119,9 +119,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) Permit package root paths to --with-libxml2= configure option
-     trunk patch: http://svn.apache.org/r1825169
-     +1: wrowe, ylavic, jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:

diff --git a/modules/filters/config.m4 b/modules/filters/config.m4
index 367e70b7faf06b951b1e308e87789f0c46fa041c..810f0d7e7456f552eaea22562b92e74872881099 100644 (file)
--- a/modules/filters/config.m4
+++ b/modules/filters/config.m4
@@ -100,7 +100,7 @@ AC_DEFUN([FIND_LIBXML2], [
   AC_CACHE_CHECK([for libxml2], [ac_cv_libxml2], [
     AC_ARG_WITH(libxml2,
       [APACHE_HELP_STRING(--with-libxml2=PATH,location for libxml2)],
-      [test_paths="${with_libxml2}"],
+      [test_paths="${with_libxml2}/include/libxml2 ${with_libxml2}/include ${with_libxml2}"],
       [test_paths="/usr/include/libxml2 /usr/local/include/libxml2 /usr/include /usr/local/include"]
     )
     AC_MSG_CHECKING(for libxml2)