From e076645382c4bfbcd3153d23916c025b1a2bdb80 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Tue, 12 Jan 2021 16:11:12 +0100 Subject: [PATCH] update obsolete autoconf constructs Part of #447. * configure.ac, m4/debug.m4, m4/devel.m4, m4/gccoptim.m4, m4/ndebug.m4: Replace AC_ERROR and AC_HELP_STRING by by AC_MSG_ERROR and AS_HELP_STRING. --- configure.ac | 14 +++++++------- m4/debug.m4 | 2 +- m4/devel.m4 | 4 ++-- m4/gccoptim.m4 | 2 +- m4/ndebug.m4 | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 9d83f6600..ac3c1277b 100644 --- a/configure.ac +++ b/configure.ac @@ -49,12 +49,12 @@ AM_SILENT_RULES([no]) # Option to activate C++20 AC_ARG_ENABLE([c++20], - [AC_HELP_STRING([--enable-c++20], + [AS_HELP_STRING([--enable-c++20], [Compile in C++20 mode.])], [enable_20=$enableval], [enable_20=no]) AC_ARG_ENABLE([doxygen], - [AC_HELP_STRING([--enable-doxygen]), + [AS_HELP_STRING([--enable-doxygen]), [enable generation of Doxygen documentation (requires Doxygen)])], [enable_doxygen=$enableval], [enable_doxygen=no]) AM_CONDITIONAL([ENABLE_DOXYGEN], [test "x${enable_doxygen:-no}" = xyes]) @@ -62,7 +62,7 @@ AM_CONDITIONAL([ENABLE_DOXYGEN], [test "x${enable_doxygen:-no}" = xyes]) # Option to indicate the maximal number of acceptance marks AC_COMPUTE_INT([default_max_accsets], [8*sizeof(unsigned)]) AC_ARG_ENABLE([max-accsets], - [AC_HELP_STRING([--enable-max-accsets=N], + [AS_HELP_STRING([--enable-max-accsets=N], [Support up to N acceptance sets])], [enable_max_accsets=$enableval], [enable_max_accsets=$default_max_accsets]) @@ -71,7 +71,7 @@ then AC_DEFINE_UNQUOTED([MAX_ACCSETS], [$enable_max_accsets], [The maximal number of acceptance sets supported (also known as acceptance marks)]) else - AC_ERROR([The argument of --enable-max-accsets must be a multiple of $default_max_accsets]) + AC_MSG_ERROR([The argument of --enable-max-accsets must be a multiple of $default_max_accsets]) fi # Activate C11 for gnulib tests @@ -128,7 +128,7 @@ if test x"${enable_20}" = xyes; then ${stdpass-false} && break done if ! "${stdpass-false}"; then - AC_ERROR([unable to turn on C++20 mode with this compiler]) + AC_MSG_ERROR([unable to turn on C++20 mode with this compiler]) fi else for f in -std=c++17 '-std=c++17 -stdlib=libc++' -std=c++1z @@ -138,7 +138,7 @@ else ${stdpass-false} && break done if ! "${stdpass-false}"; then - AC_ERROR([unable to turn on C++17 mode with this compiler]) + AC_MSG_ERROR([unable to turn on C++17 mode with this compiler]) fi fi @@ -157,7 +157,7 @@ LTDL_INIT([subproject convenience]) AX_BSYMBOLIC AC_ARG_ENABLE([python], - [AC_HELP_STRING([--disable-python], + [AS_HELP_STRING([--disable-python], [do not compile Python bindings])], [], [enable_python=yes]) diff --git a/m4/debug.m4 b/m4/debug.m4 index 50bf5f3cb..a30a802f9 100644 --- a/m4/debug.m4 +++ b/m4/debug.m4 @@ -1,6 +1,6 @@ AC_DEFUN([adl_ENABLE_DEBUG], [AC_ARG_ENABLE([debug], - [AC_HELP_STRING([--enable-debug],[enable debugging symbols])]) + [AS_HELP_STRING([--enable-debug],[enable debugging symbols])]) case "${enable_debug}" in yes) AC_DEFINE([DEBUG],1,[Define if you want debugging code.]) diff --git a/m4/devel.m4 b/m4/devel.m4 index 2cbfff661..07f7273ef 100644 --- a/m4/devel.m4 +++ b/m4/devel.m4 @@ -1,6 +1,6 @@ AC_DEFUN([adl_ENABLE_DEVEL], [AC_ARG_ENABLE([devel], - [AC_HELP_STRING([--enable-devel], + [AS_HELP_STRING([--enable-devel], [turn on useful developer options])]) # Turn on devel options for development version, unless @@ -31,7 +31,7 @@ AC_DEFUN([adl_ENABLE_DEVEL], AC_DEFUN([adl_ENABLE_GLIBCXX_DEBUG], [AC_ARG_ENABLE([glibcxx-debug], - [AC_HELP_STRING([--enable-glibcxx-debug], + [AS_HELP_STRING([--enable-glibcxx-debug], [turn on use the libstdc++ debug mode (see README)])]) if test x$enable_glibcxx_debug = xyes; then CPPFLAGS="$CPPFLAGS -D_GLIBCXX_DEBUG" diff --git a/m4/gccoptim.m4 b/m4/gccoptim.m4 index beab5ba84..e731435e3 100644 --- a/m4/gccoptim.m4 +++ b/m4/gccoptim.m4 @@ -1,7 +1,7 @@ dnl Adapted from Akim Demaille ad_GCC_WARNINGS. AC_DEFUN([ad_GCC_OPTIM], [AC_ARG_ENABLE([optimizations], - [AC_HELP_STRING([--disable-optimizations], + [AS_HELP_STRING([--disable-optimizations], [turn off aggressive optimizations])]) if test -n "$GCC" && test "${enable_optimizations-yes}" = "yes"; then AC_CACHE_CHECK([for gcc optimization options], ac_cv_prog_gcc_opt_flags, diff --git a/m4/ndebug.m4 b/m4/ndebug.m4 index 076f40aac..91f6cf31f 100644 --- a/m4/ndebug.m4 +++ b/m4/ndebug.m4 @@ -1,6 +1,6 @@ AC_DEFUN([adl_NDEBUG], [AC_ARG_ENABLE([assert], - [AC_HELP_STRING([--enable-assert], [turn on assertions])]) + [AS_HELP_STRING([--enable-assert], [turn on assertions])]) if test "$enable_assert" != yes; then CPPFLAGS="$CPPFLAGS -DNDEBUG" fi])