cvs: php4 / acinclude.m4 /ext/curl config.m4 /ext/fdf config.m4 /ext/gd config.m4 /ext/mcrypt config.m4 /ext/pdf config.m4 /ext/satellite
config.m4 /ext/sybase_ct config.m4 /ext/vpopmail config.m4
| From: | Jani Taskinen | Date: | Wed, 05 Sep 2001 13:18:08 +0000 |
| Subject: | cvs: php4 / acinclude.m4 /ext/curl config.m4 /ext/fdf config.m4 /ext/gd config.m4 /ext/mcrypt config.m4 /ext/pdf config.m4 /ext/satellite config.m4 /ext/sybase_ct config.m4 /ext/vpopmail config.m4 |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-7217@lists.php.net to get a copy of this message | ||
sniper Wed Sep 5 09:18:08 2001 EDT
Modified files:
/php4 acinclude.m4
/php4/ext/curl config.m4
/php4/ext/fdf config.m4
/php4/ext/gd config.m4
/php4/ext/mcrypt config.m4
/php4/ext/pdf config.m4
/php4/ext/satellite config.m4
/php4/ext/sybase_ct config.m4
/php4/ext/vpopmail config.m4
Log:
Fixes commit / link problems with certain compilers.
# Please use PHP_CHECK_LIBRARY() always instead of AC_CHECK_LIB
# if you need to pass extra libs/libpaths to the test.
Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.140 php4/acinclude.m4:1.141 --- php4/acinclude.m4:1.140 Tue Aug 21 07:03:45 2001 +++ php4/acinclude.m4 Wed Sep 5 09:18:03 2001 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.140 2001/08/21 11:03:45 sas Exp $ +dnl $Id: acinclude.m4,v 1.141 2001/09/05 13:18:03 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -1122,3 +1122,22 @@ fi ]) + + +dnl +dnl PHP_CHECK_LIBRARY(library, function [, action-found [, action-not-found [, extra-libs]]]) +dnl +dnl Wrapper for AC_CHECK_LIB +dnl +AC_DEFUN(PHP_CHECK_LIBRARY, [ + save_old_LDFLAGS=$LDFLAGS + LDFLAGS="$5 $LDFLAGS" + AC_CHECK_LIB([$1],[$2],[ + LDFLAGS=$save_old_LDFLAGS + $3 + ],[ + LDFLAGS=$save_old_LDFLAGS + $4 + ])dnl +]) + Index: php4/ext/curl/config.m4 diff -u php4/ext/curl/config.m4:1.8 php4/ext/curl/config.m4:1.9 --- php4/ext/curl/config.m4:1.8 Mon Aug 6 11:40:47 2001 +++ php4/ext/curl/config.m4 Wed Sep 5 09:18:05 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.8 2001/08/06 15:40:47 sniper Exp $ +dnl $Id: config.m4,v 1.9 2001/09/05 13:18:05 sniper Exp $ dnl config.m4 for extension CURL PHP_ARG_WITH(curl, for CURL support, @@ -43,7 +43,7 @@ PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/lib, CURL_SHARED_LIBADD) - AC_CHECK_LIB(curl,curl_easy_perform, + PHP_CHECK_LIBRARY(curl,curl_easy_perform, [ AC_DEFINE(HAVE_CURL,1,[ ]) ],[ Index: php4/ext/fdf/config.m4 diff -u php4/ext/fdf/config.m4:1.14 php4/ext/fdf/config.m4:1.15 --- php4/ext/fdf/config.m4:1.14 Thu Aug 30 12:29:36 2001 +++ php4/ext/fdf/config.m4 Wed Sep 5 09:18:05 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.14 2001/08/30 16:29:36 sniper Exp $ +dnl $Id: config.m4,v 1.15 2001/09/05 13:18:05 sniper Exp $ PHP_ARG_WITH(fdftk, for fdftk support, [ --with-fdftk[=DIR] Include fdftk support]) @@ -19,7 +19,7 @@ FDFLIBRARY="" for i in fdftk FdfTk; do - AC_CHECK_LIB($i, FDFOpen, [FDFLIBRARY=$i], [], [-L$FDFTK_DIR/lib -lm]) + PHP_CHECK_LIBRARY($i, FDFOpen, [FDFLIBRARY=$i], [], [-L$FDFTK_DIR/lib -lm]) done if test -z "$FDFLIBRARY"; then Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.72 php4/ext/gd/config.m4:1.73 --- php4/ext/gd/config.m4:1.72 Fri Aug 24 16:05:58 2001 +++ php4/ext/gd/config.m4 Wed Sep 5 09:18:05 2001 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.72 2001/08/24 20:05:58 sniper Exp $ +dnl $Id: config.m4,v 1.73 2001/09/05 13:18:05 sniper Exp $ dnl AC_DEFUN(PHP_GD_JPEG,[ @@ -12,7 +12,7 @@ test -f "$i/lib/libjpeg.s?" -o -f "$i/lib/libjpeg.a" && GD_JPEG_DIR=$i done - AC_CHECK_LIB(jpeg,jpeg_read_header, + PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, [ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib, GD_SHARED_LIBADD) ],[ @@ -39,7 +39,7 @@ AC_MSG_ERROR(PNG support requires ZLIB. Use --with-zlib-dir=<DIR>) fi - AC_CHECK_LIB(png,png_info_init, + PHP_CHECK_LIBRARY(png,png_info_init, [ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD) @@ -48,6 +48,7 @@ ],[ -L$PHP_ZLIB_DIR/lib -lz -L$GD_PNG_DIR/lib ]) + else AC_MSG_RESULT(If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>) fi @@ -62,7 +63,7 @@ test -f "$i/lib/libXpm.s?" -o -f "$i/lib/libXpm.a" && GD_XPM_DIR=$i done - AC_CHECK_LIB(Xpm,XpmFreeXpmImage, + PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage, [ PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) @@ -143,7 +144,7 @@ done if test -n "$T1_DIR"; then - AC_CHECK_LIB(t1, T1_LoadFont, + PHP_CHECK_LIBRARY(t1, T1_LoadFont, [ AC_DEFINE(HAVE_LIBT1,1,[ ]) PHP_ADD_INCLUDE("$T1_DIR/include") Index: php4/ext/mcrypt/config.m4 diff -u php4/ext/mcrypt/config.m4:1.18 php4/ext/mcrypt/config.m4:1.19 --- php4/ext/mcrypt/config.m4:1.18 Sat May 12 05:13:39 2001 +++ php4/ext/mcrypt/config.m4 Wed Sep 5 09:18:06 2001 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.18 2001/05/12 09:13:39 sas Exp $ +dnl $Id: config.m4,v 1.19 2001/09/05 13:18:06 sniper Exp $ dnl PHP_ARG_WITH(mcrypt, for mcrypt support, @@ -17,12 +17,12 @@ AC_MSG_ERROR(mcrypt.h not found. Please reinstall libmcrypt.) fi - AC_CHECK_LIB(mcrypt, mcrypt_module_open, + PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open, [ PHP_ADD_LIBRARY(ltdl,, MCRYPT_SHARED_LIBADD) AC_DEFINE(HAVE_LIBMCRYPT24,1,[ ]) ],[ - AC_CHECK_LIB(mcrypt, init_mcrypt, + PHP_CHECK_LIBRARY(mcrypt, init_mcrypt, [ AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ]) ],[ Index: php4/ext/pdf/config.m4 diff -u php4/ext/pdf/config.m4:1.22 php4/ext/pdf/config.m4:1.23 --- php4/ext/pdf/config.m4:1.22 Tue Aug 21 07:45:33 2001 +++ php4/ext/pdf/config.m4 Wed Sep 5 09:18:06 2001 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.22 2001/08/21 11:45:33 sas Exp $ +dnl $Id: config.m4,v 1.23 2001/09/05 13:18:06 sniper Exp $ dnl PHP_ARG_WITH(pdflib,whether to include PDFlib support, @@ -43,7 +43,7 @@ [ --with-jpeg-dir[=DIR] PDFLIB: define libjpeg install directory]) if test "$PHP_JPEG_DIR" != "no"; then - AC_CHECK_LIB(jpeg,jpeg_read_header, + PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, [ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDFLIB_SHARED_LIBADD) ],[ @@ -65,7 +65,7 @@ [ --with-png-dir[=DIR] PDFLIB: define libpng install directory]) if test "$PHP_PNG_DIR" != "no"; then - AC_CHECK_LIB(png,png_create_info_struct, + PHP_CHECK_LIBRARY(png,png_create_info_struct, [ PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, PDFLIB_SHARED_LIBADD) ],[ @@ -87,7 +87,7 @@ [ --with-tiff-dir[=DIR] PDFLIB: define libtiff install directory]) if test "$PHP_TIFF_DIR" != "no"; then - AC_CHECK_LIB(tiff,TIFFOpen, + PHP_CHECK_LIBRARY(tiff,TIFFOpen, [ PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDFLIB_SHARED_LIBADD) ],[ @@ -105,7 +105,7 @@ fi - AC_CHECK_LIB(pdf, PDF_show_boxed, + PHP_CHECK_LIBRARY(pdf, PDF_show_boxed, [ AC_DEFINE(HAVE_PDFLIB,1,[ ]) PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib, PDFLIB_SHARED_LIBADD) Index: php4/ext/satellite/config.m4 diff -u php4/ext/satellite/config.m4:1.4 php4/ext/satellite/config.m4:1.5 --- php4/ext/satellite/config.m4:1.4 Thu Aug 9 17:53:49 2001 +++ php4/ext/satellite/config.m4 Wed Sep 5 09:18:06 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 2001/08/09 21:53:49 eriksson Exp $ +dnl $Id: config.m4,v 1.5 2001/09/05 13:18:06 sniper Exp $ dnl vim: syntax=config dnl My first config.m4 - now much improved... :-) @@ -68,9 +68,9 @@ SATELLITE_CONFIG(libIDL, $ORBIT_PATH/bin, , [Please (re)install libIDL]) dnl check for symbol giop_skip_atexit in libIIOP - AC_CHECK_LIB(IIOP, giop_skip_atexit, [true], [ + PHP_CHECK_LIBRARY(IIOP, giop_skip_atexit, [], [ AC_MSG_ERROR([You need a CVS version of ORBit, please read ext/satellite/README]) - ], "$ORBIT_LIBS" ) + ], "$ORBIT_LIBS" ) AC_DEFINE(HAVE_SATELLITE,1,[ ]) fi Index: php4/ext/sybase_ct/config.m4 diff -u php4/ext/sybase_ct/config.m4:1.6 php4/ext/sybase_ct/config.m4:1.7 --- php4/ext/sybase_ct/config.m4:1.6 Fri Jun 22 11:52:25 2001 +++ php4/ext/sybase_ct/config.m4 Wed Sep 5 09:18:07 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.6 2001/06/22 15:52:25 sniper Exp $ +dnl $Id: config.m4,v 1.7 2001/09/05 13:18:07 sniper Exp $ PHP_ARG_WITH(sybase-ct, for Sybase-CT support, [ --with-sybase-ct[=DIR] Include Sybase-CT support. DIR is the Sybase home @@ -34,6 +34,6 @@ $SYBASE_CT_LIBS ]) - AC_CHECK_LIB(insck, insck__getVdate, [PHP_ADD_LIBRARY(insck,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR]) - AC_CHECK_LIB(insck, bsd_tcp, [PHP_ADD_LIBRARY(insck,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR]) + PHP_CHECK_LIBRARY(insck, insck__getVdate, [PHP_ADD_LIBRARY(insck,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR]) + PHP_CHECK_LIBRARY(insck, bsd_tcp, [PHP_ADD_LIBRARY(insck,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR]) fi Index: php4/ext/vpopmail/config.m4 diff -u php4/ext/vpopmail/config.m4:1.7 php4/ext/vpopmail/config.m4:1.8 --- php4/ext/vpopmail/config.m4:1.7 Mon May 28 15:58:35 2001 +++ php4/ext/vpopmail/config.m4 Wed Sep 5 09:18:08 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.7 2001/05/28 19:58:35 bbonev Exp $ +dnl $Id: config.m4,v 1.8 2001/09/05 13:18:08 sniper Exp $ dnl config.m4 for extension vpopmail PHP_ARG_WITH(vpopmail, for vpopmail support, @@ -43,8 +43,11 @@ AC_DEFINE(HAVE_VPOPMAIL_VAUTH,1,[Whether vpopmail has vauth.h]) fi dnl check for valias functions in the -lvpopmail - AC_CHECK_LIB(vpopmail, valias_select, - [ AC_DEFINE(HAVE_VPOPMAIL_VALIAS,1,[Whether vpopmail has valias support]) ],[],[ -L$VPOPMAIL_LIB_DIR ]) + PHP_CHECK_LIBRARY(vpopmail, valias_select, [ + AC_DEFINE(HAVE_VPOPMAIL_VALIAS,1,[Whether vpopmail has valias support]) + ],[], + -L$VPOPMAIL_LIB_DIR + ]) PHP_ADD_INCLUDE($VPOPMAIL_INC_DIR)
Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.140 php4/acinclude.m4:1.141 --- php4/acinclude.m4:1.140 Tue Aug 21 07:03:45 2001 +++ php4/acinclude.m4 Wed Sep 5 09:18:03 2001 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.140 2001/08/21 11:03:45 sas Exp $ +dnl $Id: acinclude.m4,v 1.141 2001/09/05 13:18:03 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -1122,3 +1122,22 @@ fi ]) + + +dnl +dnl PHP_CHECK_LIBRARY(library, function [, action-found [, action-not-found [, extra-libs]]]) +dnl +dnl Wrapper for AC_CHECK_LIB +dnl +AC_DEFUN(PHP_CHECK_LIBRARY, [ + save_old_LDFLAGS=$LDFLAGS + LDFLAGS="$5 $LDFLAGS" + AC_CHECK_LIB([$1],[$2],[ + LDFLAGS=$save_old_LDFLAGS + $3 + ],[ + LDFLAGS=$save_old_LDFLAGS + $4 + ])dnl +]) + Index: php4/ext/curl/config.m4 diff -u php4/ext/curl/config.m4:1.8 php4/ext/curl/config.m4:1.9 --- php4/ext/curl/config.m4:1.8 Mon Aug 6 11:40:47 2001 +++ php4/ext/curl/config.m4 Wed Sep 5 09:18:05 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.8 2001/08/06 15:40:47 sniper Exp $ +dnl $Id: config.m4,v 1.9 2001/09/05 13:18:05 sniper Exp $ dnl config.m4 for extension CURL PHP_ARG_WITH(curl, for CURL support, @@ -43,7 +43,7 @@ PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/lib, CURL_SHARED_LIBADD) - AC_CHECK_LIB(curl,curl_easy_perform, + PHP_CHECK_LIBRARY(curl,curl_easy_perform, [ AC_DEFINE(HAVE_CURL,1,[ ]) ],[ Index: php4/ext/fdf/config.m4 diff -u php4/ext/fdf/config.m4:1.14 php4/ext/fdf/config.m4:1.15 --- php4/ext/fdf/config.m4:1.14 Thu Aug 30 12:29:36 2001 +++ php4/ext/fdf/config.m4 Wed Sep 5 09:18:05 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.14 2001/08/30 16:29:36 sniper Exp $ +dnl $Id: config.m4,v 1.15 2001/09/05 13:18:05 sniper Exp $ PHP_ARG_WITH(fdftk, for fdftk support, [ --with-fdftk[=DIR] Include fdftk support]) @@ -19,7 +19,7 @@ FDFLIBRARY="" for i in fdftk FdfTk; do - AC_CHECK_LIB($i, FDFOpen, [FDFLIBRARY=$i], [], [-L$FDFTK_DIR/lib -lm]) + PHP_CHECK_LIBRARY($i, FDFOpen, [FDFLIBRARY=$i], [], [-L$FDFTK_DIR/lib -lm]) done if test -z "$FDFLIBRARY"; then Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.72 php4/ext/gd/config.m4:1.73 --- php4/ext/gd/config.m4:1.72 Fri Aug 24 16:05:58 2001 +++ php4/ext/gd/config.m4 Wed Sep 5 09:18:05 2001 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.72 2001/08/24 20:05:58 sniper Exp $ +dnl $Id: config.m4,v 1.73 2001/09/05 13:18:05 sniper Exp $ dnl AC_DEFUN(PHP_GD_JPEG,[ @@ -12,7 +12,7 @@ test -f "$i/lib/libjpeg.s?" -o -f "$i/lib/libjpeg.a" && GD_JPEG_DIR=$i done - AC_CHECK_LIB(jpeg,jpeg_read_header, + PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, [ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib, GD_SHARED_LIBADD) ],[ @@ -39,7 +39,7 @@ AC_MSG_ERROR(PNG support requires ZLIB. Use --with-zlib-dir=<DIR>) fi - AC_CHECK_LIB(png,png_info_init, + PHP_CHECK_LIBRARY(png,png_info_init, [ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD) @@ -48,6 +48,7 @@ ],[ -L$PHP_ZLIB_DIR/lib -lz -L$GD_PNG_DIR/lib ]) + else AC_MSG_RESULT(If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>) fi @@ -62,7 +63,7 @@ test -f "$i/lib/libXpm.s?" -o -f "$i/lib/libXpm.a" && GD_XPM_DIR=$i done - AC_CHECK_LIB(Xpm,XpmFreeXpmImage, + PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage, [ PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) @@ -143,7 +144,7 @@ done if test -n "$T1_DIR"; then - AC_CHECK_LIB(t1, T1_LoadFont, + PHP_CHECK_LIBRARY(t1, T1_LoadFont, [ AC_DEFINE(HAVE_LIBT1,1,[ ]) PHP_ADD_INCLUDE("$T1_DIR/include") Index: php4/ext/mcrypt/config.m4 diff -u php4/ext/mcrypt/config.m4:1.18 php4/ext/mcrypt/config.m4:1.19 --- php4/ext/mcrypt/config.m4:1.18 Sat May 12 05:13:39 2001 +++ php4/ext/mcrypt/config.m4 Wed Sep 5 09:18:06 2001 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.18 2001/05/12 09:13:39 sas Exp $ +dnl $Id: config.m4,v 1.19 2001/09/05 13:18:06 sniper Exp $ dnl PHP_ARG_WITH(mcrypt, for mcrypt support, @@ -17,12 +17,12 @@ AC_MSG_ERROR(mcrypt.h not found. Please reinstall libmcrypt.) fi - AC_CHECK_LIB(mcrypt, mcrypt_module_open, + PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open, [ PHP_ADD_LIBRARY(ltdl,, MCRYPT_SHARED_LIBADD) AC_DEFINE(HAVE_LIBMCRYPT24,1,[ ]) ],[ - AC_CHECK_LIB(mcrypt, init_mcrypt, + PHP_CHECK_LIBRARY(mcrypt, init_mcrypt, [ AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ]) ],[ Index: php4/ext/pdf/config.m4 diff -u php4/ext/pdf/config.m4:1.22 php4/ext/pdf/config.m4:1.23 --- php4/ext/pdf/config.m4:1.22 Tue Aug 21 07:45:33 2001 +++ php4/ext/pdf/config.m4 Wed Sep 5 09:18:06 2001 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.22 2001/08/21 11:45:33 sas Exp $ +dnl $Id: config.m4,v 1.23 2001/09/05 13:18:06 sniper Exp $ dnl PHP_ARG_WITH(pdflib,whether to include PDFlib support, @@ -43,7 +43,7 @@ [ --with-jpeg-dir[=DIR] PDFLIB: define libjpeg install directory]) if test "$PHP_JPEG_DIR" != "no"; then - AC_CHECK_LIB(jpeg,jpeg_read_header, + PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, [ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDFLIB_SHARED_LIBADD) ],[ @@ -65,7 +65,7 @@ [ --with-png-dir[=DIR] PDFLIB: define libpng install directory]) if test "$PHP_PNG_DIR" != "no"; then - AC_CHECK_LIB(png,png_create_info_struct, + PHP_CHECK_LIBRARY(png,png_create_info_struct, [ PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, PDFLIB_SHARED_LIBADD) ],[ @@ -87,7 +87,7 @@ [ --with-tiff-dir[=DIR] PDFLIB: define libtiff install directory]) if test "$PHP_TIFF_DIR" != "no"; then - AC_CHECK_LIB(tiff,TIFFOpen, + PHP_CHECK_LIBRARY(tiff,TIFFOpen, [ PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDFLIB_SHARED_LIBADD) ],[ @@ -105,7 +105,7 @@ fi - AC_CHECK_LIB(pdf, PDF_show_boxed, + PHP_CHECK_LIBRARY(pdf, PDF_show_boxed, [ AC_DEFINE(HAVE_PDFLIB,1,[ ]) PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib, PDFLIB_SHARED_LIBADD) Index: php4/ext/satellite/config.m4 diff -u php4/ext/satellite/config.m4:1.4 php4/ext/satellite/config.m4:1.5 --- php4/ext/satellite/config.m4:1.4 Thu Aug 9 17:53:49 2001 +++ php4/ext/satellite/config.m4 Wed Sep 5 09:18:06 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 2001/08/09 21:53:49 eriksson Exp $ +dnl $Id: config.m4,v 1.5 2001/09/05 13:18:06 sniper Exp $ dnl vim: syntax=config dnl My first config.m4 - now much improved... :-) @@ -68,9 +68,9 @@ SATELLITE_CONFIG(libIDL, $ORBIT_PATH/bin, , [Please (re)install libIDL]) dnl check for symbol giop_skip_atexit in libIIOP - AC_CHECK_LIB(IIOP, giop_skip_atexit, [true], [ + PHP_CHECK_LIBRARY(IIOP, giop_skip_atexit, [], [ AC_MSG_ERROR([You need a CVS version of ORBit, please read ext/satellite/README]) - ], "$ORBIT_LIBS" ) + ], "$ORBIT_LIBS" ) AC_DEFINE(HAVE_SATELLITE,1,[ ]) fi Index: php4/ext/sybase_ct/config.m4 diff -u php4/ext/sybase_ct/config.m4:1.6 php4/ext/sybase_ct/config.m4:1.7 --- php4/ext/sybase_ct/config.m4:1.6 Fri Jun 22 11:52:25 2001 +++ php4/ext/sybase_ct/config.m4 Wed Sep 5 09:18:07 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.6 2001/06/22 15:52:25 sniper Exp $ +dnl $Id: config.m4,v 1.7 2001/09/05 13:18:07 sniper Exp $ PHP_ARG_WITH(sybase-ct, for Sybase-CT support, [ --with-sybase-ct[=DIR] Include Sybase-CT support. DIR is the Sybase home @@ -34,6 +34,6 @@ $SYBASE_CT_LIBS ]) - AC_CHECK_LIB(insck, insck__getVdate, [PHP_ADD_LIBRARY(insck,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR]) - AC_CHECK_LIB(insck, bsd_tcp, [PHP_ADD_LIBRARY(insck,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR]) + PHP_CHECK_LIBRARY(insck, insck__getVdate, [PHP_ADD_LIBRARY(insck,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR]) + PHP_CHECK_LIBRARY(insck, bsd_tcp, [PHP_ADD_LIBRARY(insck,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR]) fi Index: php4/ext/vpopmail/config.m4 diff -u php4/ext/vpopmail/config.m4:1.7 php4/ext/vpopmail/config.m4:1.8 --- php4/ext/vpopmail/config.m4:1.7 Mon May 28 15:58:35 2001 +++ php4/ext/vpopmail/config.m4 Wed Sep 5 09:18:08 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.7 2001/05/28 19:58:35 bbonev Exp $ +dnl $Id: config.m4,v 1.8 2001/09/05 13:18:08 sniper Exp $ dnl config.m4 for extension vpopmail PHP_ARG_WITH(vpopmail, for vpopmail support, @@ -43,8 +43,11 @@ AC_DEFINE(HAVE_VPOPMAIL_VAUTH,1,[Whether vpopmail has vauth.h]) fi dnl check for valias functions in the -lvpopmail - AC_CHECK_LIB(vpopmail, valias_select, - [ AC_DEFINE(HAVE_VPOPMAIL_VALIAS,1,[Whether vpopmail has valias support]) ],[],[ -L$VPOPMAIL_LIB_DIR ]) + PHP_CHECK_LIBRARY(vpopmail, valias_select, [ + AC_DEFINE(HAVE_VPOPMAIL_VALIAS,1,[Whether vpopmail has valias support]) + ],[], + -L$VPOPMAIL_LIB_DIR + ]) PHP_ADD_INCLUDE($VPOPMAIL_INC_DIR)