[mapserver-commits] r12463 - trunk/mapserver/mapcache

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:28:40 -0700 (Fri, 26 Aug 2011)
New Revision: 12463

Modified:
   trunk/mapserver/mapcache/configure.in
Log:


Modified: trunk/mapserver/mapcache/configure.in
===================================================================
--- trunk/mapserver/mapcache/configure.in	2011-08-26 11:28:36 UTC (rev 12462)
+++ trunk/mapserver/mapcache/configure.in	2011-08-26 11:28:40 UTC (rev 12463)
@@ -55,7 +55,9 @@
     fi
     AC_SUBST(APXS)
     APACHE_SBINDIR=`$APXS -q SBINDIR`
+    APACHE_BINDIR=`$APXS -q BINDIR`
     AC_SUBST(APACHE_SBINDIR)
+    AC_SUBST(APACHE_BINDIR)
     AC_MSG_CHECKING([for apachectl utility])
     APACHECTL=
     if test -x "$APACHE_SBINDIR/apachectl" ; then
@@ -252,8 +254,16 @@
             APXSDIR=`dirname "$APXSFULL"`
             if test -x "$APXSDIR/apu-config"; then
                 APUCONFIG="$APXSDIR/apu-config"
+            elif test -x "$APACHE_SBINDIR/apu-config"; then
+                APUCONFIG="$APACHE_SBINDIR/apu-config"
+            elif test -x "$APACHE_BINDIR/apu-config"; then
+                APUCONFIG="$APACHE_BINDIR/apu-config"
             elif test -x "$APXSDIR/apu-1-config"; then
                 APUCONFIG="$APXSDIR/apu-1-config"
+            elif test -x "$APACHE_SBINDIR/apu-1-config"; then
+                APUCONFIG="$APACHE_SBINDIR/apu-1-config"
+            elif test -x "$APACHE_BINDIR/apu-1-config"; then
+                APUCONFIG="$APACHE_BINDIR/apu-1-config"
             fi
         fi
         if test -z "$APUCONFIG"; then
@@ -316,8 +326,16 @@
             APXSDIR=`dirname "$APXSFULL"`
             if test -x "$APXSDIR/apr-config"; then
                 APRCONFIG="$APXSDIR/apr-config"
+            elif test -x "$APACHE_SBINDIR/apr-config"; then
+                APRCONFIG="$APACHE_SBINDIR/apr-config"
+            elif test -x "$APACHE_BINDIR/apr-config"; then
+                APRCONFIG="$APACHE_BINDIR/apr-config"
             elif test -x "$APXSDIR/apr-1-config"; then
                 APRCONFIG="$APXSDIR/apr-1-config"
+            elif test -x "$APACHE_SBINDIR/apr-1-config"; then
+                APRCONFIG="$APACHE_SBINDIR/apr-1-config"
+            elif test -x "$APACHE_BINDIR/apr-1-config"; then
+                APRCONFIG="$APACHE_BINDIR/apr-1-config"
             fi
         fi
         if test -z "$APRCONFIG"; then