You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2005/02/04 00:39:22 UTC
svn commit: r151255 - in httpd/httpd/trunk: CHANGES server/Makefile.in
Author: jerenkrantz
Date: Thu Feb 3 15:39:21 2005
New Revision: 151255
URL: http://svn.apache.org/viewcvs?view=rev&rev=151255
Log:
Fix --with-apr=/usr and/or --with-apr-util=/usr.
PR: 29740
Submitted by: Max Bowsher <maxb ukf.net>
Reviewed by: Justin Erenkrantz
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/server/Makefile.in
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?view=diff&r1=151254&r2=151255
==============================================================================
--- httpd/httpd/trunk/CHANGES (original)
+++ httpd/httpd/trunk/CHANGES Thu Feb 3 15:39:21 2005
@@ -2,6 +2,9 @@
[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>]
Modified: httpd/httpd/trunk/server/Makefile.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/Makefile.in?view=diff&r1=151254&r2=151255
==============================================================================
--- httpd/httpd/trunk/server/Makefile.in (original)
+++ httpd/httpd/trunk/server/Makefile.in Thu Feb 3 15:39:21 2005
@@ -30,7 +30,8 @@
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
@@ -57,6 +58,10 @@
rm -f $$tmp && touch $$tmp; \
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