php-openssl-for-ext-only.patch

   1 --- php-4.2.0/configure.in.orig Wed May  1 22:39:35 2002
   2 +++ php-4.2.0/configure.in      Wed May  1 22:41:49 2002
   3 @@ -659,16 +659,6 @@
   4         AC_MSG_RESULT([/usr/local/php/bin])
   5  ])
   6
   7 -PHP_ARG_WITH(openssl,for OpenSSL support,
   8 -[  --with-openssl[=DIR]    Include OpenSSL support (requires OpenSSL >= 0.9.5) ])
   9 -if test "$PHP_OPENSSL" = "yes"; then
  10 -  PHP_OPENSSL="/usr/local/ssl /usr/local /usr /usr/local/openssl"
  11 -fi
  12 -
  13 -if test "$PHP_OPENSSL" != "no"; then
  14 -  PHP_SETUP_OPENSSL
  15 -fi
  16 -
  17  PHP_ARG_ENABLE(sigchild,whether to enable PHP's own SIGCHLD handler,
  18  [  --enable-sigchild       Enable PHP's own SIGCHLD handler.],no)
  19
  20 diff -Nur php-4.2.0/ext/openssl.orig/Makefile.in php-4.2.0/ext/openssl/Makefile.in
  21 --- php-4.2.0/ext/openssl.orig/Makefile.in      Mon Nov 13 20:47:19 2000
  22 +++ php-4.2.0/ext/openssl/Makefile.in   Wed May  1 23:12:07 2002
  23 @@ -3,5 +3,6 @@
  24  LTLIBRARY_NAME        = libopenssl.la
  25  LTLIBRARY_SOURCES     = openssl.c
  26  LTLIBRARY_SHARED_NAME = openssl.la
  27 +LTLIBRARY_SHARED_LIBADD = $(OPENSSL_SHARED_LIBADD)
  28
  29  include $(top_srcdir)/build/dynlib.mk
  30 diff -Nur php-4.2.0/ext/openssl.orig/config.m4 php-4.2.0/ext/openssl/config.m4
  31 --- php-4.2.0/ext/openssl.orig/config.m4        Fri Nov 30 19:59:48 2001
  32 +++ php-4.2.0/ext/openssl/config.m4     Wed May  1 23:16:39 2002
  33 @@ -2,6 +2,16 @@
  34  dnl $Id$
  35  dnl
  36
  37 +PHP_ARG_WITH(openssl,for OpenSSL support,
  38 +[  --with-openssl[=DIR]    Include OpenSSL support (requires OpenSSL >= 0.9.5) ])
  39 +if test "$PHP_OPENSSL" = "yes"; then
  40 +  PHP_OPENSSL="/usr/local/ssl /usr/local /usr /usr/local/openssl"
  41 +fi
  42 +
  43 +if test "$PHP_OPENSSL" != "no"; then
  44 +  PHP_SETUP_OPENSSL
  45 +fi
  46 +
  47  if test "$OPENSSL_DIR"; then
  48    PHP_EXTENSION(openssl, $ext_shared)
  49    AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ])
  50 --- php-4.2.0/acinclude.m4.orig Wed May  1 23:16:39 2002
  51 +++ php-4.2.0/acinclude.m4      Wed May  1 23:18:31 2002
  52 @@ -85,17 +85,18 @@
  53    PHP_ADD_LIBPATH($OPENSSL_DIR/lib)
  54
  55    AC_CHECK_LIB(crypto, CRYPTO_free, [
  56 -    PHP_ADD_LIBRARY(crypto)
  57 +    PHP_ADD_LIBRARY(crypto,, OPENSSL_SHARED_LIBADD)
  58    ],[
  59      AC_MSG_ERROR([libcrypto not found!])
  60    ])
  61
  62    AC_CHECK_LIB(ssl, SSL_CTX_set_ssl_version, [
  63 -    PHP_ADD_LIBRARY(ssl)
  64 +    PHP_ADD_LIBRARY(ssl,, OPENSSL_SHARED_LIBADD)
  65    ],[
  66      AC_MSG_ERROR([libssl not found!])
  67    ])
  68    PHP_ADD_INCLUDE($OPENSSL_INC)
  69 +  PHP_SUBST(OPENSSL_SHARED_LIBADD)
  70  ])
  71
  72  dnl PHP_EVAL_LIBLINE(LINE, SHARED-LIBADD)