From: Sascha Schumann <sas@php.net>
Date: Sun, 11 Jul 1999 10:51:41 +0000 (+0000)
Subject: merge in some autoconf stuff
X-Git-Tag: php-4.0b1~159
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0febf044fbe5a68bb3200a22fa4c205ba7baf26;p=php

merge in some autoconf stuff
---

diff --git a/acinclude.m4 b/acinclude.m4
index 57dd78e742..581adbb79e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -38,6 +38,8 @@ 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 "$rpath_raw" ; then
+      RPATHS="$RPATHS ${raw_runpath_switch}$ai_p"
     if test -n "$APXS" ; then
       RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'"
     else
diff --git a/configure.in.in b/configure.in.in
index 06f345941a..2e7be3840e 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -123,6 +123,7 @@ AC_CACHE_VAL(php_cv_cc_dashr,[
 AC_MSG_RESULT($php_cv_cc_dashr)
 if test $php_cv_cc_dashr = "yes"; then
 	ld_runpath_switch="-R"
+	raw_runpath_switch="-R"
 	apxs_runpath_switch="-Wl,-R'"
 else
 	AC_MSG_CHECKING([if compiler supports -Wl,-rpath,])
@@ -134,10 +135,12 @@ else
 	AC_MSG_RESULT($php_cv_cc_rpath)
 	if test $php_cv_cc_rpath = "yes"; then
 		ld_runpath_switch="-Wl,-rpath,"
+		raw_runpath_switch="-rpath "
 		apxs_runpath_switch="-Wl,'-rpath "
 	else
 		dnl something innocuous
 		ld_runpath_switch="-L"
+		raw_runpath_switch="-L"
 		apxs_runpath_switch="-L'"
 	fi
 fi
@@ -416,6 +419,7 @@ AC_ARG_WITH(shared-apache,
 	  withval=/usr/local/etc/httpd
 	fi
 	if test "$withval" != "no"; then
+      rpath_raw=yes
 	  if test -f $withval/src/include/httpd.h; then
         AC_EXPAND_PATH($withval, withval)
 	    APACHE_INCLUDE="-I$withval/src/include -I$withval/src/os/unix"
@@ -474,6 +478,7 @@ AC_ARG_WITH(apache,
 	  withval=/usr/local/etc/httpd
 	fi
 	if test "$withval" != "no"; then
+      rpath_raw=yes
 # For Apache 1.2.x
       AC_EXPAND_PATH($withval, withval)
 	  if test -f $withval/src/httpd.h; then 
diff --git a/libphp4.module.in b/libphp4.module.in
index b0dc8ac46a..cdc3c75677 100644
--- a/libphp4.module.in
+++ b/libphp4.module.in
@@ -1,6 +1,7 @@
 Name: php4_module
 ConfigStart
 	RULE_WANTHSREGEX=@HSREGEX@
+	LDFLAGS_SHLIB="@RPATHS@ $LDFLAGS_SHLIB"
 	LIBS="@PHP_LIBS@ @EXTRA_LIBS@ @LIBS@ @RDYNAMIC_LFLAGS@ $LIBS"
 	RULE_HIDE=yes
 	CFLAGS="$CFLAGS -I@abs_srcdir@ -I@abs_srcdir@/libzend -I@abs_builddir@/libzend -I@abs_builddir@"