summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2016-08-17 12:43:29 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2016-08-17 12:43:29 +0200
commit48198e4c257825ab89ee027bff5a93fc2cd59601 (patch)
tree042b5b9dd3e1cef83863cf7a0ed71e7126aa008e
parentabe00908afa2b7227cfd601ee948ff3b57c27eb7 (diff)
downloadphp-git-48198e4c257825ab89ee027bff5a93fc2cd59601.tar.gz
Fix #68302: impossible to compile php with zip support
We should not let configure succeed, if SIZEOF_OFF_T == 0, just to let the compilation fail later. Instead we bail out early, giving a hint regarding the potential issue, namely misconfigured libraries.
-rw-r--r--NEWS3
-rw-r--r--ext/zip/config.m43
2 files changed, 6 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index fdaa671f97..dca9d4f48b 100644
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,9 @@ PHP NEWS
- XML:
. Fixed bug #72085 (SEGV on unknown address zif_xml_parse). (cmb)
+- ZIP:
+ . Fixed bug #68302 (impossible to compile php with zip support). (cmb)
+
18 Aug 2016, PHP 5.6.25
- Bz2:
diff --git a/ext/zip/config.m4 b/ext/zip/config.m4
index a21ad2d3e1..845d446055 100644
--- a/ext/zip/config.m4
+++ b/ext/zip/config.m4
@@ -148,6 +148,9 @@ AC_CHECK_SIZEOF([int])
AC_CHECK_SIZEOF([long])
AC_CHECK_SIZEOF([long long])
AC_CHECK_SIZEOF([off_t])
+if test "$ac_cv_sizeof_off_t" = "0" ; then
+ AC_MSG_ERROR(off_t undefined; check your library configuration)
+fi
AC_CHECK_SIZEOF([size_t])
AC_PATH_PROG([TOUCH], [touch])