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

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:08:06 -0700 (Fri, 26 Aug 2011)
New Revision: 12217

Modified:
   trunk/mapserver/mapcache/configure
   trunk/mapserver/mapcache/configure.in
Log:
use correct version when including apr_file_link
more verbose error message for failed tile get from cache
thomas.bonfort | 2011-01-07 22:04:36 +0100 (Fri, 07 Jan 2011)

Modified: trunk/mapserver/mapcache/configure
===================================================================
--- trunk/mapserver/mapcache/configure	2011-08-26 11:08:02 UTC (rev 12216)
+++ trunk/mapserver/mapcache/configure	2011-08-26 11:08:06 UTC (rev 12217)
@@ -3538,8 +3538,8 @@
 fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable FASTCGI..." >&5
-$as_echo "$as_me: checking whether to enable FASTCGI..." >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable FASTCGI" >&5
+$as_echo_n "checking whether to enable FASTCGI... " >&6; }
     FASTCGI_LIB=''
     FASTCGI_INC=''
     if test x"$with_fastcgi" == "xno"; then
@@ -3660,7 +3660,19 @@
 fi
 
     if test "$with_apr_config" = "yes"; then
-        # Extract the first word of "apr-config", so it can be a program name with args.
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for apr-config in default locations" >&5
+$as_echo_n "checking for apr-config in default locations... " >&6; }
+        if test -n "$APXS"; then
+            APXSFULL=`which "$APXS"`
+            APXSDIR=`dirname "$APXSFULL"`
+            if test -x "$APXSDIR/apr-config"; then
+                APRCONFIG="$APXSDIR/apr-config"
+            elif test -x "$APXSDIR/apr-1-config"; then
+                APRCONFIG="$APXSDIR/apr-1-config"
+            fi
+        fi
+        if test -z "$APRCONFIG"; then
+            # Extract the first word of "apr-config", so it can be a program name with args.
 set dummy apr-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -3700,6 +3712,56 @@
 fi
 
 
+        fi
+        if test -z "$APRCONFIG"; then
+            # Extract the first word of "apr-1-config", so it can be a program name with args.
+set dummy apr-1-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_APRCONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $APRCONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_APRCONFIG="$APRCONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_APRCONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+APRCONFIG=$ac_cv_path_APRCONFIG
+if test -n "$APRCONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $APRCONFIG" >&5
+$as_echo "$APRCONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+        fi
+        if test -n "$APRCONFIG"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: using $APRCONFIG, use --with-apr-config=/path/to/apr-(1-)config to modify" >&5
+$as_echo "using $APRCONFIG, use --with-apr-config=/path/to/apr-(1-)config to modify" >&6; }
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+        fi
     elif test "$with_apr_config" = "no"; then
         as_fn_error $? "apr-config is required and cannot be disabled" "$LINENO" 5
     else

Modified: trunk/mapserver/mapcache/configure.in
===================================================================
--- trunk/mapserver/mapcache/configure.in	2011-08-26 11:08:02 UTC (rev 12216)
+++ trunk/mapserver/mapcache/configure.in	2011-08-26 11:08:06 UTC (rev 12217)
@@ -147,7 +147,27 @@
     [with_apr_config=yes]
   )
     if test "$with_apr_config" = "yes"; then
-        AC_PATH_PROG(APRCONFIG, apr-config)
+        AC_MSG_CHECKING(for apr-config in default locations)
+        if test -n "$APXS"; then
+            APXSFULL=`which "$APXS"`
+            APXSDIR=`dirname "$APXSFULL"`
+            if test -x "$APXSDIR/apr-config"; then
+                APRCONFIG="$APXSDIR/apr-config"
+            elif test -x "$APXSDIR/apr-1-config"; then
+                APRCONFIG="$APXSDIR/apr-1-config"
+            fi
+        fi
+        if test -z "$APRCONFIG"; then
+            AC_PATH_PROG(APRCONFIG, apr-config)
+        fi
+        if test -z "$APRCONFIG"; then
+            AC_PATH_PROG(APRCONFIG, apr-1-config)
+        fi
+        if test -n "$APRCONFIG"; then
+            AC_MSG_RESULT([using $APRCONFIG, use --with-apr-config=/path/to/apr-(1-)config to modify])
+        else
+            AC_MSG_RESULT([not found])
+        fi
     elif test "$with_apr_config" = "no"; then
         AC_MSG_ERROR(apr-config is required and cannot be disabled)
     else
@@ -227,7 +247,7 @@
         AC_HELP_STRING([--with-fastcgi=DIR],[Specify where FASTCGI is installed]),
         ,[with_fastcgi=no])
     
-    AC_CHECKING(whether to enable FASTCGI)
+    AC_MSG_CHECKING(whether to enable FASTCGI)
     FASTCGI_LIB=''
     FASTCGI_INC=''
     if test x"$with_fastcgi" == "xno"; then