You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@apr.apache.org by jo...@apache.org on 2006/10/31 15:46:15 UTC

svn commit: r469503 - in /apr/apr/branches/1.2.x: CHANGES build/find_apr.m4

Author: jorton
Date: Tue Oct 31 06:46:14 2006
New Revision: 469503

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

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

Submitted by: colm

Modified:
    apr/apr/branches/1.2.x/CHANGES
    apr/apr/branches/1.2.x/build/find_apr.m4

Modified: apr/apr/branches/1.2.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/CHANGES?view=diff&rev=469503&r1=469502&r2=469503
==============================================================================
--- apr/apr/branches/1.2.x/CHANGES (original)
+++ apr/apr/branches/1.2.x/CHANGES Tue Oct 31 06:46:14 2006
@@ -1,4 +1,8 @@
 Changes for APR 1.2.8
+
+  *) APR_FIND_APR macro no longer checks /usr/local/apache2/.
+     [Colm MacCarthaigh]
+
   *) Portably check for EEXIST in mktemp code.  PR 40818
      [Kenneth Golomb <KGolomb TradeCard.com>]
 

Modified: apr/apr/branches/1.2.x/build/find_apr.m4
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/build/find_apr.m4?view=diff&rev=469503&r1=469502&r2=469503
==============================================================================
--- apr/apr/branches/1.2.x/build/find_apr.m4 (original)
+++ apr/apr/branches/1.2.x/build/find_apr.m4 Tue Oct 31 06:46:14 2006
@@ -129,7 +129,7 @@
           break
         else
           dnl look in some standard places
-          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/$apr_temp_apr_config_file"; then
               apr_found="yes"
               apr_config="$lookdir/bin/$apr_temp_apr_config_file"