From 7d99fb7824615de4360c824bf2a716a2065c8731 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Fri, 2 Mar 2018 12:59:58 +0000 Subject: [PATCH] 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 --- STATUS | 3 --- modules/filters/config.m4 | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/STATUS b/STATUS index 378eb1a234..8490cfdc0f 100644 --- 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 367e70b7fa..810f0d7e74 100644 --- 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) -- 2.40.0