cvs: php-src(PHP_5_2) / acinclude.m4 configure.in

jani Mon Aug 20 14:28:45 2007 UTC Modified files: (Branch: PHP_5_2) /php-src acinclude.m4 configure.in Log: MFH:- Part 1 of fixing problems with runpath switch (make --disable-rpath work for real) http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.25&r2=1.332.2.14.2.26&diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.332.2.14.2.25 php-src/acinclude.m4:1.332.2.14.2.26 --- php-src/acinclude.m4:1.332.2.14.2.25 Fri Aug 3 10:45:23 2007 +++ php-src/acinclude.m4 Mon Aug 20 14:28:45 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.332.2.14.2.25 2007/08/03 10:45:23 jani Exp $ +dnl $Id: acinclude.m4,v 1.332.2.14.2.26 2007/08/20 14:28:45 jani Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -323,6 +323,9 @@ ld_runpath_switch=-L fi fi +if test "$PHP_RPATH" = "no"; then + ld_runpath_switch= +fi ]) dnl @@ -447,7 +450,8 @@ _PHP_ADD_LIBPATH_GLOBAL([$ai_p]) ],[ if test "$ext_shared" = "yes"; then - $2="$ld_runpath_switch$ai_p -L$ai_p [$]$2" + $2="-L$ai_p [$]$2" + test -n "$ld_runpath_switch" && $2="$ld_runpath_switch$ai_p [$]$2" else _PHP_ADD_LIBPATH_GLOBAL([$ai_p]) fi http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.72&r2=1.579.2.52.2.73&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.72 php-src/configure.in:1.579.2.52.2.73 --- php-src/configure.in:1.579.2.52.2.72 Fri Aug 17 00:38:23 2007 +++ php-src/configure.in Mon Aug 20 14:28:45 2007 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.72 2007/08/17 00:38:23 iliaa Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.73 2007/08/20 14:28:45 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -138,6 +138,10 @@ PHP_ARG_WITH(libdir, for system library directory, [ --with-libdir=NAME Look for libraries in .../NAME rather than .../lib],lib,no) +PHP_ARG_ENABLE(rpath, whether to enable runpaths, +[ --disable-rpath Disable passing additional runtime library + search paths], yes, no) + dnl check for -R, etc. switch PHP_RUNPATH_SWITCH @@ -789,10 +793,6 @@ AC_DEFINE(MAGIC_QUOTES, 0, [ ]) fi -PHP_ARG_ENABLE(rpath, whether to enable runpaths, -[ --disable-rpath Disable passing additional runtime library - search paths], yes, no) - PHP_ARG_ENABLE(libgcc, whether to explicitly link against libgcc, [ --enable-libgcc Enable explicitly linking against libgcc], no, no)