summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorHarshavardhana <harsha@zresearch.com>2009-05-21 02:20:26 +0000
committerAnand V. Avati <avati@dev.gluster.com>2009-05-21 03:35:36 -0700
commitbd297be1d1fedc85d70b9b1f3e4d4aa7b9980c76 (patch)
tree4ef2f0c1d0408872336176447acb07e8b076d336 /configure.ac
parentc7fd9f1df36a01ac9a1509d1001b0d259005b0f9 (diff)
Check for returns when apxs fails and disable mod_glusterfs
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac14
1 files changed, 10 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 621c26a..3978036 100644
--- a/configure.ac
+++ b/configure.ac
@@ -263,8 +263,11 @@ if test "x$enable_mod_glusterfs" != "xno" -a "x$HAVE_APXS" = "xyes" -a "x$HAVE_L
fi
if test "x$BUILD_MOD_GLUSTERFS" = "xyes"; then
- HTTPD_BIN_DIR=`$APXS -q SBINDIR`
- MOD_GLUSTERFS_HTTPD_VERSION=`$HTTPD_BIN_DIR/httpd -V | head -1 | awk "{print $3}" | sed 's/[[^0-9.]]//g' | sed 's/\(.*\..*\)\..*/\1/'`
+ HTTPD_BIN_DIR=`$APXS -q SBINDIR 2>/dev/null`
+ RET=$?
+ if test "x$RET" = "x0"; then
+ MOD_GLUSTERFS_HTTPD_VERSION=`$HTTPD_BIN_DIR/httpd -V | head -1 | awk "{print $3}" | sed 's/[[^0-9\.]]//g' | sed 's/\(.*\..*\)\..*/\1/'`
+ fi
fi
if test "x$with_apxspath" != "x"; then
@@ -282,8 +285,11 @@ if test "x$enable_mod_glusterfs" != "xno" -a "x$with_apxspath" != "x" -a "x$with
fi
if test "x$APACHE_MANUAL" = "xyes"; then
- HTTPD_BIN_DIR=`$APXS_MANUAL -q SBINDIR`
- MOD_GLUSTERFS_HTTPD_VERSION=`$HTTPD_MANUAL -V | head -1 | awk "{print $3}" | sed 's/[[^0-9.]]//g' | sed 's/\(.*\..*\)\..*/\1/'`
+ HTTPD_BIN_DIR=`$APXS_MANUAL -q SBINDIR 2>/dev/null`
+ RET=$?
+ if test "x$RET" = "x0"; then
+ MOD_GLUSTERFS_HTTPD_VERSION=`$HTTPD_MANUAL -V | head -1 | awk "{print $3}" | sed 's/[[^0-9\.]]//g' | sed 's/\(.*\..*\)\..*/\1/'`
+ fi
APXS=$APXS_MANUAL
fi