]>
Commit | Line | Data |
---|---|---|
9d6174b1 | 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 | |
4 | @@ -1,5 +1,7 @@ | |
5 | ||
6 | LTLIBRARY_NAME = libcpdf.la | |
7 | LTLIBRARY_SOURCES = cpdf.c | |
8 | +LTLIBRARY_SHARED_NAME = cpdf.la | |
9 | +LTLIBRARY_SHARED_LIBADD = $(CPDF_SHARED_LIBADD) | |
10 | ||
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 | |
15 | @@ -1,70 +1,100 @@ | |
16 | dnl $Id$ | |
17 | ||
18 | -AC_MSG_CHECKING(for cpdflib support) | |
19 | -AC_ARG_WITH(cpdflib, | |
20 | -[ --with-cpdflib[=DIR] Include cpdflib support (requires cpdflib >= 2).], | |
21 | -[ | |
22 | - case $withval in | |
23 | - no) | |
24 | - AC_MSG_RESULT(no) ;; | |
25 | +PHP_ARG_WITH(cpdflib, for cpdflib support, | |
26 | +[ --with-cpdflib[=DIR] Include cpdflib support (requires cpdflib >= 2).]) | |
27 | + | |
28 | +if test "$PHP_CPDFLIB" != "no"; then | |
29 | + | |
30 | + PHP_EXTENSION(cpdf, $ext_shared) | |
31 | + PHP_SUBST(CPDF_SHARED_LIBADD) | |
32 | + | |
33 | + dnl # libjpeg | |
34 | + | |
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)]) | |
37 | + | |
38 | + if test "$PHP_JPEG_DIR" != "no"; then | |
39 | + PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, | |
40 | + [ | |
41 | + PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, CPDF_SHARED_LIBADD) | |
42 | + ],[ | |
43 | + AC_MSG_ERROR([libjpeg not found!]) | |
44 | + ],[ | |
45 | + -L$PHP_JPEG_DIR/lib | |
46 | + ]) | |
47 | + else | |
48 | + AC_MSG_WARN([If configure fails, try --with-jpeg-dir=<DIR>]) | |
49 | + fi | |
50 | + | |
51 | + dnl # libpng | |
52 | + | |
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)]) | |
55 | + | |
56 | + if test "$PHP_PNG_DIR" != "no"; then | |
57 | + PHP_CHECK_LIBRARY(png,png_create_info_struct, | |
58 | + [ | |
59 | + PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, CPDF_SHARED_LIBADD) | |
60 | + ],[ | |
61 | + AC_MSG_ERROR([libpng not found!]) | |
62 | + ],[ | |
63 | + -L$PHP_PNG_DIR/lib | |
64 | + ]) | |
65 | + else | |
66 | + AC_MSG_WARN([If configure fails, try --with-png-dir=<DIR>]) | |
67 | + fi | |
68 | + | |
69 | + dnl # libtiff | |
70 | + | |
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)]) | |
73 | + | |
74 | + if test "$PHP_TIFF_DIR" != "no"; then | |
75 | + PHP_CHECK_LIBRARY(tiff,TIFFOpen, | |
76 | + [ | |
77 | + PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, CPDF_SHARED_LIBADD) | |
78 | + ],[ | |
79 | + AC_MSG_ERROR([libtiff not found!]) | |
80 | + ],[ | |
81 | + -L$PHP_TIFF_DIR/lib | |
82 | + ]) | |
83 | + else | |
84 | + AC_MSG_WARN([If configure fails, try --with-tiff-dir=<DIR>]) | |
85 | + fi | |
86 | + | |
87 | + dnl # zlib | |
88 | + | |
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>]) | |
92 | + else | |
93 | + AC_MSG_RESULT([$PHP_ZLIB_DIR]) | |
94 | + PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, CPDF_SHARED_LIBADD) | |
95 | + fi | |
96 | + | |
97 | + case $PHP_CPDFLIB in | |
98 | yes) | |
99 | - AC_MSG_RESULT(yes) | |
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) | |
106 | - ;; | |
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.])]) | |
111 | + ;; | |
112 | *) | |
113 | - test -f $withval/include/cpdflib.h && CPDFLIB_INCLUDE=$withval/include | |
114 | - if test -n "$CPDFLIB_INCLUDE" ; then | |
115 | - AC_MSG_RESULT(yes) | |
116 | - PHP_EXTENSION(cpdf) | |
117 | - old_LIBS=$LIBS | |
118 | - old_withval=$withval | |
119 | - | |
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],[ | |
123 | - AC_MSG_RESULT(yes) | |
124 | - if test -z $withval; then | |
125 | - withval=/usr/local | |
126 | - fi | |
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 | |
131 | + | |
132 | + PHP_CHECK_LIBRARY(cpdf, cpdf_open, | |
133 | + [ | |
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) | |
137 | ],[ | |
138 | - AC_MSG_RESULT(no) | |
139 | - AC_MSG_WARN(If configure fails try --with-jpeg-dir=<DIR>) | |
140 | - ]) | |
141 | - | |
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],[ | |
145 | - AC_MSG_RESULT(yes) | |
146 | - if test -z $withval; then | |
147 | - withval=/usr/local | |
148 | - fi | |
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.]) | |
153 | ],[ | |
154 | - AC_MSG_RESULT(no) | |
155 | - AC_MSG_WARN(If configure fails try --with-tiff-dir=<DIR>) | |
156 | - ]) | |
157 | - withval=$old_withval | |
158 | - | |
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.])]) | |
162 | - LIBS=$old_LIBS | |
163 | - PHP_ADD_LIBRARY_WITH_PATH(cpdf, $withval/lib) | |
164 | - PHP_ADD_INCLUDE($CPDFLIB_INCLUDE) | |
165 | + -L$PHP_PDFLIB/lib | |
166 | + ]) | |
167 | else | |
168 | - AC_MSG_RESULT(no) | |
169 | - fi ;; | |
170 | + AC_MSG_ERROR([cpdflib.h not found! Check the path passed to --with-cpdflib=<PATH>. PATH should be the install prefix directory.]) | |
171 | + fi | |
172 | + ;; | |
173 | esac | |
174 | -],[ | |
175 | - AC_MSG_RESULT(no) | |
176 | -]) | |
177 | +fi |