cvs: php4 / acinclude.m4 configure.in

sas Fri Jul 19 21:28:56 2002 EDT Modified files: /php4 acinclude.m4 configure.in Log: Improve/fix handling of --disable-rpath Might or might not fix #18374 Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.197 php4/acinclude.m4:1.198 --- php4/acinclude.m4:1.197 Sat Jul 6 20:47:16 2002 +++ php4/acinclude.m4 Fri Jul 19 21:28:56 2002 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.197 2002/07/07 00:47:16 sniper Exp $ +dnl $Id: acinclude.m4,v 1.198 2002/07/20 01:28:56 sas Exp $ dnl dnl This file contains local autoconf functions. @@ -884,19 +884,26 @@ ]) dnl -dnl PHP_BUILD_RPATH() +dnl PHP_UTILIZE_RPATHS() dnl -dnl builds RPATH from PHP_RPATHS +dnl builds RPATHS/LDFLAGS from PHP_RPATHS dnl -AC_DEFUN(PHP_BUILD_RPATH,[ - if test "$PHP_RPATH" = "yes" && test -n "$PHP_RPATHS"; then - OLD_RPATHS=$PHP_RPATHS +AC_DEFUN(PHP_UTILIZE_RPATHS,[ + OLD_RPATHS=$PHP_RPATHS + unset PHP_RPATHS + + for i in $OLD_RPATHS; do +dnl Can be passed to native cc/libtool + PHP_LDFLAGS="$PHP_LDFLAGS -L$i" +dnl Libtool-specific + PHP_RPATHS="$PHP_RPATHS -R $i" +dnl cc-specific + NATIVE_RPATHS="$NATIVE_RPATHS $ld_runpath_switch$i" + done + + if test "$PHP_RPATH" = "no"; then unset PHP_RPATHS - for i in $OLD_RPATHS; do - PHP_LDFLAGS="$PHP_LDFLAGS -L$i" - PHP_RPATHS="$PHP_RPATHS -R $i" - NATIVE_RPATHS="$NATIVE_RPATHS $ld_runpath_switch$i" - done + unset NATIVE_RPATHS fi ]) Index: php4/configure.in diff -u php4/configure.in:1.361 php4/configure.in:1.362 --- php4/configure.in:1.361 Wed Jul 17 17:56:40 2002 +++ php4/configure.in Fri Jul 19 21:28:56 2002 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.361 2002/07/17 21:56:40 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.362 2002/07/20 01:28:56 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -892,7 +892,7 @@ AC_SUBST(EXPANDED_LOCALSTATEDIR) AC_SUBST(EXPANDED_PHP_CONFIG_FILE_PATH) -PHP_BUILD_RPATH +PHP_UTILIZE_RPATHS PHP_REMOVE_USR_LIB(PHP_LDFLAGS) PHP_REMOVE_USR_LIB(LDFLAGS)