php-dl-zlib.patch

   1 --- php-4.3.0/main/SAPI.c.orig  Thu Dec  5 23:15:00 2002
   2 +++ php-4.3.0/main/SAPI.c       Fri Jan  3 10:28:01 2003
   3 @@ -521,7 +521,7 @@
   4                                 while (*ptr == ' ' && *ptr != '\0') {
   5                                         ptr++;
   6                                 }
   7 -#if HAVE_ZLIB
   8 +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
   9                                 if(!strncmp(ptr, "image/", sizeof("image/")-1)) {
  10                                         ZLIBG(output_compression) = 0;
  11                                 }
  12 @@ -669,7 +669,7 @@
  13                 return SUCCESS;
  14         }
  15
  16 -#if HAVE_ZLIB
  17 +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
  18         /* Add output compression headers at this late stage in order to make
  19            it possible to switch it off inside the script. */
  20         if (ZLIBG(output_compression)) {
  21 --- php-4.3.0/ext/standard/image.c.orig Thu Dec  5 16:52:35 2002
  22 +++ php-4.3.0/ext/standard/image.c      Fri Jan  3 10:29:20 2003
  23 @@ -34,7 +34,7 @@
  24  #endif
  25  #include "php_image.h"
  26
  27 -#if HAVE_ZLIB
  28 +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
  29  #include "zlib.h"
  30  #endif
  31
  32 @@ -80,7 +80,7 @@
  33         REGISTER_LONG_CONSTANT("IMAGETYPE_JP2",     IMAGE_FILETYPE_JP2,     CONST_CS | CONST_PERSISTENT);
  34         REGISTER_LONG_CONSTANT("IMAGETYPE_JPX",     IMAGE_FILETYPE_JPX,     CONST_CS | CONST_PERSISTENT);
  35         REGISTER_LONG_CONSTANT("IMAGETYPE_JB2",     IMAGE_FILETYPE_JB2,     CONST_CS | CONST_PERSISTENT);
  36 -#if HAVE_ZLIB
  37 +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
  38         REGISTER_LONG_CONSTANT("IMAGETYPE_SWC",     IMAGE_FILETYPE_SWC,     CONST_CS | CONST_PERSISTENT);
  39  #endif
  40         REGISTER_LONG_CONSTANT("IMAGETYPE_IFF",     IMAGE_FILETYPE_IFF,     CONST_CS | CONST_PERSISTENT);
  41 @@ -170,7 +170,7 @@
  42  }
  43  /* }}} */
  44
  45 -#if HAVE_ZLIB
  46 +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
  47  /* {{{ php_handle_swc
  48   */
  49  static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC)
  50 @@ -944,7 +944,7 @@
  51                 case IMAGE_FILETYPE_SWF:
  52                         result = php_handle_swf(stream TSRMLS_CC);
  53                         break;
  54 -#if HAVE_ZLIB
  55 +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
  56                 case IMAGE_FILETYPE_SWC:
  57                         result = php_handle_swc(stream TSRMLS_CC);
  58                         break;