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.

diff --git a/acinclude.m4 b/acinclude.m4
index fc6f41e82f94e5c70a207980bdb42da97eedc257..771f48e55fcda6eb14c103c61b9dfcc4baa929aa 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1122,3 +1122,22 @@ AC_DEFUN(PHP_FOPENCOOKIE,[
 
        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
+])
+

diff --git a/ext/curl/config.m4 b/ext/curl/config.m4
index 729e45e04c4b5b40857f8a80d8b16f6eae985528..46a906685323fc1de538933bb1f1e4e75ae721a3 100644 (file)
--- a/ext/curl/config.m4
+++ b/ext/curl/config.m4
@@ -43,7 +43,7 @@ if test "$PHP_CURL" != "no"; then
   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,[ ])
   ],[

diff --git a/ext/fdf/config.m4 b/ext/fdf/config.m4
index 139458c8c54e803393537c1c74021c360cd18059..b6569b6697ea13b3d89526b1090cbbd8db8304ff 100644 (file)
--- a/ext/fdf/config.m4
+++ b/ext/fdf/config.m4
@@ -19,7 +19,7 @@ if test "$PHP_FDFTK" != "no"; then
   
   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

diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index e551f6781a7daff420ca2596a64a16c034b3c321..50c7bd801605761c42e004c7484eb1843bf45b1d 100644 (file)
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -12,7 +12,7 @@ AC_DEFUN(PHP_GD_JPEG,[
       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_DEFUN(PHP_GD_PNG,[
       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 @@ AC_DEFUN(PHP_GD_PNG,[
     ],[
       -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 @@ AC_DEFUN(PHP_GD_XPM,[
       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 @@ AC_DEFUN(PHP_GD_T1LIB,[
     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")

diff --git a/ext/mcrypt/config.m4 b/ext/mcrypt/config.m4
index 8b26ee67da5a6ce07ca6c76e6ac39deb1813cf61..e98b77ebf83274445fd8bb4ed9bec859e90c13a6 100644 (file)
--- a/ext/mcrypt/config.m4
+++ b/ext/mcrypt/config.m4
@@ -17,12 +17,12 @@ if test "$PHP_MCRYPT" != "no"; then
     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,[ ])
     ],[

diff --git a/ext/pdf/config.m4 b/ext/pdf/config.m4
index 834236be48cf355652efa19ec8196bc4d357d448..1cb4efc40aa120c759f59881ab55c89448fdd93b 100644 (file)
--- a/ext/pdf/config.m4
+++ b/ext/pdf/config.m4
@@ -43,7 +43,7 @@ if test "$PHP_PDFLIB" != "no"; then
         [  --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 @@ if test "$PHP_PDFLIB" != "no"; then
         [  --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 @@ if test "$PHP_PDFLIB" != "no"; then
         [  --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 @@ if test "$PHP_PDFLIB" != "no"; then
         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)

diff --git a/ext/satellite/config.m4 b/ext/satellite/config.m4
index ca3fecae0ff30f1b8173d13cdb4f6294f43524eb..d3830e6686cb7c3b2093fc0a25979dc161b52cad 100644 (file)
--- a/ext/satellite/config.m4
+++ b/ext/satellite/config.m4
@@ -68,9 +68,9 @@ if test "$PHP_SATELLITE" != "no"; then
        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

diff --git a/ext/sybase_ct/config.m4 b/ext/sybase_ct/config.m4
index d2ba808fe7e81f12dc50ce8f625d838ed6e5c7ba..c924d0eaa3758b3a90708c7b8e5d15d52efad63a 100644 (file)
--- a/ext/sybase_ct/config.m4
+++ b/ext/sybase_ct/config.m4
@@ -34,6 +34,6 @@ if test "$PHP_SYBASE_CT" != "no"; then
     $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

diff --git a/ext/vpopmail/config.m4 b/ext/vpopmail/config.m4
index 7e123b7e1d5dfb1069951fd4f09ba678756f459f..8580924bf6dbee0cf15abda4c4030ca253ca41c6 100644 (file)
--- a/ext/vpopmail/config.m4
+++ b/ext/vpopmail/config.m4
@@ -43,8 +43,11 @@ if test "$PHP_VPOPMAIL" != "no"; then
                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)