php-cpdf-fix.patch

   1 --- php-4.3.2/ext/cpdf/config.m4.orig   Wed Apr 30 10:23:06 2003
   2 +++ php-4.3.2/ext/cpdf/config.m4        Fri Jun 13 12:23:26 2003
   3 @@ -24,9 +24,9 @@
   4      ],)
   5      AC_CHECK_LIB(jpeg,jpeg_read_header, ,[AC_MSG_ERROR(Problem with libjpeg.(a|so). Please check config.log for more information.)],)
   6      if test -z "$CPDF_JPEG_DIR"; then
   7 -      PHP_ADD_LIBRARY(jpeg)
   8 +      PHP_ADD_LIBRARY(jpeg, , CPDF_SHARED_LIBADD)
   9      else
  10 -      PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib)
  11 +      PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib, CPDF_SHARED_LIBADD)
  12      fi
  13    ])
  14  ])
  15 @@ -49,22 +49,23 @@
  16      ],)
  17      AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_ERROR(Problem with libtiff.(a|so). Please check config.log for more information.)],)
  18      if test -z "$CPDF_TIFF_DIR"; then
  19 -      PHP_ADD_LIBRARY(tiff)
  20 +      PHP_ADD_LIBRARY(tiff, , CPDF_SHARED_LIBADD)
  21      else
  22 -      PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib)
  23 +      PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib, CPDF_SHARED_LIBADD)
  24      fi
  25    ])
  26  ])
  27
  28 -AC_MSG_CHECKING(for cpdflib support)
  29  AC_ARG_WITH(cpdflib,
  30  [  --with-cpdflib[=DIR]    Include cpdflib support (requires cpdflib >= 2).],
  31  [
  32 +  AC_MSG_CHECKING(for cpdflib support)
  33    if test "$withval" = "no"; then
  34      AC_MSG_RESULT(no)
  35    else
  36      AC_MSG_RESULT(yes)
  37 -    PHP_NEW_EXTENSION(cpdf, cpdf.c)
  38 +    PHP_NEW_EXTENSION(cpdf, cpdf.c, $ext_shared)
  39 +    PHP_SUBST(CPDF_SHARED_LIBADD)
  40      CPDF_JPEG_TEST
  41      CPDF_TIFF_TEST
  42      for i in $withval /usr /usr/local; do
  43 @@ -78,10 +79,10 @@
  44              [AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])])
  45          ])
  46          if test "$i" != "/usr" -a "$i" != "/usr/local"; then
  47 -          PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib)
  48 +          PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib, CPDF_SHARED_LIBADD)
  49            PHP_ADD_INCLUDE($CPDFLIB_INCLUDE)
  50          else
  51 -          PHP_ADD_LIBRARY(cpdf)
  52 +          PHP_ADD_LIBRARY(cpdf, , CPDF_SHARED_LIBADD)
  53          fi
  54          break
  55        fi