@@ -18,7 +18,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
@@ -54,7 +54,7 @@ AC_DEFUN([OVS_CHECK_DDLOG], [
AC_ARG_VAR([DDLOG_HOME], [Root of the DDlog installation])
AC_ARG_WITH(
[ddlog],
- [AC_HELP_STRING([--with-ddlog[[=INSTALLDIR|LIBDIR]]], [Enables DDlog])],
+ [AS_HELP_STRING([--with-ddlog[[=INSTALLDIR|LIBDIR]]], [Enables DDlog])],
[DDLOG_PATH=$PATH
if test "$withval" = yes; then
# --with-ddlog: $DDLOG_HOME must be set
@@ -321,7 +321,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])])
@@ -400,10 +400,10 @@ dnl
dnl Check for OVS sources
AC_DEFUN([OVN_CHECK_OVS], [
AC_ARG_WITH([ovs-source],
- [AC_HELP_STRING([--with-ovs-source=/path/to/ovs/src/dir],
+ [AS_HELP_STRING([--with-ovs-source=/path/to/ovs/src/dir],
[Specify the OVS src directory])])
AC_ARG_WITH([ovs-build],
- [AC_HELP_STRING([--with-ovs-build=/path/to/ovs/build/dir],
+ [AS_HELP_STRING([--with-ovs-build=/path/to/ovs/build/dir],
[Specify the OVS build directory])])
AC_MSG_CHECKING([for OVS source directory])
@@ -449,7 +449,7 @@ AC_DEFUN([OVN_CHECK_VIF_PLUG_PROVIDER], [
AC_ARG_VAR([VIF_PLUG_PROVIDER])
AC_ARG_WITH(
[vif-plug-provider],
- [AC_HELP_STRING([--with-vif-plug-provider=/path/to/provider/repository],
+ [AS_HELP_STRING([--with-vif-plug-provider=/path/to/provider/repository],
[Specify path to a configured and built VIF plug provider repository])],
[if test "$withval" = yes; then
if test -z "$VIF_PLUG_PROVIDER"; then
@@ -482,7 +482,7 @@ dnl Enable built-in plug providers
AC_DEFUN([OVN_ENABLE_VIF_PLUG], [
AC_ARG_ENABLE(
[vif-plug-providers],
- [AC_HELP_STRING([--enable-vif-plug-providers], [Enable building of built-in VIF plug providers])],
+ [AS_HELP_STRING([--enable-vif-plug-providers], [Enable building of built-in VIF plug providers])],
[], [enable_vif_plug=no])
AM_CONDITIONAL([ENABLE_VIF_PLUG], [test "$enable_vif_plug" != no])
if test "$enable_vif_plug" != no; then
@@ -21,7 +21,7 @@ AC_DEFUN([OVN_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 ;;
@@ -197,7 +197,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 ;;
@@ -249,7 +249,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'])
@@ -259,7 +259,7 @@ dnl Checks for the directory in which to store pidfiles.
AC_DEFUN([OVN_CHECK_RUNDIR],
[AC_ARG_WITH(
[rundir],
- AC_HELP_STRING([--with-rundir=DIR],
+ AS_HELP_STRING([--with-rundir=DIR],
[directory used for pidfiles
[[LOCALSTATEDIR/run/ovn]]]),
[OVN_RUNDIR=$withval],
@@ -270,7 +270,7 @@ dnl Checks for the directory in which to store logs.
AC_DEFUN([OVN_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}'])
@@ -280,7 +280,7 @@ dnl Checks for the directory in which to store the OVN database.
AC_DEFUN([OVN_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}'])
@@ -581,7 +581,7 @@ dnl Checks for --enable-ddlog-fast-build and updates DDLOG_EXTRA_RUSTFLAGS.
AC_DEFUN([OVS_CHECK_DDLOG_FAST_BUILD],
[AC_ARG_ENABLE(
[ddlog_fast_build],
- [AC_HELP_STRING([--enable-ddlog-fast-build],
+ [AS_HELP_STRING([--enable-ddlog-fast-build],
[Build ddlog programs faster, but generate slower code])],
[case "${enableval}" in
(yes) ddlog_fast_build=true ;;
AS_HELP_STRING is a direct replacement for AC_HELP_STRING. It is available since autoconf 2.57a. OVN 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:88: warning: The macro `AC_HELP_STRING' is obsolete. configure.ac:88: You should run autoupdate. ... Signed-off-by: Ilya Maximets <i.maximets@ovn.org> --- acinclude.m4 | 14 +++++++------- m4/ovn.m4 | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-)