From: Joe Orton Date: Fri, 7 Jul 2023 12:05:33 +0000 (+0000) Subject: Merge r1909241 from trunk: X-Git-Tag: 2.4.58-rc1-candidate~82 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acd2f3432060532a1f90b23121948cef7b22164a;p=thirdparty%2Fapache%2Fhttpd.git Merge r1909241 from trunk: * Add server directory to include path as mod_rewrite requires test_char.h. PR: 66571 Submitted by: Valeria Petrov Reviewed by: rpluem, icing, ylavic Submitted by: rpluem git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910855 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/changes-entries/pr66571.txt b/changes-entries/pr66571.txt new file mode 100644 index 00000000000..bfa89af649a --- /dev/null +++ b/changes-entries/pr66571.txt @@ -0,0 +1,2 @@ + *) mod_rewrite: Add server directory to include path as mod_rewrite requires + test_char.h. PR 66571 [Valeria Petrov ] diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4 index 55a97ab9932..7120b729b7b 100644 --- a/modules/mappers/config9.m4 +++ b/modules/mappers/config9.m4 @@ -14,6 +14,11 @@ APACHE_MODULE(userdir, mapping of requests to user-specific directories, , , mos APACHE_MODULE(alias, mapping of requests to different filesystem parts, , , yes) APACHE_MODULE(rewrite, rule based URL manipulation, , , most) +if test "x$enable_rewrite" != "xno"; then + # mod_rewrite needs test_char.h + APR_ADDTO(INCLUDES, [-I\$(top_builddir)/server]) +fi + APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current]) APACHE_MODPATH_FINISH