cvs: /php4 acinclude.m4 configure.in.in libphp4.module.in

sas Sun Aug 22 14:47:27 1999 EDT Modified files: /php4 acinclude.m4 configure.in.in libphp4.module.in Log: remove all references to RAW_RPATHs Apache builds now correctly when shared core is used Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.23 php4/acinclude.m4:1.24 --- php4/acinclude.m4:1.23 Tue Aug 3 16:56:13 1999 +++ php4/acinclude.m4 Sun Aug 22 14:47:27 1999 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.23 1999/08/03 20:56:13 gerdts Exp $ +dnl $Id: acinclude.m4,v 1.24 1999/08/22 18:47:27 sas Exp $ dnl dnl This file contains local autoconf functions. @@ -38,7 +38,6 @@ 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 Index: php4/configure.in.in diff -u php4/configure.in.in:1.66 php4/configure.in.in:1.67 --- php4/configure.in.in:1.66 Tue Aug 17 08:32:23 1999 +++ php4/configure.in.in Sun Aug 22 14:47:27 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in.in,v 1.66 1999/08/17 12:32:23 thies Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.67 1999/08/22 18:47:27 sas Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. divert(0) @@ -139,7 +139,6 @@ 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 @@ 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 @@ 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(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) Index: php4/libphp4.module.in diff -u php4/libphp4.module.in:1.4 php4/libphp4.module.in:1.5 --- php4/libphp4.module.in:1.4 Tue Jul 20 12:54:05 1999 +++ php4/libphp4.module.in Sun Aug 22 14:47:27 1999 @@ -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@"