php4-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 14:23:59.583381250 +0000
  12 +++ php/ext/ldap/config.m4      2006-08-10 14:24:40.013908000 +0000
  13 @@ -113,8 +113,9 @@
  14    dnl Save original values
  15    _SAVE_CPPFLAGS=$CPPFLAGS
  16    _SAVE_LDFLAGS=$LDFLAGS
  17 -  LDFLAGS="$LDFLAGS $LDAP_SHARED_LIBADD"
  18 +  LDFLAGS="$LDFLAGS"
  19    CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR"
  20 +  LIBS="$LIBS $LDAP_SHARED_LIBADD"
  21
  22    dnl Check for 3 arg ldap_set_rebind_proc
  23    AC_CACHE_CHECK([for 3 arg ldap_set_rebind_proc], ac_cv_3arg_setrebindproc,
  24 @@ -138,4 +139,5 @@
  25    dnl Restore original values
  26    CPPFLAGS=$_SAVE_CPPFLAGS
  27    LDFLAGS=$_SAVE_LDFLAGS
  28 +  LIBS=$_SAVE_LIBS
  29  fi
  30 --- php.org/acinclude.m4~       2006-08-20 13:12:40.191078397 +0200
  31 +++ php/acinclude.m4    2006-08-20 13:14:34.859406479 +0200
  32 @@ -1607,7 +1607,7 @@
  33
  34    save_ext_shared=$ext_shared
  35    ext_shared=yes
  36 -  PHP_EVAL_LIBLINE([$]ac_stuff, LDFLAGS)
  37 +  PHP_EVAL_LIBLINE([$]ac_stuff, LIBS)
  38    AC_CHECK_LIB([$1],[$2],[
  39      LDFLAGS=$save_old_LDFLAGS
  40      ext_shared=$save_ext_shared
  41 --- php.org/ext/openssl/config0.m4~     2004-12-30 15:54:35.000000000 +0100
  42 +++ php/ext/openssl/config0.m4  2006-08-20 13:32:55.412011298 +0200
  43 @@ -22,6 +22,7 @@
  44        AC_DEFINE(HAVE_OPENSSL_SHARED_EXT,1,[ ])
  45      else
  46        AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ])
  47 +      EXTRA_LIBS="$EXTRA_LIBS $OPENSSL_LIBS"
  48      fi
  49    ], [
  50      AC_MSG_ERROR([OpenSSL check failed. Please check config.log for more information.])
  51 --- php4.org/configure.in~      2006-08-20 13:46:26.604918962 +0200
  52 +++ php4/configure.in   2006-08-20 13:57:32.736841691 +0200
  53 @@ -353,6 +353,9 @@
  54  PHP_CHECK_FUNC(inet_aton, resolv, bind)
  55  PHP_CHECK_FUNC(dn_skipname, resolv, bind)
  56
  57 +PHP_CHECK_FUNC(__dn_expand, resolv, bind)
  58 +PHP_CHECK_FUNC(__dn_skipname, resolv, bind)
  59 +PHP_CHECK_FUNC(__res_search, resolv, bind)
  60
  61  dnl Then headers.
  62  dnl -------------------------------------------------------------------------
  63 --- php4/configure.in.orig      2006-08-20 13:58:18.272000811 +0200
  64 +++ php4/configure.in   2006-08-20 14:11:43.477794868 +0200
  65 @@ -353,9 +353,8 @@
  66  PHP_CHECK_FUNC(inet_aton, resolv, bind)
  67  PHP_CHECK_FUNC(dn_skipname, resolv, bind)
  68
  69 -PHP_CHECK_FUNC(__dn_expand, resolv, bind)
  70 -PHP_CHECK_FUNC(__dn_skipname, resolv, bind)
  71 -PHP_CHECK_FUNC(__res_search, resolv, bind)
  72 +dnl force resolv and pthread
  73 +EXTRA_LIBS="$EXTRA_LIBS -lresolv -pthread"
  74
  75  dnl Then headers.
  76  dnl -------------------------------------------------------------------------
  77