com php-src: fix acinclude, messed up by bad merge #2124: acinclude.m4
| From: | Joe Watkins | Date: | Fri, 06 Jan 2017 16:13:21 +0000 |
| Subject: | com php-src: fix acinclude, messed up by bad merge #2124: acinclude.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96570@lists.php.net to get a copy of this message | ||
Commit: 46c800948e75140cfcda1fe1defc9bef4c211f82
Author: Joe Watkins <krakjoe@php.net> Fri, 6 Jan 2017 16:13:21 +0000
Parents: 91cf3269c2ce384f79dde8b01e926b2cb9d98735
Branches: PHP-7.1
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=46c800948e75140cfcda1fe1defc9bef4c211f82
Log:
fix acinclude, messed up by bad merge #2124
Bugs:
https://bugs.php.net/2124
Changed paths:
M acinclude.m4
Diff:
diff --git a/acinclude.m4 b/acinclude.m4
index 4f06730..1a4ac7c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -3109,3 +3109,6 @@ AC_DEFUN([PHP_CHECK_BUILTIN_CTZLL], [
AC_DEFINE_UNQUOTED([PHP_HAVE_BUILTIN_CTZLL], [$have_builtin_ctzll], [Whether the compiler
supports __builtin_ctzll])
])
+
+dnl Load the AX_CHECK_COMPILE_FLAG macro from the autoconf archive.
+m4_include([build/ax_check_compile_flag.m4])