ax_boost_{chrono,unit_test_framework}.m4: take changes from upstream

Apply changes to
build-aux/m4/ax_boost_chrono.m4 and
build-aux/m4/ax_boost_unit_test_framework.m4
from upstream: https://github.com/peti/autoconf-archive
This commit is contained in:
Vasil Dimov 2018-03-13 20:54:34 +01:00
parent 947c25ead2
commit 8c632f73c2
No known key found for this signature in database
GPG Key ID: 170E923FF6C1A420
2 changed files with 9 additions and 9 deletions

View File

@ -1,5 +1,5 @@
# =========================================================================== # ===========================================================================
# http://www.gnu.org/software/autoconf-archive/ax_boost_chrono.html # https://www.gnu.org/software/autoconf-archive/ax_boost_chrono.html
# =========================================================================== # ===========================================================================
# #
# SYNOPSIS # SYNOPSIS
@ -8,7 +8,7 @@
# #
# DESCRIPTION # DESCRIPTION
# #
# Test for System library from the Boost C++ libraries. The macro requires # Test for Chrono library from the Boost C++ libraries. The macro requires
# a preceding call to AX_BOOST_BASE. Further documentation is available at # a preceding call to AX_BOOST_BASE. Further documentation is available at
# <http://randspringer.de/boost/index.html>. # <http://randspringer.de/boost/index.html>.
# #
@ -29,7 +29,7 @@
# and this notice are preserved. This file is offered as-is, without any # and this notice are preserved. This file is offered as-is, without any
# warranty. # warranty.
#serial 1 #serial 4
AC_DEFUN([AX_BOOST_CHRONO], AC_DEFUN([AX_BOOST_CHRONO],
[ [
@ -68,7 +68,7 @@ AC_DEFUN([AX_BOOST_CHRONO],
CXXFLAGS_SAVE=$CXXFLAGS CXXFLAGS_SAVE=$CXXFLAGS
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/chrono.hpp>]], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/chrono.hpp>]],
[[boost::chrono::system_clock::time_point time;]])], [[boost::chrono::system_clock::time_point* time = new boost::chrono::system_clock::time_point; delete time;]])],
ax_cv_boost_chrono=yes, ax_cv_boost_chrono=no) ax_cv_boost_chrono=yes, ax_cv_boost_chrono=no)
CXXFLAGS=$CXXFLAGS_SAVE CXXFLAGS=$CXXFLAGS_SAVE
AC_LANG_POP([C++]) AC_LANG_POP([C++])

View File

@ -1,6 +1,6 @@
# ================================================================================ # =================================================================================
# http://www.gnu.org/software/autoconf-archive/ax_boost_unit_test_framework.html # https://www.gnu.org/software/autoconf-archive/ax_boost_unit_test_framework.html
# ================================================================================ # =================================================================================
# #
# SYNOPSIS # SYNOPSIS
# #
@ -29,7 +29,7 @@
# and this notice are preserved. This file is offered as-is, without any # and this notice are preserved. This file is offered as-is, without any
# warranty. # warranty.
#serial 19 #serial 21
AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK], AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
[ [
@ -66,7 +66,7 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
[AC_LANG_PUSH([C++]) [AC_LANG_PUSH([C++])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/test/unit_test.hpp>]], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/test/unit_test.hpp>]],
[[using boost::unit_test::test_suite; [[using boost::unit_test::test_suite;
test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" ); return 0;]])], test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" ); if (test == NULL) { return 1; } else { return 0; }]])],
ax_cv_boost_unit_test_framework=yes, ax_cv_boost_unit_test_framework=no) ax_cv_boost_unit_test_framework=yes, ax_cv_boost_unit_test_framework=no)
AC_LANG_POP([C++]) AC_LANG_POP([C++])
]) ])