Skip to content

Commit 0d8eb57

Browse files
nikicnikic
committed
Merge branch 'PHP-7.4'
2 parents e175c4d + 55ecfe4 commit 0d8eb57

File tree

7 files changed

+43
-148
lines changed

7 files changed

+43
-148
lines changed

‎ext/ffi/config.m4

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ if test "$PHP_FFI" != "no"; then
1010
FFI_INCDIR=$PHP_FFI/include
1111
FFI_LIBDIR=$PHP_FFI
1212
else
13-
dnl First try to find pkg-config
14-
if test -z "$PKG_CONFIG"; then
15-
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
16-
fi
17-
18-
dnl If pkg-config is installed, try using it
1913
if test -x "$PKG_CONFIG" && "$PKG_CONFIG" --exists libffi; then
2014
FFI_VER=`"$PKG_CONFIG" --modversion libffi`
2115
FFI_INCDIR=`"$PKG_CONFIG" --variable=includedir libffi`

‎ext/odbc/config.m4

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,9 +327,6 @@ PHP_ARG_WITH([iodbc],,
327327

328328
AC_MSG_CHECKING(for iODBC support)
329329
if test "$PHP_IODBC" != "no"; then
330-
if test -z "$PKG_CONFIG"; then
331-
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
332-
fi
333330
if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
334331
PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
335332
ODBC_TYPE=iodbc

‎ext/skeleton/config.m4.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ if test "$PHP_%EXTNAMECAPS%" != "no"; then
2222
dnl Write more examples of tests here...
2323

2424
dnl # get library FOO build options from pkg-config output
25-
dnl AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
2625
dnl AC_MSG_CHECKING(for libfoo)
2726
dnl if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists foo; then
2827
dnl if $PKG_CONFIG foo --atleast-version 1.2.3; then

‎ext/sodium/config.m4

Lines changed: 5 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -2,64 +2,15 @@ dnl config.m4 for extension sodium
22

33
PHP_ARG_WITH([sodium],
44
[for sodium support],
5-
[AS_HELP_STRING([[--with-sodium[=DIR]]],
5+
[AS_HELP_STRING([--with-sodium],
66
[Include sodium support])])
77

88
if test "$PHP_SODIUM" != "no"; then
9-
SEARCH_PATH="/usr/local /usr" # you might want to change this
10-
SEARCH_FOR="/include/sodium.h" # you most likely want to change this
9+
PKG_CHECK_MODULES([LIBSODIUM], [libsodium >= 1.0.8])
1110

12-
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
13-
AC_MSG_CHECKING([for libsodium])
14-
15-
dnl user provided location
16-
if test -r $PHP_SODIUM/$SEARCH_FOR; then # path given as parameter
17-
LIBSODIUM_DIR=$PHP_SODIUM
18-
AC_MSG_RESULT([found in $PHP_SODIUM])
19-
20-
dnl pkg-config output
21-
elif test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libsodium; then
22-
LIBSODIUM_VERSION=`$PKG_CONFIG libsodium --modversion`
23-
if $PKG_CONFIG libsodium --atleast-version=1.0.8; then
24-
LIBSODIUM_CFLAGS=`$PKG_CONFIG libsodium --cflags`
25-
LIBSODIUM_LIBS=`$PKG_CONFIG libsodium --libs`
26-
AC_MSG_RESULT(version $LIBSODIUM_VERSION found using pkg-config)
27-
PHP_EVAL_LIBLINE($LIBSODIUM_LIBS, SODIUM_SHARED_LIBADD)
28-
PHP_EVAL_INCLINE($LIBSODIUM_CFLAGS)
29-
else
30-
AC_MSG_ERROR([Libsodium $LIBSODIUM_VERSION is too old, version >= 1.0.8 required])
31-
fi
32-
33-
dnl search default path list
34-
else
35-
for i in $SEARCH_PATH ; do
36-
if test -r $i/$SEARCH_FOR; then
37-
LIBSODIUM_DIR=$i
38-
AC_MSG_RESULT(found in $i)
39-
fi
40-
done
41-
if test -z "$LIBSODIUM_DIR"; then
42-
AC_MSG_ERROR([Please install libsodium - See https://github.com/jedisct1/libsodium])
43-
fi
44-
fi
45-
46-
LIBNAME=sodium
47-
LIBSYMBOL=sodium_add
48-
49-
if test -n "$LIBSODIUM_DIR"; then
50-
PHP_ADD_INCLUDE($LIBSODIUM_DIR/include)
51-
PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $LIBSODIUM_DIR/$PHP_LIBDIR, SODIUM_SHARED_LIBADD)
52-
fi
53-
54-
PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
55-
[
56-
AC_DEFINE(HAVE_LIBSODIUMLIB,1,[ ])
57-
],[
58-
AC_MSG_ERROR([wrong libsodium lib version (< 1.0.8) or lib not found])
59-
],[
60-
])
61-
62-
PHP_SUBST(SODIUM_SHARED_LIBADD)
11+
PHP_EVAL_INCLINE($LIBSODIUM_CFLAGS)
12+
PHP_EVAL_LIBLINE($LIBSODIUM_LIBS, SODIUM_SHARED_LIBADD)
6313

14+
AC_DEFINE(HAVE_LIBSODIUMLIB, 1, [ ])
6415
PHP_NEW_EXTENSION(sodium, libsodium.c, $ext_shared)
6516
fi

‎ext/zip/config.m4

Lines changed: 37 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,47 @@
11
dnl config.m4 for extension zip
22

3-
PHP_ARG_ENABLE([zip],
4-
[for zip archive read/writesupport],
5-
[AS_HELP_STRING([--enable-zip],
3+
PHP_ARG_WITH([zip],
4+
[for zip archive read/write support],
5+
[AS_HELP_STRING([--with-zip],
66
[Include Zip read/write support])])
77

8-
PHP_ARG_WITH([libzip],
9-
[libzip],
10-
[AS_HELP_STRING([[--with-libzip[=DIR]]],
11-
[ZIP: use libzip])],
12-
[yes],
13-
[no])
14-
158
if test "$PHP_ZIP" != "no"; then
9+
PKG_CHECK_MODULES([LIBZIP], [libzip >= 0.11])
10+
LIBZIP_LIBDIR=`$PKG_CONFIG --variable=libdir libzip`
11+
12+
dnl Could not think of a simple way to check libzip for overwrite support
13+
PHP_CHECK_LIBRARY(zip, zip_open,
14+
[
15+
PHP_ADD_LIBRARY_WITH_PATH(zip, $LIBZIP_LIBDIR, ZIP_SHARED_LIBADD)
16+
AC_DEFINE(HAVE_LIBZIP,1,[ ])
17+
], [
18+
AC_MSG_ERROR(could not find usable libzip)
19+
], [
20+
-L$LIBZIP_LIBDIR
21+
])
22+
23+
PHP_CHECK_LIBRARY(zip, zip_file_set_encryption,
24+
[
25+
PHP_ADD_LIBRARY_WITH_PATH(zip, $LIBZIP_LIBDIR, ZIP_SHARED_LIBADD)
26+
AC_DEFINE(HAVE_ENCRYPTION, 1, [Libzip >= 1.2.0 with encryption support])
27+
], [
28+
AC_MSG_WARN(Libzip >= 1.2.0 needed for encryption support)
29+
], [
30+
-L$LIBZIP_LIBDIR
31+
])
32+
33+
PHP_CHECK_LIBRARY(zip, zip_libzip_version,
34+
[
35+
AC_DEFINE(HAVE_LIBZIP_VERSION, 1, [Libzip >= 1.3.1 with zip_libzip_version function])
36+
], [
37+
], [
38+
-L$LIBZIP_LIBDIR
39+
])
40+
41+
AC_DEFINE(HAVE_ZIP,1,[ ])
1642

1743
PHP_ZIP_SOURCES="php_zip.c zip_stream.c"
18-
19-
if test "$PHP_LIBZIP" != "no"; then
20-
21-
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
22-
23-
AC_MSG_CHECKING(for libzip)
24-
if test -r $PHP_LIBZIP/include/zip.h; then
25-
LIBZIP_CFLAGS="-I$PHP_LIBZIP/include"
26-
LIBZIP_LIBDIR="$PHP_LIBZIP/$PHP_LIBDIR"
27-
AC_MSG_RESULT(from option: found in $PHP_LIBZIP)
28-
29-
elif test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libzip; then
30-
if $PKG_CONFIG libzip --atleast-version 0.11; then
31-
LIBZIP_CFLAGS=`$PKG_CONFIG libzip --cflags`
32-
LIBZIP_LIBDIR=`$PKG_CONFIG libzip --variable=libdir`
33-
LIBZIP_VERSON=`$PKG_CONFIG libzip --modversion`
34-
AC_MSG_RESULT(from pkgconfig: version $LIBZIP_VERSON found in $LIBZIP_LIBDIR)
35-
else
36-
AC_MSG_ERROR(system libzip must be upgraded to version >= 0.11)
37-
fi
38-
39-
else
40-
for i in /usr/local /usr; do
41-
if test -r $i/include/zip.h; then
42-
LIBZIP_CFLAGS="-I$i/include"
43-
LIBZIP_LIBDIR="$i/$PHP_LIBDIR"
44-
AC_MSG_RESULT(in default path: found in $i)
45-
break
46-
fi
47-
done
48-
fi
49-
50-
if test -z "$LIBZIP_LIBDIR"; then
51-
AC_MSG_RESULT(not found)
52-
AC_MSG_ERROR(Please reinstall the libzip. Header zip.h not found.)
53-
fi
54-
55-
dnl Could not think of a simple way to check libzip for overwrite support
56-
PHP_CHECK_LIBRARY(zip, zip_open,
57-
[
58-
PHP_ADD_LIBRARY_WITH_PATH(zip, $LIBZIP_LIBDIR, ZIP_SHARED_LIBADD)
59-
AC_DEFINE(HAVE_LIBZIP,1,[ ])
60-
], [
61-
AC_MSG_ERROR(could not find usable libzip)
62-
], [
63-
-L$LIBZIP_LIBDIR
64-
])
65-
66-
PHP_CHECK_LIBRARY(zip, zip_file_set_encryption,
67-
[
68-
PHP_ADD_LIBRARY_WITH_PATH(zip, $LIBZIP_LIBDIR, ZIP_SHARED_LIBADD)
69-
AC_DEFINE(HAVE_ENCRYPTION, 1, [Libzip >= 1.2.0 with encryption support])
70-
], [
71-
AC_MSG_WARN(Libzip >= 1.2.0 needed for encryption support)
72-
], [
73-
-L$LIBZIP_LIBDIR
74-
])
75-
76-
PHP_CHECK_LIBRARY(zip, zip_libzip_version,
77-
[
78-
AC_DEFINE(HAVE_LIBZIP_VERSION, 1, [Libzip >= 1.3.1 with zip_libzip_version function])
79-
], [
80-
], [
81-
-L$LIBZIP_LIBDIR
82-
])
83-
84-
AC_DEFINE(HAVE_ZIP,1,[ ])
85-
PHP_NEW_EXTENSION(zip, $PHP_ZIP_SOURCES, $ext_shared,, $LIBZIP_CFLAGS)
86-
else
87-
AC_MSG_ERROR([libzip is no longer bundled: install libzip version >= 0.11 (1.3.0 recommended for encryption and bzip2 support)])
88-
fi
44+
PHP_NEW_EXTENSION(zip, $PHP_ZIP_SOURCES, $ext_shared,, $LIBZIP_CFLAGS)
8945

9046
PHP_SUBST(ZIP_SHARED_LIBADD)
9147

‎sapi/fpm/config.m4

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -591,9 +591,6 @@ if test "$PHP_FPM" != "no"; then
591591
[no])
592592

593593
if test "$PHP_FPM_SYSTEMD" != "no" ; then
594-
if test -z "$PKG_CONFIG"; then
595-
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
596-
fi
597594
unset SYSTEMD_LIBS
598595
unset SYSTEMD_INCS
599596

‎scripts/phpize.m4

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ test -z "$CFLAGS" && auto_cflags=1
3333
abs_srcdir=`(cd $srcdir && pwd)`
3434
abs_builddir=`pwd`
3535

36+
PKG_PROG_PKG_CONFIG
3637
AC_PROG_CC([cc gcc])
3738
PHP_DETECT_ICC
3839
PHP_DETECT_SUNCC

0 commit comments

Comments
 (0)