svn commit: r533027 - in /apr/apr-util/branches/1.2.x: CHANGES build/find_apu.m4

[jo...@apache.org]

Author: jorton
Date: Fri Apr 27 02:09:04 2007
New Revision: 533027

URL: http://svn.apache.org/viewvc?view=rev&rev=533027
Log:
Merge r356625 from trunk:

Remove /usr/local/apache2 from the paths the APR_FIND_APR[R|U] macros search
and document the change.

PR: 42089
Submitted by: colm
Reviewed by: jorton

Modified:
    apr/apr-util/branches/1.2.x/CHANGES
    apr/apr-util/branches/1.2.x/build/find_apu.m4

Modified: apr/apr-util/branches/1.2.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/CHANGES?view=diff&rev=533027&r1=533026&r2=533027
==============================================================================
--- apr/apr-util/branches/1.2.x/CHANGES (original)
+++ apr/apr-util/branches/1.2.x/CHANGES Fri Apr 27 02:09:04 2007
@@ -1,5 +1,8 @@
 Changes with APR-util 1.2.9
 
+  *) APR_FIND_APU macro no longer checks /usr/local/apache2/.
+     PR 42089.  [Colm MacCarthaigh]
+
   *) Fix handling of attribute namespaces in apr_xml_to_text() when
      a namespace map is provided.  PR 41908.  [Joe Orton]
 

Modified: apr/apr-util/branches/1.2.x/build/find_apu.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/build/find_apu.m4?view=diff&rev=533027&r1=533026&r2=533027
==============================================================================
--- apr/apr-util/branches/1.2.x/build/find_apu.m4 (original)
+++ apr/apr-util/branches/1.2.x/build/find_apu.m4 Fri Apr 27 02:09:04 2007
@@ -138,7 +138,7 @@
           break
         else
           dnl look in some standard places (apparently not in builtin/default)
-          for lookdir in /usr /usr/local /usr/local/apr /opt/apr /usr/local/apache2 ; do
+          for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
             if $TEST_X "$lookdir/bin/$apu_temp_apu_config_file"; then
               apu_found="yes"
               apu_config="$lookdir/bin/$apu_temp_apu_config_file"