[LTP] [RFC PATCH v2 7/7] m4: Fix warnings
Petr Vorel
pvorel@suse.cz
Wed Jan 26 13:35:47 CET 2022
from autoconf 2.71:
* s/AC_HELP_STRING/AS_HELP_STRING/
Similar replace was done in autoconf commit 5958ce17 ("*
doc/autoconf.texi: Replace AC_HELP_STRING AS_HELP_STRING.")
from 2.58.
* s/AC_TRY_LINK/AC_COMPILE_IFELSE([AC_LANG_PROGRAM/
Similar replace was done in autoconf commit ede91cff ("Modernize
AC_EXEEXT and AC_OBJEXT. Now work with other languages than C and C++.")
from 2.50.
Due previous keep requiring 2.61. Tested on 2.63 (SLES 11 and CentOS 6
both don't even compile as unsupported, thus we could bump version to 2.63).
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
New in v2
configure.ac | 24 ++++++++++++------------
m4/ltp-kernel_devel.m4 | 6 +++---
testcases/realtime/m4/check.m4 | 6 +++---
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/configure.ac b/configure.ac
index f83bbe950b..03184e13e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,7 +219,7 @@ AC_CHECK_TYPES([struct __kernel_old_timeval, struct __kernel_old_timespec, struc
# Bash
AC_ARG_WITH([bash],
- [AC_HELP_STRING([--with-bash],
+ [AS_HELP_STRING([--with-bash],
[have the Bourne Again Shell interpreter])],
[with_bash=$withval],
[with_bash=no]
@@ -232,24 +232,24 @@ fi
# metadata
AC_ARG_ENABLE([metadata],
- [AC_HELP_STRING([--disable-metadata],
+ [AS_HELP_STRING([--disable-metadata],
[Disable metadata generation (both HTML and PDF, default no)])],
[], [enable_metadata=yes]
)
AC_ARG_ENABLE([metadata_html],
- [AC_HELP_STRING([--disable-metadata-html],
+ [AS_HELP_STRING([--disable-metadata-html],
[Disable metadata HTML generation (default no)])],
[], [enable_metadata_html=yes]
)
AC_ARG_ENABLE([metadata_pdf],
- [AC_HELP_STRING([--enable-metadata-pdf],
+ [AS_HELP_STRING([--enable-metadata-pdf],
[Enable metadata PDF generation (default no)])],
[], [enable_metadata_pdf=no]
)
AC_ARG_WITH([metadata_generator],
- [AC_HELP_STRING([--with-metadata-generator=asciidoc|asciidoctor],
+ [AS_HELP_STRING([--with-metadata-generator=asciidoc|asciidoctor],
[Specify metadata generator to use (default autodetect)])],
[with_metadata_generator=$withval],
[with_metadata_generator=detect]
@@ -259,7 +259,7 @@ LTP_DOCPARSE
# Expect
AC_ARG_WITH([expect],
- [AC_HELP_STRING([--with-expect],
+ [AS_HELP_STRING([--with-expect],
[have the Tcl/expect library])],
[with_expect=$withval],
[with_expect=no]
@@ -272,7 +272,7 @@ fi
# Numa
AC_ARG_WITH([numa],
- AC_HELP_STRING([--without-numa],
+ AS_HELP_STRING([--without-numa],
[without numa support]),
[with_numa=$withval],
[with_numa=yes]
@@ -280,7 +280,7 @@ AC_ARG_WITH([numa],
# Perl
AC_ARG_WITH([perl],
- [AC_HELP_STRING([--with-perl],
+ [AS_HELP_STRING([--with-perl],
[have a perl interpreter])],
[with_perl=$withval],
[with_perl=no]
@@ -293,7 +293,7 @@ fi
# Python
AC_ARG_WITH([python],
- [AC_HELP_STRING([--with-python],
+ [AS_HELP_STRING([--with-python],
[have a python interpreter])],
[with_python=$withval],
[with_python=no]
@@ -306,7 +306,7 @@ fi
# TI RPC
AC_ARG_WITH([tirpc],
- AC_HELP_STRING([--without-tirpc],
+ AS_HELP_STRING([--without-tirpc],
[without libtirpc support]),
[with_tirpc=$withval],
[with_tirpc=yes]
@@ -316,7 +316,7 @@ AC_ARG_WITH([tirpc],
# Testsuites knobs
AC_ARG_WITH([open-posix-testsuite],
- [AC_HELP_STRING([--with-open-posix-testsuite],
+ [AS_HELP_STRING([--with-open-posix-testsuite],
[compile and install the open posix testsuite])],
[with_open_posix_testsuite=$withval],
[with_open_posix_testsuite=no]
@@ -329,7 +329,7 @@ fi
# TODO: testcases/realtime requires bash and python.
AC_ARG_WITH([realtime-testsuite],
- [AC_HELP_STRING([--with-realtime-testsuite],
+ [AS_HELP_STRING([--with-realtime-testsuite],
[compile and install the realtime testsuite])],
[with_realtime_testsuite=$withval],
[with_realtime_testsuite=no]
diff --git a/m4/ltp-kernel_devel.m4 b/m4/ltp-kernel_devel.m4
index 8a0598e5a3..d46d54775a 100644
--- a/m4/ltp-kernel_devel.m4
+++ b/m4/ltp-kernel_devel.m4
@@ -9,7 +9,7 @@ AC_DEFUN([LTP_CHECK_KERNEL_DEVEL],[
AC_MSG_CHECKING([for kernel-devel])
AC_ARG_WITH(
[linux-version],
- [AC_HELP_STRING([--with-linux-version=VERSION],
+ [AS_HELP_STRING([--with-linux-version=VERSION],
[specify the Linux version to build modules for])],
[LINUX_VERSION="${withval}"],
AS_IF([test "$cross_compiling" = "no"],
@@ -18,7 +18,7 @@ AC_ARG_WITH(
AC_SUBST(LINUX_VERSION)
AC_ARG_WITH([linux-dir],
- [AC_HELP_STRING([--with-linux-dir=DIR],
+ [AS_HELP_STRING([--with-linux-dir=DIR],
[specify path to kernel-devel directory])],
[LINUX_DIR="${withval}"],
AS_IF([test -n "$LINUX_VERSION"],
@@ -44,7 +44,7 @@ AC_MSG_RESULT([$WITH_MODULES])
AC_ARG_WITH(
[modules],
- [AC_HELP_STRING([--without-modules],
+ [AS_HELP_STRING([--without-modules],
[disable auto-building kernel modules])],
[WITH_MODULES="no"],
[])
diff --git a/testcases/realtime/m4/check.m4 b/testcases/realtime/m4/check.m4
index e60ae19289..d04a2cc73a 100644
--- a/testcases/realtime/m4/check.m4
+++ b/testcases/realtime/m4/check.m4
@@ -1,10 +1,10 @@
AC_DEFUN([REALTIME_CHECK_PRIO_INHERIT],[
AC_MSG_CHECKING([for PTHREAD_PRIO_INHERIT])
-AC_TRY_COMPILE([
-#include <pthread.h>],[int main(void) {
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <pthread.h>]], [[int main(void) {
pthread_mutexattr_t attr;
return pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT);
-}],[has_priority_inherit="yes"],[])
+}]])],[has_priority_inherit="yes"],[])
if test "x$has_priority_inherit" = "xyes" ; then
AC_DEFINE(HAS_PRIORITY_INHERIT,1,[Define to 1 if you have PTHREAD_PRIO_INHERIT])
AC_MSG_RESULT(yes)
--
2.34.1
More information about the ltp
mailing list