alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

update obsolete autoconf constructs

Browse source 
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.
This commit is contained in:
Alexandre Duret-Lutz 2021-01-12 16:11:12 +01:00
parent 7efdd497a8
commit d779395db6
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
configure.ac
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright (C) 2008-2020, Laboratoire de Recherche et Développement
# Copyright (C) 2008-2021, Laboratoire de Recherche et Développement
# de l'Epita (LRDE).
# Copyright (C) 2003-2007 Laboratoire d'Informatique de Paris 6
# (LIP6), département Systèmes Répartis Coopératifs (SRC), Université
@ -49,12 +49,12 @@ AM_SILENT_RULES([no])
# Option to activate C++17
AC_ARG_ENABLE([c++17],
[AC_HELP_STRING([--enable-c++17],
[AS_HELP_STRING([--enable-c++17],
[Compile in C++17 mode.])],
[enable_17=$enableval], [enable_17=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
@ -125,7 +125,7 @@ if test x"${enable_17}" = xyes; then
${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
else
for f in -std=c++14 '-std=c++14 -stdlib=libc++' -std=c++1y
@ -135,7 +135,7 @@ else
${stdpass-false} && break
done
if ! "${stdpass-false}"; then
AC_ERROR([unable to turn on C++14 mode with this compiler])
AC_MSG_ERROR([unable to turn on C++14 mode with this compiler])
fi
fi
@ -151,7 +151,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])