Later AOLserver releases will copy the include to the installation dir.

diff --git a/sapi/aolserver/README b/sapi/aolserver/README
index 8a29e8674a9cdf308b792cdae29278269e94e35c..45fb89d320f22c479d6fa05334117fb16e2c9a99 100644 (file)
--- a/sapi/aolserver/README
+++ b/sapi/aolserver/README
@@ -19,6 +19,11 @@ $ ./configure \
        --with-aolserver-src=/path/to/source/distribution \
        <other options>
 
+NOTE: While AOLserver 3.0 did not install its include directory, later
+      releases will do so. This effectively means that you do not need
+      to retain the source directory of AOLserver, if there is an
+      include directory in the installation directory.
+
 3.) Compiling and Installing PHP
 
 $ make install

diff --git a/sapi/aolserver/config.m4 b/sapi/aolserver/config.m4
index 42c7b14b7acb46826223f00f05008df3c74ee70a..50a0c5b880ffaccffd89f45e63884d52fdaf9122 100644 (file)
--- a/sapi/aolserver/config.m4
+++ b/sapi/aolserver/config.m4
@@ -16,6 +16,9 @@ AC_ARG_WITH(aolserver,
 AC_MSG_RESULT($PHP_AOLSERVER)
 
 if test "$PHP_AOLSERVER" != "no"; then
+  if test -d "$PHP_AOLSERVER/include"; then
+    PHP_AOLSERVER_SRC="$PHP_AOLSERVER"
+  fi
   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