com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/date/config0.m4
| From: | Peter Kokot | Date: | Wed, 13 Feb 2019 18:26:02 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/date/config0.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-104617@lists.php.net to get a copy of this message | ||
Commit: a89948320b7f835fa1dfe8dc3fc3f369304e5893
Author: Peter Kokot <peterkokot@gmail.com> Wed, 13 Feb 2019 19:26:02 +0100
Parents: aa7fbdf2cd41b956cf039c9f779db265b264947d 0ffa84d7401d61a251029c0813e38a69f84a9486
Branches: PHP-7.3 PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a89948320b7f835fa1dfe8dc3fc3f369304e5893
Log:
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Refactor timelib.m4
Changed paths:
MM ext/date/config0.m4
Diff:
diff --cc ext/date/config0.m4
index dfaa9bb,e464156..6c9d614
--- a/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