Skip to content

Commit ff4b99e

Browse files
petkpetk
authored
Autotools: Quote PHP_ADD_LIB* arguments (#15112)
Following previous CS syncs, this quotes arguments in PHP_ADD_LIB* M4 macros: - PHP_ADD_LIBRARY - PHP_ADD_LIBRARY_WITH_PATH - PHP_ADD_LIBPATH
1 parent a7bd911 commit ff4b99e

File tree

14 files changed

+57
-47
lines changed

14 files changed

+57
-47
lines changed

‎build/php.m4

+4-2
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ AC_DEFUN([PHP_REQUIRE_CXX],[
744744
if test -z "$php_cxx_done"; then
745745
AC_PROG_CXX
746746
AC_PROG_CXXCPP
747-
PHP_ADD_LIBRARY(stdc++)
747+
PHP_ADD_LIBRARY([stdc++])
748748
php_cxx_done=yes
749749
fi
750750
])
@@ -1877,7 +1877,9 @@ AC_DEFUN([PHP_SETUP_ICONV], [
18771877
if test "$found_iconv" = "yes"; then
18781878
AC_DEFINE(HAVE_ICONV,1,[ ])
18791879
if test -n "$ICONV_DIR"; then
1880-
PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/$PHP_LIBDIR, $1)
1880+
PHP_ADD_LIBRARY_WITH_PATH([$iconv_lib_name],
1881+
[$ICONV_DIR/$PHP_LIBDIR],
1882+
[$1])
18811883
PHP_ADD_INCLUDE([$ICONV_INCLUDE_DIR])
18821884
fi
18831885
$2

‎configure.ac

+3-3
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ if test -d /usr/pkg/include && test -d /usr/pkg/lib; then
337337
CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
338338
LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
339339
fi
340-
test -d /usr/ucblib && PHP_ADD_LIBPATH(/usr/ucblib)
340+
test -d /usr/ucblib && PHP_ADD_LIBPATH([/usr/ucblib])
341341

342342
dnl First, library checks.
343343
dnl ----------------------------------------------------------------------------
@@ -952,8 +952,8 @@ if test "$PHP_LIBGCC" = "yes"; then
952952
if test -z "$libgcc_libpath"; then
953953
AC_MSG_ERROR([Cannot locate libgcc. Make sure that gcc is in your path])
954954
fi
955-
PHP_ADD_LIBPATH($libgcc_libpath)
956-
PHP_ADD_LIBRARY(gcc, yes)
955+
PHP_ADD_LIBPATH([$libgcc_libpath])
956+
PHP_ADD_LIBRARY([gcc], [yes])
957957
fi
958958

959959
PHP_ARG_ENABLE([short-tags],

‎ext/bz2/config.m4

+3-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ if test "$PHP_BZ2" != "no"; then
2525
PHP_CHECK_LIBRARY(bz2, BZ2_bzerror,
2626
[
2727
PHP_ADD_INCLUDE([$BZIP_DIR/include])
28-
PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/$PHP_LIBDIR, BZ2_SHARED_LIBADD)
28+
PHP_ADD_LIBRARY_WITH_PATH([bz2],
29+
[$BZIP_DIR/$PHP_LIBDIR],
30+
[BZ2_SHARED_LIBADD])
2931
AC_DEFINE(HAVE_BZ2,1,[ ])
3032
], [
3133
AC_MSG_ERROR([bz2 module requires libbz2 >= 1.0.0])

‎ext/dba/config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ AC_DEFUN([PHP_DBA_STD_CHECK],[
3333

3434
dnl Attach THIS_x to DBA_x
3535
AC_DEFUN([PHP_DBA_STD_ATTACH],[
36-
PHP_ADD_LIBRARY_WITH_PATH($THIS_LIBS, $THIS_LFLAGS, DBA_SHARED_LIBADD)
36+
PHP_ADD_LIBRARY_WITH_PATH([$THIS_LIBS], [$THIS_LFLAGS], [DBA_SHARED_LIBADD])
3737
unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX
3838
])
3939

‎ext/gettext/config.m4

+3-1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ if test "$PHP_GETTEXT" != "no"; then
4444
LDFLAGS=$O_LDFLAGS
4545

4646
if test -n "$GETTEXT_LIBS"; then
47-
PHP_ADD_LIBRARY_WITH_PATH($GETTEXT_LIBS, $GETTEXT_LIBDIR, GETTEXT_SHARED_LIBADD)
47+
PHP_ADD_LIBRARY_WITH_PATH([$GETTEXT_LIBS],
48+
[$GETTEXT_LIBDIR],
49+
[GETTEXT_SHARED_LIBADD])
4850
fi
4951
fi

‎ext/gmp/config.m4

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if test "$PHP_GMP" != "no"; then
1010
AC_MSG_ERROR([GNU MP Library version 4.2 or greater required.])
1111
])
1212

13-
PHP_ADD_LIBRARY(gmp,,GMP_SHARED_LIBADD)
13+
PHP_ADD_LIBRARY([gmp],, [GMP_SHARED_LIBADD])
1414
else
1515
if test ! -f $PHP_GMP/include/gmp.h; then
1616
AC_MSG_ERROR([Unable to locate gmp.h])
@@ -23,7 +23,9 @@ if test "$PHP_GMP" != "no"; then
2323
-L$PHP_GMP/$PHP_LIBDIR
2424
])
2525

26-
PHP_ADD_LIBRARY_WITH_PATH(gmp, $PHP_GMP/$PHP_LIBDIR, GMP_SHARED_LIBADD)
26+
PHP_ADD_LIBRARY_WITH_PATH([gmp],
27+
[$PHP_GMP/$PHP_LIBDIR],
28+
[GMP_SHARED_LIBADD])
2729
PHP_ADD_INCLUDE([$PHP_GMP/include])
2830
fi
2931

‎ext/ldap/config.m4

+6-6
Original file line numberDiff line numberDiff line change
@@ -69,22 +69,22 @@ if test "$PHP_LDAP" != "no"; then
6969
MACHINE_INCLUDES=$($CC -dumpmachine | $SED 's/-pc//')
7070

7171
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
72-
PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
73-
PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
72+
PHP_ADD_LIBRARY_WITH_PATH([lber], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
73+
PHP_ADD_LIBRARY_WITH_PATH([ldap], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
7474

7575
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
76-
PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
76+
PHP_ADD_LIBRARY_WITH_PATH([ldap], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
7777

7878
elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.12.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.12.1; then
79-
PHP_ADD_LIBRARY_WITH_PATH(clntsh, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
79+
PHP_ADD_LIBRARY_WITH_PATH([clntsh], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
8080
AC_DEFINE(HAVE_ORALDAP,1,[ ])
8181

8282
elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.11.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
83-
PHP_ADD_LIBRARY_WITH_PATH(clntsh, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
83+
PHP_ADD_LIBRARY_WITH_PATH([clntsh], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
8484
AC_DEFINE(HAVE_ORALDAP,1,[ ])
8585

8686
elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME; then
87-
PHP_ADD_LIBRARY_WITH_PATH(clntsh, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
87+
PHP_ADD_LIBRARY_WITH_PATH([clntsh], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
8888
AC_DEFINE(HAVE_ORALDAP,1,[ ])
8989

9090
else

‎ext/odbc/config.m4

+7-7
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,15 @@ PHP_ARG_WITH([adabas],,
107107
PHP_ADABAS=/usr/local
108108
fi
109109
PHP_ADD_INCLUDE([$PHP_ADABAS/incl])
110-
PHP_ADD_LIBPATH($PHP_ADABAS/$PHP_LIBDIR)
110+
PHP_ADD_LIBPATH([$PHP_ADABAS/$PHP_LIBDIR])
111111
ODBC_OBJS="$PHP_ADABAS/$PHP_LIBDIR/odbclib.a"
112112
ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a"
113113
$srcdir/build/shtool mkdir -f -p ext/odbc
114114
rm -f "$ODBC_LIB"
115115
cp "$ODBC_OBJS" "$ODBC_LIB"
116-
PHP_ADD_LIBRARY(sqlptc)
117-
PHP_ADD_LIBRARY(sqlrte)
118-
PHP_ADD_LIBRARY_WITH_PATH(odbc_adabas, $abs_builddir/ext/odbc)
116+
PHP_ADD_LIBRARY([sqlptc])
117+
PHP_ADD_LIBRARY([sqlrte])
118+
PHP_ADD_LIBRARY_WITH_PATH([odbc_adabas], [$abs_builddir/ext/odbc])
119119
ODBC_TYPE=adabas
120120
ODBC_INCDIR=$PHP_ADABAS/incl
121121
PHP_ODBC_CHECK_HEADER(sqlext.h)
@@ -137,8 +137,8 @@ PHP_ARG_WITH([sapdb],,
137137
PHP_SAPDB=/usr/local
138138
fi
139139
PHP_ADD_INCLUDE([$PHP_SAPDB/incl])
140-
PHP_ADD_LIBPATH($PHP_SAPDB/$PHP_LIBDIR)
141-
PHP_ADD_LIBRARY(sqlod)
140+
PHP_ADD_LIBPATH([$PHP_SAPDB/$PHP_LIBDIR])
141+
PHP_ADD_LIBRARY([sqlod])
142142
ODBC_TYPE=sapdb
143143
AC_DEFINE(HAVE_SAPDB,1,[ ])
144144
AC_MSG_RESULT([$ext_output])
@@ -422,7 +422,7 @@ PHP_ARG_WITH([dbmaker],,
422422
ODBC_SHARED="odbc.la"
423423
else
424424
AC_MSG_RESULT([yes (static)])
425-
PHP_ADD_LIBRARY_WITH_PATH(dmapic, $ODBC_LIBDIR)
425+
PHP_ADD_LIBRARY_WITH_PATH([dmapic], [$ODBC_LIBDIR])
426426
PHP_ADD_INCLUDE([$ODBC_INCDIR])
427427
ODBC_STATIC="libphpext_odbc.la"
428428
fi

‎ext/pdo_dblib/config.m4

+4-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if test "$PHP_PDO_DBLIB" != "no"; then
1616
[],[
1717
AC_MSG_ERROR([Cannot find FreeTDS in known installation directories])
1818
])
19-
PHP_ADD_LIBRARY(sybdb,,PDO_DBLIB_SHARED_LIBADD)
19+
PHP_ADD_LIBRARY([sybdb],, [PDO_DBLIB_SHARED_LIBADD])
2020
elif test "$PHP_PDO_DBLIB" != "no"; then
2121

2222
if test -f $PHP_PDO_DBLIB/include/sybdb.h; then
@@ -38,7 +38,9 @@ if test "$PHP_PDO_DBLIB" != "no"; then
3838
fi
3939

4040
PHP_ADD_INCLUDE([$PDO_FREETDS_INCLUDE_DIR])
41-
PHP_ADD_LIBRARY_WITH_PATH(sybdb, $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR, PDO_DBLIB_SHARED_LIBADD)
41+
PHP_ADD_LIBRARY_WITH_PATH([sybdb],
42+
[$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR],
43+
[PDO_DBLIB_SHARED_LIBADD])
4244
fi
4345

4446
PHP_CHECK_PDO_INCLUDES

‎ext/pdo_firebird/config.m4

+3-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then
5454
], [
5555
$FIREBIRD_LIBDIR_FLAG
5656
])
57-
PHP_ADD_LIBRARY_WITH_PATH($FIREBIRD_LIBNAME, $FIREBIRD_LIBDIR, PDO_FIREBIRD_SHARED_LIBADD)
57+
PHP_ADD_LIBRARY_WITH_PATH([$FIREBIRD_LIBNAME],
58+
[$FIREBIRD_LIBDIR],
59+
[PDO_FIREBIRD_SHARED_LIBADD])
5860
PHP_ADD_INCLUDE([$FIREBIRD_INCDIR])
5961
fi
6062

‎ext/readline/config.m4

+10-17
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,22 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
3131
PHP_READLINE_LIBS=""
3232
AC_CHECK_LIB(ncurses, tgetent,
3333
[
34-
PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD)
34+
PHP_ADD_LIBRARY([ncurses],, [READLINE_SHARED_LIBADD])
3535
PHP_READLINE_LIBS="$PHP_READLINE_LIBS -lncurses"
3636
],[
3737
AC_CHECK_LIB(termcap, tgetent,
3838
[
39-
PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD)
39+
PHP_ADD_LIBRARY([termcap],, [READLINE_SHARED_LIBADD])
4040
PHP_READLINE_LIBS="$PHP_READLINE_LIBS -ltermcap"
4141
])
4242
])
4343

4444
PHP_CHECK_LIBRARY(readline, readline,
45-
[
46-
PHP_ADD_LIBRARY_WITH_PATH(readline, $READLINE_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD)
47-
], [
48-
AC_MSG_ERROR([readline library not found])
49-
], [
50-
-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
51-
])
45+
[PHP_ADD_LIBRARY_WITH_PATH([readline],
46+
[$READLINE_DIR/$PHP_LIBDIR],
47+
[READLINE_SHARED_LIBADD])],
48+
[AC_MSG_ERROR([readline library not found])],
49+
[-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS])
5250

5351
PHP_CHECK_LIBRARY(readline, rl_pending_input,
5452
[], [
@@ -95,14 +93,9 @@ elif test "$PHP_LIBEDIT" != "no"; then
9593
PHP_EVAL_INCLINE([$EDIT_CFLAGS])
9694

9795
AC_CHECK_LIB(ncurses, tgetent,
98-
[
99-
PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD)
100-
],[
101-
AC_CHECK_LIB(termcap, tgetent,
102-
[
103-
PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD)
104-
])
105-
])
96+
[PHP_ADD_LIBRARY([ncurses],, [READLINE_SHARED_LIBADD])],
97+
[AC_CHECK_LIB(termcap, tgetent,
98+
[PHP_ADD_LIBRARY([termcap],, [READLINE_SHARED_LIBADD])])])
10699

107100
PHP_CHECK_LIBRARY(edit, readline,
108101
[

‎ext/session/config.m4

+3-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ if test "$PHP_MM" != "no"; then
3636
AC_MSG_ERROR([--with-mm cannot be combined with --enable-zts])
3737
fi
3838

39-
PHP_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/$PHP_LIBDIR, SESSION_SHARED_LIBADD)
39+
PHP_ADD_LIBRARY_WITH_PATH([mm],
40+
[$MM_DIR/$PHP_LIBDIR],
41+
[SESSION_SHARED_LIBADD])
4042
PHP_ADD_INCLUDE([$MM_DIR/include])
4143
PHP_INSTALL_HEADERS([ext/session], [mod_mm.h])
4244
AC_DEFINE(HAVE_LIBMM, 1, [Whether you have libmm])

‎ext/skeleton/config.m4.in

+3-2
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@ if test "$PHP_%EXTNAMECAPS%" != "no"; then
7676
dnl If you need to check for a particular library function (e.g. a conditional
7777
dnl or version-dependent feature) and you are not using pkg-config:
7878
dnl PHP_CHECK_LIBRARY($LIBNAME, $LIBSYMBOL,
79-
dnl [
80-
dnl PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $%EXTNAMECAPS%_DIR/$PHP_LIBDIR, %EXTNAMECAPS%_SHARED_LIBADD)
79+
dnl [PHP_ADD_LIBRARY_WITH_PATH([$LIBNAME],
80+
dnl [$%EXTNAMECAPS%_DIR/$PHP_LIBDIR],
81+
dnl [%EXTNAMECAPS%_SHARED_LIBADD])
8182
dnl AC_DEFINE(HAVE_%EXTNAMECAPS%_FEATURE, 1, [ ])
8283
dnl ],[
8384
dnl AC_MSG_ERROR([FEATURE not supported by your %EXTNAME% library.])

‎ext/tidy/config.m4

+3-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ if test "$PHP_TIDY" != "no"; then
6262
AC_DEFINE(HAVE_TIDYRELEASEDATE,1,[ ])
6363
], [], [])
6464

65-
PHP_ADD_LIBRARY_WITH_PATH($TIDY_LIB_NAME, $TIDY_LIBDIR, TIDY_SHARED_LIBADD)
65+
PHP_ADD_LIBRARY_WITH_PATH([$TIDY_LIB_NAME],
66+
[$TIDY_LIBDIR],
67+
[TIDY_SHARED_LIBADD])
6668
PHP_ADD_INCLUDE([$TIDY_INCDIR])
6769

6870
dnl Add -Wno-ignored-qualifiers as this is an issue upstream

0 commit comments

Comments
 (0)