Commit 9773f9dd authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

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
parent c3b9eb1f

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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>]










































server/Makefile.in



+6
−1



























Changes for server/Makefile.in: 6 added lines, 1 removed line.



Original line number
Diff line number
Diff line







@@ -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