--enable-versioning can now be used with CGI/AOLserver as well. Note that

we do not use versioning per se anymore, but export only the required
symbols.

diff --git a/acinclude.m4 b/acinclude.m4
index 489cf3001dd3cd40b13d32d6c1a5c0a5312c6778..85d01850e10e64720bee8fdd4ade60b4c7b6355d 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2,6 +2,16 @@ dnl $Id$
 dnl
 dnl This file contains local autoconf functions.
 
+dnl
+dnl PHP_SET_SYM_FILE(path)
+dnl
+dnl set the path of the file which contains the symbol export list
+dnl
+AC_DEFUN(PHP_SET_SYM_FILE,
+[
+  PHP_SYM_FILE="$1"
+])
+
 dnl
 dnl PHP_BUILD_SHARED
 dnl

diff --git a/configure.in b/configure.in
index 30cad7e1cc9fc35e2e2796acc45786d707d66183..f9782e9c98c408db03cb5f1030c9da50fb5f790c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -372,19 +372,6 @@ abs_builddir=`pwd`
 AC_SUBST(abs_srcdir)
 AC_SUBST(abs_builddir)
 
-RESULT=no
-AC_MSG_CHECKING(whether to enable versioning)
-AC_ARG_ENABLE(versioning,
-[  --enable-versioning     Take advantage of versioning and scoping.
-                          See INSTALL for more information],
-[
-  if test "$enableval" = "yes" ; then
-    EXTRA_LDFLAGS="-export-symbols \$(srcdir)/php.sym"
-    RESULT="yes"
-  fi
-])
-AC_MSG_RESULT($RESULT)
-
 AC_MSG_CHECKING(whether to use a configuration file)
 AC_ARG_WITH(config-file-path,
 [  --with-config-file-path=PATH  
@@ -599,6 +586,20 @@ esyscmd(./scripts/config-stubs ext)
 
 PHP_OUTPUT(sapi/$PHP_SAPI/Makefile)
 
+RESULT=no
+AC_MSG_CHECKING(whether to enable versioning)
+AC_ARG_ENABLE(versioning,
+[  --enable-versioning     Export only required symbols.
+                          See INSTALL for more information],
+[
+  test -z "$PHP_SYM_FILE" && PHP_SYM_FILE="$abs_srcdir/sapi/$PHP_SAPI/php.sym"
+  if test "$enableval" = "yes" && test -f "$PHP_SYM_FILE"; then
+    EXTRA_LDFLAGS="-export-symbols $PHP_SYM_FILE"
+    RESULT="yes"
+  fi
+])
+AC_MSG_RESULT($RESULT)
+
 divert(4)
 
 enable_shared=yes

diff --git a/sapi/aolserver/php.sym b/sapi/aolserver/php.sym
new file mode 100644 (file)
index 0000000..b401ffd
--- /dev/null
+++ b/sapi/aolserver/php.sym
@@ -0,0 +1,2 @@
+Ns_ModuleVersion
+Ns_ModuleInit

diff --git a/php.sym b/sapi/apache/php.sym
similarity index 100%
rename from php.sym
rename to sapi/apache/php.sym

diff --git a/sapi/cgi/php.sym b/sapi/cgi/php.sym
new file mode 100644 (file)
index 0000000..e69de29