Skip to content

Commit 8c632f7

Browse files
committed
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
1 parent 947c25e commit 8c632f7

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

build-aux/m4/ax_boost_chrono.m4

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ===========================================================================
2-
# http://www.gnu.org/software/autoconf-archive/ax_boost_chrono.html
2+
# https://www.gnu.org/software/autoconf-archive/ax_boost_chrono.html
33
# ===========================================================================
44
#
55
# SYNOPSIS
@@ -8,7 +8,7 @@
88
#
99
# DESCRIPTION
1010
#
11-
# Test for System library from the Boost C++ libraries. The macro requires
11+
# Test for Chrono library from the Boost C++ libraries. The macro requires
1212
# a preceding call to AX_BOOST_BASE. Further documentation is available at
1313
# <http://randspringer.de/boost/index.html>.
1414
#
@@ -29,7 +29,7 @@
2929
# and this notice are preserved. This file is offered as-is, without any
3030
# warranty.
3131

32-
#serial 1
32+
#serial 4
3333

3434
AC_DEFUN([AX_BOOST_CHRONO],
3535
[
@@ -68,7 +68,7 @@ AC_DEFUN([AX_BOOST_CHRONO],
6868
CXXFLAGS_SAVE=$CXXFLAGS
6969
7070
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/chrono.hpp>]],
71-
[[boost::chrono::system_clock::time_point time;]])],
71+
[[boost::chrono::system_clock::time_point* time = new boost::chrono::system_clock::time_point; delete time;]])],
7272
ax_cv_boost_chrono=yes, ax_cv_boost_chrono=no)
7373
CXXFLAGS=$CXXFLAGS_SAVE
7474
AC_LANG_POP([C++])

build-aux/m4/ax_boost_unit_test_framework.m4

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# ================================================================================
2-
# http://www.gnu.org/software/autoconf-archive/ax_boost_unit_test_framework.html
3-
# ================================================================================
1+
# =================================================================================
2+
# https://www.gnu.org/software/autoconf-archive/ax_boost_unit_test_framework.html
3+
# =================================================================================
44
#
55
# SYNOPSIS
66
#
@@ -29,7 +29,7 @@
2929
# and this notice are preserved. This file is offered as-is, without any
3030
# warranty.
3131

32-
#serial 19
32+
#serial 21
3333

3434
AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
3535
[
@@ -66,7 +66,7 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
6666
[AC_LANG_PUSH([C++])
6767
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/test/unit_test.hpp>]],
6868
[[using boost::unit_test::test_suite;
69-
test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" ); return 0;]])],
69+
test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" ); if (test == NULL) { return 1; } else { return 0; }]])],
7070
ax_cv_boost_unit_test_framework=yes, ax_cv_boost_unit_test_framework=no)
7171
AC_LANG_POP([C++])
7272
])

0 commit comments

Comments
 (0)