jani Mon Aug 20 14:28:30 2007 UTC
Modified files:
/php-src acinclude.m4 configure.in
Log:
- 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.383&r2=1.384&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.383 php-src/acinclude.m4:1.384
--- php-src/acinclude.m4:1.383 Fri Aug 3 10:46:19 2007
+++ php-src/acinclude.m4 Mon Aug 20 14:28:29 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.383 2007/08/03 10:46:19 jani Exp $
+dnl $Id: acinclude.m4,v 1.384 2007/08/20 14:28:29 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.639&r2=1.640&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.639 php-src/configure.in:1.640
--- php-src/configure.in:1.639 Mon Aug 6 14:33:06 2007
+++ php-src/configure.in Mon Aug 20 14:28:29 2007
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.639 2007/08/06 14:33:06 jani Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.640 2007/08/20 14:28:29 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
@@ -755,10 +759,6 @@
AC_DEFINE(PHP_SIGCHILD, 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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
