cvs: /php3 Makefile.in configure.in php.map

sas Fri Sep 10 18:19:27 1999 EDT Modified files: /php3 Makefile.in configure.in php.map Log: - scoping - Solaris 2.x support Index: php3/Makefile.in diff -u php3/Makefile.in:1.348 php3/Makefile.in:1.349 --- php3/Makefile.in:1.348 Thu Sep 2 15:36:54 1999 +++ php3/Makefile.in Fri Sep 10 18:19:26 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.348 1999/09/02 19:36:54 rasmus Exp $ +# $Id: Makefile.in,v 1.349 1999/09/10 22:19:26 sas Exp $ # prefix = @prefix@ @@ -51,7 +51,7 @@ YACC = @YACC@ MAINT = @MAINT@ APXS = @APXS@ -APXS_LDFLAGS = @PHP_LIBS@ @APXS_LDFLAGS@ @LIBS@ +APXS_LDFLAGS = @VERSION_SCRIPT@ @PHP_LIBS@ @APXS_LDFLAGS@ @LIBS@ APXS_EXP = @APXS_EXP@ WARNING_LEVEL = @WARNING_LEVEL@ DBF_OBJS=dbase/dbf_head.o dbase/dbf_rec.o dbase/dbf_misc.o dbase/dbf_ndx.o Index: php3/configure.in diff -u php3/configure.in:1.460 php3/configure.in:1.461 --- php3/configure.in:1.460 Wed Sep 8 08:29:39 1999 +++ php3/configure.in Fri Sep 10 18:19:26 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.460 1999/09/08 12:29:39 sas Exp $ +dnl $Id: configure.in,v 1.461 1999/09/10 22:19:26 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -307,14 +307,31 @@ APXS_CC="$APXS -q CC" fi + +abs_srcdir="(cd $srcdir && pwd)" +versioning="no" AC_MSG_CHECKING(whether to enable versioning) AC_ARG_ENABLE(versioning, -[ --enable-versioning], +[ --enable-versioning Take advantage of versioning and scoping + Provided by Solaris 2.x and Linux], [ if test "$enableval" = "yes" ; then - RPATHS="-Wl,--version-script=\$(srcdir)/php.map $RPATHS" + case "uname -sr" in + "SunOS 5"*) + VERSION_SCRIPT="-Wl,'-M $abs_srcdir/php.map'" + ;; + Linux*) + VERSION_SCRIPT="-Wl,--version-script=$abs_srcdir/php.map" + ;; + *) + AC_MSG_ERROR(versioning is not supported on your OS) + ;; + esac + versioning="yes" fi ]) +AC_MSG_RESULT($versioning) +AC_SUBST(VERSION_SCRIPT) if test "$BINNAME" != "libmodphp3-so.a"; then if test "$BINNAME" != "libphp3.so"; then Index: php3/php.map diff -u php3/php.map:1.1 php3/php.map:1.2 --- php3/php.map:1.1 Wed Sep 8 08:29:40 1999 +++ php3/php.map Fri Sep 10 18:19:26 1999 @@ -1 +1,4 @@ -PHP3 { global: *; }; +PHP3 { + global: php3_module; + local: *; +};