From 5763a98bdac994a8c2ddbd693d36cbb75b1ce987 Mon Sep 17 00:00:00 2001
From: Stef Walter <stef@memberwebs.com>
Date: Fri, 25 May 2007 16:35:40 +0000
Subject: Build improvements

---
 autogen.sh   | 10 ++++++++++
 configure.in | 16 ++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100755 autogen.sh

diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..08037e2
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+set -e
+
+aclocal
+autoheader
+automake -a
+autoconf
+./configure --enable-maintainer-mode "$@"
+
diff --git a/configure.in b/configure.in
index 96ffeec..75798b5 100644
--- a/configure.in
+++ b/configure.in
@@ -179,16 +179,24 @@ fi
 
 AC_PATH_PROG(APXS, apxs, "failed")
 if test "$APXS" = "failed"; then
-    AC_PATH_PROG(APXS2, apxs2, "apxs")
-    APXS=$APXS2
+    AC_PATH_PROG(APXS2, apxs2, "failed")
+	if test "$APXS2" = "failed"; then
+		APXS="apxs"
+	else
+	    APXS=$APXS2
+	fi
 fi
 
 AC_SUBST(APXS)
 
 AC_PATH_PROG(APACHECTL, apachectl, "failed")
 if test "$APACHECTL" = "failed"; then
-    AC_PATH_PROG(APACHE2CTL, apache2ctl, "apachectl")
-    APACHECTL=$APACHE2CTL
+    AC_PATH_PROG(APACHE2CTL, apache2ctl, "failed")
+	if test "$APACHE2CTL" = "failed"; then
+		APACHECTL="apachectl"
+	else
+	    APACHECTL=$APACHE2CTL
+	fi
 fi
 
 AC_SUBST(APACHECTL)
-- 
cgit v1.2.3