Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 42448 invoked from network); 3 Feb 2005 23:39:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 3 Feb 2005 23:39:30 -0000 Received: (qmail 12756 invoked by uid 500); 3 Feb 2005 23:39:27 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 12725 invoked by uid 500); 3 Feb 2005 23:39:27 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 12711 invoked by uid 99); 3 Feb 2005 23:39:27 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 03 Feb 2005 15:39:25 -0800 Received: (qmail 42265 invoked by uid 65534); 3 Feb 2005 23:39:22 -0000 Message-ID: <20050203233922.42262.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Thu, 03 Feb 2005 23:39:22 -0000 Subject: svn commit: r151255 - in httpd/httpd/trunk: CHANGES server/Makefile.in To: cvs@httpd.apache.org From: jerenkrantz@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: jerenkrantz Date: Thu Feb 3 15:39:21 2005 New Revision: 151255 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D151255 Log: Fix --with-apr=3D/usr and/or --with-apr-util=3D/usr. PR: 29740 Submitted by: Max Bowsher 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=3Ddiff&r1= =3D151254&r2=3D151255 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- httpd/httpd/trunk/CHANGES (original) +++ httpd/httpd/trunk/CHANGES Thu Feb 3 15:39:21 2005 @@ -2,6 +2,9 @@ =20 [Remove entries to the current 2.0 section below, when backported] =20 + *) Fix --with-apr=3D/usr and/or --with-apr-util=3D/usr. PR 29740. + [Max Bowsher ] + *) mod_proxy: Fix ProxyRemoteMatch directive. PR 33170. [Rici Lake ] =20 Modified: httpd/httpd/trunk/server/Makefile.in URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/Makefile.in?vie= w=3Ddiff&r1=3D151254&r2=3D151255 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- httpd/httpd/trunk/server/Makefile.in (original) +++ httpd/httpd/trunk/server/Makefile.in Thu Feb 3 15:39:21 2005 @@ -30,7 +30,8 @@ =20 util.lo: test_char.h =20 -EXPORT_DIRS =3D $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(APR_INC= LUDEDIR) $(APU_INCLUDEDIR) $(top_srcdir)/modules/http +EXPORT_DIRS =3D $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(top_src= dir)/modules/http +EXPORT_DIRS_APR =3D $(APR_INCLUDEDIR) $(APU_INCLUDEDIR) =20 # 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