1 --- php-4.0.6/ext/pdf/config.m4.wiget Thu Jun 14 06:35:44 2001
2 +++ php-4.0.6/ext/pdf/config.m4 Fri Jul 6 08:37:53 2001
4 AC_CHECK_LIB(pdf, PDF_show_boxed, [
5 AC_DEFINE(HAVE_PDFLIB,1,[ ])
7 - AC_MSG_ERROR(pdflib extension requires at least pdflib 3.x. You may also need libtiff and libjpeg. If so, use the options --with-tiff-dir=<DIR> and --with-jpeg-dir=<DIR>)
8 + AC_MSG_ERROR([pdflib extension requires at least pdflib 3.x. You may also need libtiff and libjpeg. If so, use the options --with-tiff-dir=<DIR> and --with-jpeg-dir=<DIR>])
10 -ltiff -ljpeg -lpng -lz
13 if test -n "$PDFLIB_INCLUDE" ; then
15 if test "$PHP_ZLIB_DIR" = "no"; then
16 - AC_MSG_ERROR(PDF extension requires ZLIB. Use --with-zlib-dir=<DIR>)
17 + AC_MSG_ERROR([PDF extension requires ZLIB. Use --with-zlib-dir=<DIR>])
20 PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDFLIB_SHARED_LIBADD)
23 PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDFLIB_SHARED_LIBADD)
25 - AC_MSG_ERROR(libjpeg not found!)
26 + AC_MSG_ERROR([libjpeg not found!])
32 PHP_ADD_LIBRARY(jpeg,, PDFLIB_SHARED_LIBADD)
34 - AC_MSG_RESULT(no, try --with-jpeg-dir=<DIR>)
35 + AC_MSG_RESULT([no, try --with-jpeg-dir=<DIR>])
40 - PHP_ARG_WITH(png-dir, for the location of libpng,
41 + PHP_ARG_WITH(png-dir,[ for the location of libpng],
42 [ --with-png-dir[=DIR] PDFLIB: define libpng install directory])
44 if test "$PHP_PNG_DIR" != "no"; then
47 PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, PDFLIB_SHARED_LIBADD)
49 - AC_MSG_ERROR(libpng not found!)
50 + AC_MSG_ERROR([libpng not found!])
56 PHP_ADD_LIBRARY(png,, PDFLIB_SHARED_LIBADD)
58 - AC_MSG_RESULT(no, try --with-png-dir=<DIR>)
59 + AC_MSG_RESULT([no, try --with-png-dir=<DIR>])
64 - PHP_ARG_WITH(tiff-dir, for the location of libtiff,
65 + PHP_ARG_WITH(tiff-dir,[ for the location of libtiff],
66 [ --with-tiff-dir[=DIR] PDFLIB: define libtiff install directory])
68 if test "$PHP_TIFF_DIR" != "no"; then
71 PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDFLIB_SHARED_LIBADD)
73 - AC_MSG_ERROR(libtiff not found!)
74 + AC_MSG_ERROR([libtiff not found!])
80 PHP_ADD_LIBRARY(tiff,, PDFLIB_SHARED_LIBADD)
82 - AC_MSG_RESULT(no, Try --with-tiff-dir=<DIR>)
83 + AC_MSG_RESULT([no, Try --with-tiff-dir=<DIR>])
88 PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib, PDFLIB_SHARED_LIBADD)
89 PHP_ADD_INCLUDE($PDFLIB_INCLUDE)
91 - AC_MSG_ERROR(pdflib extension requires at least pdflib 3.x.)
92 + AC_MSG_ERROR([pdflib extension requires at least pdflib 3.x.])
96 --- php-4.0.6/ext/yp/config.m4.wiget Fri Jul 6 08:37:53 2001
97 +++ php-4.0.6/ext/yp/config.m4 Fri Jul 6 08:37:53 2001
99 dnl config.m4 for extension yp
100 dnl don't forget to call PHP_EXTENSION(yp)
102 -PHP_ARG_ENABLE(yp,whether to include YP support,
103 +PHP_ARG_ENABLE(yp,[whether to include YP support],
104 [ --enable-yp Include YP support])
106 if test "$PHP_YP" != "no"; then
107 PHP_SUBST(NSL_SHARED_LIBADD)
108 - AC_ADD_LIBRARY_WITH_PATH(nsl, /usr/lib, NSL_SHARED_LIBADD)
109 - AC_CHECK_LIB(nsl, yp_match, [AC_DEFINE(HAVE_YP,1,[ ])], [AC_MSG_ERROR(YP module requires libnsl)],)
110 + AC_CHECK_LIB(nsl, yp_match, [
111 + AC_DEFINE(HAVE_YP,1,[ ])
112 + PHP_ADD_LIBRARY(nsl,, NSL_SHARED_LIBADD)
113 + ], [AC_MSG_ERROR([YP module requires libnsl])])
114 PHP_EXTENSION(yp, $ext_shared)
116 case "$host_alias" in
117 --- php-4.1.1/acinclude.m4.wiget Sun Jun 10 21:52:56 2001
118 +++ php-4.1.1/acinclude.m4 Fri Jul 6 09:26:10 2001
123 -AC_DEFUN(PHP_FAST_OUTPUT,[
124 +AC_DEFUN([PHP_FAST_OUTPUT],[
125 PHP_FAST_OUTPUT_FILES="$PHP_FAST_OUTPUT_FILES $1"
132 -AC_DEFUN(PHP_GEN_MAKEFILES,[
133 +AC_DEFUN([PHP_GEN_MAKEFILES],[
134 $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $1
138 dnl ## This macro can be used several times.
139 AC_DEFUN(PHP_OUTPUT,[
140 PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES $1"
141 + AC_CONFIG_FILES($1)
144 AC_DEFUN(PHP_DECLARED_TIMEZONE,[
145 --- php-4.0.6/configure.in.wiget Fri Jul 6 08:37:53 2001
146 +++ php-4.0.6/configure.in Fri Jul 6 09:32:15 2001
149 AC_INIT(README.CVS-RULES)
151 -PHP_FAST_OUTPUT(sapi/Makefile ext/Makefile Makefile pear/Makefile main/Makefile)
152 +PHP_FAST_OUTPUT([sapi/Makefile ext/Makefile Makefile pear/Makefile main/Makefile])
154 if test "$with_shared_apache" != "no" && test -n "$with_shared_apache" ; then
155 AC_MSG_ERROR(--with-shared-apache is not supported. Please refer to the documentation for using APXS)
161 -if test -n "$LEX"; then
166 dnl ## Make flex scanners use const if they can, even if __STDC__ is not
167 dnl ## true, for compilers like Sun's that only set __STDC__ true in
168 @@ -225,12 +222,12 @@
170 unset ac_cv_func_yp_get_default_domain
171 AC_CHECK_FUNC(yp_get_default_domain,
172 - [php_no_nsl_checks=yes],[ ])
173 + [php_no_nsl_checks=yes],[true ])
174 unset ac_cv_func_yp_get_default_domain
176 if test "$php_no_nsl_checks" != "yes"; then
178 -AC_CHECK_FUNC(gethostname, [ ], [
179 +AC_CHECK_FUNC(gethostname, [true ], [
180 AC_CHECK_LIB(nsl, gethostname, [
182 AC_DEFINE(HAVE_LIBNSL,1,[ ]) ],[
185 dnl Only include libbind if inet_aton is not found in
187 -AC_CHECK_LIB(resolv, inet_aton, [], [
188 - AC_CHECK_LIB(bind, inet_aton, [], [
189 +AC_CHECK_LIB(resolv, inet_aton, [true], [
190 + AC_CHECK_LIB(bind, inet_aton, [true], [
191 AC_CHECK_LIB(bind, __inet_aton)
196 PHP_SUBST(WARNING_LEVEL)
198 +PHP_SUBST(EXT_SUBDIRS)
199 +PHP_SUBST(EXT_STATIC)
200 +PHP_SUBST(EXT_SHARED)
202 +PHP_SUBST(EXT_LTLIBS)
205 PHP_CONFIGURE_PART(Configuring libtool)
207 @@ -936,14 +939,17 @@
208 pear/scripts/pear pear/scripts/phpize pear/scripts/php-config \
209 TSRM/Makefile $PHP_OUTPUT_FILES"
211 -AC_OUTPUT($ALL_OUTPUT_FILES, [], [
212 +AC_CONFIG_FILES([php4.spec Zend/Makefile main/build-defs.h
213 + pear/scripts/pear pear/scripts/phpize pear/scripts/php-config
215 +AC_CONFIG_COMMANDS([default], [true], [
217 -if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES"; then
218 +dnl if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES"; then
223 if test -n "\$REDO_ALL"; then
224 - PHP_GEN_MAKEFILES($PHP_FAST_OUTPUT_FILES)
225 + PHP_GEN_MAKEFILES([$PHP_FAST_OUTPUT_FILES])
228 if test ! -f $srcdir/ext/bcmath/number.c; then
229 @@ -1057,6 +1063,8 @@
235 dnl ## Local Variables:
238 --- php-4.1.1/ext/imap/config.m4.orig Tue Aug 7 18:18:04 2001
239 +++ php-4.1.1/ext/imap/config.m4 Sat Jan 19 13:50:24 2002
243 AC_DEFINE(HAVE_IMAP2001, 1, [ ])
246 CPPFLAGS=$old_CPPFLAGS
248 AC_CHECK_LIB(pam, pam_start)