Commands.txt: Import descriptions from "rbose/command_help"

[ngircd-alex.git] / configure.ng

diff --git a/configure.ng b/configure.ng
index 732e55ee01388280e2e858a86b686dee0826dbb4..c89096fd0f8febf02f3f1a08134ba7c686e387c3 100644 (file)
--- a/configure.ng
+++ b/configure.ng
@@ -518,7 +518,8 @@ if test "$x_ircplus_on" = "yes"; then
        # CHARCONV is the only function depending on it.
        x_iconv_on=no
        AC_ARG_WITH(iconv,
-               [  --with-iconv            enable character conversation using libiconv],
+               AS_HELP_STRING([--with-iconv],
+                              [enable character conversation using libiconv]),
                [ if test "$withval" != "no"; then
                        if test "$withval" != "yes"; then
                                CFLAGS="-I$withval/include $CFLAGS"
@@ -711,7 +712,8 @@ echo $ECHO_N "   libiconv support: $ECHO_C"
 
 echo
 
-if ! grep "^AUTOMAKE_OPTIONS = ../portab/ansi2knr" src/ngircd/Makefile.am >/dev/null 2>&1; then
+define(_automake_regex_,[[^AUTOMAKE_OPTIONS = [a-z .\-]*/portab/ansi2knr]])
+if ! grep "_automake_regex_" src/ngircd/Makefile.am >/dev/null 2>&1; then
        echo "WARNING:"
        echo "This GNU automake generated build system does not support \"de-ANSI-fication\","
        echo "therefore don't use it to generate \"official\" distribution archives!"