Support install directories other than srcdir/root

diff --git a/sapi/aolserver/config.m4 b/sapi/aolserver/config.m4
index e2377a473bb92710552b85604821d9a2b99bb56e..42c7b14b7acb46826223f00f05008df3c74ee70a 100644 (file)
--- a/sapi/aolserver/config.m4
+++ b/sapi/aolserver/config.m4
@@ -1,23 +1,34 @@
 dnl ## $Id$ -*- sh -*-
 
-RESULT=no
+AC_ARG_WITH(aolserver-src,
+[  --with-aolserver-src=DIR         Specify path to the source distribution of 
+                                   AOLserver],[
+  PHP_AOLSERVER_SRC=$withval
+])
+
 AC_MSG_CHECKING(for AOLserver support)
 AC_ARG_WITH(aolserver,
-[  --with-aolserver=DIR],
-[
-       if test ! -d $withval ; then
-               AC_MSG_ERROR(You did not specify a directory)
-       fi
-       PHP_BUILD_THREAD_SAFE
-       NS_DIR=$withval
-       AC_ADD_INCLUDE($NS_DIR/include)
-       AC_DEFINE(HAVE_AOLSERVER,1,[Whether you have AOLserver])
-       PHP_SAPI=aolserver
-       PHP_BUILD_SHARED
-       INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $NS_DIR/root/bin/"
-       RESULT=yes
+[  --with-aolserver=DIR             Specify path to the installed AOLserver],[
+  PHP_AOLSERVER=$withval
+],[
+  PHP_AOLSERVER=no
 ])
-AC_MSG_RESULT($RESULT)
+AC_MSG_RESULT($PHP_AOLSERVER)
+
+if test "$PHP_AOLSERVER" != "no"; then
+  if test -z "$PHP_AOLSERVER_SRC" || test ! -d $PHP_AOLSERVER_SRC/include; then
+    AC_MSG_ERROR(Please specify the path to the source distribution of AOLserver using --with-aolserver-src=DIR)
+  fi
+  if test ! -d $PHP_AOLSERVER/bin ; then
+    AC_MSG_ERROR(Please specify the path to the root of AOLserver using --with-aolserver=DIR)
+  fi
+  PHP_BUILD_THREAD_SAFE
+  AC_ADD_INCLUDE($PHP_AOLSERVER_SRC/include)
+  AC_DEFINE(HAVE_AOLSERVER,1,[Whether you have AOLserver])
+  PHP_SAPI=aolserver
+  PHP_BUILD_SHARED
+  INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_AOLSERVER/bin/"
+fi
 
 dnl ## Local Variables:
 dnl ## tab-width: 4