[PATCH 07/13] configure.ac: use AS_HELP_STRING for help text

Ruben Kerkhof ruben at rubenkerkhof.com
Sat Mar 18 17:25:37 CET 2017


---
 configure.ac | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 60 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index ed236751..633805cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,17 +6,66 @@ AC_INIT
 AC_CONFIG_SRCDIR([conf/confbase.Y])
 AC_CONFIG_AUX_DIR(tools)
 
-AC_ARG_ENABLE(debug,  [  --enable-debug          enable internal debugging routines (default: disabled)],,enable_debug=no)
-AC_ARG_ENABLE(memcheck, [  --enable-memcheck       check memory allocations when debugging (default: enabled)],,enable_memcheck=yes)
-AC_ARG_ENABLE(client, [  --enable-client         enable building of BIRD client (default: enabled)],,enable_client=yes)
-AC_ARG_ENABLE(ipv6, [  --enable-ipv6           enable building of IPv6 version (default: disabled)],,enable_ipv6=no)
-AC_ARG_ENABLE(pthreads, [  --enable-pthreads       enable POSIX threads support (default: detect)],,enable_pthreads=try)
-AC_ARG_WITH(suffix, [  --with-suffix=STRING    use specified suffix for BIRD files (default: 6 for IPv6 version)],[given_suffix="yes"])
-AC_ARG_WITH(sysconfig,  [  --with-sysconfig=FILE   use specified BIRD system configuration file])
-AC_ARG_WITH(protocols,  [  --with-protocols=LIST   include specified routing protocols (default: all)],,[with_protocols="all"])
-AC_ARG_WITH(sysinclude, [  --with-sysinclude=PATH  search for system includes on specified place])
-AC_ARG_WITH(runtimedir, [  --with-runtimedir=PATH  path for runtime files (default: $(localstatedir)/run)],[runtimedir="$with_runtimedir"],[runtimedir="\$(localstatedir)/run"])
-AC_ARG_WITH(iproutedir, [  --with-iproutedir=PATH  path to iproute2 config files (default: /etc/iproute2)],[given_iproutedir="yes"])
+AC_ARG_ENABLE([client],
+  [AS_HELP_STRING([--enable-client], [enable building of BIRD client @<:@default=yes@:>@])],
+  [],
+  [enable_client=yes]
+)
+
+AC_ARG_ENABLE([debug],
+  [AS_HELP_STRING([--enable-debug],[enable internal debugging routines @<:@default=no@:>@])],
+  [],
+  [enable_debug=no]
+)
+
+AC_ARG_ENABLE([ipv6],
+  [AS_HELP_STRING([--enable-ipv6],[enable building of IPv6 version @<:@default=no@:>@])],
+  [],
+  [enable_ipv6=no]
+)
+
+AC_ARG_ENABLE([memcheck],
+  [AS_HELP_STRING([--enable-memcheck], [check memory allocations when debugging @<:@default=yes@:>@])],
+  [],
+  [enable_memcheck=yes]
+)
+
+AC_ARG_ENABLE([pthreads],
+  [AS_HELP_STRING([--enable-pthreads], [enable POSIX threads support @<:@default=try@:>@])],
+  [],
+  [enable_pthreads=try]
+)
+
+AC_ARG_WITH([iproutedir],
+  [AS_HELP_STRING([--with-iproutedir=PATH], [path to iproute2 config files @<:@default=/etc/iproute2@:>@])],
+  [given_iproutedir="yes"]
+)
+
+AC_ARG_WITH([protocols],
+  [AS_HELP_STRING([--with-protocols=LIST], [include specified routing protocols @<:@default=all@:>@])],
+  [],
+  [with_protocols="all"]
+)
+
+AC_ARG_WITH([runtimedir],
+  [AS_HELP_STRING([--with-runtimedir=PATH], [path for runtime files @<:@default=$(localstatedir)/run@:>@])],
+  [runtimedir="$with_runtimedir"],
+  [runtimedir="\$(localstatedir)/run"]
+)
+
+AC_ARG_WITH([suffix],
+  [AS_HELP_STRING([--with-suffix=STRING], [use specified suffix for BIRD files @<:@default=6 for IPv6 version@:>@])],
+  [given_suffix="yes"]
+)
+
+AC_ARG_WITH([sysconfig],
+  [AS_HELP_STRING([--with-sysconfig=FILE], [use specified BIRD system configuration file])]
+)
+
+AC_ARG_WITH([sysinclude],
+  [AS_HELP_STRING([--with-sysinclude=PATH], [search for system includes in specified path])]
+)
+
 AC_ARG_VAR([FLEX], [location of the Flex program])
 AC_ARG_VAR([BISON], [location of the Bison program])
 AC_ARG_VAR([M4], [location of the M4 program])
-- 
2.12.0



More information about the Bird-users mailing list