php-link-libs.patch

   1 --- php-4.3.0/configure.in.orig Fri Dec 27 05:07:18 2002
   2 +++ php-4.3.0/configure.in      Thu Jan  2 20:34:43 2003
   3 @@ -288,7 +288,6 @@
   4  PHP_CHECK_FUNC(htonl, socket)
   5  PHP_CHECK_FUNC(gethostname, nsl)
   6  PHP_CHECK_FUNC(gethostbyaddr, nsl)
   7 -PHP_CHECK_FUNC(yp_get_default_domain, nsl)
   8
   9  PHP_CHECK_FUNC(dlopen, dl)
  10  if test "$ac_cv_func_dlopen" = "yes"; then
  11 --- php.org/ext/ldap/config.m4.org      2006-08-10 06:31:57.985269750 +0000
  12 +++ php/ext/ldap/config.m4      2006-08-10 06:37:42.330790000 +0000
  13 @@ -160,8 +160,10 @@
  14    dnl Save original values
  15    _SAVE_CPPFLAGS=$CPPFLAGS
  16    _SAVE_LDFLAGS=$LDFLAGS
  17 +  _SAVE_LIBS=$LIBS
  18    CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR"
  19 -  LDFLAGS="$LDFLAGS $LDAP_SHARED_LIBADD"
  20 +  LDFLAGS="$LDFLAGS"
  21 +  LIBS="$LIBS $LDAP_SHARED_LIBADD"
  22
  23    dnl Check for 3 arg ldap_set_rebind_proc
  24    AC_CACHE_CHECK([for 3 arg ldap_set_rebind_proc], ac_cv_3arg_setrebindproc,
  25 @@ -192,4 +194,5 @@
  26    dnl Restore original values
  27    CPPFLAGS=$_SAVE_CPPFLAGS
  28    LDFLAGS=$_SAVE_LDFLAGS
  29 +  LIBS=$_SAVE_LIBS
  30  fi
  31 --- php-5.2.0/acinclude.m4.orig 2006-12-22 21:52:13.766461055 +0100
  32 +++ php-5.2.0/acinclude.m4      2006-12-22 21:52:37.159794165 +0100
  33 @@ -1740,18 +1740,18 @@
  34  dnl Wrapper for AC_CHECK_LIB
  35  dnl
  36  AC_DEFUN([PHP_CHECK_LIBRARY], [
  37 -  save_old_LDFLAGS=$LDFLAGS
  38 +  save_old_LIBS=$LIBS
  39    ac_stuff="$5"
  40
  41    save_ext_shared=$ext_shared
  42    ext_shared=yes
  43 -  PHP_EVAL_LIBLINE([$]ac_stuff, LDFLAGS)
  44 +  PHP_EVAL_LIBLINE([$]ac_stuff, LIBS)
  45    AC_CHECK_LIB([$1],[$2],[
  46 -    LDFLAGS=$save_old_LDFLAGS
  47 +    LIBS=$save_old_LIBS
  48      ext_shared=$save_ext_shared
  49      $3
  50    ],[
  51 -    LDFLAGS=$save_old_LDFLAGS
  52 +    LIBS=$save_old_LIBS
  53      ext_shared=$save_ext_shared
  54      unset ac_cv_lib_$1[]_$2
  55      $4