AS_HELP_STRING is a direct replacement for AC_HELP_STRING. It is available since autoconf 2.57a. OVS requires 2.63, so AS_HELP_STRING can be freely used.
This fixes the following warning on systems with 2.70+: $ ./boot.sh ... configure.ac:92: warning: The macro `AC_HELP_STRING' is obsolete. configure.ac:92: You should run autoupdate. ... Signed-off-by: Ilya Maximets <[email protected]> --- acinclude.m4 | 16 ++++++++-------- m4/openvswitch.m4 | 18 +++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 03afb4170..d9a33f583 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -19,7 +19,7 @@ dnl at compile time. This enables automatically running all unit tests dnl with all actions implementations. AC_DEFUN([OVS_CHECK_ACTIONS_AUTOVALIDATOR], [ AC_ARG_ENABLE([actions-default-autovalidator], - [AC_HELP_STRING([--enable-actions-default-autovalidator], + [AS_HELP_STRING([--enable-actions-default-autovalidator], [Enable actions autovalidator as default ovs actions implementation.])], [autovalidator=yes],[autovalidator=no]) @@ -39,7 +39,7 @@ dnl This enables automatically running all unit tests with all MFEX dnl implementations. AC_DEFUN([OVS_CHECK_MFEX_AUTOVALIDATOR], [ AC_ARG_ENABLE([mfex-default-autovalidator], - [AC_HELP_STRING([--enable-mfex-default-autovalidator], + [AS_HELP_STRING([--enable-mfex-default-autovalidator], [Enable MFEX autovalidator as default miniflow_extract implementation.])], [autovalidator=yes],[autovalidator=no]) @@ -58,7 +58,7 @@ dnl This enables automatically running all unit tests with all DPCLS dnl implementations. AC_DEFUN([OVS_CHECK_DPCLS_AUTOVALIDATOR], [ AC_ARG_ENABLE([autovalidator], - [AC_HELP_STRING([--enable-autovalidator], + [AS_HELP_STRING([--enable-autovalidator], [Enable DPCLS autovalidator as default subtable search implementation.])], [autovalidator=yes],[autovalidator=no]) @@ -77,7 +77,7 @@ dnl Set OVS DPIF default implementation at configure time for running the unit dnl tests on the whole codebase without modifying tests per DPIF impl AC_DEFUN([OVS_CHECK_DPIF_AVX512_DEFAULT], [ AC_ARG_ENABLE([dpif-default-avx512], - [AC_HELP_STRING([--enable-dpif-default-avx512], + [AS_HELP_STRING([--enable-dpif-default-avx512], [Enable DPIF AVX512 implementation as default.])], [dpifavx512=yes],[dpifavx512=no]) AC_MSG_CHECKING([whether DPIF AVX512 is default implementation]) @@ -108,7 +108,7 @@ dnl OVS_ENABLE_WERROR AC_DEFUN([OVS_ENABLE_WERROR], [AC_ARG_ENABLE( [Werror], - [AC_HELP_STRING([--enable-Werror], [Add -Werror to CFLAGS])], + [AS_HELP_STRING([--enable-Werror], [Add -Werror to CFLAGS])], [], [enable_Werror=no]) AC_CONFIG_COMMANDS_PRE( [if test "X$enable_Werror" = Xyes; then @@ -254,7 +254,7 @@ dnl dnl Check both Linux kernel AF_XDP and libbpf support AC_DEFUN([OVS_CHECK_LINUX_AF_XDP], [ AC_ARG_ENABLE([afxdp], - [AC_HELP_STRING([--enable-afxdp], [Enable AF-XDP support])], + [AS_HELP_STRING([--enable-afxdp], [Enable AF-XDP support])], [], [enable_afxdp=no]) AC_MSG_CHECKING([whether AF_XDP is enabled]) if test "$enable_afxdp" != yes; then @@ -296,7 +296,7 @@ dnl dnl Configure DPDK source tree AC_DEFUN([OVS_CHECK_DPDK], [ AC_ARG_WITH([dpdk], - [AC_HELP_STRING([--with-dpdk=static|shared|yes], + [AS_HELP_STRING([--with-dpdk=static|shared|yes], [Specify "static" or "shared" depending on the DPDK libraries to use])], [have_dpdk=true]) @@ -663,7 +663,7 @@ AC_DEFUN([OVS_ENABLE_SPARSE], AC_ARG_ENABLE( [sparse], - [AC_HELP_STRING([--enable-sparse], [Run "sparse" by default])], + [AS_HELP_STRING([--enable-sparse], [Run "sparse" by default])], [], [enable_sparse=no]) AM_CONDITIONAL([ENABLE_SPARSE_BY_DEFAULT], [test $enable_sparse = yes])]) diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 index fe51455b4..6eef1fb35 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -21,7 +21,7 @@ AC_DEFUN([OVS_CHECK_COVERAGE], [AC_REQUIRE([AC_PROG_CC]) AC_ARG_ENABLE( [coverage], - [AC_HELP_STRING([--enable-coverage], + [AS_HELP_STRING([--enable-coverage], [Enable gcov coverage tool.])], [case "${enableval}" in (yes) coverage=true ;; @@ -50,7 +50,7 @@ dnl Checks for --enable-ndebug and defines NDEBUG if it is specified. AC_DEFUN([OVS_CHECK_NDEBUG], [AC_ARG_ENABLE( [ndebug], - [AC_HELP_STRING([--enable-ndebug], + [AS_HELP_STRING([--enable-ndebug], [Disable debugging features for max performance])], [case "${enableval}" in (yes) ndebug=true ;; @@ -64,7 +64,7 @@ dnl Checks for --enable-usdt-probes and defines HAVE_USDT if it is specified. AC_DEFUN([OVS_CHECK_USDT], [ AC_ARG_ENABLE( [usdt-probes], - [AC_HELP_STRING([--enable-usdt-probes], + [AS_HELP_STRING([--enable-usdt-probes], [Enable User Statically Defined Tracing (USDT) probes])], [case "${enableval}" in (yes) usdt=true ;; @@ -227,7 +227,7 @@ dnl Checks for libcap-ng. AC_DEFUN([OVS_CHECK_LIBCAPNG], [AC_ARG_ENABLE( [libcapng], - [AC_HELP_STRING([--disable-libcapng], [Disable Linux capability support])], + [AS_HELP_STRING([--disable-libcapng], [Disable Linux capability support])], [case "${enableval}" in (yes) libcapng=true ;; (no) libcapng=false ;; @@ -263,7 +263,7 @@ dnl Checks for OpenSSL. AC_DEFUN([OVS_CHECK_OPENSSL], [AC_ARG_ENABLE( [ssl], - [AC_HELP_STRING([--disable-ssl], [Disable OpenSSL support])], + [AS_HELP_STRING([--disable-ssl], [Disable OpenSSL support])], [case "${enableval}" in (yes) ssl=true ;; (no) ssl=false ;; @@ -320,7 +320,7 @@ dnl Checks for the directory in which to store the PKI. AC_DEFUN([OVS_CHECK_PKIDIR], [AC_ARG_WITH( [pkidir], - AC_HELP_STRING([--with-pkidir=DIR], + AS_HELP_STRING([--with-pkidir=DIR], [PKI hierarchy directory [[LOCALSTATEDIR/lib/openvswitch/pki]]]), [PKIDIR=$withval], [PKIDIR='${localstatedir}/lib/openvswitch/pki']) @@ -330,7 +330,7 @@ dnl Checks for the directory in which to store pidfiles. AC_DEFUN([OVS_CHECK_RUNDIR], [AC_ARG_WITH( [rundir], - AC_HELP_STRING([--with-rundir=DIR], + AS_HELP_STRING([--with-rundir=DIR], [directory used for pidfiles [[LOCALSTATEDIR/run/openvswitch]]]), [RUNDIR=$withval], @@ -341,7 +341,7 @@ dnl Checks for the directory in which to store logs. AC_DEFUN([OVS_CHECK_LOGDIR], [AC_ARG_WITH( [logdir], - AC_HELP_STRING([--with-logdir=DIR], + AS_HELP_STRING([--with-logdir=DIR], [directory used for logs [[LOCALSTATEDIR/log/PACKAGE]]]), [LOGDIR=$withval], [LOGDIR='${localstatedir}/log/${PACKAGE}']) @@ -351,7 +351,7 @@ dnl Checks for the directory in which to store the Open vSwitch database. AC_DEFUN([OVS_CHECK_DBDIR], [AC_ARG_WITH( [dbdir], - AC_HELP_STRING([--with-dbdir=DIR], + AS_HELP_STRING([--with-dbdir=DIR], [directory used for conf.db [[SYSCONFDIR/PACKAGE]]]), [DBDIR=$withval], [DBDIR='${sysconfdir}/${PACKAGE}']) -- 2.34.3 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
