* Use new MY_ARG_DISABLED for tcl/ipv6

autotools/includes/acinclude.m4

@@ -88,21 +88,7 @@ dnl  EGG_IPV6_OPTIONS()
 dnl
 AC_DEFUN([EGG_IPV6_OPTIONS], 
 [
-AC_MSG_CHECKING(whether or not you disabled IPv6 support)
-AC_ARG_ENABLE(ipv6, [AS_HELP_STRING([--disable-ipv6], [disable IPv6 support])],
-[ ac_cv_dipv6="yes"
-  AC_MSG_RESULT(yes)
-],
-[ ac_cv_dipv6="no"
-  if test "$egg_cv_ipv6_supported" = "no"; then
-    ac_cv_dipv6="no"
-  fi
-  AC_MSG_RESULT($ac_cv_dipv6)
-])
-
-if test "$ac_cv_dipv6" = "no"; then
-  AC_DEFINE(USE_IPV6, 1, [Define if you want ipv6 support])
-fi
+MY_ARG_DISABLE(ipv6, [IPv6])
 ])
 
 

autotools/includes/libtcl.m4

@@ -10,20 +10,7 @@ AC_DEFUN([EGG_TCL_OPTIONS],
   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"])
 
-  AC_MSG_CHECKING(whether TCL Script is enabled)
-  AC_ARG_ENABLE(script_tcl,
-    [AS_HELP_STRING([--disable-script-tcl], [disable TCL Script support])],
-    [ enable_script_tcl="yes"
-      AC_MSG_RESULT(no)
-    ],
-    [ enable_script_tcl="no"
-      AC_MSG_RESULT(yes)
-    ]
-  )
-
-  if test "$enable_script_tcl" = "no"; then
-    AC_DEFINE(USE_SCRIPT_TCL, 1, [Define if you want TCL Script support])
-  fi
+  MY_ARG_DISABLE([script_tcl], [TCL Script])
 
   WARN=0
   # Make sure either both or neither $tcllibname and $tclincname are set

config.h.in

@@ -310,7 +310,7 @@
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
-/* Define if you want ipv6 support */
+/* Define if you want IPv6 support */
 #undef USE_IPV6
 
 /* Define if you want TCL Script support */

configure

@@ -4378,32 +4378,35 @@ esac
 # Check for IPv6 support
 #EGG_IPV6_SUPPORTED
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether or not you disabled IPv6 support" >&5
-$as_echo_n "checking whether or not you disabled IPv6 support... " >&6; }
-# Check whether --enable-ipv6 was given.
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether IPv6 is enabled" >&5
+$as_echo_n "checking whether IPv6 is enabled... " >&6; }
+  # Check whether --enable-ipv6 was given.
 if test "${enable_ipv6+set}" = set; then :
-  enableval=$enable_ipv6;  ac_cv_dipv6="yes"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  enableval=$enable_ipv6;
+       enable_ipv6=$enableval
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
 
 else
-   ac_cv_dipv6="no"
-  if test "$egg_cv_ipv6_supported" = "no"; then
-    ac_cv_dipv6="no"
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_dipv6" >&5
-$as_echo "$ac_cv_dipv6" >&6; }
 
-fi
+       # default if not given is ENABLED
+       if test "x$enableval" = "x"; then
+         enableval="yes"
+       fi
+       enable_ipv6=$enableval
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
 
+$as_echo "#define USE_IPV6 1" >>confdefs.h
 
-if test "$ac_cv_dipv6" = "no"; then
 
-$as_echo "#define USE_IPV6 1" >>confdefs.h
 
 fi
 
 
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5
 $as_echo_n "checking for socklen_t... " >&6; }
 if ${egg_cv_socklen_t+:} false; then :
@@ -5529,28 +5532,33 @@ if test "${with_tclinc+set}" = set; then :
 fi
 
 
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether TCL Script is enabled" >&5
 $as_echo_n "checking whether TCL Script is enabled... " >&6; }
-  # Check whether --enable-script_tcl was given.
+  # Check whether --enable-script-tcl was given.
 if test "${enable_script_tcl+set}" = set; then :
-  enableval=$enable_script_tcl;  enable_script_tcl="yes"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  enableval=$enable_script_tcl;
+       enable_script_tcl=$enableval
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
 
 else
-   enable_script_tcl="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
 
+       # default if not given is ENABLED
+       if test "x$enableval" = "x"; then
+         enableval="yes"
+       fi
+       enable_script_tcl=$enableval
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
 
-fi
+$as_echo "#define USE_SCRIPT_TCL 1" >>confdefs.h
 
 
-  if test "$enable_script_tcl" = "no"; then
 
-$as_echo "#define USE_SCRIPT_TCL 1" >>confdefs.h
+fi
+
 
-  fi
 
   WARN=0
   # Make sure either both or neither $tcllibname and $tclincname are set