diff options
Diffstat (limited to '11.patch')
| -rw-r--r-- | 11.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/11.patch b/11.patch new file mode 100644 index 0000000..be346f2 --- /dev/null +++ b/11.patch @@ -0,0 +1,37 @@ +From e73c4c546dc7845cd161e51ffe339acb5421c39b Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Thu, 24 Sep 2020 11:37:49 +0200 +Subject: [PATCH] remove remaining hardcoded /lib + +--- + config.m4 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/config.m4 b/config.m4 +index 5abb4fa..b8041bc 100644 +--- a/config.m4 ++++ b/config.m4 +@@ -9,7 +9,7 @@ dnl Make sure that the comment is aligned: + if test "$PHP_IP2LOCATION" != "no"; then + + # --with-ip2location -> check with-path +- SEARCH_PATH="/usr/local /usr /opt/local /lib" ++ SEARCH_PATH="/usr/local /usr /opt/local" + SEARCH_FOR="/include/IP2Location.h" + if test -r $PHP_IP2LOCATION/$SEARCH_FOR; then + IP2LOCATION_DIR=$PHP_IP2LOCATION +@@ -43,12 +43,12 @@ if test "$PHP_IP2LOCATION" != "no"; then + + PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOLNEW, + [ +- PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $IP2LOCATION_DIR/lib, IP2LOCATION_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $IP2LOCATION_DIR/$PHP_LIBDIR, IP2LOCATION_SHARED_LIBADD) + AC_DEFINE(HAVE_IPLOCATIONLIB,1,[ ]) + ],[ + PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOLOLD, + [ +- PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $IP2LOCATION_DIR/lib, IP2LOCATION_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $IP2LOCATION_DIR/$PHP_LIBDIR, IP2LOCATION_SHARED_LIBADD) + AC_DEFINE(HAVE_IPLOCATIONLIB,1,[ ]) + ],[ + AC_MSG_ERROR([wrong ip2location, lib version >= 6.x.x is required or library not found]) |