Bug 11719: Should automatically line-up "configure --help" and also include appropriate

missing [brackets] after you update configure using "autoconf".

From Jose Da Silva <Digital@JoesCat.com>


git-svn-id: svn+ssh://svn.abisource.com/svnroot/enchant/trunk@24841 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6

1 files changed, 14 insertions, 17 deletions

diff --git a/configure.in b/configure.in
index c1a9897..4ff7872 100644
--- a/configure.in
+++ b/configure.in
@@ -90,7 +90,7 @@ AC_DEFUN([ENCHANT_CXX_TRY_FLAG], [
   AC_LANG_POP(C++)
 ])
 
-dnl Use lots of warning flags with with gcc and compatible compilers
+dnl Use lots of warning flags with gcc and compatible compilers
 
 dnl Note: if you change the following variable, the cache is automatically
 dnl skipped and all flags rechecked.  So there's no need to do anything
@@ -260,7 +260,7 @@ AM_CONDITIONAL(WITH_BINRELOC, test "x$br_cv_binreloc" = "xyes")
 
 build_ispell=yes
 
-AC_ARG_ENABLE(ispell, [  --disable-ispell     enable the ispell backend [default=auto]], build_ispell="$enableval", build_ispell=yes)
+AC_ARG_ENABLE(ispell, AS_HELP_STRING([--disable-ispell],[enable the ispell backend @<:@default=auto@:>@]), build_ispell="$enableval", build_ispell=yes)
 
 if test "x$have_cxx" = "xno"; then
    build_ispell=no
@@ -268,7 +268,7 @@ fi
 AM_CONDITIONAL(WITH_ISPELL, test "x$build_ispell" = "xyes")
 
 ispell_dir=${datadir}/enchant/ispell
-AC_ARG_WITH(ispell-dir, [  --with-ispell-dir=PATH    path to installed ispell dicts ])
+AC_ARG_WITH(ispell-dir, AS_HELP_STRING([--with-ispell-dir=PATH],[path to installed ispell dicts]))
 
 if test "x$with_ispell_dir" != "x" ; then
    ispell_dir=$with_ispell_dir
@@ -279,7 +279,7 @@ AC_SUBST(ISPELL_CFLAGS)
 
 build_myspell=yes
 
-AC_ARG_ENABLE(myspell, [  --disable-myspell     enable the myspell backend [default=auto]], build_myspell="$enableval", build_myspell=yes)
+AC_ARG_ENABLE(myspell, AS_HELP_STRING([--disable-myspell],[enable the myspell backend @<:@default=auto@:>@]), build_myspell="$enableval", build_myspell=yes)
 
 if test "x$have_cxx" = "xno"; then
    build_myspell=no
@@ -287,7 +287,7 @@ fi
 AM_CONDITIONAL(WITH_MYSPELL, test "x$build_myspell" = "xyes")
 
 myspell_dir=${datadir}/myspell/dicts
-AC_ARG_WITH(myspell-dir, [  --with-myspell-dir=PATH    path to installed myspell dicts ])
+AC_ARG_WITH(myspell-dir, AS_HELP_STRING([--with-myspell-dir=PATH],[path to installed myspell dicts]))
 
 if test "x$with_myspell_dir" != "x" ; then
    myspell_dir=$with_myspell_dir
@@ -302,10 +302,9 @@ AM_CONDITIONAL(WITH_SYSTEM_MYSPELL, test "x$have_system_myspell" = "xtrue")
 check_aspell=yes
 build_aspell=no
 
-AC_ARG_ENABLE(aspell, [  --disable-aspell     enable the aspell backend [default=auto]], check_aspell="$enableval", check_aspell=yes)
+AC_ARG_ENABLE(aspell, AS_HELP_STRING([--disable-aspell],[enable the aspell backend @<:@default=auto@:>@]), check_aspell="$enableval", check_aspell=yes)
 
-AC_ARG_WITH(aspell-prefix, [  --with-aspell-prefix=DIR
-                          specify under which prefix aspell is installed.], aspell_prefix="$withval", )
+AC_ARG_WITH(aspell-prefix, AS_HELP_STRING([--with-aspell-prefix=DIR],[specify under which prefix aspell is installed]), aspell_prefix="$withval", )
 
 if test "x$check_aspell" != "xno"; then
    saved_LDFLAGS=$LDFLAGS
@@ -377,10 +376,9 @@ AM_CONDITIONAL(WITH_ASPELL, test "$build_aspell" = yes)
 check_voikko=yes
 build_voikko=no
 
-AC_ARG_ENABLE(voikko, [  --disable-voikko     enable the voikko backend [default=auto]], check_voikko="$enableval", check_voikko=yes)
+AC_ARG_ENABLE(voikko, AS_HELP_STRING([--disable-voikko],[enable the voikko backend @<:@default=auto@:>@]), check_voikko="$enableval", check_voikko=yes)
 
-AC_ARG_WITH(voikko-prefix, [  --with-voikko-prefix=DIR
-                          specify under which prefix voikko is installed.], voikko_prefix="$withval", )
+AC_ARG_WITH(voikko-prefix, AS_HELP_STRING([--with-voikko-prefix=DIR],[specify under which prefix voikko is installed]), voikko_prefix="$withval", )
 
 if test "x$check_voikko" != "xno"; then
    saved_LDFLAGS=$LDFLAGS
@@ -406,7 +404,7 @@ AM_CONDITIONAL(WITH_VOIKKO, test "$build_voikko" = yes)
 build_uspell=no
 
 check_uspell=yes
-AC_ARG_ENABLE(uspell, [  --disable-uspell     enable the uspell backend [default=auto]], check_uspell="$enableval", check_uspell=yes)
+AC_ARG_ENABLE(uspell, AS_HELP_STRING([--disable-uspell],[enable the uspell backend @<:@default=auto@:>@]), check_uspell="$enableval", check_uspell=yes)
 
 if test "x$have_cxx" = "xno"; then
    check_uspell=no
@@ -417,7 +415,7 @@ if test "x$check_uspell" != "xno"; then
 fi
 
 uspell_dir=${datadir}/uspell
-AC_ARG_WITH(uspell-dir, [  --with-uspell-dir=PATH    path to installed uspell dicts ])
+AC_ARG_WITH(uspell-dir, AS_HELP_STRING([--with-uspell-dir=PATH],[path to installed uspell dicts]))
 
 if test "x$with_uspell_dir" != "x" ; then
    uspell_dir=$with_uspell_dir
@@ -431,10 +429,9 @@ AM_CONDITIONAL(WITH_USPELL, test "$build_uspell" = yes)
 
 build_hspell=no
 check_hspell=yes
-AC_ARG_ENABLE(hspell, [  --disable-hspell     enable the hspell backend [default=auto]], check_hspell="$enableval", check_hspell=yes)
+AC_ARG_ENABLE(hspell, AS_HELP_STRING([--disable-hspell],[enable the hspell backend @<:@default=auto@:>@]), check_hspell="$enableval", check_hspell=yes)
 
-AC_ARG_WITH(hspell-prefix, [  --with-hspell-prefix=DIR
-                          specify under which prefix hspell is installed.], hspell_prefix="$withval", )
+AC_ARG_WITH(hspell-prefix, AS_HELP_STRING([--with-hspell-prefix=DIR],[specify under which prefix hspell is installed]), hspell_prefix="$withval", )
 
 dnl change to pkg-config when hspell provides a hspell.pc file
 
@@ -461,7 +458,7 @@ AM_CONDITIONAL(WITH_HSPELL, test "$build_hspell" = yes)
 
 build_zemberek=yes
 
-AC_ARG_ENABLE(zemberek, [  --disable-zemberek     enable the zemberek backend [default=auto]], build_zemberek="$enableval", build_zemberek=yes)
+AC_ARG_ENABLE(zemberek, AS_HELP_STRING([--disable-zemberek],[enable the zemberek backend @<:@default=auto@:>@]), build_zemberek="$enableval", build_zemberek=yes)
 
 if test "x$have_cxx" = "xno"; then
    build_zemberek=no