[OpenSRF-GIT] OpenSRF branch rel_2_1 updated. osrf_rel_2_1_2-7-gfee9166

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".

The branch, rel_2_1 has been updated
       via  fee9166e11a618573c49c95f6dad12a4e9ff6151 (commit)
      from  e6462241444ab06944ef06a08a7599cb0e51e26f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fee9166e11a618573c49c95f6dad12a4e9ff6151
Author: Dan Scott <dscott at laurentian.ca>
Date:   Sun Jan 27 11:08:12 2013 -0500

    Test for Apache executable in sbin dirs
    
    Debian apparently doesn't include /usr/sbin in the default user PATH, so
    add an APXS2-like lookup with likely locations if we don't find the
    apache executable in our standard path.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/configure.ac b/configure.ac
index d23354d..8896f2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,9 +213,18 @@ AC_SUBST([APR_HEADERS])
 # Collect apache version number. If for nothing else, this
 # guarantees that httpd is a working apache executable.
 #
-changequote(<<, >>)dnl
 APACHE=`$APXS2 -q progname`
-APACHE_READABLE_VERSION=`$APACHE -v | grep 'Server version' | sed -e 's;.*Apache/\([0-9\.][0-9\.]*\).*;\1;'`
+AC_PATH_PROG(APACHE_PATH, [$APACHE], [])
+if test -z "$APACHE_PATH" ; then
+	for i in /usr/bin /usr/sbin /usr/local/apache/bin /usr/local/apache2/bin ; do
+        if test -x "$i/$APACHE"; then
+            APACHE_PATH="$i/$APACHE"
+            break
+        fi
+	done
+fi
+changequote(<<, >>)dnl
+APACHE_READABLE_VERSION=`$APACHE_PATH -v | grep 'Server version' | sed -e 's;.*Apache/\([0-9\.][0-9\.]*\).*;\1;'`
 changequote([, ])dnl
 APACHE_VERSION=`echo $APACHE_READABLE_VERSION | sed -e 's/\.//g'`
 if test -z "$APACHE_VERSION" ; then

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
OpenSRF