Allow the location of the Phoenix library to be specified on the configure

commandline.

diff --git a/ext/msession/config.m4 b/ext/msession/config.m4
index ee9104b9fc74bc050a8f3971283c605e07bfaee4..79c10b28efb4c1d3495f1fa433a070508a71c741 100644 (file)
--- a/ext/msession/config.m4
+++ b/ext/msession/config.m4
@@ -1,15 +1,32 @@
 
 PHP_ARG_WITH(msession, for msession support,
-        [  --with-msession             Include msession support])
+[  --with-msession[=DIR]   Include msession support])
  
 if test "$PHP_MSESSION" != "no"; then
-       PHOENIX_HOME="/usr/local/phoenix"
-       AC_DEFINE(HAVE_MSESSION, 1, [ ])
-       PHP_EXTENSION(msession, $ext_shared)
-       PHOENIX_INCLUDE_="-I/usr/local/phoenix/lib"
-       PHP_ADD_LIBRARY_WITH_PATH(phoenix, "/usr/local/phoenix/lib", PHOENIX_LIB)
+       if test -r $PHP_MSESSION/lib/libphoenix.a; then
+               PHOENIX_DIR=$PHP_MSESSION
+       else
+               AC_MSG_CHECKING(for msession in default path)
+               for i in /usr/local/phoenix /usr/local /usr; do
+                       if test -r $i/lib/libphoenix.a; then
+                               PHOENIX_DIR=$i
+                               AC_MSG_RESULT(found in $i)
+                       fi
+               done
+       fi
+
+       if test -z "$PHOENIX_DIR"; then
+               AC_MSG_RESULT(not found)
+               AC_MSG_ERROR(Please reinstall the Phoenix / msession distribution)
+       fi
+
 
+       AC_DEFINE(HAVE_MSESSION, 1, [ ])
+       PHP_ADD_LIBRARY_WITH_PATH(phoenix, "$PHOENIX_DIR/lib", PHOENIX_LIB)
+       PHOENIX_INCLUDE="-I$PHOENIX_DIR"
        PHP_SUBST(PHOENIX_INCLUDE)
        PHP_SUBST(PHOENIX_LIB)
+
+       PHP_EXTENSION(msession, $ext_shared)
 fi