cvs commit

From: sas Date: Sun Jul 11 06:51:41 1999 Modified files: php4/acinclude.m4 php4/libphp4.module.in php4/configure.in.in Log message: merge in some autoconf stuff Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.15 php4/acinclude.m4:1.16 --- php4/acinclude.m4:1.15 Mon Jun 28 09:37:59 1999 +++ php4/acinclude.m4 Sun Jul 11 06:51:41 1999 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.15 1999/06/28 13:37:59 sas Exp $ +dnl $Id: acinclude.m4,v 1.16 1999/07/11 10:51:41 sas Exp $ dnl dnl This file contains local autoconf functions. @@ -38,6 +38,8 @@ 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 Index: php4/libphp4.module.in diff -u php4/libphp4.module.in:1.2 php4/libphp4.module.in:1.3 --- php4/libphp4.module.in:1.2 Sat May 29 15:06:22 1999 +++ php4/libphp4.module.in Sun Jul 11 06:51:41 1999 @@ -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@" Index: php4/configure.in.in diff -u php4/configure.in.in:1.45 php4/configure.in.in:1.46 --- php4/configure.in.in:1.45 Fri Jul 2 21:28:31 1999 +++ php4/configure.in.in Sun Jul 11 06:51:41 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in.in,v 1.45 1999/07/03 01:28:31 sas Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.46 1999/07/11 10:51:41 sas Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. @@ -123,6 +123,7 @@ 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 @@ 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 @@ 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 @@ 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