Autotools: Quote PHP_ADD_LIB* arguments

build/php.m4

@@ -744,7 +744,7 @@ AC_DEFUN([PHP_REQUIRE_CXX],[
   if test -z "$php_cxx_done"; then
     AC_PROG_CXX
     AC_PROG_CXXCPP
-    PHP_ADD_LIBRARY(stdc++)
+    PHP_ADD_LIBRARY([stdc++])
     php_cxx_done=yes
   fi
 ])
@@ -1877,7 +1877,9 @@ AC_DEFUN([PHP_SETUP_ICONV], [
   if test "$found_iconv" = "yes"; then
     AC_DEFINE(HAVE_ICONV,1,[ ])
     if test -n "$ICONV_DIR"; then
-      PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/$PHP_LIBDIR, $1)
+      PHP_ADD_LIBRARY_WITH_PATH([$iconv_lib_name],
+        [$ICONV_DIR/$PHP_LIBDIR],
+        [$1])
       PHP_ADD_INCLUDE([$ICONV_INCLUDE_DIR])
     fi
     $2

configure.ac

@@ -337,7 +337,7 @@ if test -d /usr/pkg/include && test -d /usr/pkg/lib; then
    CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
    LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
 fi
-test -d /usr/ucblib && PHP_ADD_LIBPATH(/usr/ucblib)
+test -d /usr/ucblib && PHP_ADD_LIBPATH([/usr/ucblib])
 
 dnl First, library checks.
 dnl ----------------------------------------------------------------------------
@@ -952,8 +952,8 @@ if test "$PHP_LIBGCC" = "yes"; then
   if test -z "$libgcc_libpath"; then
     AC_MSG_ERROR([Cannot locate libgcc. Make sure that gcc is in your path])
   fi
-  PHP_ADD_LIBPATH($libgcc_libpath)
-  PHP_ADD_LIBRARY(gcc, yes)
+  PHP_ADD_LIBPATH([$libgcc_libpath])
+  PHP_ADD_LIBRARY([gcc], [yes])
 fi
 
 PHP_ARG_ENABLE([short-tags],

ext/bz2/config.m4

@@ -25,7 +25,9 @@ if test "$PHP_BZ2" != "no"; then
   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)
+    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])

ext/dba/config.m4

@@ -33,7 +33,7 @@ AC_DEFUN([PHP_DBA_STD_CHECK],[
 
 dnl Attach THIS_x to DBA_x
 AC_DEFUN([PHP_DBA_STD_ATTACH],[
-  PHP_ADD_LIBRARY_WITH_PATH($THIS_LIBS, $THIS_LFLAGS, DBA_SHARED_LIBADD)
+  PHP_ADD_LIBRARY_WITH_PATH([$THIS_LIBS], [$THIS_LFLAGS], [DBA_SHARED_LIBADD])
   unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX
 ])
 

ext/gettext/config.m4

@@ -44,6 +44,8 @@ if test "$PHP_GETTEXT" != "no"; then
   LDFLAGS=$O_LDFLAGS
 
   if test -n "$GETTEXT_LIBS"; then
-    PHP_ADD_LIBRARY_WITH_PATH($GETTEXT_LIBS, $GETTEXT_LIBDIR, GETTEXT_SHARED_LIBADD)
+    PHP_ADD_LIBRARY_WITH_PATH([$GETTEXT_LIBS],
+      [$GETTEXT_LIBDIR],
+      [GETTEXT_SHARED_LIBADD])
   fi
 fi

ext/gmp/config.m4

@@ -10,7 +10,7 @@ if test "$PHP_GMP" != "no"; then
       AC_MSG_ERROR([GNU MP Library version 4.2 or greater required.])
     ])
 
-    PHP_ADD_LIBRARY(gmp,,GMP_SHARED_LIBADD)
+    PHP_ADD_LIBRARY([gmp],, [GMP_SHARED_LIBADD])
   else
     if test ! -f $PHP_GMP/include/gmp.h; then
       AC_MSG_ERROR([Unable to locate gmp.h])
@@ -23,7 +23,9 @@ if test "$PHP_GMP" != "no"; then
       -L$PHP_GMP/$PHP_LIBDIR
     ])
 
-    PHP_ADD_LIBRARY_WITH_PATH(gmp, $PHP_GMP/$PHP_LIBDIR, GMP_SHARED_LIBADD)
+    PHP_ADD_LIBRARY_WITH_PATH([gmp],
+      [$PHP_GMP/$PHP_LIBDIR],
+      [GMP_SHARED_LIBADD])
     PHP_ADD_INCLUDE([$PHP_GMP/include])
   fi
 

ext/ldap/config.m4

@@ -69,22 +69,22 @@ if test "$PHP_LDAP" != "no"; then
   MACHINE_INCLUDES=$($CC -dumpmachine | $SED 's/-pc//')
 
   if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.a || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.$SHLIB_SUFFIX_NAME; then
-    PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
-    PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+    PHP_ADD_LIBRARY_WITH_PATH([lber], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
+    PHP_ADD_LIBRARY_WITH_PATH([ldap], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
 
   elif test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME.3 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libldap.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libldap.$SHLIB_SUFFIX_NAME.3 || test -f $LDAP_LIBDIR/libldap.3.dylib; then
-    PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+    PHP_ADD_LIBRARY_WITH_PATH([ldap], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
 
   elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.12.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.12.1; then
-    PHP_ADD_LIBRARY_WITH_PATH(clntsh, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+    PHP_ADD_LIBRARY_WITH_PATH([clntsh], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
     AC_DEFINE(HAVE_ORALDAP,1,[ ])
 
   elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.11.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
-    PHP_ADD_LIBRARY_WITH_PATH(clntsh, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+    PHP_ADD_LIBRARY_WITH_PATH([clntsh], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
     AC_DEFINE(HAVE_ORALDAP,1,[ ])
 
   elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME; then
-     PHP_ADD_LIBRARY_WITH_PATH(clntsh, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+     PHP_ADD_LIBRARY_WITH_PATH([clntsh], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
      AC_DEFINE(HAVE_ORALDAP,1,[ ])
 
   else

ext/odbc/config.m4

@@ -107,15 +107,15 @@ PHP_ARG_WITH([adabas],,
       PHP_ADABAS=/usr/local
     fi
     PHP_ADD_INCLUDE([$PHP_ADABAS/incl])
-    PHP_ADD_LIBPATH($PHP_ADABAS/$PHP_LIBDIR)
+    PHP_ADD_LIBPATH([$PHP_ADABAS/$PHP_LIBDIR])
     ODBC_OBJS="$PHP_ADABAS/$PHP_LIBDIR/odbclib.a"
     ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a"
     $srcdir/build/shtool mkdir -f -p ext/odbc
     rm -f "$ODBC_LIB"
     cp "$ODBC_OBJS" "$ODBC_LIB"
-    PHP_ADD_LIBRARY(sqlptc)
-    PHP_ADD_LIBRARY(sqlrte)
-    PHP_ADD_LIBRARY_WITH_PATH(odbc_adabas, $abs_builddir/ext/odbc)
+    PHP_ADD_LIBRARY([sqlptc])
+    PHP_ADD_LIBRARY([sqlrte])
+    PHP_ADD_LIBRARY_WITH_PATH([odbc_adabas], [$abs_builddir/ext/odbc])
     ODBC_TYPE=adabas
     ODBC_INCDIR=$PHP_ADABAS/incl
     PHP_ODBC_CHECK_HEADER(sqlext.h)
@@ -137,8 +137,8 @@ PHP_ARG_WITH([sapdb],,
       PHP_SAPDB=/usr/local
     fi
     PHP_ADD_INCLUDE([$PHP_SAPDB/incl])
-    PHP_ADD_LIBPATH($PHP_SAPDB/$PHP_LIBDIR)
-    PHP_ADD_LIBRARY(sqlod)
+    PHP_ADD_LIBPATH([$PHP_SAPDB/$PHP_LIBDIR])
+    PHP_ADD_LIBRARY([sqlod])
     ODBC_TYPE=sapdb
     AC_DEFINE(HAVE_SAPDB,1,[ ])
     AC_MSG_RESULT([$ext_output])
@@ -422,7 +422,7 @@ PHP_ARG_WITH([dbmaker],,
       ODBC_SHARED="odbc.la"
     else
       AC_MSG_RESULT([yes (static)])
-      PHP_ADD_LIBRARY_WITH_PATH(dmapic, $ODBC_LIBDIR)
+      PHP_ADD_LIBRARY_WITH_PATH([dmapic], [$ODBC_LIBDIR])
       PHP_ADD_INCLUDE([$ODBC_INCDIR])
       ODBC_STATIC="libphpext_odbc.la"
     fi

ext/pdo_dblib/config.m4

@@ -16,7 +16,7 @@ if test "$PHP_PDO_DBLIB" != "no"; then
     [],[
       AC_MSG_ERROR([Cannot find FreeTDS in known installation directories])
     ])
-    PHP_ADD_LIBRARY(sybdb,,PDO_DBLIB_SHARED_LIBADD)
+    PHP_ADD_LIBRARY([sybdb],, [PDO_DBLIB_SHARED_LIBADD])
   elif test "$PHP_PDO_DBLIB" != "no"; then
 
     if test -f $PHP_PDO_DBLIB/include/sybdb.h; then
@@ -38,7 +38,9 @@ if test "$PHP_PDO_DBLIB" != "no"; then
     fi
 
     PHP_ADD_INCLUDE([$PDO_FREETDS_INCLUDE_DIR])
-    PHP_ADD_LIBRARY_WITH_PATH(sybdb, $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR, PDO_DBLIB_SHARED_LIBADD)
+    PHP_ADD_LIBRARY_WITH_PATH([sybdb],
+      [$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR],
+      [PDO_DBLIB_SHARED_LIBADD])
   fi
 
   PHP_CHECK_PDO_INCLUDES

ext/pdo_firebird/config.m4

@@ -54,7 +54,9 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then
     ], [
       $FIREBIRD_LIBDIR_FLAG
     ])
-    PHP_ADD_LIBRARY_WITH_PATH($FIREBIRD_LIBNAME, $FIREBIRD_LIBDIR, PDO_FIREBIRD_SHARED_LIBADD)
+    PHP_ADD_LIBRARY_WITH_PATH([$FIREBIRD_LIBNAME],
+      [$FIREBIRD_LIBDIR],
+      [PDO_FIREBIRD_SHARED_LIBADD])
     PHP_ADD_INCLUDE([$FIREBIRD_INCDIR])
   fi
 

ext/readline/config.m4

@@ -31,24 +31,22 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
   PHP_READLINE_LIBS=""
   AC_CHECK_LIB(ncurses, tgetent,
   [
-    PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD)
+    PHP_ADD_LIBRARY([ncurses],, [READLINE_SHARED_LIBADD])
     PHP_READLINE_LIBS="$PHP_READLINE_LIBS -lncurses"
   ],[
     AC_CHECK_LIB(termcap, tgetent,
     [
-      PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD)
+      PHP_ADD_LIBRARY([termcap],, [READLINE_SHARED_LIBADD])
       PHP_READLINE_LIBS="$PHP_READLINE_LIBS -ltermcap"
     ])
   ])
 
   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_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,
   [], [
@@ -95,14 +93,9 @@ elif test "$PHP_LIBEDIT" != "no"; then
   PHP_EVAL_INCLINE([$EDIT_CFLAGS])
 
   AC_CHECK_LIB(ncurses, tgetent,
-  [
-    PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD)
-  ],[
-    AC_CHECK_LIB(termcap, tgetent,
-    [
-      PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD)
-    ])
-  ])
+    [PHP_ADD_LIBRARY([ncurses],, [READLINE_SHARED_LIBADD])],
+    [AC_CHECK_LIB(termcap, tgetent,
+      [PHP_ADD_LIBRARY([termcap],, [READLINE_SHARED_LIBADD])])])
 
   PHP_CHECK_LIBRARY(edit, readline,
   [

ext/session/config.m4

@@ -36,7 +36,9 @@ if test "$PHP_MM" != "no"; then
     AC_MSG_ERROR([--with-mm cannot be combined with --enable-zts])
   fi
 
-  PHP_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/$PHP_LIBDIR, SESSION_SHARED_LIBADD)
+  PHP_ADD_LIBRARY_WITH_PATH([mm],
+    [$MM_DIR/$PHP_LIBDIR],
+    [SESSION_SHARED_LIBADD])
   PHP_ADD_INCLUDE([$MM_DIR/include])
   PHP_INSTALL_HEADERS([ext/session], [mod_mm.h])
   AC_DEFINE(HAVE_LIBMM, 1, [Whether you have libmm])

ext/skeleton/config.m4.in

@@ -76,8 +76,9 @@ 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 not using pkg-config:
   dnl PHP_CHECK_LIBRARY($LIBNAME, $LIBSYMBOL,
-  dnl [
-  dnl   PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $%EXTNAMECAPS%_DIR/$PHP_LIBDIR, %EXTNAMECAPS%_SHARED_LIBADD)
+  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.])

ext/tidy/config.m4

@@ -62,7 +62,9 @@ if test "$PHP_TIDY" != "no"; then
     AC_DEFINE(HAVE_TIDYRELEASEDATE,1,[ ])
   ], [], [])
 
-  PHP_ADD_LIBRARY_WITH_PATH($TIDY_LIB_NAME, $TIDY_LIBDIR, TIDY_SHARED_LIBADD)
+  PHP_ADD_LIBRARY_WITH_PATH([$TIDY_LIB_NAME],
+    [$TIDY_LIBDIR],
+    [TIDY_SHARED_LIBADD])
   PHP_ADD_INCLUDE([$TIDY_INCDIR])
 
   dnl Add -Wno-ignored-qualifiers as this is an issue upstream