diff options
| author | Remi Collet <remi@remirepo.net> | 2018-11-08 17:03:56 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-11-08 17:03:56 +0100 |
| commit | 2cad8f700849d06000ccfc1d877a0c6bf508d090 (patch) | |
| tree | b3a2402cd53664434a584d8a8503277102c67933 /4b3e00c2b4f33124dbc2cf94f472c66d5c44b4cc.patch | |
| parent | 5818ac23bcfe265b9fe633f0a94987c2fbeb56b3 (diff) | |
add upstream patches from merged PRs
add weak dependencies on geolite2 databases
Diffstat (limited to '4b3e00c2b4f33124dbc2cf94f472c66d5c44b4cc.patch')
| -rw-r--r-- | 4b3e00c2b4f33124dbc2cf94f472c66d5c44b4cc.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/4b3e00c2b4f33124dbc2cf94f472c66d5c44b4cc.patch b/4b3e00c2b4f33124dbc2cf94f472c66d5c44b4cc.patch new file mode 100644 index 0000000..bf199f8 --- /dev/null +++ b/4b3e00c2b4f33124dbc2cf94f472c66d5c44b4cc.patch @@ -0,0 +1,29 @@ +From 4b3e00c2b4f33124dbc2cf94f472c66d5c44b4cc Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Wed, 7 Nov 2018 18:01:38 +0100 +Subject: [PATCH] fux typo + raise minimal version to 1.0.0 + +--- + ext/config.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ext/config.m4 b/ext/config.m4 +index efddab5..675e00c 100644 +--- a/ext/config.m4 ++++ b/ext/config.m4 +@@ -12,13 +12,13 @@ if test $PHP_MAXMINDDB != "no"; then + AC_MSG_CHECKING(for libmaxminddb) + if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libmaxminddb; then + dnl retrieve build options from pkg-config +- if $PKG_CONFIG libzip --atleast-version 0; then ++ if $PKG_CONFIG libmaxminddb --atleast-version 1.0.0; then + LIBMAXMINDDB_INC=`$PKG_CONFIG libmaxminddb --cflags` + LIBMAXMINDDB_LIB=`$PKG_CONFIG libmaxminddb --libs` + LIBMAXMINDDB_VER=`$PKG_CONFIG libmaxminddb --modversion` + AC_MSG_RESULT(found version $LIBMAXMINDDB_VER) + else +- AC_MSG_ERROR(system libmaxminddb must be upgraded to version >= 0) ++ AC_MSG_ERROR(system libmaxminddb must be upgraded to version >= 1.0.0) + fi + PHP_EVAL_LIBLINE($LIBMAXMINDDB_LIB, MAXMINDDB_SHARED_LIBADD) + PHP_EVAL_INCLINE($LIBMAXMINDDB_INC) |