- better use of scoping

- support Solaris 2.x

3 files changed, 19 insertions, 5 deletions

diff --git a/Makefile.in b/Makefile.in
index a295a6886d..329f7249a7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,7 +30,6 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 srcdir = @srcdir@
-abs_srcdir = @abs_srcdir@
 VPATH = @srcdir@
 bindir = @bindir@
 
diff --git a/configure.in.in b/configure.in.in
index 4fc4930082..d78434e1ff 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -340,7 +340,6 @@ divert(2)
 
 abs_srcdir=`(cd $srcdir; pwd)`
 abs_builddir=`pwd`
-AC_SUBST(abs_srcdir)
 AC_SUBST(abs_builddir)
 
 AC_MSG_CHECKING(for Apache module support via DSO through APXS)
@@ -377,16 +376,31 @@ AC_ARG_WITH(apxs,
     AC_MSG_RESULT(no)
 ])
 
+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
-    VERSION_SCRIPT="-Wl,--version-script=\$(abs_srcdir)/php.map"
+    case "`uname -sr`" in
+    "SunOS 5"*)
+        VERSION_SCRIPT="-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)
 
+
 APACHE_INSTALL_FILES="$srcdir/mod_php4.* libphp4.module"
 
 if test "$BINNAME" != "libmodphp4-so.a"; then
diff --git a/php.map b/php.map
index a25721f559..d08024feef 100644
--- a/php.map
+++ b/php.map
@@ -1,3 +1,4 @@
 PHP4 {
-global: *;
+global: php4_module;
+local: *;
 };