Merge branch 'master' into next

* master:
  * Use AS_HELP_STRING for tcl --with options
  * Fix spacing of --disable-ipv6 in autoconf

autotools/includes/acinclude.m4

@@ -30,7 +30,7 @@ dnl
 AC_DEFUN([EGG_IPV6_OPTIONS], 
 [
 AC_MSG_CHECKING(whether or not you disabled IPv6 support)
-AC_ARG_ENABLE(ipv6, [  --disable-ipv6           disable IPv6 support],
+AC_ARG_ENABLE(ipv6, [AS_HELP_STRING([--disable-ipv6], [disable IPv6 support])],
 [ ac_cv_dipv6="yes"
   AC_MSG_RESULT(yes)
 ],

autotools/includes/libtcl.m4

@@ -7,8 +7,8 @@ dnl EGG_TCL_ARG_WITH()
 dnl
 AC_DEFUN([EGG_TCL_ARG_WITH],
 [
-  AC_ARG_WITH(tcllib, [  --with-tcllib=PATH      full path to Tcl library], [tcllibname="$withval"])
-  AC_ARG_WITH(tclinc, [  --with-tclinc=PATH      full path to Tcl header],  [tclincname="$withval"])
+  AC_ARG_WITH(tcllib, [AS_HELP_STRING([--with-tcllib=PATH],[full path to Tcl library])], [tcllibname="$withval"])
+  AC_ARG_WITH(tclinc, [AS_HELP_STRING([--with-tclinc=PATH],[full path to Tcl header])],  [tclincname="$withval"])
 
   WARN=0
   # Make sure either both or neither $tcllibname and $tclincname are set

configure

@@ -1315,7 +1315,7 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-ipv6           disable IPv6 support
+  --disable-ipv6          disable IPv6 support
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]