cvs: /php4/sapi/aolserver php.sym /php4/sapi/apache php.sym /php4/sapi/cgi php.sym /php4 php.sym /php4 acinclude.m4 configure.in

sas Sat Nov 20 14:00:47 1999 EDT Added files: /php4/sapi/aolserver php.sym /php4/sapi/apache php.sym /php4/sapi/cgi php.sym Removed files: /php4 php.sym Modified files: /php4 acinclude.m4 configure.in Log: --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. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.39 php4/acinclude.m4:1.40 --- php4/acinclude.m4:1.39 Sat Nov 13 11:51:30 1999 +++ php4/acinclude.m4 Sat Nov 20 14:00:15 1999 @@ -1,6 +1,16 @@ -dnl $Id: acinclude.m4,v 1.39 1999/11/13 16:51:30 sas Exp $ +dnl $Id: acinclude.m4,v 1.40 1999/11/20 19:00:15 sas Exp $ 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 Index: php4/configure.in diff -u php4/configure.in:1.36 php4/configure.in:1.37 --- php4/configure.in:1.36 Wed Nov 17 16:06:32 1999 +++ php4/configure.in Sat Nov 20 14:00:15 1999 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.36 1999/11/17 21:06:32 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.37 1999/11/20 19:00:15 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(0) @@ -372,19 +372,6 @@ 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 @@ -598,6 +585,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)