diff options
| author | Sascha Schumann <sas@php.net> | 1999-08-22 18:47:27 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-08-22 18:47:27 +0000 |
| commit | 85151a61cedba3f8ff1874bf6f80ef80e26d2520 (patch) | |
| tree | 95cdf02b6016f8e05035d0b78b01ca8ecca08e75 | |
| parent | 433880bc6e7cb506c0b1b2acd7e41f28fd7ca7ac (diff) | |
| download | php-git-85151a61cedba3f8ff1874bf6f80ef80e26d2520.tar.gz | |
remove all references to RAW_RPATHs
Apache builds now correctly when shared core is used
| -rw-r--r-- | acinclude.m4 | 1 | ||||
| -rw-r--r-- | configure.in.in | 5 | ||||
| -rw-r--r-- | libphp4.module.in | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d0c260eacb..b8e80403da 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -38,7 +38,6 @@ AC_DEFUN(AC_ADD_LIBPATH,[ AC_EXPAND_PATH($1, ai_p) AC_PHP_ONCE(LIBPATH, $ai_p, [ EXTRA_LIBS="$EXTRA_LIBS -L$ai_p" - RAW_RPATHS="$RAW_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 cd5f36c744..83571d16c7 100644 --- a/configure.in.in +++ b/configure.in.in @@ -139,7 +139,6 @@ 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,]) @@ -151,12 +150,10 @@ 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 @@ -395,7 +392,6 @@ 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 @@ -879,7 +875,6 @@ AC_SUBST(CFLAGS_SHLIB) AC_SUBST(LDFLAGS_SHLIB) AC_SUBST(LDFLAGS_SHLIB_EXPORT) AC_SUBST(RPATHS) -AC_SUBST(RAW_RPATHS) PHP_BUILD_DATE=`date '+%Y-%m-%d'` AC_SUBST(PHP_BUILD_DATE) diff --git a/libphp4.module.in b/libphp4.module.in index 8735976fbf..9b80f6c742 100644 --- a/libphp4.module.in +++ b/libphp4.module.in @@ -1,7 +1,6 @@ Name: php4_module ConfigStart RULE_WANTHSREGEX=@HSREGEX@ - LDFLAGS_SHLIB="@RAW_RPATHS@ $LDFLAGS_SHLIB" LIBS="@RPATHS@ @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@" |