cvs: php4 / acinclude.m4 /sapi/cgi config.m4 /sapi/cli config.m4
| From: | Marko Karppinen | Date: | Sun, 21 Jul 2002 14:42:02 +0000 |
| Subject: | cvs: php4 / acinclude.m4 /sapi/cgi config.m4 /sapi/cli config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12919@lists.php.net to get a copy of this message | ||
markonen Sun Jul 21 10:42:02 2002 EDT
Modified files:
/php4 acinclude.m4
/php4/sapi/cgi config.m4
/php4/sapi/cli config.m4
Log:
Made PHP_ADD_LIBPATH use the $ld_runpath_switch and changed the Darwin
link lines in sapi/cli and sapi/cgi to use $NATIVE_RPATHS.
This is a tentative fix for #18450.
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.198 php4/acinclude.m4:1.199
--- php4/acinclude.m4:1.198 Fri Jul 19 21:28:56 2002
+++ php4/acinclude.m4 Sun Jul 21 10:42:01 2002
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.198 2002/07/20 01:28:56 sas Exp $
+dnl $Id: acinclude.m4,v 1.199 2002/07/21 14:42:01 markonen Exp $
dnl
dnl This file contains local autoconf functions.
@@ -875,7 +875,7 @@
PHP_ADD_LIBPATH_GLOBAL([$ai_p])
],[
if test "$ext_shared" = "yes"; then
- $2="-R$ai_p -L$ai_p [$]$2"
+ $2="$ld_runpath_switch$ai_p -L$ai_p [$]$2"
else
PHP_ADD_LIBPATH_GLOBAL([$ai_p])
fi
Index: php4/sapi/cgi/config.m4
diff -u php4/sapi/cgi/config.m4:1.14 php4/sapi/cgi/config.m4:1.15
--- php4/sapi/cgi/config.m4:1.14 Thu Jul 4 04:39:11 2002
+++ php4/sapi/cgi/config.m4 Sun Jul 21 10:42:01 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.14 2002/07/04 08:39:11 markonen Exp $
+dnl $Id: config.m4,v 1.15 2002/07/21 14:42:01 markonen Exp $
dnl
AC_DEFUN(PHP_TEST_WRITE_STDOUT,[
@@ -100,7 +100,7 @@
case $host_alias in
*darwin*)
- BUILD_CGI="\$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS)
\$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(EXTRA_LIBS)
\$(ZEND_EXTRA_LIBS) -o php"
+ BUILD_CGI="\$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS)
\$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(EXTRA_LIBS)
\$(ZEND_EXTRA_LIBS) -o php"
;;
*)
BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(COMMON_FLAGS)
\$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS)
\$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o php"
Index: php4/sapi/cli/config.m4
diff -u php4/sapi/cli/config.m4:1.7 php4/sapi/cli/config.m4:1.8
--- php4/sapi/cli/config.m4:1.7 Mon Jul 1 17:17:39 2002
+++ php4/sapi/cli/config.m4 Sun Jul 21 10:42:01 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.7 2002/07/01 21:17:39 markonen Exp $
+dnl $Id: config.m4,v 1.8 2002/07/21 14:42:01 markonen Exp $
dnl
AC_MSG_CHECKING(for CLI build)
@@ -16,7 +16,7 @@
if test "$PHP_SAPI_CLI" != "no"; then
case $host_alias in
*darwin*)
- BUILD_CLI="\$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS)
\$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS)
\$(ZEND_EXTRA_LIBS) -o sapi/cli/php"
+ BUILD_CLI="\$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS)
\$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS)
\$(ZEND_EXTRA_LIBS) -o sapi/cli/php"
;;
*)
BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(COMMON_FLAGS)
\$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS)
\$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o sapi/cli/php"