Commit 4f8194ed authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

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

MFC: 151255
PR: 297409
Submitted by: Max Bowsher <maxb ukf.net>
Reviewed by: jerenkrantz, trawick, fielding, pquerna


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@151377 13f79535-47bb-0310-9956-ffa450edef68
parent f6afc2b7

CHANGES

+3 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.53













  *) 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






























Original line number
Diff line number
Diff line








@@ -31,7 +31,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