From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Thu, 3 Feb 2005 23:39:21 +0000 (+0000)
Subject: Fix --with-apr=/usr and/or --with-apr-util=/usr.
X-Git-Tag: 2.1.3~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47d226131880f8f293f80ed4ea3a8356eb20c429;p=apache

Fix --with-apr=/usr and/or --with-apr-util=/usr.

PR: 29740
Submitted by: Max Bowsher <maxb ukf.net>
Reviewed by:  Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151255 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 14c452b5f8..65402d2319 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.3
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Fix --with-apr=/usr and/or --with-apr-util=/usr.  PR 29740.
+     [Max Bowsher <maxb ukf.net>]
+
   *) mod_proxy: Fix ProxyRemoteMatch directive.  PR 33170.
      [Rici Lake <rici ricilake.net>]
 
diff --git a/server/Makefile.in b/server/Makefile.in
index 5f5df99b9f..97b602f7d9 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -30,7 +30,8 @@ test_char.h: gen_test_char
 
 util.lo: test_char.h
 
-EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(APR_INCLUDEDIR) $(APU_INCLUDEDIR) $(top_srcdir)/modules/http
+EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(top_srcdir)/modules/http
+EXPORT_DIRS_APR = $(APR_INCLUDEDIR) $(APU_INCLUDEDIR)
 
 # If export_files is a dependency here, but we remove it during this stage,
 # when exports.c is generated, make will not detect that export_files is no
@@ -58,6 +59,10 @@ export_files:
 	for dir in $(EXPORT_DIRS); do \
 	    ls $$dir/*.h >> $$tmp; \
 	done; \
+	for dir in $(EXPORT_DIRS_APR); do \
+	    ls $$dir/ap[ru].h >> $$tmp; \
+	    ls $$dir/ap[ru]_*.h >> $$tmp; \
+	done; \
 	sort -u $$tmp > $@; \
 	rm -f $$tmp