Autotools: Quote PHP_CHECK_LIBRARY arguments (#15136)

This syncs the quotes across the PHP_CHECK_LIBRARY macro arguments.
2024-09-21 09:57:23 +00:00 · 2024-07-28 18:39:14 +02:00 · 2024-07-28 18:39:14 +02:00 · 2b97c84d4c
commit 2b97c84d4c
parent a7d856d9bf
16 changed files with 224 additions and 288 deletions
--- a/build/php.m4
+++ b/build/php.m4
@ -1868,19 +1868,17 @@ AC_DEFUN([PHP_SETUP_ICONV], [
       test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME ||
       test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.tbd
    then
-      PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [
+      PHP_CHECK_LIBRARY([$iconv_lib_name], [libiconv], [
        found_iconv=yes
-        AC_DEFINE(HAVE_LIBICONV,1,[ ])
-        AC_DEFINE([ICONV_ALIASED_LIBICONV],1,[iconv() is aliased to libiconv() in -liconv])
-      ], [
-        PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [
-          found_iconv=yes
-        ], [], [
-          -L$ICONV_DIR/$PHP_LIBDIR
-        ])
-      ], [
-        -L$ICONV_DIR/$PHP_LIBDIR
-      ])
+        AC_DEFINE([HAVE_LIBICONV], [1], [ ])
+        AC_DEFINE([ICONV_ALIASED_LIBICONV], [1],
+          [iconv() is aliased to libiconv() in -liconv])
+        ],
+        [PHP_CHECK_LIBRARY([$iconv_lib_name], [iconv],
+          [found_iconv=yes],
+          [],
+          [-L$ICONV_DIR/$PHP_LIBDIR])],
+        [-L$ICONV_DIR/$PHP_LIBDIR])
    fi
  fi

--- a/ext/bz2/config.m4
+++ b/ext/bz2/config.m4
@ -22,18 +22,15 @@ if test "$PHP_BZ2" != "no"; then
    AC_MSG_ERROR([Please reinstall the BZip2 distribution])
  fi

-  PHP_CHECK_LIBRARY(bz2, BZ2_bzerror,
-  [
+  PHP_CHECK_LIBRARY([bz2], [BZ2_bzerror], [
    PHP_ADD_INCLUDE([$BZIP_DIR/include])
    PHP_ADD_LIBRARY_WITH_PATH([bz2],
      [$BZIP_DIR/$PHP_LIBDIR],
      [BZ2_SHARED_LIBADD])
-    AC_DEFINE(HAVE_BZ2,1,[ ])
-  ], [
-    AC_MSG_ERROR([bz2 module requires libbz2 >= 1.0.0])
-  ], [
-    -L$BZIP_DIR/$PHP_LIBDIR
-  ])
+    AC_DEFINE([HAVE_BZ2], [1], [ ])
+    ],
+    [AC_MSG_ERROR([bz2 module requires libbz2 >= 1.0.0])],
+    [-L$BZIP_DIR/$PHP_LIBDIR])

  PHP_NEW_EXTENSION(bz2, bz2.c bz2_filter.c, $ext_shared)
  PHP_SUBST([BZ2_SHARED_LIBADD])
--- a/ext/dba/config.m4
+++ b/ext/dba/config.m4
@ -150,9 +150,9 @@ if test "$PHP_QDBM" != "no"; then

  if test -n "$THIS_INCLUDE"; then
    for LIB in qdbm; do
-      PHP_CHECK_LIBRARY($LIB, dpopen, [
-        AC_DEFINE_UNQUOTED(QDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
-        AC_DEFINE(DBA_QDBM, 1, [ ])
+      PHP_CHECK_LIBRARY([$LIB], [dpopen], [
+        AC_DEFINE_UNQUOTED([QDBM_INCLUDE_FILE], ["$THIS_INCLUDE"], [ ])
+        AC_DEFINE([DBA_QDBM], [1], [ ])
        THIS_LIBS=$LIB
      ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
      if test -n "$THIS_LIBS"; then
@ -182,9 +182,9 @@ if test "$PHP_GDBM" != "no"; then
  done

  if test -n "$THIS_INCLUDE"; then
-    PHP_CHECK_LIBRARY(gdbm, gdbm_open, [
-      AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
-      AC_DEFINE(DBA_GDBM, 1, [ ])
+    PHP_CHECK_LIBRARY([gdbm], [gdbm_open], [
+      AC_DEFINE_UNQUOTED([GDBM_INCLUDE_FILE], ["$THIS_INCLUDE"], [ ])
+      AC_DEFINE([DBA_GDBM], [1], [ ])
      THIS_LIBS=gdbm
    ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
  fi
@ -212,9 +212,9 @@ if test "$PHP_NDBM" != "no"; then

  if test -n "$THIS_INCLUDE"; then
    for LIB in ndbm db1 c; do
-      PHP_CHECK_LIBRARY($LIB, dbm_open, [
-        AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
-        AC_DEFINE(DBA_NDBM, 1, [ ])
+      PHP_CHECK_LIBRARY([$LIB], [dbm_open], [
+        AC_DEFINE_UNQUOTED([NDBM_INCLUDE_FILE], ["$THIS_INCLUDE"], [ ])
+        AC_DEFINE([DBA_NDBM], [1], [ ])
        THIS_LIBS=$LIB
      ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
      if test -n "$THIS_LIBS"; then
@ -243,9 +243,9 @@ if test "$PHP_TCADB" != "no"; then

  if test -n "$THIS_INCLUDE"; then
    for LIB in tokyocabinet; do
-      PHP_CHECK_LIBRARY($LIB, tcadbopen, [
-        AC_DEFINE_UNQUOTED(TCADB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
-        AC_DEFINE(DBA_TCADB, 1, [ ])
+      PHP_CHECK_LIBRARY([$LIB], [tcadbopen], [
+        AC_DEFINE_UNQUOTED([TCADB_INCLUDE_FILE], ["$THIS_INCLUDE"], [ ])
+        AC_DEFINE([DBA_TCADB], [1], [ ])
        THIS_LIBS=$LIB
      ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
      if test -n "$THIS_LIBS"; then
@ -274,9 +274,9 @@ if test "$PHP_LMDB" != "no"; then

  if test -n "$THIS_INCLUDE"; then
    for LIB in lmdb; do
-      PHP_CHECK_LIBRARY($LIB, mdb_env_open, [
-        AC_DEFINE_UNQUOTED(LMDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
-        AC_DEFINE(DBA_LMDB, 1, [ ])
+      PHP_CHECK_LIBRARY([$LIB], [mdb_env_open], [
+        AC_DEFINE_UNQUOTED([LMDB_INCLUDE_FILE], ["$THIS_INCLUDE"], [ ])
+        AC_DEFINE([DBA_LMDB], [1], [ ])
        THIS_LIBS=$LIB
      ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
      if test -n "$THIS_LIBS"; then
@ -588,17 +588,17 @@ if test "$PHP_DBM" != "no"; then

  if test -n "$THIS_INCLUDE"; then
    for LIB in dbm c gdbm; do
-      PHP_CHECK_LIBRARY($LIB, dbminit, [
+      PHP_CHECK_LIBRARY([$LIB], [dbminit], [
        AC_MSG_CHECKING([for DBM using GDBM])
-        AC_DEFINE_UNQUOTED(DBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
+        AC_DEFINE_UNQUOTED([DBM_INCLUDE_FILE], ["$THIS_INCLUDE"], [ ])
        if test "$LIB" = "gdbm"; then
-          AC_DEFINE_UNQUOTED(DBM_VERSION, "GDBM", [ ])
+          AC_DEFINE_UNQUOTED([DBM_VERSION], ["GDBM"], [ ])
          AC_MSG_RESULT([yes])
        else
-          AC_DEFINE_UNQUOTED(DBM_VERSION, "DBM", [ ])
+          AC_DEFINE_UNQUOTED([DBM_VERSION], ["DBM"], [ ])
          AC_MSG_RESULT([no])
        fi
-        AC_DEFINE(DBA_DBM, 1, [ ])
+        AC_DEFINE([DBA_DBM], [1], [ ])
        THIS_LIBS=$LIB
      ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
      if test -n "$THIS_LIBS"; then
@ -657,9 +657,9 @@ elif test "$PHP_CDB" != "no"; then

  if test -n "$THIS_INCLUDE"; then
    for LIB in cdb c; do
-      PHP_CHECK_LIBRARY($LIB, cdb_read, [
-        AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
-        AC_DEFINE(DBA_CDB, 1, [ ])
+      PHP_CHECK_LIBRARY([$LIB], [cdb_read], [
+        AC_DEFINE_UNQUOTED([CDB_INCLUDE_FILE], ["$THIS_INCLUDE"], [ ])
+        AC_DEFINE([DBA_CDB], [1], [ ])
        THIS_LIBS=$LIB
      ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
      if test -n "$THIS_LIBS"; then
--- a/ext/enchant/config.m4
+++ b/ext/enchant/config.m4
@ -20,19 +20,17 @@ if test "$PHP_ENCHANT" != "no"; then
    PHP_EVAL_INCLINE([$ENCHANT_CFLAGS])
    PHP_EVAL_LIBLINE([$ENCHANT_LIBS], [ENCHANT_SHARED_LIBADD])

-    PHP_CHECK_LIBRARY(enchant, enchant_get_version,
-    [
-      AC_DEFINE(HAVE_ENCHANT_GET_VERSION, 1, [ enchant_get_version since 1.6.0 ])
-    ], [ ], [
-      $ENCHANT_LIBS
-    ])
+    PHP_CHECK_LIBRARY([enchant], [enchant_get_version],
+      [AC_DEFINE([HAVE_ENCHANT_GET_VERSION], [1],
+        [enchant_get_version since 1.6.0 ])],
+      [],
+      [$ENCHANT_LIBS])

-    PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param,
-    [
-      AC_DEFINE(HAVE_ENCHANT_BROKER_SET_PARAM, 1, [ enchant_broker_set_param since 1.5.0 and removed in 2.x ])
-    ], [ ], [
-      $ENCHANT_LIBS
-    ])
+    PHP_CHECK_LIBRARY([enchant], [enchant_broker_set_param],
+      [AC_DEFINE([HAVE_ENCHANT_BROKER_SET_PARAM], [1],
+        [enchant_broker_set_param since 1.5.0 and removed in 2.x])],
+      [],
+      [$ENCHANT_LIBS])
  fi

  AC_DEFINE(HAVE_ENCHANT, 1, [ ])
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@ -188,9 +188,18 @@ AC_DEFUN([PHP_GD_CHECK_VERSION],[
  PHP_GD_CHECK_FORMAT([Xpm],  [HAVE_GD_XPM])
  PHP_GD_CHECK_FORMAT([Bmp],  [HAVE_GD_BMP])
  PHP_GD_CHECK_FORMAT([Tga],  [HAVE_GD_TGA])
-  PHP_CHECK_LIBRARY(gd, gdFontCacheShutdown,           [AC_DEFINE(HAVE_GD_FREETYPE,          1, [ ])], [], [ $GD_SHARED_LIBADD ])
-  PHP_CHECK_LIBRARY(gd, gdVersionString,               [AC_DEFINE(HAVE_GD_LIBVERSION,        1, [ ])], [], [ $GD_SHARED_LIBADD ])
-  PHP_CHECK_LIBRARY(gd, gdImageGetInterpolationMethod, [AC_DEFINE(HAVE_GD_GET_INTERPOLATION, 1, [ ])], [], [ $GD_SHARED_LIBADD ])
+  PHP_CHECK_LIBRARY([gd], [gdFontCacheShutdown],
+    [AC_DEFINE([HAVE_GD_FREETYPE], [1], [ ])],
+    [],
+    [$GD_SHARED_LIBADD])
+  PHP_CHECK_LIBRARY([gd], [gdVersionString],
+    [AC_DEFINE([HAVE_GD_LIBVERSION], [1], [ ])],
+    [],
+    [$GD_SHARED_LIBADD])
+  PHP_CHECK_LIBRARY([gd], [gdImageGetInterpolationMethod],
+    [AC_DEFINE([HAVE_GD_GET_INTERPOLATION], [1], [ ])],
+    [],
+    [$GD_SHARED_LIBADD])
 ])

 dnl
@ -279,9 +288,10 @@ dnl Various checks for GD features

    PHP_NEW_EXTENSION([gd], [gd.c $extra_sources], [$ext_shared])
    PHP_INSTALL_HEADERS([ext/gd], [php_gd.h])
-    PHP_CHECK_LIBRARY(gd, gdImageCreate, [], [
-      AC_MSG_ERROR([GD build test failed. Please check the config.log for details.])
-    ], [ $GD_SHARED_LIBADD ])
+    PHP_CHECK_LIBRARY([gd], [gdImageCreate],
+      [],
+      [AC_MSG_ERROR([GD build test failed. Please check the config.log for details.])],
+      [$GD_SHARED_LIBADD])
  fi

  PHP_SUBST([GD_SHARED_LIBADD])
--- a/ext/gmp/config.m4
+++ b/ext/gmp/config.m4
@ -5,10 +5,9 @@ PHP_ARG_WITH([gmp],

 if test "$PHP_GMP" != "no"; then
  if test "$PHP_GMP" = "yes"; then
-    PHP_CHECK_LIBRARY(gmp, __gmpz_rootrem,
-    [],[
-      AC_MSG_ERROR([GNU MP Library version 4.2 or greater required.])
-    ])
+    PHP_CHECK_LIBRARY([gmp], [__gmpz_rootrem],
+      [],
+      [AC_MSG_ERROR([GNU MP Library version 4.2 or greater required.])])

    PHP_ADD_LIBRARY([gmp],, [GMP_SHARED_LIBADD])
  else
@ -16,12 +15,10 @@ if test "$PHP_GMP" != "no"; then
      AC_MSG_ERROR([Unable to locate gmp.h])
    fi

-    PHP_CHECK_LIBRARY(gmp, __gmpz_rootrem,
-    [],[
-      AC_MSG_ERROR([GNU MP Library version 4.2 or greater required.])
-    ],[
-      -L$PHP_GMP/$PHP_LIBDIR
-    ])
+    PHP_CHECK_LIBRARY([gmp], [__gmpz_rootrem],
+      [],
+      [AC_MSG_ERROR([GNU MP Library version 4.2 or greater required.])],
+      [-L$PHP_GMP/$PHP_LIBDIR])

    PHP_ADD_LIBRARY_WITH_PATH([gmp],
      [$PHP_GMP/$PHP_LIBDIR],
--- a/ext/pdo_dblib/config.m4
+++ b/ext/pdo_dblib/config.m4
@ -12,10 +12,9 @@ if test "$PHP_PDO_DBLIB" != "no"; then
  if test "$PHP_PDO_DBLIB" = "yes"; then
    dnl FreeTDS must be on the default system include/library path.
    dnl Only perform a sanity check that this is really the case.
-    PHP_CHECK_LIBRARY(sybdb, dbsqlexec,
-    [],[
-      AC_MSG_ERROR([Cannot find FreeTDS in known installation directories])
-    ])
+    PHP_CHECK_LIBRARY([sybdb], [dbsqlexec],
+      [],
+      [AC_MSG_ERROR([Cannot find FreeTDS in known installation directories])])
    PHP_ADD_LIBRARY([sybdb],, [PDO_DBLIB_SHARED_LIBADD])
  elif test "$PHP_PDO_DBLIB" != "no"; then

--- a/ext/pdo_firebird/config.m4
+++ b/ext/pdo_firebird/config.m4
@ -32,28 +32,16 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then
      FIREBIRD_LIBDIR_FLAG=-L$FIREBIRD_LIBDIR
    fi

-    PHP_CHECK_LIBRARY(fbclient, isc_detach_database,
-    [
-      FIREBIRD_LIBNAME=fbclient
-    ], [
-      PHP_CHECK_LIBRARY(gds, isc_detach_database,
-      [
-        FIREBIRD_LIBNAME=gds
-      ], [
-        PHP_CHECK_LIBRARY(ib_util, isc_detach_database,
-        [
-          FIREBIRD_LIBNAME=ib_util
-        ], [
-          AC_MSG_ERROR([libfbclient, libgds or libib_util not found! Check config.log for more information.])
-        ], [
-          $FIREBIRD_LIBDIR_FLAG
-        ])
-      ], [
-        $FIREBIRD_LIBDIR_FLAG
-      ])
-    ], [
-      $FIREBIRD_LIBDIR_FLAG
-    ])
+    PHP_CHECK_LIBRARY([fbclient], [isc_detach_database],
+      [FIREBIRD_LIBNAME=fbclient],
+      [PHP_CHECK_LIBRARY([gds], [isc_detach_database],
+        [FIREBIRD_LIBNAME=gds],
+        [PHP_CHECK_LIBRARY([ib_util], [isc_detach_database],
+          [FIREBIRD_LIBNAME=ib_util],
+          [AC_MSG_ERROR([libfbclient, libgds or libib_util not found! Check config.log for more information.])],
+          [$FIREBIRD_LIBDIR_FLAG])],
+        [$FIREBIRD_LIBDIR_FLAG])],
+      [$FIREBIRD_LIBDIR_FLAG])
    PHP_ADD_LIBRARY_WITH_PATH([$FIREBIRD_LIBNAME],
      [$FIREBIRD_LIBDIR],
      [PDO_FIREBIRD_SHARED_LIBADD])
--- a/ext/pdo_odbc/config.m4
+++ b/ext/pdo_odbc/config.m4
@ -94,22 +94,21 @@ if test "$PHP_PDO_ODBC" != "no"; then
    PDO_ODBC_CFLAGS="$pdo_odbc_def_cflags -I$PDO_ODBC_INCDIR"
    PDO_ODBC_LIBS="$pdo_odbc_def_ldflags -L$PDO_ODBC_LIBDIR -l$pdo_odbc_def_lib"

-    dnl Check first for an ODBC 1.0 function to assert that the libraries work
-    PHP_CHECK_LIBRARY($pdo_odbc_def_lib, SQLBindCol,
-    [
-      dnl And now check for an ODBC 3.0 function to assert that they're *good*
-      dnl libraries.
-      PHP_CHECK_LIBRARY($pdo_odbc_def_lib, SQLAllocHandle,
-      [], [
-        AC_MSG_ERROR([
+    dnl Check first for an ODBC 1.0 function to assert that the libraries work,
+    dnl and then check for an ODBC 3.0 function to assert that they are *good*
+    dnl libraries.
+    PHP_CHECK_LIBRARY([$pdo_odbc_def_lib], [SQLBindCol],
+      [PHP_CHECK_LIBRARY([$pdo_odbc_def_lib], [SQLAllocHandle],
+        [],
+        [AC_MSG_ERROR([
 Your ODBC library does not appear to be ODBC 3 compatible.
 You should consider using iODBC or unixODBC instead, and loading your
 libraries as a driver in that environment; it will emulate the
 functions required for PDO support.
-])], $PDO_ODBC_LIBS)
-    ],[
-      AC_MSG_ERROR([Your ODBC library does not exist or there was an error. Check config.log for more information])
-    ], $PDO_ODBC_LIBS)
+])],
+        [$PDO_ODBC_LIBS])],
+      [AC_MSG_ERROR([Your ODBC library does not exist or there was an error. Check config.log for more information])],
+      [$PDO_ODBC_LIBS])
  fi

  PHP_EVAL_INCLINE([$PDO_ODBC_CFLAGS])
--- a/ext/pdo_sqlite/config.m4
+++ b/ext/pdo_sqlite/config.m4
@ -14,19 +14,22 @@ if test "$PHP_PDO_SQLITE" != "no"; then

  PHP_SETUP_SQLITE([PDO_SQLITE_SHARED_LIBADD])

-  PHP_CHECK_LIBRARY(sqlite3, sqlite3_close_v2, [
-    AC_DEFINE(HAVE_SQLITE3_CLOSE_V2, 1, [have sqlite3_close_v2])
-  ], [], [$PDO_SQLITE_SHARED_LIBADD])
-
-  PHP_CHECK_LIBRARY(sqlite3, sqlite3_column_table_name, [
-    AC_DEFINE(HAVE_SQLITE3_COLUMN_TABLE_NAME, 1, [have sqlite3_column_table_name])
-  ], [], [$PDO_SQLITE_SHARED_LIBADD])
-
-  PHP_CHECK_LIBRARY(sqlite3, sqlite3_load_extension,
+  PHP_CHECK_LIBRARY([sqlite3], [sqlite3_close_v2],
+    [AC_DEFINE([HAVE_SQLITE3_CLOSE_V2], [1], [have sqlite3_close_v2])],
    [],
-    [AC_DEFINE(PDO_SQLITE_OMIT_LOAD_EXTENSION, 1, [have sqlite3 with extension support])],
-    [$PDO_SQLITE_SHARED_LIBADD]
-  )
+    [$PDO_SQLITE_SHARED_LIBADD])
+
+  PHP_CHECK_LIBRARY([sqlite3], [sqlite3_column_table_name],
+    [AC_DEFINE([HAVE_SQLITE3_COLUMN_TABLE_NAME], [1],
+      [have sqlite3_column_table_name])],
+    [],
+    [$PDO_SQLITE_SHARED_LIBADD])
+
+  PHP_CHECK_LIBRARY([sqlite3], [sqlite3_load_extension],
+    [],
+    [AC_DEFINE([PDO_SQLITE_OMIT_LOAD_EXTENSION], [1],
+      [have sqlite3 with extension support])],
+    [$PDO_SQLITE_SHARED_LIBADD])

  PHP_SUBST([PDO_SQLITE_SHARED_LIBADD])
  PHP_NEW_EXTENSION(pdo_sqlite, pdo_sqlite.c sqlite_driver.c sqlite_statement.c sqlite_sql_parser.c,
--- a/ext/readline/config.m4
+++ b/ext/readline/config.m4
@ -39,40 +39,32 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
    ])
  ])

-  PHP_CHECK_LIBRARY(readline, readline,
+  PHP_CHECK_LIBRARY([readline], [readline],
    [PHP_ADD_LIBRARY_WITH_PATH([readline],
      [$READLINE_DIR/$PHP_LIBDIR],
      [READLINE_SHARED_LIBADD])],
    [AC_MSG_ERROR([readline library not found])],
    [-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS])

-  PHP_CHECK_LIBRARY(readline, rl_pending_input,
-  [], [
-    AC_MSG_ERROR([invalid readline installation detected. Try --with-libedit instead.])
-  ], [
-    -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
-  ])
+  PHP_CHECK_LIBRARY([readline], [rl_pending_input],
+    [],
+    [AC_MSG_ERROR([invalid readline installation detected. Try --with-libedit instead.])],
+    [-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS])

-  PHP_CHECK_LIBRARY(readline, rl_callback_read_char,
-  [
-    AC_DEFINE(HAVE_RL_CALLBACK_READ_CHAR, 1, [ ])
-  ],[],[
-    -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
-  ])
+  PHP_CHECK_LIBRARY([readline], [rl_callback_read_char],
+    [AC_DEFINE([HAVE_RL_CALLBACK_READ_CHAR], [1], [ ])],
+    [],
+    [-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS])

-  PHP_CHECK_LIBRARY(readline, rl_on_new_line,
-  [
-    AC_DEFINE(HAVE_RL_ON_NEW_LINE, 1, [ ])
-  ],[],[
-    -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
-  ])
+  PHP_CHECK_LIBRARY([readline], [rl_on_new_line],
+    [AC_DEFINE([HAVE_RL_ON_NEW_LINE], [1], [ ])],
+    [],
+    [-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS])

-  PHP_CHECK_LIBRARY(readline, rl_completion_matches,
-  [
-    AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1, [ ])
-  ],[],[
-    -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
-  ])
+  PHP_CHECK_LIBRARY([readline], [rl_completion_matches],
+    [AC_DEFINE([HAVE_RL_COMPLETION_MATCHES], [1], [ ])],
+    [],
+    [-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS])

  CFLAGS_SAVE=$CFLAGS
  LDFLAGS_SAVE=$LDFLAGS
@ -104,41 +96,30 @@ elif test "$PHP_LIBEDIT" != "no"; then
    [AC_CHECK_LIB([termcap], [tgetent],
      [PHP_ADD_LIBRARY([termcap],, [READLINE_SHARED_LIBADD])])])

-  PHP_CHECK_LIBRARY(edit, readline,
-  [
-  ], [
-    AC_MSG_ERROR([edit library required by readline not found])
-  ], [
-    $READLINE_SHARED_LIBADD
-  ])
+  PHP_CHECK_LIBRARY([edit], [readline],
+    [],
+    [AC_MSG_ERROR([edit library required by readline not found])],
+    [$READLINE_SHARED_LIBADD])

-  PHP_CHECK_LIBRARY(edit, rl_callback_read_char,
-  [
-    AC_DEFINE(HAVE_RL_CALLBACK_READ_CHAR, 1, [ ])
-  ],[],[
-    $READLINE_SHARED_LIBADD
-  ])
+  PHP_CHECK_LIBRARY([edit], [rl_callback_read_char],
+    [AC_DEFINE([HAVE_RL_CALLBACK_READ_CHAR], [1], [ ])],
+    [],
+    [$READLINE_SHARED_LIBADD])

-  PHP_CHECK_LIBRARY(edit, rl_on_new_line,
-  [
-    AC_DEFINE(HAVE_RL_ON_NEW_LINE, 1, [ ])
-  ],[],[
-    $READLINE_SHARED_LIBADD
-  ])
+  PHP_CHECK_LIBRARY([edit], [rl_on_new_line],
+    [AC_DEFINE([HAVE_RL_ON_NEW_LINE], [1], [ ])],
+    [],
+    [$READLINE_SHARED_LIBADD])

-  PHP_CHECK_LIBRARY(edit, rl_completion_matches,
-  [
-    AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1, [ ])
-  ],[],[
-    $READLINE_SHARED_LIBADD
-  ])
+  PHP_CHECK_LIBRARY([edit], [rl_completion_matches],
+    [AC_DEFINE([HAVE_RL_COMPLETION_MATCHES], [1], [ ])],
+    [],
+    [$READLINE_SHARED_LIBADD])

-  PHP_CHECK_LIBRARY(edit, history_list,
-  [
-    AC_DEFINE(HAVE_HISTORY_LIST, 1, [ ])
-  ],[],[
-    $READLINE_SHARED_LIBADD
-  ])
+  PHP_CHECK_LIBRARY([edit], [history_list],
+    [AC_DEFINE([HAVE_HISTORY_LIST], [1], [ ])],
+    [],
+    [$READLINE_SHARED_LIBADD])

  CFLAGS_SAVE=$CFLAGS
  LIBS_SAVE=$LIBS
--- a/ext/skeleton/config.m4.in
+++ b/ext/skeleton/config.m4.in
@ -64,27 +64,21 @@ if test "$PHP_%EXTNAMECAPS%" != "no"; then

  dnl If you need to check for a particular library function (e.g. a conditional
  dnl or version-dependent feature) and you are using pkg-config:
-  dnl PHP_CHECK_LIBRARY($LIBNAME, $LIBSYMBOL,
-  dnl [
-  dnl   AC_DEFINE(HAVE_%EXTNAMECAPS%_FEATURE, 1, [ ])
-  dnl ],[
-  dnl   AC_MSG_ERROR([FEATURE not supported by your %EXTNAME% library.])
-  dnl ], [
-  dnl   $LIBFOO_LIBS
-  dnl ])
+  dnl PHP_CHECK_LIBRARY([$LIBNAME], [$LIBSYMBOL],
+  dnl   [AC_DEFINE([HAVE_%EXTNAMECAPS%_FEATURE], [1], [ ])],
+  dnl   [AC_MSG_ERROR([FEATURE not supported by your %EXTNAME% library.])],
+  dnl   [$LIBFOO_LIBS])

  dnl If you need to check for a particular library function (e.g. a conditional
  dnl or version-dependent feature) and you are not using pkg-config:
-  dnl PHP_CHECK_LIBRARY($LIBNAME, $LIBSYMBOL,
+  dnl PHP_CHECK_LIBRARY([$LIBNAME], [$LIBSYMBOL],
  dnl   [PHP_ADD_LIBRARY_WITH_PATH([$LIBNAME],
  dnl     [$%EXTNAMECAPS%_DIR/$PHP_LIBDIR],
  dnl     [%EXTNAMECAPS%_SHARED_LIBADD])
-  dnl   AC_DEFINE(HAVE_%EXTNAMECAPS%_FEATURE, 1, [ ])
-  dnl ],[
-  dnl   AC_MSG_ERROR([FEATURE not supported by your %EXTNAME% library.])
-  dnl ],[
-  dnl   -L$%EXTNAMECAPS%_DIR/$PHP_LIBDIR -lm
-  dnl ])
+  dnl   AC_DEFINE([HAVE_%EXTNAMECAPS%_FEATURE], [1], [ ])
+  dnl   ],
+  dnl   [AC_MSG_ERROR([FEATURE not supported by your %EXTNAME% library.])],
+  dnl   [-L$%EXTNAMECAPS%_DIR/$PHP_LIBDIR -lm])
  dnl
  dnl PHP_SUBST([%EXTNAMECAPS%_SHARED_LIBADD])

--- a/ext/snmp/config.m4
+++ b/ext/snmp/config.m4
@ -37,38 +37,28 @@ if test "$PHP_SNMP" != "no"; then
  fi

  dnl Test build.
-  PHP_CHECK_LIBRARY($SNMP_LIBNAME, init_snmp,
-  [
-    AC_DEFINE(HAVE_SNMP,1,[ ])
-  ], [
-    AC_MSG_ERROR([SNMP sanity check failed. Please check config.log for more information.])
-  ], [
-    $SNMP_SHARED_LIBADD
-  ])
+  PHP_CHECK_LIBRARY([$SNMP_LIBNAME], [init_snmp],
+    [AC_DEFINE([HAVE_SNMP], [1], [ ])],
+    [AC_MSG_ERROR([SNMP sanity check failed. Please check config.log for more information.])],
+    [$SNMP_SHARED_LIBADD])

  dnl Check whether shutdown_snmp_logging() exists.
-  PHP_CHECK_LIBRARY($SNMP_LIBNAME, shutdown_snmp_logging,
-  [
-    AC_DEFINE(HAVE_SHUTDOWN_SNMP_LOGGING, 1, [ ])
-  ], [], [
-    $SNMP_SHARED_LIBADD
-  ])
+  PHP_CHECK_LIBRARY([$SNMP_LIBNAME], [shutdown_snmp_logging],
+    [AC_DEFINE([HAVE_SHUTDOWN_SNMP_LOGGING], [1], [ ])],
+    [],
+    [$SNMP_SHARED_LIBADD])

  dnl Check whether usmHMAC192SHA256AuthProtocol exists.
-  PHP_CHECK_LIBRARY($SNMP_LIBNAME, usmHMAC192SHA256AuthProtocol,
-  [
-    AC_DEFINE(HAVE_SNMP_SHA256, 1, [ ])
-  ], [], [
-    $SNMP_SHARED_LIBADD
-  ])
+  PHP_CHECK_LIBRARY([$SNMP_LIBNAME], [usmHMAC192SHA256AuthProtocol],
+    [AC_DEFINE([HAVE_SNMP_SHA256], [1], [ ])],
+    [],
+    [$SNMP_SHARED_LIBADD])

  dnl Check whether usmHMAC384SHA512AuthProtocol exists.
-  PHP_CHECK_LIBRARY($SNMP_LIBNAME, usmHMAC384SHA512AuthProtocol,
-  [
-    AC_DEFINE(HAVE_SNMP_SHA512, 1, [ ])
-  ], [], [
-    $SNMP_SHARED_LIBADD
-  ])
+  PHP_CHECK_LIBRARY([$SNMP_LIBNAME], [usmHMAC384SHA512AuthProtocol],
+    [AC_DEFINE([HAVE_SNMP_SHA512], [1], [ ])],
+    [],
+    [$SNMP_SHARED_LIBADD])

  PHP_NEW_EXTENSION(snmp, snmp.c, $ext_shared)
  PHP_SUBST([SNMP_SHARED_LIBADD])
--- a/ext/sqlite3/config0.m4
+++ b/ext/sqlite3/config0.m4
@ -8,19 +8,22 @@ if test $PHP_SQLITE3 != "no"; then
  PHP_SETUP_SQLITE([SQLITE3_SHARED_LIBADD])
  AC_DEFINE(HAVE_SQLITE3, 1, [Define to 1 if you have the sqlite3 extension enabled.])

-  PHP_CHECK_LIBRARY(sqlite3, sqlite3_errstr, [
-    AC_DEFINE(HAVE_SQLITE3_ERRSTR, 1, [have sqlite3_errstr function])
-  ], [], [$SQLITE3_SHARED_LIBADD])
-
-  PHP_CHECK_LIBRARY(sqlite3, sqlite3_expanded_sql, [
-    AC_DEFINE(HAVE_SQLITE3_EXPANDED_SQL, 1, [have sqlite3_expanded_sql function])
-  ], [], [$SQLITE3_SHARED_LIBADD])
-
-  PHP_CHECK_LIBRARY(sqlite3,sqlite3_load_extension,
+  PHP_CHECK_LIBRARY([sqlite3], [sqlite3_errstr],
+    [AC_DEFINE([HAVE_SQLITE3_ERRSTR], [1], [have sqlite3_errstr function])],
    [],
-    [AC_DEFINE(SQLITE_OMIT_LOAD_EXTENSION, 1, [have sqlite3 with extension support])],
-    [$SQLITE3_SHARED_LIBADD]
-  )
+    [$SQLITE3_SHARED_LIBADD])
+
+  PHP_CHECK_LIBRARY([sqlite3], [sqlite3_expanded_sql],
+    [AC_DEFINE([HAVE_SQLITE3_EXPANDED_SQL], [1],
+      [have sqlite3_expanded_sql function])],
+    [],
+    [$SQLITE3_SHARED_LIBADD])
+
+  PHP_CHECK_LIBRARY([sqlite3], [sqlite3_load_extension],
+    [],
+    [AC_DEFINE([SQLITE_OMIT_LOAD_EXTENSION], [1],
+      [have sqlite3 with extension support])],
+    [$SQLITE3_SHARED_LIBADD])

  PHP_NEW_EXTENSION(sqlite3, sqlite3.c, $ext_shared,,-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
  PHP_SUBST([SQLITE3_SHARED_LIBADD])
--- a/ext/tidy/config.m4
+++ b/ext/tidy/config.m4
@ -46,21 +46,14 @@ if test "$PHP_TIDY" != "no"; then
  fi


-  PHP_CHECK_LIBRARY($TIDY_LIB_NAME,tidyOptGetDoc,
-  [
-    AC_DEFINE(HAVE_TIDYOPTGETDOC,1,[ ])
-  ],[
-    PHP_CHECK_LIBRARY(tidy5,tidyOptGetDoc,
-    [
-      TIDY_LIB_NAME=tidy5
-      AC_DEFINE(HAVE_TIDYOPTGETDOC,1,[ ])
-    ], [], [])
-  ],[])
+  PHP_CHECK_LIBRARY([$TIDY_LIB_NAME], [tidyOptGetDoc],
+    [AC_DEFINE([HAVE_TIDYOPTGETDOC], [1], [ ])],
+    [PHP_CHECK_LIBRARY([tidy5], [tidyOptGetDoc],
+      [TIDY_LIB_NAME=tidy5
+      AC_DEFINE([HAVE_TIDYOPTGETDOC], [1], [ ])])])

-  PHP_CHECK_LIBRARY($TIDY_LIB_NAME,tidyReleaseDate,
-  [
-    AC_DEFINE(HAVE_TIDYRELEASEDATE,1,[ ])
-  ], [], [])
+  PHP_CHECK_LIBRARY([$TIDY_LIB_NAME], [tidyReleaseDate],
+    [AC_DEFINE([HAVE_TIDYRELEASEDATE], [1], [ ])])

  PHP_ADD_LIBRARY_WITH_PATH([$TIDY_LIB_NAME],
    [$TIDY_LIBDIR],
--- a/ext/zip/config.m4
+++ b/ext/zip/config.m4
@ -9,55 +9,41 @@ if test "$PHP_ZIP" != "no"; then
  PHP_EVAL_INCLINE([$LIBZIP_CFLAGS])
  PHP_EVAL_LIBLINE([$LIBZIP_LIBS], [ZIP_SHARED_LIBADD])

-  PHP_CHECK_LIBRARY(zip, zip_file_set_mtime,
-  [
-    AC_DEFINE(HAVE_SET_MTIME, 1, [Libzip >= 1.0.0 with zip_file_set_mtime])
-  ], [
-    AC_MSG_WARN([Libzip >= 1.0.0 needed for setting mtime])
-  ], [
-    $LIBZIP_LIBS
-  ])
+  PHP_CHECK_LIBRARY([zip], [zip_file_set_mtime],
+    [AC_DEFINE([HAVE_SET_MTIME], [1],
+      [Libzip >= 1.0.0 with zip_file_set_mtime])],
+    [AC_MSG_WARN([Libzip >= 1.0.0 needed for setting mtime])],
+    [$LIBZIP_LIBS])

-  PHP_CHECK_LIBRARY(zip, zip_file_set_encryption,
-  [
-    AC_DEFINE(HAVE_ENCRYPTION, 1, [Libzip >= 1.2.0 with encryption support])
-  ], [
-    AC_MSG_WARN([Libzip >= 1.2.0 needed for encryption support])
-  ], [
-    $LIBZIP_LIBS
-  ])
+  PHP_CHECK_LIBRARY([zip], [zip_file_set_encryption],
+    [AC_DEFINE([HAVE_ENCRYPTION], [1],
+      [Libzip >= 1.2.0 with encryption support])],
+    [AC_MSG_WARN([Libzip >= 1.2.0 needed for encryption support])],
+    [$LIBZIP_LIBS])

-  PHP_CHECK_LIBRARY(zip, zip_libzip_version,
-  [
-    AC_DEFINE(HAVE_LIBZIP_VERSION, 1, [Libzip >= 1.3.1 with zip_libzip_version function])
-  ], [
-  ], [
-    $LIBZIP_LIBS
-  ])
+  PHP_CHECK_LIBRARY([zip], [zip_libzip_version],
+    [AC_DEFINE([HAVE_LIBZIP_VERSION], [1],
+      [Libzip >= 1.3.1 with zip_libzip_version function])],
+    [],
+    [$LIBZIP_LIBS])

-  PHP_CHECK_LIBRARY(zip, zip_register_progress_callback_with_state,
-  [
-    AC_DEFINE(HAVE_PROGRESS_CALLBACK, 1, [Libzip >= 1.3.0 with zip_register_progress_callback_with_state function])
-  ], [
-  ], [
-    $LIBZIP_LIBS
-  ])
+  PHP_CHECK_LIBRARY([zip], [zip_register_progress_callback_with_state],
+    [AC_DEFINE([HAVE_PROGRESS_CALLBACK], [1],
+      [Libzip >= 1.3.0 with zip_register_progress_callback_with_state function])],
+    [],
+    [$LIBZIP_LIBS])

-  PHP_CHECK_LIBRARY(zip, zip_register_cancel_callback_with_state,
-  [
-    AC_DEFINE(HAVE_CANCEL_CALLBACK, 1, [Libzip >= 1.6.0 with zip_register_cancel_callback_with_state function])
-  ], [
-  ], [
-    $LIBZIP_LIBS
-  ])
+  PHP_CHECK_LIBRARY([zip], [zip_register_cancel_callback_with_state],
+    [AC_DEFINE([HAVE_CANCEL_CALLBACK], [1],
+      [Libzip >= 1.6.0 with zip_register_cancel_callback_with_state function])],
+    [],
+    [$LIBZIP_LIBS])

-  PHP_CHECK_LIBRARY(zip, zip_compression_method_supported,
-  [
-    AC_DEFINE(HAVE_METHOD_SUPPORTED, 1, [Libzip >= 1.7.0 with zip_*_method_supported functions])
-  ], [
-  ], [
-    $LIBZIP_LIBS
-  ])
+  PHP_CHECK_LIBRARY([zip], [zip_compression_method_supported],
+    [AC_DEFINE([HAVE_METHOD_SUPPORTED], [1],
+      [Libzip >= 1.7.0 with zip_*_method_supported functions])],
+    [],
+    [$LIBZIP_LIBS])

  AC_DEFINE(HAVE_ZIP,1,[ ])