Disable rpaths optionally.

diff --git a/ChangeLog b/ChangeLog
index 2335fdae24f58608267b0532a8a30dd3cb170ad4..1b1a73567f7518b19deca7aa02a75cddddb698ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ PHP 4.0 CHANGE LOG                                                    ChangeLog
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ?? ?? 1999, Version 4.0 Beta 3
+- Added '--disable-rpath' option (Sascha)
 - Added AOLserver SAPI module (Sascha)
 - Fixed XML Callbacks. (Thies)
 - Updated ODBC to use the new high-performance Zend function API (kara)

diff --git a/acinclude.m4 b/acinclude.m4
index fd9ed6cd18b204ec25744d65b2f3c4980d324370..532ce34fdb36a2d1efb01f593aa41c4c40c9ce55 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -38,12 +38,27 @@ AC_DEFUN(AC_ADD_LIBPATH,[
   AC_EXPAND_PATH($1, ai_p)
   AC_PHP_ONCE(LIBPATH, $ai_p, [
     EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
-    if test -n "$APXS" ; then
-      RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
+    PHP_RPATHS="$PHP_RPATHS $ai_p"
+  ])
+])
+
+dnl
+dnl AC_BUILD_RPATH()
+dnl
+dnl builds RPATH from PHP_RPATHS
+dnl
+AC_DEFUN(AC_BUILD_RPATH,[
+  if test "$enable_rpath" = "yes"; then
+    if test -n "$AXPS"; then
+      for i in $PHP_RPATHS; do
+        RPATHS="$RPATHS ${apxs_runpath_switch}$i'"
+      done
     else
-      RPATHS="$RPATHS ${ld_runpath_switch}$ai_p"
+      for i in $PHP_RPATHS; do
+        RPATHS="$RPATHS ${ld_runpath_switch}$i"
+      done
     fi
-  ])
+  fi
 ])
 
 dnl

diff --git a/configure.in.in b/configure.in.in
index c8620c629e2857f3708942c8b723a4f4614b631c..62139ac470f41080933fb6c325fed2d0043b7091 100644 (file)
--- a/configure.in.in
+++ b/configure.in.in
@@ -638,7 +638,6 @@ AC_ARG_WITH(aolserver,
   AC_DEFINE(HAVE_AOLSERVER)
   BINNAME=php4_aol.so
   INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $BINNAME $NS_DIR/root/bin/$BINNAME"
-  CFLAGS="$CFLAGS -rdynamic"
   RESULT=yes
 ])
 AC_MSG_RESULT($RESULT)
@@ -873,6 +872,21 @@ AC_ARG_ENABLE(thread-safety,
 AC_SUBST(TSRM_DIR)
 AC_SUBST(TSRM_LIB)
 
+AC_MSG_CHECKING(whether to enable runpaths)
+AC_ARG_ENABLE(rpath,
+[  --disable-rpath         Disable passing additional runtime library
+                          search paths],
+[
+  if test "$enableval" = "no"; then
+    enable_rpath=no
+  else
+    enable_rpath=yes
+  fi
+],[
+  enable_rpath=yes
+])
+AC_MSG_RESULT($enable_rpath)
+
 dnl AC_MSG_CHECKING(whether to enable PHP RPC support)
 dnl AC_ARG_ENABLE(php-rpc,
 dnl [  --enable-php-rpc        Compile with PHP RPC support.],
@@ -1004,6 +1018,8 @@ dnl test -n "$GCC" && CFLAGS="$CFLAGS -fpic"
 dnl add -fPIC option on Solaris if we are building dynamic extensions
 PHP_SOLARIS_PIC_WEIRDNESS
 
+AC_BUILD_RPATH
+
 AC_SUBST(CFLAGS)
 AC_SUBST(PROG_SENDMAIL)
 AC_SUBST(CFLAGS_SHLIB)