build: harmonize configure help strings
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Acked-by: Greg Troxel <gdt@ir.bbn.com>
Acked-by: Feng Lu <lu.feng@6wind.com>
Acked-by: Paul Jakma <paul@jakma.org>
diff --git a/configure.ac b/configure.ac
index 1583fb6..0fd4db1 100755
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@
dnl default is to match previous behavior
exampledir=${sysconfdir}
AC_ARG_ENABLE([exampledir],
- AC_HELP_STRING([--enable-exampledir],
+ AS_HELP_STRING([--enable-exampledir],
[specify alternate directory for examples]),
exampledir="$enableval",)
dnl XXX add --exampledir to autoconf standard directory list somehow
@@ -42,7 +42,7 @@
pkgsrcrcdir=""
pkgsrcdir=""
AC_ARG_ENABLE([pkgsrcrcdir],
- AC_HELP_STRING([--enable-pkgsrcrcdir],
+ AS_HELP_STRING([--enable-pkgsrcrcdir],
[specify directory for rc.d scripts]),
pkgsrcrcdir="$enableval"; pkgsrcdir="pkgsrc",)
dnl XXX add --pkgsrcrcdir to autoconf standard directory list somehow
@@ -197,85 +197,85 @@
AS_HELP_STRING([--with-pkg-git-version], [add git information to MOTD and build version string]),
[ test "x$withval" != "xno" && with_pkg_git_version="yes" ])
AC_ARG_ENABLE(vtysh,
-[ --enable-vtysh include integrated vty shell for Quagga])
+ AS_HELP_STRING([--enable-vtysh], [include integrated vty shell for Quagga]))
AC_ARG_ENABLE(ipv6,
-[ --disable-ipv6 turn off IPv6 related features and daemons])
+ AS_HELP_STRING([--disable-ipv6], [turn off IPv6 related features and daemons]))
AC_ARG_ENABLE(doc,
-[ --disable-doc do not build docs])
+ AS_HELP_STRING([--disable-doc], [do not build docs]))
AC_ARG_ENABLE(zebra,
-[ --disable-zebra do not build zebra daemon])
+ AS_HELP_STRING([--disable-zebra], [do not build zebra daemon]))
AC_ARG_ENABLE(bgpd,
-[ --disable-bgpd do not build bgpd])
+ AS_HELP_STRING([--disable-bgpd], [do not build bgpd]))
AC_ARG_ENABLE(ripd,
-[ --disable-ripd do not build ripd])
+ AS_HELP_STRING([--disable-ripd], [do not build ripd]))
AC_ARG_ENABLE(ripngd,
-[ --disable-ripngd do not build ripngd])
+ AS_HELP_STRING([--disable-ripngd], [do not build ripngd]))
AC_ARG_ENABLE(ospfd,
-[ --disable-ospfd do not build ospfd])
+ AS_HELP_STRING([--disable-ospfd], [do not build ospfd]))
AC_ARG_ENABLE(ospf6d,
-[ --disable-ospf6d do not build ospf6d])
+ AS_HELP_STRING([--disable-ospf6d], [do not build ospf6d]))
AC_ARG_ENABLE(babeld,
-[ --disable-babeld do not build babeld])
+ AS_HELP_STRING([--disable-babeld], [do not build babeld]))
AC_ARG_ENABLE(watchquagga,
-[ --disable-watchquagga do not build watchquagga])
+ AS_HELP_STRING([--disable-watchquagga], [do not build watchquagga]))
AC_ARG_ENABLE(isisd,
-[ --enable-isisd build isisd])
+ AS_HELP_STRING([--enable-isisd], [build isisd]))
AC_ARG_ENABLE(pimd,
-[ --enable-pimd build pimd])
+ AS_HELP_STRING([--enable-pimd], [build pimd]))
AC_ARG_ENABLE(bgp-announce,
-[ --disable-bgp-announce, turn off BGP route announcement])
+ AS_HELP_STRING([--disable-bgp-announce,], [turn off BGP route announcement]))
AC_ARG_ENABLE(snmp,
-[ --enable-snmp=ARG enable SNMP support (smux or agentx)])
+ AS_HELP_STRING([--enable-snmp=ARG], [enable SNMP support (smux or agentx)]))
AC_ARG_WITH(libpam,
-[ --with-libpam use libpam for PAM support in vtysh])
+ AS_HELP_STRING([--with-libpam], [use libpam for PAM support in vtysh]))
AC_ARG_ENABLE(tcp-zebra,
-[ --enable-tcp-zebra enable TCP/IP socket connection between zebra and protocol daemon])
+ AS_HELP_STRING([--enable-tcp-zebra], [enable TCP/IP socket connection between zebra and protocol daemon]))
AC_ARG_ENABLE(opaque-lsa,
- AC_HELP_STRING([--disable-opaque-lsa],[do not build OSPF Opaque-LSA with OSPFAPI support (RFC2370)]))
+ AS_HELP_STRING([--disable-opaque-lsa],[do not build OSPF Opaque-LSA with OSPFAPI support (RFC2370)]))
AC_ARG_ENABLE(ospfapi,
-[ --disable-ospfapi do not build OSPFAPI to access the OSPF LSA Database])
+ AS_HELP_STRING([--disable-ospfapi], [do not build OSPFAPI to access the OSPF LSA Database]))
AC_ARG_ENABLE(ospfclient,
-[ --disable-ospfclient do not build OSPFAPI client for OSPFAPI,
- (this is the default if --disable-ospfapi is set)])
+ AS_HELP_STRING([--disable-ospfclient], [do not build OSPFAPI client for OSPFAPI,
+ (this is the default if --disable-ospfapi is set)]))
AC_ARG_ENABLE(ospf-te,
- AC_HELP_STRING([--disable-ospf-te],[disable Traffic Engineering Extension to OSPF]))
+ AS_HELP_STRING([--disable-ospf-te],[disable Traffic Engineering Extension to OSPF]))
AC_ARG_ENABLE(multipath,
-[ --enable-multipath=ARG enable multipath function, ARG must be digit])
+ AS_HELP_STRING([--enable-multipath=ARG], [enable multipath function, ARG must be digit]))
AC_ARG_ENABLE(user,
- AC_HELP_STRING([--enable-user=user], [user to run Quagga suite as (default quagga)]))
+ AS_HELP_STRING([--enable-user=USER], [user to run Quagga suite as (default quagga)]))
AC_ARG_ENABLE(group,
- AC_HELP_STRING([--enable-group=group], [group to run Quagga suite as (default quagga)]))
+ AS_HELP_STRING([--enable-group=GROUP], [group to run Quagga suite as (default quagga)]))
AC_ARG_ENABLE(vty_group,
-[ --enable-vty-group=ARG set vty sockets to have specified group as owner])
+ AS_HELP_STRING([--enable-vty-group=ARG], [set vty sockets to have specified group as owner]))
AC_ARG_ENABLE(configfile_mask,
-[ --enable-configfile-mask=ARG set mask for config files])
+ AS_HELP_STRING([--enable-configfile-mask=ARG], [set mask for config files]))
AC_ARG_ENABLE(logfile_mask,
-[ --enable-logfile-mask=ARG set mask for log files])
+ AS_HELP_STRING([--enable-logfile-mask=ARG], [set mask for log files]))
AC_ARG_ENABLE(rtadv,
-[ --disable-rtadv disable IPV6 router advertisement feature])
+ AS_HELP_STRING([--disable-rtadv], [disable IPV6 router advertisement feature]))
AC_ARG_ENABLE(irdp,
-[ --enable-irdp enable IRDP server support in zebra])
+ AS_HELP_STRING([--enable-irdp], [enable IRDP server support in zebra]))
AC_ARG_ENABLE(isis_topology,
-[ --enable-isis-topology enable IS-IS topology generator])
+ AS_HELP_STRING([--enable-isis-topology], [enable IS-IS topology generator]))
AC_ARG_ENABLE(capabilities,
-[ --disable-capabilities disable using POSIX capabilities])
+ AS_HELP_STRING([--disable-capabilities], [disable using POSIX capabilities]))
AC_ARG_ENABLE(rusage,
-[ --disable-rusage disable using getrusage])
+ AS_HELP_STRING([--disable-rusage], [disable using getrusage]))
AC_ARG_ENABLE(gcc_ultra_verbose,
-[ --enable-gcc-ultra-verbose enable ultra verbose GCC warnings])
+ AS_HELP_STRING([--enable-gcc-ultra-verbose], [enable ultra verbose GCC warnings]))
AC_ARG_ENABLE(linux24_tcp_md5,
-[ --enable-linux24-tcp-md5 enable support for old, Linux-2.4 RFC2385 patch])
+ AS_HELP_STRING([--enable-linux24-tcp-md5], [enable support for old, Linux-2.4 RFC2385 patch]))
AC_ARG_ENABLE(gcc-rdynamic,
-[ --enable-gcc-rdynamic enable linking with -rdynamic for better backtraces (default if gcc)])
+ AS_HELP_STRING([--enable-gcc-rdynamic], [enable linking with -rdynamic for better backtraces (default if gcc)]))
AC_ARG_ENABLE(backtrace,
-[ --disable-backtrace, disable crash backtraces (default autodetect)])
+ AS_HELP_STRING([--disable-backtrace,], [disable crash backtraces (default autodetect)]))
AC_ARG_ENABLE(time-check,
-[ --disable-time-check disable slow thread warning messages])
+ AS_HELP_STRING([--disable-time-check], [disable slow thread warning messages]))
AC_ARG_ENABLE(pcreposix,
-[ --enable-pcreposix enable using PCRE Posix libs for regex functions])
+ AS_HELP_STRING([--enable-pcreposix], [enable using PCRE Posix libs for regex functions]))
AC_ARG_ENABLE(fpm,
-[ --enable-fpm enable Forwarding Plane Manager support])
+ AS_HELP_STRING([--enable-fpm], [enable Forwarding Plane Manager support]))
if test x"${enable_gcc_ultra_verbose}" = x"yes" ; then
CFLAGS="${CFLAGS} -W -Wcast-qual -Wstrict-prototypes"