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,8 @@
  14    dnl Save original values
  15    _SAVE_CPPFLAGS=$CPPFLAGS
  16 -  _SAVE_LDFLAGS=$LDFLAGS
  17 -  LDFLAGS="$LDFLAGS $LDAP_SHARED_LIBADD"
  18 +  _SAVE_LIBS="$LIBS"
  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 +138,4 @@
  25    dnl Restore original values
  26    CPPFLAGS=$_SAVE_CPPFLAGS
  27 -  LDFLAGS=$_SAVE_LDFLAGS
  28 +  LIBS=$_SAVE_LIBS
  29  fi
  30 --- php-4.4.9/acinclude.m4.orig 2020-10-22 22:24:40.164611677 +0200
  31 +++ php-4.4.9/acinclude.m4      2020-10-22 22:25:44.137927068 +0200
  32 @@ -1621,18 +1621,18 @@
  33  dnl Wrapper for AC_CHECK_LIB
  34  dnl
  35  AC_DEFUN([PHP_CHECK_LIBRARY], [
  36 -  save_old_LDFLAGS=$LDFLAGS
  37 +  save_old_LIBS=$LIBS
  38    ac_stuff="$5"
  39
  40    save_ext_shared=$ext_shared
  41    ext_shared=yes
  42 -  PHP_EVAL_LIBLINE([$]ac_stuff, LDFLAGS)
  43 +  PHP_EVAL_LIBLINE([$]ac_stuff, LIBS)
  44    AC_CHECK_LIB([$1],[$2],[
  45 -    LDFLAGS=$save_old_LDFLAGS
  46 +    LIBS=$save_old_LIBS
  47      ext_shared=$save_ext_shared
  48      $3
  49    ],[
  50 -    LDFLAGS=$save_old_LDFLAGS
  51 +    LIBS=$save_old_LIBS
  52      ext_shared=$save_ext_shared
  53      unset ac_cv_lib_$1[]_$2
  54      $4
  55 --- php.org/ext/openssl/config0.m4~     2004-12-30 15:54:35.000000000 +0100
  56 +++ php/ext/openssl/config0.m4  2006-08-20 13:32:55.412011298 +0200
  57 @@ -22,6 +22,7 @@
  58        AC_DEFINE(HAVE_OPENSSL_SHARED_EXT,1,[ ])
  59      else
  60        AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ])
  61 +      EXTRA_LIBS="$EXTRA_LIBS $OPENSSL_LIBS"
  62      fi
  63    ], [
  64      AC_MSG_ERROR([OpenSSL check failed. Please check config.log for more information.])
  65 --- php4.org/configure.in~      2006-08-20 13:46:26.604918962 +0200
  66 +++ php4/configure.in   2006-08-20 13:57:32.736841691 +0200
  67 @@ -353,6 +353,9 @@
  68  PHP_CHECK_FUNC(inet_aton, resolv, bind)
  69  PHP_CHECK_FUNC(dn_skipname, resolv, bind)
  70
  71 +PHP_CHECK_FUNC(__dn_expand, resolv, bind)
  72 +PHP_CHECK_FUNC(__dn_skipname, resolv, bind)
  73 +PHP_CHECK_FUNC(__res_search, resolv, bind)
  74
  75  dnl Then headers.
  76  dnl -------------------------------------------------------------------------
  77 --- php4/configure.in.orig      2006-08-20 13:58:18.272000811 +0200
  78 +++ php4/configure.in   2006-08-20 14:11:43.477794868 +0200
  79 @@ -353,9 +353,8 @@
  80  PHP_CHECK_FUNC(inet_aton, resolv, bind)
  81  PHP_CHECK_FUNC(dn_skipname, resolv, bind)
  82
  83 -PHP_CHECK_FUNC(__dn_expand, resolv, bind)
  84 -PHP_CHECK_FUNC(__dn_skipname, resolv, bind)
  85 -PHP_CHECK_FUNC(__res_search, resolv, bind)
  86 +dnl force resolv and pthread
  87 +EXTRA_LIBS="$EXTRA_LIBS -lresolv -pthread"
  88
  89  dnl Then headers.
  90  dnl -------------------------------------------------------------------------
  91