Skip to content

Commit 738e516

Browse files
committed
Update m4s.
1 parent 730c8c3 commit 738e516

15 files changed

+1177
-1293
lines changed

m4/ax_boost_base.m4

+143-113
Large diffs are not rendered by default.

m4/ax_boost_unit_test_framework.m4

+6-6
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 22
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
])
@@ -124,7 +124,7 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
124124
done
125125
fi
126126
if test "x$ax_lib" = "x"; then
127-
AC_MSG_ERROR(Could not find a version of the library!)
127+
AC_MSG_ERROR(Could not find a version of the Boost::Unit_Test_Framework library!)
128128
fi
129129
if test "x$link_unit_test_framework" != "xyes"; then
130130
AC_MSG_ERROR(Could not link against $ax_lib !)

m4/ax_check_compile_flag.m4

+8-29
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ===========================================================================
2-
# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
2+
# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
33
# ===========================================================================
44
#
55
# SYNOPSIS
@@ -29,36 +29,15 @@
2929
# Copyright (c) 2008 Guido U. Draheim <[email protected]>
3030
# Copyright (c) 2011 Maarten Bosmans <[email protected]>
3131
#
32-
# This program is free software: you can redistribute it and/or modify it
33-
# under the terms of the GNU General Public License as published by the
34-
# Free Software Foundation, either version 3 of the License, or (at your
35-
# option) any later version.
36-
#
37-
# This program is distributed in the hope that it will be useful, but
38-
# WITHOUT ANY WARRANTY; without even the implied warranty of
39-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
40-
# Public License for more details.
41-
#
42-
# You should have received a copy of the GNU General Public License along
43-
# with this program. If not, see <http://www.gnu.org/licenses/>.
44-
#
45-
# As a special exception, the respective Autoconf Macro's copyright owner
46-
# gives unlimited permission to copy, distribute and modify the configure
47-
# scripts that are the output of Autoconf when processing the Macro. You
48-
# need not follow the terms of the GNU General Public License when using
49-
# or distributing such scripts, even though portions of the text of the
50-
# Macro appear in them. The GNU General Public License (GPL) does govern
51-
# all other use of the material that constitutes the Autoconf Macro.
52-
#
53-
# This special exception to the GPL applies to versions of the Autoconf
54-
# Macro released by the Autoconf Archive. When you make and distribute a
55-
# modified version of the Autoconf Macro, you may extend this special
56-
# exception to the GPL to apply to your modified version as well.
32+
# Copying and distribution of this file, with or without modification, are
33+
# permitted in any medium without royalty provided the copyright notice
34+
# and this notice are preserved. This file is offered as-is, without any
35+
# warranty.
5736

58-
#serial 3
37+
#serial 6
5938

6039
AC_DEFUN([AX_CHECK_COMPILE_FLAG],
61-
[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
40+
[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
6241
AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
6342
AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
6443
ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
@@ -67,7 +46,7 @@ AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
6746
[AS_VAR_SET(CACHEVAR,[yes])],
6847
[AS_VAR_SET(CACHEVAR,[no])])
6948
_AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
70-
AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
49+
AS_VAR_IF(CACHEVAR,yes,
7150
[m4_default([$2], :)],
7251
[m4_default([$3], :)])
7352
AS_VAR_POPDEF([CACHEVAR])dnl

m4/ax_check_link_flag.m4

+9-29
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ===========================================================================
2-
# http://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html
2+
# https://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html
33
# ===========================================================================
44
#
55
# SYNOPSIS
@@ -29,44 +29,24 @@
2929
# Copyright (c) 2008 Guido U. Draheim <[email protected]>
3030
# Copyright (c) 2011 Maarten Bosmans <[email protected]>
3131
#
32-
# This program is free software: you can redistribute it and/or modify it
33-
# under the terms of the GNU General Public License as published by the
34-
# Free Software Foundation, either version 3 of the License, or (at your
35-
# option) any later version.
36-
#
37-
# This program is distributed in the hope that it will be useful, but
38-
# WITHOUT ANY WARRANTY; without even the implied warranty of
39-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
40-
# Public License for more details.
41-
#
42-
# You should have received a copy of the GNU General Public License along
43-
# with this program. If not, see <http://www.gnu.org/licenses/>.
44-
#
45-
# As a special exception, the respective Autoconf Macro's copyright owner
46-
# gives unlimited permission to copy, distribute and modify the configure
47-
# scripts that are the output of Autoconf when processing the Macro. You
48-
# need not follow the terms of the GNU General Public License when using
49-
# or distributing such scripts, even though portions of the text of the
50-
# Macro appear in them. The GNU General Public License (GPL) does govern
51-
# all other use of the material that constitutes the Autoconf Macro.
52-
#
53-
# This special exception to the GPL applies to versions of the Autoconf
54-
# Macro released by the Autoconf Archive. When you make and distribute a
55-
# modified version of the Autoconf Macro, you may extend this special
56-
# exception to the GPL to apply to your modified version as well.
32+
# Copying and distribution of this file, with or without modification, are
33+
# permitted in any medium without royalty provided the copyright notice
34+
# and this notice are preserved. This file is offered as-is, without any
35+
# warranty.
5736

58-
#serial 3
37+
#serial 6
5938

6039
AC_DEFUN([AX_CHECK_LINK_FLAG],
61-
[AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
40+
[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
41+
AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
6242
AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [
6343
ax_check_save_flags=$LDFLAGS
6444
LDFLAGS="$LDFLAGS $4 $1"
6545
AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
6646
[AS_VAR_SET(CACHEVAR,[yes])],
6747
[AS_VAR_SET(CACHEVAR,[no])])
6848
LDFLAGS=$ax_check_save_flags])
69-
AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
49+
AS_VAR_IF(CACHEVAR,yes,
7050
[m4_default([$2], :)],
7151
[m4_default([$3], :)])
7252
AS_VAR_POPDEF([CACHEVAR])dnl

m4/ax_check_preproc_flag.m4

+6-27
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ===========================================================================
2-
# http://www.gnu.org/software/autoconf-archive/ax_check_preproc_flag.html
2+
# https://www.gnu.org/software/autoconf-archive/ax_check_preproc_flag.html
33
# ===========================================================================
44
#
55
# SYNOPSIS
@@ -29,33 +29,12 @@
2929
# Copyright (c) 2008 Guido U. Draheim <[email protected]>
3030
# Copyright (c) 2011 Maarten Bosmans <[email protected]>
3131
#
32-
# This program is free software: you can redistribute it and/or modify it
33-
# under the terms of the GNU General Public License as published by the
34-
# Free Software Foundation, either version 3 of the License, or (at your
35-
# option) any later version.
36-
#
37-
# This program is distributed in the hope that it will be useful, but
38-
# WITHOUT ANY WARRANTY; without even the implied warranty of
39-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
40-
# Public License for more details.
41-
#
42-
# You should have received a copy of the GNU General Public License along
43-
# with this program. If not, see <http://www.gnu.org/licenses/>.
44-
#
45-
# As a special exception, the respective Autoconf Macro's copyright owner
46-
# gives unlimited permission to copy, distribute and modify the configure
47-
# scripts that are the output of Autoconf when processing the Macro. You
48-
# need not follow the terms of the GNU General Public License when using
49-
# or distributing such scripts, even though portions of the text of the
50-
# Macro appear in them. The GNU General Public License (GPL) does govern
51-
# all other use of the material that constitutes the Autoconf Macro.
52-
#
53-
# This special exception to the GPL applies to versions of the Autoconf
54-
# Macro released by the Autoconf Archive. When you make and distribute a
55-
# modified version of the Autoconf Macro, you may extend this special
56-
# exception to the GPL to apply to your modified version as well.
32+
# Copying and distribution of this file, with or without modification, are
33+
# permitted in any medium without royalty provided the copyright notice
34+
# and this notice are preserved. This file is offered as-is, without any
35+
# warranty.
5736

58-
#serial 4
37+
#serial 6
5938

6039
AC_DEFUN([AX_CHECK_PREPROC_FLAG],
6140
[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF

0 commit comments

Comments
 (0)