Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Refactor timelib.m4

diff --cc ext/date/config0.m4
index dfaa9bb3438c8963d932c09886ac83f3db1bdf18,e4641565711051a869c19383ba790056ea09228a..6c9d6141816763bb020204da60d353bedf4657dd
--- 1/ext/date/config0.m4
--- 2/ext/date/config0.m4
+++ b/ext/date/config0.m4
@@@ -1,7 -1,14 +1,13 @@@
 -dnl $Id$
  dnl config.m4 for date extension
  
- sinclude(ext/date/lib/timelib.m4)
- sinclude(lib/timelib.m4)
+ dnl Check for headers needed by timelib
+ AC_CHECK_HEADERS([ \
+ strings.h \
+ io.h
+ ])
+ 
+ dnl Check for strtoll, atoll
+ AC_CHECK_FUNCS(strtoll atoll)
  
  PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
  timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c