1 diff -Nur php-4.2.0.orig/ext/cpdf/Makefile.in php-4.2.0/ext/cpdf/Makefile.in
2 --- php-4.2.0.orig/ext/cpdf/Makefile.in Tue May 2 00:35:17 2000
3 +++ php-4.2.0/ext/cpdf/Makefile.in Wed May 1 19:01:09 2002
6 LTLIBRARY_NAME = libcpdf.la
7 LTLIBRARY_SOURCES = cpdf.c
8 +LTLIBRARY_SHARED_NAME = cpdf.la
9 +LTLIBRARY_SHARED_LIBADD = $(CPDF_SHARED_LIBADD)
11 include $(top_srcdir)/build/dynlib.mk
12 diff -Nur php-4.2.0.orig/ext/cpdf/config.m4 php-4.2.0/ext/cpdf/config.m4
13 --- php-4.2.0.orig/ext/cpdf/config.m4 Fri Nov 30 19:59:27 2001
14 +++ php-4.2.0/ext/cpdf/config.m4 Wed May 1 19:15:34 2002
18 -AC_MSG_CHECKING(for cpdflib support)
20 -[ --with-cpdflib[=DIR] Include cpdflib support (requires cpdflib >= 2).],
24 - AC_MSG_RESULT(no) ;;
25 +PHP_ARG_WITH(cpdflib, for cpdflib support,
26 +[ --with-cpdflib[=DIR] Include cpdflib support (requires cpdflib >= 2).])
28 +if test "$PHP_CPDFLIB" != "no"; then
30 + PHP_EXTENSION(cpdf, $ext_shared)
31 + PHP_SUBST(CPDF_SHARED_LIBADD)
35 + PHP_ARG_WITH(jpeg-dir, for the location of libjpeg,
36 + [ --with-jpeg-dir[=DIR] PDFLIB: define libjpeg install directory. (OPTIONAL for PDFlib v4)])
38 + if test "$PHP_JPEG_DIR" != "no"; then
39 + PHP_CHECK_LIBRARY(jpeg,jpeg_read_header,
41 + PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, CPDF_SHARED_LIBADD)
43 + AC_MSG_ERROR([libjpeg not found!])
48 + AC_MSG_WARN([If configure fails, try --with-jpeg-dir=<DIR>])
53 + PHP_ARG_WITH(png-dir, for the location of libpng,
54 + [ --with-png-dir[=DIR] PDFLIB: define libpng install directory. (OPTIONAL for PDFlib v4)])
56 + if test "$PHP_PNG_DIR" != "no"; then
57 + PHP_CHECK_LIBRARY(png,png_create_info_struct,
59 + PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, CPDF_SHARED_LIBADD)
61 + AC_MSG_ERROR([libpng not found!])
66 + AC_MSG_WARN([If configure fails, try --with-png-dir=<DIR>])
71 + PHP_ARG_WITH(tiff-dir, for the location of libtiff,
72 + [ --with-tiff-dir[=DIR] PDFLIB: define libtiff install directory. (OPTIONAL for PDFlib v4)])
74 + if test "$PHP_TIFF_DIR" != "no"; then
75 + PHP_CHECK_LIBRARY(tiff,TIFFOpen,
77 + PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, CPDF_SHARED_LIBADD)
79 + AC_MSG_ERROR([libtiff not found!])
84 + AC_MSG_WARN([If configure fails, try --with-tiff-dir=<DIR>])
89 + AC_MSG_CHECKING([for the location of zlib])
90 + if test "$PHP_ZLIB_DIR" = "no"; then
91 + AC_MSG_RESULT([no. If configure fails, try --with-zlib-dir=<DIR>])
93 + AC_MSG_RESULT([$PHP_ZLIB_DIR])
94 + PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, CPDF_SHARED_LIBADD)
97 + case $PHP_CPDFLIB in
100 - PHP_EXTENSION(cpdf)
101 - AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])],
102 - [AC_MSG_ERROR([Cpdf module requires cpdflib >= 2.])])
103 - PHP_ADD_LIBRARY(cpdf)
104 - PHP_ADD_LIBRARY(tiff)
105 - PHP_ADD_LIBRARY(jpeg)
107 + AC_CHECK_LIB(cpdf, cpdf_open, [
108 + AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])
109 + PHP_ADD_LIBRARY(cpdf,, CPDF_SHARED_LIBADD)
110 + ],[AC_MSG_ERROR([Cpdf module requires cpdflib >= 2.])])
113 - test -f $withval/include/cpdflib.h && CPDFLIB_INCLUDE=$withval/include
114 - if test -n "$CPDFLIB_INCLUDE" ; then
116 - PHP_EXTENSION(cpdf)
118 - old_withval=$withval
120 - AC_MSG_CHECKING([for libjpeg (needed by cpdflib 2.x)])
121 - AC_ARG_WITH(jpeg-dir,
122 - [ --with-jpeg-dir[=DIR] jpeg dir for cpdflib 2.x],[
124 - if test -z $withval; then
127 - LIBS="$LIBS -L$withval/lib"
128 - AC_CHECK_LIB(jpeg,jpeg_read_header, ,[AC_MSG_RESULT(no)],)
129 - PHP_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib)
130 + if test -f "$PHP_CPDFLIB/include/cpdflib.h" ; then
132 + PHP_CHECK_LIBRARY(cpdf, cpdf_open,
134 + AC_DEFINE(HAVE_PDFLIB,1,[ ])
135 + PHP_ADD_LIBRARY_WITH_PATH(cpdf, $PHP_CPDFLIB/lib, CPDF_SHARED_LIBADD)
136 + PHP_ADD_INCLUDE($PHP_CPDFLIB/include)
139 - AC_MSG_WARN(If configure fails try --with-jpeg-dir=<DIR>)
142 - AC_MSG_CHECKING([for libtiff (needed by cpdflib 2.x)])
143 - AC_ARG_WITH(tiff-dir,
144 - [ --with-tiff-dir[=DIR] tiff dir for cpdflib 2.x],[
146 - if test -z $withval; then
149 - LIBS="$LIBS -L$withval/lib"
150 - AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_RESULT(no)],)
151 - PHP_ADD_LIBRARY_WITH_PATH(tiff, $withval/lib)
152 + AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])
155 - AC_MSG_WARN(If configure fails try --with-tiff-dir=<DIR>)
157 - withval=$old_withval
159 - LIBS="$LIBS -L$withval/lib"
160 - AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])],
161 - [AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])])
163 - PHP_ADD_LIBRARY_WITH_PATH(cpdf, $withval/lib)
164 - PHP_ADD_INCLUDE($CPDFLIB_INCLUDE)
170 + AC_MSG_ERROR([cpdflib.h not found! Check the path passed to --with-cpdflib=<PATH>. PATH should be the install prefix directory.])