diff options
| -rw-r--r-- | acinclude.m4 | 10 | ||||
| -rw-r--r-- | configure.in | 27 | ||||
| -rw-r--r-- | sapi/aolserver/php.sym | 2 | ||||
| -rw-r--r-- | sapi/apache/php.sym (renamed from php.sym) | 0 | ||||
| -rw-r--r-- | sapi/cgi/php.sym | 0 |
5 files changed, 26 insertions, 13 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 489cf3001d..85d01850e1 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -3,6 +3,16 @@ 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 AC_DEFUN(PHP_BUILD_SHARED,[ diff --git a/configure.in b/configure.in index 30cad7e1cc..f9782e9c98 100644 --- 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 index 0000000000..b401ffd2b3 --- /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 index 2dca1256c2..2dca1256c2 100644 --- a/php.sym +++ b/sapi/apache/php.sym diff --git a/sapi/cgi/php.sym b/sapi/cgi/php.sym new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/sapi/cgi/php.sym |