SOURCES: php-link-libs.patch - as-needed fixes

[arekm]

Author: arekm                        Date: Thu Aug 10 07:18:42 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- as-needed fixes

---- Files affected:
SOURCES:
   php-link-libs.patch (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SOURCES/php-link-libs.patch
diff -u SOURCES/php-link-libs.patch:1.8 SOURCES/php-link-libs.patch:1.9
--- SOURCES/php-link-libs.patch:1.8	Thu Jan  2 21:56:10 2003
+++ SOURCES/php-link-libs.patch	Thu Aug 10 09:18:37 2006
@@ -8,3 +8,34 @@
  
  PHP_CHECK_FUNC(dlopen, dl)
  if test "$ac_cv_func_dlopen" = "yes"; then
+--- php.org/ext/ldap/config.m4.org	2006-08-10 06:31:57.985269750 +0000
++++ php/ext/ldap/config.m4	2006-08-10 06:37:42.330790000 +0000
+@@ -160,8 +160,10 @@
+   dnl Save original values
+   _SAVE_CPPFLAGS=$CPPFLAGS
+   _SAVE_LDFLAGS=$LDFLAGS
++  _SAVE_LIBS=$LIBS
+   CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR"
+-  LDFLAGS="$LDFLAGS $LDAP_SHARED_LIBADD"
++  LDFLAGS="$LDFLAGS"
++  LIBS="$LIBS $LDAP_SHARED_LIBADD"
+ 
+   dnl Check for 3 arg ldap_set_rebind_proc
+   AC_CACHE_CHECK([for 3 arg ldap_set_rebind_proc], ac_cv_3arg_setrebindproc,
+@@ -192,4 +194,5 @@
+   dnl Restore original values
+   CPPFLAGS=$_SAVE_CPPFLAGS
+   LDFLAGS=$_SAVE_LDFLAGS
++  LIBS=$_SAVE_LIBS
+ fi 
+--- php.org/acinclude.m4~	2006-08-10 06:39:21.000000000 +0000
++++ php/acinclude.m4	2006-08-10 06:58:46.933822750 +0000
+@@ -1745,7 +1745,7 @@
+   
+   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
+     ext_shared=$save_ext_shared
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/php-link-libs.patch?r1=1.8&r2=1.9&f=u