diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2015-04-25 17:53:28 +0200 |
|---|---|---|
| committer | Roger Meier <roger@apache.org> | 2015-04-26 16:03:38 +0200 |
| commit | e856d6846bce5402cc79f7bbaa59897690080017 (patch) | |
| tree | e9bd6bdbd661a7777ab21069760913498e4c1475 /aclocal/ax_lib_zlib.m4 | |
| parent | 1684c429501e9df9387cb518e660691f032d7926 (diff) | |
| download | thrift-e856d6846bce5402cc79f7bbaa59897690080017.tar.gz | |
THRIFT-3113 m4 C++11 macro issue
Make it cross-compile happy the hard way, there's no clean way.
Make zlib version detection cross-compile happy.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
autotools: update ax_cxx_compile_stdcxx_11.m4 to version 10
The ax_cxx_compile_stdcxx_11 macro bundled in thrift package is
brocken [1] and out of date.
Since Thrift actually doesn't use that particular C++11 feature,
make C++11 support optional.
[1] https://savannah.gnu.org/patch/index.php?8287
Fixes:
[thrift]
http://autobuild.buildroot.net/results/21e/21e3fff1e0d714f94ac7e621289d1a59bc02a05f/build-end.log
[host-thrift]
http://autobuild.buildroot.net/results/b89/b89ffc2bff699eb10bb6abd92369a43d4900354d/build-end.log
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
This closes: #462
Diffstat (limited to 'aclocal/ax_lib_zlib.m4')
| -rw-r--r-- | aclocal/ax_lib_zlib.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/aclocal/ax_lib_zlib.m4 b/aclocal/ax_lib_zlib.m4 index 8c10ab413..bdb9e110e 100644 --- a/aclocal/ax_lib_zlib.m4 +++ b/aclocal/ax_lib_zlib.m4 @@ -73,7 +73,7 @@ AC_DEFUN([AX_LIB_ZLIB_DO_CHECK], # (defined in the library). AC_LANG_PUSH([C]) dnl This can be changed to AC_LINK_IFELSE if you are cross-compiling. - AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include <zlib.h> #if ZLIB_VERNUM >= 0x$WANT_ZLIB_VERSION #else |