X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php-link-libs.patch;h=23a7acc0073fe62566c735c7b013cdf48dba450a;hb=4a34415cf9b96f9bc48f646ed8345deaf08b57e7;hp=d69e07f0df88ffd2f9f3822fd9cdefd0d7b14cae;hpb=68abf4df74e0ec2d683bf68169c96b5b0649edd5;p=packages%2Fphp.git

diff --git a/php-link-libs.patch b/php-link-libs.patch
index d69e07f..23a7acc 100644
--- a/php-link-libs.patch
+++ b/php-link-libs.patch
@@ -1,52 +1,35 @@
---- php-4.0.6/ext/yp/Makefile.in.wiget	Tue May  2 03:21:26 2000
-+++ php-4.0.6/ext/yp/Makefile.in	Wed Jul  4 22:44:51 2001
-@@ -2,5 +2,6 @@
- LTLIBRARY_NAME    = libyp.la
- LTLIBRARY_SOURCES = yp.c
- LTLIBRARY_SHARED_NAME = yp.la
-+LTLIBRARY_SHARED_LIBADD = $(NSL_SHARED_LIBADD)
+--- php-4.3.0/configure.in.orig	Fri Dec 27 05:07:18 2002
++++ php-4.3.0/configure.in	Thu Jan  2 20:34:43 2003
+@@ -288,7 +288,6 @@
+ PHP_CHECK_FUNC(htonl, socket)
+ PHP_CHECK_FUNC(gethostname, nsl)
+ PHP_CHECK_FUNC(gethostbyaddr, nsl)
+-PHP_CHECK_FUNC(yp_get_default_domain, nsl)
  
- include $(top_srcdir)/build/dynlib.mk
---- php-4.1.1/ext/yp/config.m4.wiget	Tue May  2 03:21:26 2000
-+++ php-4.1.1/ext/yp/config.m4	Wed Jul  4 22:44:51 2001
-@@ -6,8 +6,11 @@
- [  --enable-yp             Include YP support])
- 
- if test "$PHP_YP" != "no"; then
--  AC_DEFINE(HAVE_YP,1,[ ])
-+  PHP_SUBST(NSL_SHARED_LIBADD)
-+  AC_ADD_LIBRARY_WITH_PATH(nsl, /usr/lib, NSL_SHARED_LIBADD)
-+  AC_CHECK_LIB(nsl, yp_match, [AC_DEFINE(HAVE_YP,1,[ ])], [AC_MSG_ERROR(YP module requires libnsl)],)
-   PHP_EXTENSION(yp, $ext_shared)
-+
-   case $host_alias in
-   *solaris*)
-     AC_DEFINE(SOLARIS_YP,1,[ ]) ;;
---- php-4.0.6/configure.in.wiget	Wed Jun 20 22:12:59 2001
-+++ php-4.0.6/configure.in	Wed Jul  4 22:49:05 2001
-@@ -230,6 +230,7 @@
- 
- if test "$php_no_nsl_checks" != "yes"; then
- 
-+AC_CHECK_FUNC(gethostname, [ ], [
- AC_CHECK_LIB(nsl, gethostname, [
-  PHP_ADD_LIBRARY(nsl)
-  AC_DEFINE(HAVE_LIBNSL,1,[ ]) ],[
-@@ -237,6 +238,7 @@
-   PHP_ADD_LIBRARY(nsl)
-   AC_DEFINE(HAVE_LIBNSL,1,[ ]) ], [])
- ])
-+])
- 
- fi
- 
---- php-4.0.6.orig/ext/gmp/config.m4	Tue Mar 27 22:34:27 2001
-+++ php-4.0.6/ext/gmp/config.m4	Fri Aug  3 15:34:22 2001
-@@ -23,5 +23,6 @@
- 
-   PHP_EXTENSION(gmp, $ext_shared)
-   AC_DEFINE(HAVE_GMP, 1, [ ])
--  PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib)
-+  PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib, GMP_SHARED_LIBADD)
- fi
-+PHP_SUBST(GMP_SHARED_LIBADD)
+ PHP_CHECK_FUNC(dlopen, dl)
+ if test "$ac_cv_func_dlopen" = "yes"; then
+--- php-5.2.0/acinclude.m4.orig	2006-12-22 21:52:13.766461055 +0100
++++ php-5.2.0/acinclude.m4	2006-12-22 21:52:37.159794165 +0100
+@@ -1740,18 +1740,18 @@
+ dnl Wrapper for AC_CHECK_LIB
+ dnl
+ AC_DEFUN([PHP_CHECK_LIBRARY], [
+-  save_old_LDFLAGS=$LDFLAGS
++  save_old_LIBS=$LIBS
+   ac_stuff="$5"
+   
+   save_ext_shared=$ext_shared
+   ext_shared=yes
+-  PHP_EVAL_LIBLINE([$]ac_stuff, LDFLAGS)
++  PHP_EVAL_LIBLINE([$]ac_stuff, LIBS)
+   AC_CHECK_LIB([$1],[$2],[
+-    LDFLAGS=$save_old_LDFLAGS
++    LIBS=$save_old_LIBS
+     ext_shared=$save_ext_shared
+     $3
+   ],[
+-    LDFLAGS=$save_old_LDFLAGS
++    LIBS=$save_old_LIBS
+     ext_shared=$save_ext_shared
+     unset ac_cv_lib_$1[]_$2
+     $4