svn commit: r263922 - in /httpd/mod_python/trunk: configure configure.in

[jg...@apache.org]

Author: jgallacher
Date: Sun Aug 28 14:03:20 2005
New Revision: 263922

URL: http://svn.apache.org/viewcvs?rev=263922&view=rev
Log:
Added apxs2 path detection to ./configure. Some linux distributions such
as Debian use apxs2 instead of apxs for apache2 installations.

Modified:
    httpd/mod_python/trunk/configure
    httpd/mod_python/trunk/configure.in

Modified: httpd/mod_python/trunk/configure
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/configure?rev=263922&r1=263921&r2=263922&view=diff
==============================================================================
--- httpd/mod_python/trunk/configure (original)
+++ httpd/mod_python/trunk/configure Sun Aug 28 14:03:20 2005
@@ -2590,12 +2590,63 @@
   fi
 fi
 
-# last resort
+# second last resort
 if test -z "$APXS"; then
   echo "$as_me:$LINENO: checking for apxs in your PATH" >&5
 echo $ECHO_N "checking for apxs in your PATH... $ECHO_C" >&6
   # Extract the first word of "apxs", so it can be a program name with args.
 set dummy apxs; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_APXS+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $APXS in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_APXS="$APXS" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_APXS="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+APXS=$ac_cv_path_APXS
+
+if test -n "$APXS"; then
+  echo "$as_me:$LINENO: result: $APXS" >&5
+echo "${ECHO_T}$APXS" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  if test -n "$APXS"; then
+    echo "$as_me:$LINENO: result: found $APXS, we'll use this. Use --with-apxs to specify another." >&5
+echo "${ECHO_T}found $APXS, we'll use this. Use --with-apxs to specify another." >&6
+  fi
+fi
+
+# last resort
+# some linux distributions use apxs2 for apache2 installations,
+# so check for apxs2 before we give up.
+if test -z "$APXS"; then
+  echo "$as_me:$LINENO: checking for apxs2 in your PATH" >&5
+echo $ECHO_N "checking for apxs2 in your PATH... $ECHO_C" >&6
+  # Extract the first word of "apxs2", so it can be a program name with args.
+set dummy apxs2; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_APXS+set}" = set; then

Modified: httpd/mod_python/trunk/configure.in
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/configure.in?rev=263922&r1=263921&r2=263922&view=diff
==============================================================================
--- httpd/mod_python/trunk/configure.in (original)
+++ httpd/mod_python/trunk/configure.in Sun Aug 28 14:03:20 2005
@@ -73,10 +73,21 @@
   fi
 fi
 
-# last resort
+# second last resort
 if test -z "$APXS"; then
   AC_MSG_CHECKING(for apxs in your PATH)
   AC_PATH_PROG(APXS, apxs)
+  if test -n "$APXS"; then
+    AC_MSG_RESULT([found $APXS, we'll use this. Use --with-apxs to specify another.])
+  fi
+fi  
+
+# last resort
+# some linux distributions use apxs2 for apache2 installations,
+# so check for apxs2 before we give up.
+if test -z "$APXS"; then
+  AC_MSG_CHECKING(for apxs2 in your PATH)
+  AC_PATH_PROG(APXS, apxs2)
   if test -n "$APXS"; then
     AC_MSG_RESULT([found $APXS, we'll use this. Use --with-apxs to specify another.])
   fi