From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 3 Aug 2009 05:32:51 +0000 (-0400)
Subject: Upgraded to autogen-5.9.9-pre5
X-Git-Tag: NTP_4_2_5P198~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a9f56cefa1e53483857a19f80dc250849790f1d;p=thirdparty%2Fntp.git

Upgraded to autogen-5.9.9-pre5

bk: 4a767683JDenqDfECo95DFk3uDB0nA
---

diff --git a/ChangeLog b/ChangeLog
index 4d7e7f122..1174aab44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Upgrade to autogen-5.9.9-pre5.
 (4.2.5p197) 2009/07/30 Released by Harlan Stenn <stenn@ntp.org>
 * The build script now has . at the end of PATH for config.guess.
 (4.2.5p196) 2009/07/29 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/gsoc_sntp/libopts/ag-char-map.h b/gsoc_sntp/libopts/ag-char-map.h
index dcdd8b7d7..85e384117 100644
--- a/gsoc_sntp/libopts/ag-char-map.h
+++ b/gsoc_sntp/libopts/ag-char-map.h
@@ -1,5 +1,5 @@
 /*
- *   Character mapping generated 07/23/09 17:36:47
+ *   Character mapping generated 08/01/09 11:21:22
  *
  *  This file contains the character classifications
  *  used by AutoGen and AutoOpts for identifying tokens.
@@ -12,17 +12,48 @@
 #  include <inttypes.h>
 # elif defined(HAVE_STDINT_H)
 #  include <stdint.h>
+
 # else
-#  error "no int-types header."
-#  choke-me-now.
-# endif
-#else
+#   ifndef HAVE_INT8_T
+        typedef signed char     int8_t;
+#   endif
+#   ifndef HAVE_UINT8_T
+        typedef unsigned char   uint8_t;
+#   endif
+#   ifndef HAVE_INT16_T
+        typedef signed short    int16_t;
+#   endif
+#   ifndef HAVE_UINT16_T
+        typedef unsigned short  uint16_t;
+#   endif
+#   ifndef HAVE_UINT_T
+        typedef unsigned int    uint_t;
+#   endif
+
+#   ifndef HAVE_INT32_T
+#    if SIZEOF_INT == 4
+        typedef signed int      int32_t;
+#    elif SIZEOF_LONG == 4
+        typedef signed long     int32_t;
+#    endif
+#   endif
+
+#   ifndef HAVE_UINT32_T
+#    if SIZEOF_INT == 4
+        typedef unsigned int    uint32_t;
+#    elif SIZEOF_LONG == 4
+        typedef unsigned long   uint32_t;
+#    endif
+#   endif
+# endif /* HAVE_*INT*_H header */
+
+#else /* not HAVE_CONFIG_H -- */
 # ifdef __sun
 #  include <inttypes.h>
 # else
 #  include <stdint.h>
 # endif
-#endif
+#endif /* HAVE_CONFIG_H */
 
 #if 0 /* mapping specification source (from autogen.map) */
 // 
diff --git a/gsoc_sntp/libopts/autoopts.c b/gsoc_sntp/libopts/autoopts.c
index 9fcc95adf..417d469ad 100644
--- a/gsoc_sntp/libopts/autoopts.c
+++ b/gsoc_sntp/libopts/autoopts.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: autoopts.c,v 4.44 2009/01/25 19:31:56 bkorb Exp $
+ *  $Id: autoopts.c,v 4.40 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2009-01-12 02:49:49 bkorb"
  *
  *  This file contains all of the routines that must be linked into
@@ -24,8 +24,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/autoopts.h b/gsoc_sntp/libopts/autoopts.h
index 38edd3e9f..108bcb7ac 100644
--- a/gsoc_sntp/libopts/autoopts.h
+++ b/gsoc_sntp/libopts/autoopts.h
@@ -2,7 +2,7 @@
 /*
  *  Time-stamp:      "2008-11-01 20:08:06 bkorb"
  *
- *  autoopts.h  $Id: autoopts.h,v 4.41 2009/01/01 16:49:26 bkorb Exp $
+ *  autoopts.h  $Id: autoopts.h,v 4.31 2009/08/01 17:44:36 bkorb Exp $
  *
  *  This file defines all the global structures and special values
  *  used in the automated option processing library.
@@ -23,8 +23,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/autoopts/options.h b/gsoc_sntp/libopts/autoopts/options.h
index 4aad8f118..e84bd8646 100644
--- a/gsoc_sntp/libopts/autoopts/options.h
+++ b/gsoc_sntp/libopts/autoopts/options.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (options.h)
  *  
- *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:34 PM PDT
+ *  It has been AutoGen-ed  August  1, 2009 at 11:21:11 AM by AutoGen 5.9.9pre4
  *  From the definitions    funcs.def
  *  and the template file   options_h
  *
@@ -144,7 +144,7 @@ typedef enum {
     OPTST_DEPRECATED_ID      =  26  /* support is being removed      */
 } opt_state_enum_t;
 
-#define OPTST_INIT           0U
+#define OPTST_INIT               0U
 #define OPTST_SET            (1U << OPTST_SET_ID)
 #define OPTST_PRESET         (1U << OPTST_PRESET_ID)
 #define OPTST_DEFINED        (1U << OPTST_DEFINED_ID)
@@ -173,40 +173,34 @@ typedef enum {
 #define OPTST_DEPRECATED     (1U << OPTST_DEPRECATED_ID)
 #define OPT_STATE_MASK       0x07FFFF7FU
 
-#define OPTST_SET_MASK       (  \
-        OPTST_SET | \
-        OPTST_PRESET | \
-        OPTST_RESET | \
-        OPTST_DEFINED )
-
-#define OPTST_MUTABLE_MASK   (  \
-        OPTST_SET | \
-        OPTST_PRESET | \
-        OPTST_RESET | \
-        OPTST_DEFINED | \
-        OPTST_EQUIVALENCE | \
-        OPTST_DISABLED | \
-        OPTST_ALLOC_ARG )
-
-#define OPTST_SELECTED_MASK  (  \
-        OPTST_SET | \
-        OPTST_DEFINED )
-
-#define OPTST_ARG_TYPE_MASK  (  \
-        OPTST_ARG_TYPE_1 | \
-        OPTST_ARG_TYPE_2 | \
-        OPTST_ARG_TYPE_3 | \
-        OPTST_ARG_TYPE_4 )
-
-#define OPTST_DO_NOT_SAVE_MASK   (  \
-        OPTST_NO_INIT | \
-        OPTST_DOCUMENT | \
-        OPTST_OMITTED )
-
-#define OPTST_NO_USAGE_MASK  (  \
-        OPTST_OMITTED | \
-        OPTST_NO_COMMAND | \
-        OPTST_DEPRECATED )
+#define OPTST_SET_MASK       ( \
+        OPTST_DEFINED | OPTST_PRESET |  OPTST_RESET | \
+        OPTST_SET \
+        /* 0x0000000FU */ )
+
+#define OPTST_MUTABLE_MASK   ( \
+        OPTST_ALLOC_ARG |   OPTST_DEFINED | \
+        OPTST_DISABLED |    OPTST_EQUIVALENCE | \
+        OPTST_PRESET |      OPTST_RESET | \
+        OPTST_SET \
+        /* 0x0000007FU */ )
+
+#define OPTST_SELECTED_MASK  ( \
+        OPTST_DEFINED | OPTST_SET \
+        /* 0x00000005U */ )
+
+#define OPTST_ARG_TYPE_MASK  ( \
+        OPTST_ARG_TYPE_1 | OPTST_ARG_TYPE_2 | OPTST_ARG_TYPE_3 | \
+        OPTST_ARG_TYPE_4 \
+        /* 0x0000F000U */ )
+
+#define OPTST_DO_NOT_SAVE_MASK   ( \
+        OPTST_DOCUMENT | OPTST_NO_INIT |  OPTST_OMITTED \
+        /* 0x00280100U */ )
+
+#define OPTST_NO_USAGE_MASK  ( \
+        OPTST_DEPRECATED | OPTST_NO_COMMAND | OPTST_OMITTED \
+        /* 0x06080000U */ )
 
 #ifdef NO_OPTIONAL_OPT_ARGS
 # undef  OPTST_ARG_OPTIONAL
@@ -253,7 +247,7 @@ typedef enum {
     OPTPROC_PRESETTING_ID      =  19  /* opt processing in preset state */
 } optproc_state_enum_t;
 
-#define OPTPROC_NONE           0U
+#define OPTPROC_NONE               0U
 #define OPTPROC_LONGOPT        (1U << OPTPROC_LONGOPT_ID)
 #define OPTPROC_SHORTOPT       (1U << OPTPROC_SHORTOPT_ID)
 #define OPTPROC_ERRSTOP        (1U << OPTPROC_ERRSTOP_ID)
@@ -273,9 +267,9 @@ typedef enum {
 #define OPTPROC_PRESETTING     (1U << OPTPROC_PRESETTING_ID)
 #define OPTPROC_STATE_MASK     0x000B3FFFU
 
-#define OPTPROC_NO_XLAT_MASK   (  \
-        OPTPROC_NXLAT_OPT_CFG | \
-        OPTPROC_NXLAT_OPT )
+#define OPTPROC_NO_XLAT_MASK   ( \
+        OPTPROC_NXLAT_OPT |     OPTPROC_NXLAT_OPT_CFG \
+        /* 0x00030000U */ )
 
 #define STMTS(s)  do { s; } while (0)
 
diff --git a/gsoc_sntp/libopts/autoopts/usage-txt.h b/gsoc_sntp/libopts/autoopts/usage-txt.h
index 83081d5f5..826da53eb 100644
--- a/gsoc_sntp/libopts/autoopts/usage-txt.h
+++ b/gsoc_sntp/libopts/autoopts/usage-txt.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (usage-txt.h)
  *  
- *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:33 PM PDT
+ *  It has been AutoGen-ed  August  1, 2009 at 11:21:10 AM by AutoGen 5.9.9pre4
  *  From the definitions    usage-txt.def
  *  and the template file   usage-txt.tpl
  *
diff --git a/gsoc_sntp/libopts/boolean.c b/gsoc_sntp/libopts/boolean.c
index 5f9446912..58a59d023 100644
--- a/gsoc_sntp/libopts/boolean.c
+++ b/gsoc_sntp/libopts/boolean.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: boolean.c,v 4.15 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: boolean.c,v 4.17 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2008-08-03 13:06:02 bkorb"
  *
  *   Automated Options Paged Usage module.
@@ -24,8 +24,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/compat/compat.h b/gsoc_sntp/libopts/compat/compat.h
index 27c1eb45f..5c73ae8e4 100644
--- a/gsoc_sntp/libopts/compat/compat.h
+++ b/gsoc_sntp/libopts/compat/compat.h
@@ -4,7 +4,7 @@
  *
  *  Time-stamp:      "2008-06-14 09:36:25 bkorb"
  *
- * $Id: compat.h,v 4.22 2009/01/01 16:49:26 bkorb Exp $
+ * $Id: compat.h,v 4.21 2009/01/01 16:51:52 bkorb Exp $
  *
  *  compat.h is free software.
  *  This file is part of AutoGen.
diff --git a/gsoc_sntp/libopts/compat/pathfind.c b/gsoc_sntp/libopts/compat/pathfind.c
index d87bada3a..480674dda 100644
--- a/gsoc_sntp/libopts/compat/pathfind.c
+++ b/gsoc_sntp/libopts/compat/pathfind.c
@@ -5,10 +5,10 @@
 /*
  * Author:           Gary V Vaughan <gvaughan@oranda.demon.co.uk>
  * Time-stamp:       "2006-09-23 19:46:16 bkorb"
- * Last Modified:    $Date: 2007/10/07 16:54:54 $
+ * Last Modified:    $Date: 2007/07/04 20:51:18 $
  *            by: bkorb
  *
- * $Id: pathfind.c,v 4.12 2007/10/07 16:54:54 bkorb Exp $
+ * $Id: pathfind.c,v 4.11 2007/07/04 20:51:18 bkorb Exp $
  */
 
 /* Code: */
diff --git a/gsoc_sntp/libopts/compat/windows-config.h b/gsoc_sntp/libopts/compat/windows-config.h
index 1594f28ca..76a9956f0 100644
--- a/gsoc_sntp/libopts/compat/windows-config.h
+++ b/gsoc_sntp/libopts/compat/windows-config.h
@@ -2,7 +2,7 @@
 /*
  * Time-stamp:        "2009-07-22 18:53:59 bkorb"
  *             by: bkorb
- * Last Committed:    $Date: 2009/07/23 02:05:55 $
+ * Last Committed:    $Date: 2009/07/23 02:07:46 $
  *
  *  This file is part of AutoGen.
  *
diff --git a/gsoc_sntp/libopts/configfile.c b/gsoc_sntp/libopts/configfile.c
index 92b59860c..b8fdb6904 100644
--- a/gsoc_sntp/libopts/configfile.c
+++ b/gsoc_sntp/libopts/configfile.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: configfile.c,v 4.46 2009/01/18 22:48:51 bkorb Exp $
+ *  $Id: configfile.c,v 1.36 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2009-01-18 10:21:58 bkorb"
  *
  *  configuration/rc/ini file handling.
@@ -20,8 +20,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/cook.c b/gsoc_sntp/libopts/cook.c
index 3a66751ba..baf9d81df 100644
--- a/gsoc_sntp/libopts/cook.c
+++ b/gsoc_sntp/libopts/cook.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: cook.c,v 4.16 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: cook.c,v 4.18 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2007-11-16 22:49:11 bkorb"
  *
  *  This file contains the routines that deal with processing quoted strings
@@ -21,8 +21,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/enumeration.c b/gsoc_sntp/libopts/enumeration.c
index 6c5bad05a..1c67679b4 100644
--- a/gsoc_sntp/libopts/enumeration.c
+++ b/gsoc_sntp/libopts/enumeration.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: enumeration.c,v 4.25 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: enumeration.c,v 4.26 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2008-07-27 12:28:01 bkorb"
  *
  *   Automated Options Paged Usage module.
@@ -24,8 +24,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/environment.c b/gsoc_sntp/libopts/environment.c
index 037140419..d201e22fd 100644
--- a/gsoc_sntp/libopts/environment.c
+++ b/gsoc_sntp/libopts/environment.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: environment.c,v 4.20 2009/07/21 03:21:57 bkorb Exp $
+ *  $Id: environment.c,v 4.21 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2009-07-20 20:12:24 bkorb"
  *
  *  This file contains all of the routines that must be linked into
@@ -24,8 +24,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/file.c b/gsoc_sntp/libopts/file.c
index 287119a3d..2224c8b4e 100644
--- a/gsoc_sntp/libopts/file.c
+++ b/gsoc_sntp/libopts/file.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: file.c,v 4.7 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: file.c,v 1.9 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2009-07-23 17:23:46 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
@@ -19,8 +19,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/genshell.c b/gsoc_sntp/libopts/genshell.c
index 54dddb06a..5d4e35432 100644
--- a/gsoc_sntp/libopts/genshell.c
+++ b/gsoc_sntp/libopts/genshell.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (genshell.c)
  *  
- *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:35 PM PDT
+ *  It has been AutoGen-ed  August  1, 2009 at 11:21:11 AM by AutoGen 5.9.9pre4
  *  From the definitions    genshell.def
  *  and the template file   options
  *
@@ -20,7 +20,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * genshellopt copyright 1999-2009 Bruce Korb - all rights reserved
+ * genshellopt copyright (c) 1999-2009 Bruce Korb - all rights reserved
  *
  * genshellopt is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/gsoc_sntp/libopts/genshell.h b/gsoc_sntp/libopts/genshell.h
index d075431b0..6891c9a9e 100644
--- a/gsoc_sntp/libopts/genshell.h
+++ b/gsoc_sntp/libopts/genshell.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (genshell.h)
  *  
- *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:35 PM PDT
+ *  It has been AutoGen-ed  August  1, 2009 at 11:21:11 AM by AutoGen 5.9.9pre4
  *  From the definitions    genshell.def
  *  and the template file   options
  *
@@ -20,7 +20,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * genshellopt copyright 1999-2009 Bruce Korb - all rights reserved
+ * genshellopt copyright (c) 1999-2009 Bruce Korb - all rights reserved
  *
  * genshellopt is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/gsoc_sntp/libopts/load.c b/gsoc_sntp/libopts/load.c
index 2d8d8b074..f2982a7be 100644
--- a/gsoc_sntp/libopts/load.c
+++ b/gsoc_sntp/libopts/load.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: load.c,v 4.37 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: load.c,v 4.29 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2008-12-06 10:16:05 bkorb"
  *
  *  This file contains the routines that deal with processing text strings
@@ -23,8 +23,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/m4/libopts.m4 b/gsoc_sntp/libopts/m4/libopts.m4
index 8124af147..13083120a 100644
--- a/gsoc_sntp/libopts/m4/libopts.m4
+++ b/gsoc_sntp/libopts/m4/libopts.m4
@@ -2,7 +2,7 @@ dnl  -*- buffer-read-only: t -*- vi: set ro:
 dnl 
 dnl DO NOT EDIT THIS FILE   (libopts.m4)
 dnl 
-dnl It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:36 PM PDT
+dnl It has been AutoGen-ed  August  1, 2009 at 11:21:13 AM by AutoGen 5.9.9pre4
 dnl From the definitions    libopts.def
 dnl and the template file   conftest.tpl
 dnl
@@ -444,7 +444,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS],[
 dnl @synopsis  LIBOPTS_CHECK
 dnl
 dnl Time-stamp:        "2009-07-22 18:50:49 bkorb"
-dnl Last Committed:    $Date: 2009/07/23 02:05:55 $
+dnl Last Committed:    $Date: 2009/07/23 02:07:47 $
 dnl
 dnl If autoopts-config works, add the linking information to LIBS.
 dnl Otherwise, add ``libopts-${ao_rev}'' to SUBDIRS and run all
diff --git a/gsoc_sntp/libopts/m4/liboptschk.m4 b/gsoc_sntp/libopts/m4/liboptschk.m4
index a2df33c93..db3ce4a68 100644
--- a/gsoc_sntp/libopts/m4/liboptschk.m4
+++ b/gsoc_sntp/libopts/m4/liboptschk.m4
@@ -6,7 +6,7 @@ dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl Time-stamp:        "2009-07-22 18:53:27 bkorb"
-dnl Last Committed:    $Date: 2009/07/23 02:05:55 $
+dnl Last Committed:    $Date: 2009/07/23 02:07:46 $
 
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
diff --git a/gsoc_sntp/libopts/makeshell.c b/gsoc_sntp/libopts/makeshell.c
index dc7627d9a..4d9271bfb 100644
--- a/gsoc_sntp/libopts/makeshell.c
+++ b/gsoc_sntp/libopts/makeshell.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: makeshell.c,v 4.29 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: makeshell.c,v 4.29 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2008-07-26 16:10:51 bkorb"
  *
  *  This module will interpret the options set in the tOptions
@@ -22,8 +22,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/nested.c b/gsoc_sntp/libopts/nested.c
index 400335734..fddb572da 100644
--- a/gsoc_sntp/libopts/nested.c
+++ b/gsoc_sntp/libopts/nested.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: nested.c,v 4.31 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: nested.c,v 4.28 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2008-07-28 19:18:28 bkorb"
  *
  *   Automated Options Nested Values module.
@@ -21,8 +21,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/numeric.c b/gsoc_sntp/libopts/numeric.c
index e336ba151..1c8a4926a 100644
--- a/gsoc_sntp/libopts/numeric.c
+++ b/gsoc_sntp/libopts/numeric.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: numeric.c,v 4.20 2009/01/17 22:08:09 bkorb Exp $
+ *  $Id: numeric.c,v 4.23 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2009-07-23 17:25:39 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
@@ -19,8 +19,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/pgusage.c b/gsoc_sntp/libopts/pgusage.c
index 5f103cdd3..d59b107ab 100644
--- a/gsoc_sntp/libopts/pgusage.c
+++ b/gsoc_sntp/libopts/pgusage.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: pgusage.c,v 4.17 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: pgusage.c,v 4.18 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2008-07-27 21:08:42 bkorb"
  *
  *   Automated Options Paged Usage module.
@@ -24,8 +24,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/proto.h b/gsoc_sntp/libopts/proto.h
index af35d1808..10673c9aa 100644
--- a/gsoc_sntp/libopts/proto.h
+++ b/gsoc_sntp/libopts/proto.h
@@ -1,7 +1,7 @@
 /* -*- buffer-read-only: t -*- vi: set ro:
  *
  * Prototypes for autoopts
- * Generated Thu Jul 23 17:36:35 PDT 2009
+ * Generated Sat Aug  1 11:21:12 PDT 2009
  */
 #ifndef AUTOOPTS_PROTO_H_GUARD
 #define AUTOOPTS_PROTO_H_GUARD 1
diff --git a/gsoc_sntp/libopts/putshell.c b/gsoc_sntp/libopts/putshell.c
index 9aeaacd52..c0aac05d1 100644
--- a/gsoc_sntp/libopts/putshell.c
+++ b/gsoc_sntp/libopts/putshell.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: putshell.c,v 4.26 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: putshell.c,v 4.27 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2008-07-27 12:14:38 bkorb"
  *
  *  This module will interpret the options set in the tOptions
@@ -23,8 +23,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/reset.c b/gsoc_sntp/libopts/reset.c
index d23786349..7f6dec967 100644
--- a/gsoc_sntp/libopts/reset.c
+++ b/gsoc_sntp/libopts/reset.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: reset.c,v 4.6 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: reset.c,v 4.4 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2008-08-02 12:25:18 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
@@ -19,8 +19,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/restore.c b/gsoc_sntp/libopts/restore.c
index 2481a02ff..28b16576e 100644
--- a/gsoc_sntp/libopts/restore.c
+++ b/gsoc_sntp/libopts/restore.c
@@ -1,6 +1,6 @@
 
 /*
- *  restore.c  $Id: restore.c,v 4.13 2009/01/01 16:49:26 bkorb Exp $
+ *  restore.c  $Id: restore.c,v 4.15 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2007-07-04 11:34:40 bkorb"
  *
  *  This module's routines will save the current option state to memory
@@ -23,8 +23,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/save.c b/gsoc_sntp/libopts/save.c
index 3b49b69ca..4a9d76e5d 100644
--- a/gsoc_sntp/libopts/save.c
+++ b/gsoc_sntp/libopts/save.c
@@ -1,6 +1,6 @@
 
 /*
- *  save.c  $Id: save.c,v 4.35 2009/07/21 04:01:30 bkorb Exp $
+ *  save.c  $Id: save.c,v 4.32 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2009-07-20 20:40:28 bkorb"
  *
  *  This module's routines will take the currently set options and
@@ -23,8 +23,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/sort.c b/gsoc_sntp/libopts/sort.c
index 4294382f8..900581d49 100644
--- a/gsoc_sntp/libopts/sort.c
+++ b/gsoc_sntp/libopts/sort.c
@@ -1,6 +1,6 @@
 
 /*
- *  sort.c  $Id: sort.c,v 4.16 2009/01/01 16:49:26 bkorb Exp $
+ *  sort.c  $Id: sort.c,v 4.16 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2007-07-04 11:34:52 bkorb"
  *
  *  This module implements argument sorting.
@@ -21,8 +21,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/stack.c b/gsoc_sntp/libopts/stack.c
index 10cf18a49..a0ac11be5 100644
--- a/gsoc_sntp/libopts/stack.c
+++ b/gsoc_sntp/libopts/stack.c
@@ -1,7 +1,7 @@
 
 /*
  *  stack.c
- *  $Id: stack.c,v 4.18 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: stack.c,v 4.19 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2008-07-30 16:56:32 bkorb"
  *
  *  This is a special option processing routine that will save the
@@ -23,8 +23,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/streqvcmp.c b/gsoc_sntp/libopts/streqvcmp.c
index b5971d845..836079744 100644
--- a/gsoc_sntp/libopts/streqvcmp.c
+++ b/gsoc_sntp/libopts/streqvcmp.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: streqvcmp.c,v 4.16 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: streqvcmp.c,v 4.16 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2008-12-26 10:15:46 bkorb"
  *
  *  String Equivalence Comparison
@@ -26,8 +26,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  *
  * This array is designed for mapping upper and lower case letter
diff --git a/gsoc_sntp/libopts/text_mmap.c b/gsoc_sntp/libopts/text_mmap.c
index 566644132..34d29d03f 100644
--- a/gsoc_sntp/libopts/text_mmap.c
+++ b/gsoc_sntp/libopts/text_mmap.c
@@ -1,5 +1,5 @@
 /*
- * $Id: text_mmap.c,v 4.20 2009/01/01 16:49:26 bkorb Exp $
+ * $Id: text_mmap.c,v 4.20 2009/08/01 17:44:36 bkorb Exp $
  *
  * Time-stamp:      "2007-07-04 11:35:49 bkorb"
  *
@@ -19,8 +19,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/time.c b/gsoc_sntp/libopts/time.c
index 484fc27e9..2d9a1d073 100644
--- a/gsoc_sntp/libopts/time.c
+++ b/gsoc_sntp/libopts/time.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: time.c,v 4.4 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: time.c,v 4.4 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2008-11-16 14:51:48 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
@@ -19,8 +19,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/tokenize.c b/gsoc_sntp/libopts/tokenize.c
index bc7edfba1..74295674a 100644
--- a/gsoc_sntp/libopts/tokenize.c
+++ b/gsoc_sntp/libopts/tokenize.c
@@ -18,8 +18,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/usage.c b/gsoc_sntp/libopts/usage.c
index bd64a5949..ba6782d73 100644
--- a/gsoc_sntp/libopts/usage.c
+++ b/gsoc_sntp/libopts/usage.c
@@ -1,6 +1,6 @@
 
 /*
- *  usage.c  $Id: usage.c,v 4.29 2009/01/17 22:08:09 bkorb Exp $
+ *  usage.c  $Id: usage.c,v 4.31 2009/08/01 17:44:37 bkorb Exp $
  * Time-stamp:      "2009-01-17 13:18:23 bkorb"
  *
  *  This module implements the default usage procedure for
@@ -29,8 +29,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/value-type.h b/gsoc_sntp/libopts/value-type.h
index 45a36048e..2eff3dbd0 100644
--- a/gsoc_sntp/libopts/value-type.h
+++ b/gsoc_sntp/libopts/value-type.h
@@ -1,5 +1,5 @@
 /*
- *  Generated header for gperf generated source Thu Jul 23 17:36:47 PDT 2009
+ *  Generated header for gperf generated source Sat Aug  1 11:21:22 PDT 2009
  *  This file enumerates the list of names and declares the
  *  procedure for mapping string names to the enum value.
  */
diff --git a/gsoc_sntp/libopts/version.c b/gsoc_sntp/libopts/version.c
index a091da51c..0005c9f7d 100644
--- a/gsoc_sntp/libopts/version.c
+++ b/gsoc_sntp/libopts/version.c
@@ -1,5 +1,5 @@
 
-/*  $Id: version.c,v 4.18 2009/01/01 16:49:26 bkorb Exp $
+/*  $Id: version.c,v 4.17 2009/08/01 17:44:37 bkorb Exp $
  * Time-stamp:      "2008-07-27 10:11:30 bkorb"
  *
  *  This module implements the default usage procedure for
@@ -23,8 +23,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/gsoc_sntp/libopts/xat-attribute.h b/gsoc_sntp/libopts/xat-attribute.h
index e081b54f6..ae87eacae 100644
--- a/gsoc_sntp/libopts/xat-attribute.h
+++ b/gsoc_sntp/libopts/xat-attribute.h
@@ -1,5 +1,5 @@
 /*
- *  Generated header for gperf generated source Thu Jul 23 17:36:47 PDT 2009
+ *  Generated header for gperf generated source Sat Aug  1 11:21:22 PDT 2009
  *  This file enumerates the list of names and declares the
  *  procedure for mapping string names to the enum value.
  */
diff --git a/libopts/ag-char-map.h b/libopts/ag-char-map.h
index dcdd8b7d7..85e384117 100644
--- a/libopts/ag-char-map.h
+++ b/libopts/ag-char-map.h
@@ -1,5 +1,5 @@
 /*
- *   Character mapping generated 07/23/09 17:36:47
+ *   Character mapping generated 08/01/09 11:21:22
  *
  *  This file contains the character classifications
  *  used by AutoGen and AutoOpts for identifying tokens.
@@ -12,17 +12,48 @@
 #  include <inttypes.h>
 # elif defined(HAVE_STDINT_H)
 #  include <stdint.h>
+
 # else
-#  error "no int-types header."
-#  choke-me-now.
-# endif
-#else
+#   ifndef HAVE_INT8_T
+        typedef signed char     int8_t;
+#   endif
+#   ifndef HAVE_UINT8_T
+        typedef unsigned char   uint8_t;
+#   endif
+#   ifndef HAVE_INT16_T
+        typedef signed short    int16_t;
+#   endif
+#   ifndef HAVE_UINT16_T
+        typedef unsigned short  uint16_t;
+#   endif
+#   ifndef HAVE_UINT_T
+        typedef unsigned int    uint_t;
+#   endif
+
+#   ifndef HAVE_INT32_T
+#    if SIZEOF_INT == 4
+        typedef signed int      int32_t;
+#    elif SIZEOF_LONG == 4
+        typedef signed long     int32_t;
+#    endif
+#   endif
+
+#   ifndef HAVE_UINT32_T
+#    if SIZEOF_INT == 4
+        typedef unsigned int    uint32_t;
+#    elif SIZEOF_LONG == 4
+        typedef unsigned long   uint32_t;
+#    endif
+#   endif
+# endif /* HAVE_*INT*_H header */
+
+#else /* not HAVE_CONFIG_H -- */
 # ifdef __sun
 #  include <inttypes.h>
 # else
 #  include <stdint.h>
 # endif
-#endif
+#endif /* HAVE_CONFIG_H */
 
 #if 0 /* mapping specification source (from autogen.map) */
 // 
diff --git a/libopts/autoopts.c b/libopts/autoopts.c
index 9fcc95adf..417d469ad 100644
--- a/libopts/autoopts.c
+++ b/libopts/autoopts.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: autoopts.c,v 4.44 2009/01/25 19:31:56 bkorb Exp $
+ *  $Id: autoopts.c,v 4.40 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2009-01-12 02:49:49 bkorb"
  *
  *  This file contains all of the routines that must be linked into
@@ -24,8 +24,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/autoopts.h b/libopts/autoopts.h
index 38edd3e9f..108bcb7ac 100644
--- a/libopts/autoopts.h
+++ b/libopts/autoopts.h
@@ -2,7 +2,7 @@
 /*
  *  Time-stamp:      "2008-11-01 20:08:06 bkorb"
  *
- *  autoopts.h  $Id: autoopts.h,v 4.41 2009/01/01 16:49:26 bkorb Exp $
+ *  autoopts.h  $Id: autoopts.h,v 4.31 2009/08/01 17:44:36 bkorb Exp $
  *
  *  This file defines all the global structures and special values
  *  used in the automated option processing library.
@@ -23,8 +23,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/autoopts/options.h b/libopts/autoopts/options.h
index 4aad8f118..e84bd8646 100644
--- a/libopts/autoopts/options.h
+++ b/libopts/autoopts/options.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (options.h)
  *  
- *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:34 PM PDT
+ *  It has been AutoGen-ed  August  1, 2009 at 11:21:11 AM by AutoGen 5.9.9pre4
  *  From the definitions    funcs.def
  *  and the template file   options_h
  *
@@ -144,7 +144,7 @@ typedef enum {
     OPTST_DEPRECATED_ID      =  26  /* support is being removed      */
 } opt_state_enum_t;
 
-#define OPTST_INIT           0U
+#define OPTST_INIT               0U
 #define OPTST_SET            (1U << OPTST_SET_ID)
 #define OPTST_PRESET         (1U << OPTST_PRESET_ID)
 #define OPTST_DEFINED        (1U << OPTST_DEFINED_ID)
@@ -173,40 +173,34 @@ typedef enum {
 #define OPTST_DEPRECATED     (1U << OPTST_DEPRECATED_ID)
 #define OPT_STATE_MASK       0x07FFFF7FU
 
-#define OPTST_SET_MASK       (  \
-        OPTST_SET | \
-        OPTST_PRESET | \
-        OPTST_RESET | \
-        OPTST_DEFINED )
-
-#define OPTST_MUTABLE_MASK   (  \
-        OPTST_SET | \
-        OPTST_PRESET | \
-        OPTST_RESET | \
-        OPTST_DEFINED | \
-        OPTST_EQUIVALENCE | \
-        OPTST_DISABLED | \
-        OPTST_ALLOC_ARG )
-
-#define OPTST_SELECTED_MASK  (  \
-        OPTST_SET | \
-        OPTST_DEFINED )
-
-#define OPTST_ARG_TYPE_MASK  (  \
-        OPTST_ARG_TYPE_1 | \
-        OPTST_ARG_TYPE_2 | \
-        OPTST_ARG_TYPE_3 | \
-        OPTST_ARG_TYPE_4 )
-
-#define OPTST_DO_NOT_SAVE_MASK   (  \
-        OPTST_NO_INIT | \
-        OPTST_DOCUMENT | \
-        OPTST_OMITTED )
-
-#define OPTST_NO_USAGE_MASK  (  \
-        OPTST_OMITTED | \
-        OPTST_NO_COMMAND | \
-        OPTST_DEPRECATED )
+#define OPTST_SET_MASK       ( \
+        OPTST_DEFINED | OPTST_PRESET |  OPTST_RESET | \
+        OPTST_SET \
+        /* 0x0000000FU */ )
+
+#define OPTST_MUTABLE_MASK   ( \
+        OPTST_ALLOC_ARG |   OPTST_DEFINED | \
+        OPTST_DISABLED |    OPTST_EQUIVALENCE | \
+        OPTST_PRESET |      OPTST_RESET | \
+        OPTST_SET \
+        /* 0x0000007FU */ )
+
+#define OPTST_SELECTED_MASK  ( \
+        OPTST_DEFINED | OPTST_SET \
+        /* 0x00000005U */ )
+
+#define OPTST_ARG_TYPE_MASK  ( \
+        OPTST_ARG_TYPE_1 | OPTST_ARG_TYPE_2 | OPTST_ARG_TYPE_3 | \
+        OPTST_ARG_TYPE_4 \
+        /* 0x0000F000U */ )
+
+#define OPTST_DO_NOT_SAVE_MASK   ( \
+        OPTST_DOCUMENT | OPTST_NO_INIT |  OPTST_OMITTED \
+        /* 0x00280100U */ )
+
+#define OPTST_NO_USAGE_MASK  ( \
+        OPTST_DEPRECATED | OPTST_NO_COMMAND | OPTST_OMITTED \
+        /* 0x06080000U */ )
 
 #ifdef NO_OPTIONAL_OPT_ARGS
 # undef  OPTST_ARG_OPTIONAL
@@ -253,7 +247,7 @@ typedef enum {
     OPTPROC_PRESETTING_ID      =  19  /* opt processing in preset state */
 } optproc_state_enum_t;
 
-#define OPTPROC_NONE           0U
+#define OPTPROC_NONE               0U
 #define OPTPROC_LONGOPT        (1U << OPTPROC_LONGOPT_ID)
 #define OPTPROC_SHORTOPT       (1U << OPTPROC_SHORTOPT_ID)
 #define OPTPROC_ERRSTOP        (1U << OPTPROC_ERRSTOP_ID)
@@ -273,9 +267,9 @@ typedef enum {
 #define OPTPROC_PRESETTING     (1U << OPTPROC_PRESETTING_ID)
 #define OPTPROC_STATE_MASK     0x000B3FFFU
 
-#define OPTPROC_NO_XLAT_MASK   (  \
-        OPTPROC_NXLAT_OPT_CFG | \
-        OPTPROC_NXLAT_OPT )
+#define OPTPROC_NO_XLAT_MASK   ( \
+        OPTPROC_NXLAT_OPT |     OPTPROC_NXLAT_OPT_CFG \
+        /* 0x00030000U */ )
 
 #define STMTS(s)  do { s; } while (0)
 
diff --git a/libopts/autoopts/usage-txt.h b/libopts/autoopts/usage-txt.h
index 83081d5f5..826da53eb 100644
--- a/libopts/autoopts/usage-txt.h
+++ b/libopts/autoopts/usage-txt.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (usage-txt.h)
  *  
- *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:33 PM PDT
+ *  It has been AutoGen-ed  August  1, 2009 at 11:21:10 AM by AutoGen 5.9.9pre4
  *  From the definitions    usage-txt.def
  *  and the template file   usage-txt.tpl
  *
diff --git a/libopts/boolean.c b/libopts/boolean.c
index 5f9446912..58a59d023 100644
--- a/libopts/boolean.c
+++ b/libopts/boolean.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: boolean.c,v 4.15 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: boolean.c,v 4.17 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2008-08-03 13:06:02 bkorb"
  *
  *   Automated Options Paged Usage module.
@@ -24,8 +24,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/compat/compat.h b/libopts/compat/compat.h
index 27c1eb45f..5c73ae8e4 100644
--- a/libopts/compat/compat.h
+++ b/libopts/compat/compat.h
@@ -4,7 +4,7 @@
  *
  *  Time-stamp:      "2008-06-14 09:36:25 bkorb"
  *
- * $Id: compat.h,v 4.22 2009/01/01 16:49:26 bkorb Exp $
+ * $Id: compat.h,v 4.21 2009/01/01 16:51:52 bkorb Exp $
  *
  *  compat.h is free software.
  *  This file is part of AutoGen.
diff --git a/libopts/compat/pathfind.c b/libopts/compat/pathfind.c
index d87bada3a..480674dda 100644
--- a/libopts/compat/pathfind.c
+++ b/libopts/compat/pathfind.c
@@ -5,10 +5,10 @@
 /*
  * Author:           Gary V Vaughan <gvaughan@oranda.demon.co.uk>
  * Time-stamp:       "2006-09-23 19:46:16 bkorb"
- * Last Modified:    $Date: 2007/10/07 16:54:54 $
+ * Last Modified:    $Date: 2007/07/04 20:51:18 $
  *            by: bkorb
  *
- * $Id: pathfind.c,v 4.12 2007/10/07 16:54:54 bkorb Exp $
+ * $Id: pathfind.c,v 4.11 2007/07/04 20:51:18 bkorb Exp $
  */
 
 /* Code: */
diff --git a/libopts/compat/windows-config.h b/libopts/compat/windows-config.h
index 1594f28ca..76a9956f0 100644
--- a/libopts/compat/windows-config.h
+++ b/libopts/compat/windows-config.h
@@ -2,7 +2,7 @@
 /*
  * Time-stamp:        "2009-07-22 18:53:59 bkorb"
  *             by: bkorb
- * Last Committed:    $Date: 2009/07/23 02:05:55 $
+ * Last Committed:    $Date: 2009/07/23 02:07:46 $
  *
  *  This file is part of AutoGen.
  *
diff --git a/libopts/configfile.c b/libopts/configfile.c
index 92b59860c..b8fdb6904 100644
--- a/libopts/configfile.c
+++ b/libopts/configfile.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: configfile.c,v 4.46 2009/01/18 22:48:51 bkorb Exp $
+ *  $Id: configfile.c,v 1.36 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2009-01-18 10:21:58 bkorb"
  *
  *  configuration/rc/ini file handling.
@@ -20,8 +20,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/cook.c b/libopts/cook.c
index 3a66751ba..baf9d81df 100644
--- a/libopts/cook.c
+++ b/libopts/cook.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: cook.c,v 4.16 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: cook.c,v 4.18 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2007-11-16 22:49:11 bkorb"
  *
  *  This file contains the routines that deal with processing quoted strings
@@ -21,8 +21,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/enumeration.c b/libopts/enumeration.c
index 6c5bad05a..1c67679b4 100644
--- a/libopts/enumeration.c
+++ b/libopts/enumeration.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: enumeration.c,v 4.25 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: enumeration.c,v 4.26 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2008-07-27 12:28:01 bkorb"
  *
  *   Automated Options Paged Usage module.
@@ -24,8 +24,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/environment.c b/libopts/environment.c
index 037140419..d201e22fd 100644
--- a/libopts/environment.c
+++ b/libopts/environment.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: environment.c,v 4.20 2009/07/21 03:21:57 bkorb Exp $
+ *  $Id: environment.c,v 4.21 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2009-07-20 20:12:24 bkorb"
  *
  *  This file contains all of the routines that must be linked into
@@ -24,8 +24,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/file.c b/libopts/file.c
index 287119a3d..2224c8b4e 100644
--- a/libopts/file.c
+++ b/libopts/file.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: file.c,v 4.7 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: file.c,v 1.9 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2009-07-23 17:23:46 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
@@ -19,8 +19,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/genshell.c b/libopts/genshell.c
index 54dddb06a..5d4e35432 100644
--- a/libopts/genshell.c
+++ b/libopts/genshell.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (genshell.c)
  *  
- *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:35 PM PDT
+ *  It has been AutoGen-ed  August  1, 2009 at 11:21:11 AM by AutoGen 5.9.9pre4
  *  From the definitions    genshell.def
  *  and the template file   options
  *
@@ -20,7 +20,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * genshellopt copyright 1999-2009 Bruce Korb - all rights reserved
+ * genshellopt copyright (c) 1999-2009 Bruce Korb - all rights reserved
  *
  * genshellopt is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/libopts/genshell.h b/libopts/genshell.h
index d075431b0..6891c9a9e 100644
--- a/libopts/genshell.h
+++ b/libopts/genshell.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (genshell.h)
  *  
- *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:35 PM PDT
+ *  It has been AutoGen-ed  August  1, 2009 at 11:21:11 AM by AutoGen 5.9.9pre4
  *  From the definitions    genshell.def
  *  and the template file   options
  *
@@ -20,7 +20,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * genshellopt copyright 1999-2009 Bruce Korb - all rights reserved
+ * genshellopt copyright (c) 1999-2009 Bruce Korb - all rights reserved
  *
  * genshellopt is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/libopts/load.c b/libopts/load.c
index 2d8d8b074..f2982a7be 100644
--- a/libopts/load.c
+++ b/libopts/load.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: load.c,v 4.37 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: load.c,v 4.29 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2008-12-06 10:16:05 bkorb"
  *
  *  This file contains the routines that deal with processing text strings
@@ -23,8 +23,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/m4/libopts.m4 b/libopts/m4/libopts.m4
index 8124af147..13083120a 100644
--- a/libopts/m4/libopts.m4
+++ b/libopts/m4/libopts.m4
@@ -2,7 +2,7 @@ dnl  -*- buffer-read-only: t -*- vi: set ro:
 dnl 
 dnl DO NOT EDIT THIS FILE   (libopts.m4)
 dnl 
-dnl It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:36 PM PDT
+dnl It has been AutoGen-ed  August  1, 2009 at 11:21:13 AM by AutoGen 5.9.9pre4
 dnl From the definitions    libopts.def
 dnl and the template file   conftest.tpl
 dnl
@@ -444,7 +444,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS],[
 dnl @synopsis  LIBOPTS_CHECK
 dnl
 dnl Time-stamp:        "2009-07-22 18:50:49 bkorb"
-dnl Last Committed:    $Date: 2009/07/23 02:05:55 $
+dnl Last Committed:    $Date: 2009/07/23 02:07:47 $
 dnl
 dnl If autoopts-config works, add the linking information to LIBS.
 dnl Otherwise, add ``libopts-${ao_rev}'' to SUBDIRS and run all
diff --git a/libopts/m4/liboptschk.m4 b/libopts/m4/liboptschk.m4
index a2df33c93..db3ce4a68 100644
--- a/libopts/m4/liboptschk.m4
+++ b/libopts/m4/liboptschk.m4
@@ -6,7 +6,7 @@ dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl Time-stamp:        "2009-07-22 18:53:27 bkorb"
-dnl Last Committed:    $Date: 2009/07/23 02:05:55 $
+dnl Last Committed:    $Date: 2009/07/23 02:07:46 $
 
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
diff --git a/libopts/makeshell.c b/libopts/makeshell.c
index dc7627d9a..4d9271bfb 100644
--- a/libopts/makeshell.c
+++ b/libopts/makeshell.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: makeshell.c,v 4.29 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: makeshell.c,v 4.29 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2008-07-26 16:10:51 bkorb"
  *
  *  This module will interpret the options set in the tOptions
@@ -22,8 +22,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/nested.c b/libopts/nested.c
index 400335734..fddb572da 100644
--- a/libopts/nested.c
+++ b/libopts/nested.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: nested.c,v 4.31 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: nested.c,v 4.28 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2008-07-28 19:18:28 bkorb"
  *
  *   Automated Options Nested Values module.
@@ -21,8 +21,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/numeric.c b/libopts/numeric.c
index e336ba151..1c8a4926a 100644
--- a/libopts/numeric.c
+++ b/libopts/numeric.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: numeric.c,v 4.20 2009/01/17 22:08:09 bkorb Exp $
+ *  $Id: numeric.c,v 4.23 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2009-07-23 17:25:39 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
@@ -19,8 +19,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/pgusage.c b/libopts/pgusage.c
index 5f103cdd3..d59b107ab 100644
--- a/libopts/pgusage.c
+++ b/libopts/pgusage.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: pgusage.c,v 4.17 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: pgusage.c,v 4.18 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2008-07-27 21:08:42 bkorb"
  *
  *   Automated Options Paged Usage module.
@@ -24,8 +24,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/proto.h b/libopts/proto.h
index af35d1808..10673c9aa 100644
--- a/libopts/proto.h
+++ b/libopts/proto.h
@@ -1,7 +1,7 @@
 /* -*- buffer-read-only: t -*- vi: set ro:
  *
  * Prototypes for autoopts
- * Generated Thu Jul 23 17:36:35 PDT 2009
+ * Generated Sat Aug  1 11:21:12 PDT 2009
  */
 #ifndef AUTOOPTS_PROTO_H_GUARD
 #define AUTOOPTS_PROTO_H_GUARD 1
diff --git a/libopts/putshell.c b/libopts/putshell.c
index 9aeaacd52..c0aac05d1 100644
--- a/libopts/putshell.c
+++ b/libopts/putshell.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: putshell.c,v 4.26 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: putshell.c,v 4.27 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2008-07-27 12:14:38 bkorb"
  *
  *  This module will interpret the options set in the tOptions
@@ -23,8 +23,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/reset.c b/libopts/reset.c
index d23786349..7f6dec967 100644
--- a/libopts/reset.c
+++ b/libopts/reset.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: reset.c,v 4.6 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: reset.c,v 4.4 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2008-08-02 12:25:18 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
@@ -19,8 +19,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/restore.c b/libopts/restore.c
index 2481a02ff..28b16576e 100644
--- a/libopts/restore.c
+++ b/libopts/restore.c
@@ -1,6 +1,6 @@
 
 /*
- *  restore.c  $Id: restore.c,v 4.13 2009/01/01 16:49:26 bkorb Exp $
+ *  restore.c  $Id: restore.c,v 4.15 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2007-07-04 11:34:40 bkorb"
  *
  *  This module's routines will save the current option state to memory
@@ -23,8 +23,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/save.c b/libopts/save.c
index 3b49b69ca..4a9d76e5d 100644
--- a/libopts/save.c
+++ b/libopts/save.c
@@ -1,6 +1,6 @@
 
 /*
- *  save.c  $Id: save.c,v 4.35 2009/07/21 04:01:30 bkorb Exp $
+ *  save.c  $Id: save.c,v 4.32 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2009-07-20 20:40:28 bkorb"
  *
  *  This module's routines will take the currently set options and
@@ -23,8 +23,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/sort.c b/libopts/sort.c
index 4294382f8..900581d49 100644
--- a/libopts/sort.c
+++ b/libopts/sort.c
@@ -1,6 +1,6 @@
 
 /*
- *  sort.c  $Id: sort.c,v 4.16 2009/01/01 16:49:26 bkorb Exp $
+ *  sort.c  $Id: sort.c,v 4.16 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2007-07-04 11:34:52 bkorb"
  *
  *  This module implements argument sorting.
@@ -21,8 +21,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/stack.c b/libopts/stack.c
index 10cf18a49..a0ac11be5 100644
--- a/libopts/stack.c
+++ b/libopts/stack.c
@@ -1,7 +1,7 @@
 
 /*
  *  stack.c
- *  $Id: stack.c,v 4.18 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: stack.c,v 4.19 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2008-07-30 16:56:32 bkorb"
  *
  *  This is a special option processing routine that will save the
@@ -23,8 +23,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/streqvcmp.c b/libopts/streqvcmp.c
index b5971d845..836079744 100644
--- a/libopts/streqvcmp.c
+++ b/libopts/streqvcmp.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: streqvcmp.c,v 4.16 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: streqvcmp.c,v 4.16 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2008-12-26 10:15:46 bkorb"
  *
  *  String Equivalence Comparison
@@ -26,8 +26,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  *
  * This array is designed for mapping upper and lower case letter
diff --git a/libopts/text_mmap.c b/libopts/text_mmap.c
index 566644132..34d29d03f 100644
--- a/libopts/text_mmap.c
+++ b/libopts/text_mmap.c
@@ -1,5 +1,5 @@
 /*
- * $Id: text_mmap.c,v 4.20 2009/01/01 16:49:26 bkorb Exp $
+ * $Id: text_mmap.c,v 4.20 2009/08/01 17:44:36 bkorb Exp $
  *
  * Time-stamp:      "2007-07-04 11:35:49 bkorb"
  *
@@ -19,8 +19,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/time.c b/libopts/time.c
index 484fc27e9..2d9a1d073 100644
--- a/libopts/time.c
+++ b/libopts/time.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: time.c,v 4.4 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: time.c,v 4.4 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2008-11-16 14:51:48 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
@@ -19,8 +19,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/tokenize.c b/libopts/tokenize.c
index bc7edfba1..74295674a 100644
--- a/libopts/tokenize.c
+++ b/libopts/tokenize.c
@@ -18,8 +18,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/usage.c b/libopts/usage.c
index bd64a5949..ba6782d73 100644
--- a/libopts/usage.c
+++ b/libopts/usage.c
@@ -1,6 +1,6 @@
 
 /*
- *  usage.c  $Id: usage.c,v 4.29 2009/01/17 22:08:09 bkorb Exp $
+ *  usage.c  $Id: usage.c,v 4.31 2009/08/01 17:44:37 bkorb Exp $
  * Time-stamp:      "2009-01-17 13:18:23 bkorb"
  *
  *  This module implements the default usage procedure for
@@ -29,8 +29,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/value-type.h b/libopts/value-type.h
index 45a36048e..2eff3dbd0 100644
--- a/libopts/value-type.h
+++ b/libopts/value-type.h
@@ -1,5 +1,5 @@
 /*
- *  Generated header for gperf generated source Thu Jul 23 17:36:47 PDT 2009
+ *  Generated header for gperf generated source Sat Aug  1 11:21:22 PDT 2009
  *  This file enumerates the list of names and declares the
  *  procedure for mapping string names to the enum value.
  */
diff --git a/libopts/version.c b/libopts/version.c
index a091da51c..0005c9f7d 100644
--- a/libopts/version.c
+++ b/libopts/version.c
@@ -1,5 +1,5 @@
 
-/*  $Id: version.c,v 4.18 2009/01/01 16:49:26 bkorb Exp $
+/*  $Id: version.c,v 4.17 2009/08/01 17:44:37 bkorb Exp $
  * Time-stamp:      "2008-07-27 10:11:30 bkorb"
  *
  *  This module implements the default usage procedure for
@@ -23,8 +23,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/libopts/xat-attribute.h b/libopts/xat-attribute.h
index e081b54f6..ae87eacae 100644
--- a/libopts/xat-attribute.h
+++ b/libopts/xat-attribute.h
@@ -1,5 +1,5 @@
 /*
- *  Generated header for gperf generated source Thu Jul 23 17:36:47 PDT 2009
+ *  Generated header for gperf generated source Sat Aug  1 11:21:22 PDT 2009
  *  This file enumerates the list of names and declares the
  *  procedure for mapping string names to the enum value.
  */
diff --git a/sntp/libopts/ag-char-map.h b/sntp/libopts/ag-char-map.h
index dcdd8b7d7..85e384117 100644
--- a/sntp/libopts/ag-char-map.h
+++ b/sntp/libopts/ag-char-map.h
@@ -1,5 +1,5 @@
 /*
- *   Character mapping generated 07/23/09 17:36:47
+ *   Character mapping generated 08/01/09 11:21:22
  *
  *  This file contains the character classifications
  *  used by AutoGen and AutoOpts for identifying tokens.
@@ -12,17 +12,48 @@
 #  include <inttypes.h>
 # elif defined(HAVE_STDINT_H)
 #  include <stdint.h>
+
 # else
-#  error "no int-types header."
-#  choke-me-now.
-# endif
-#else
+#   ifndef HAVE_INT8_T
+        typedef signed char     int8_t;
+#   endif
+#   ifndef HAVE_UINT8_T
+        typedef unsigned char   uint8_t;
+#   endif
+#   ifndef HAVE_INT16_T
+        typedef signed short    int16_t;
+#   endif
+#   ifndef HAVE_UINT16_T
+        typedef unsigned short  uint16_t;
+#   endif
+#   ifndef HAVE_UINT_T
+        typedef unsigned int    uint_t;
+#   endif
+
+#   ifndef HAVE_INT32_T
+#    if SIZEOF_INT == 4
+        typedef signed int      int32_t;
+#    elif SIZEOF_LONG == 4
+        typedef signed long     int32_t;
+#    endif
+#   endif
+
+#   ifndef HAVE_UINT32_T
+#    if SIZEOF_INT == 4
+        typedef unsigned int    uint32_t;
+#    elif SIZEOF_LONG == 4
+        typedef unsigned long   uint32_t;
+#    endif
+#   endif
+# endif /* HAVE_*INT*_H header */
+
+#else /* not HAVE_CONFIG_H -- */
 # ifdef __sun
 #  include <inttypes.h>
 # else
 #  include <stdint.h>
 # endif
-#endif
+#endif /* HAVE_CONFIG_H */
 
 #if 0 /* mapping specification source (from autogen.map) */
 // 
diff --git a/sntp/libopts/autoopts.c b/sntp/libopts/autoopts.c
index 9fcc95adf..417d469ad 100644
--- a/sntp/libopts/autoopts.c
+++ b/sntp/libopts/autoopts.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: autoopts.c,v 4.44 2009/01/25 19:31:56 bkorb Exp $
+ *  $Id: autoopts.c,v 4.40 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2009-01-12 02:49:49 bkorb"
  *
  *  This file contains all of the routines that must be linked into
@@ -24,8 +24,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/autoopts.h b/sntp/libopts/autoopts.h
index 38edd3e9f..108bcb7ac 100644
--- a/sntp/libopts/autoopts.h
+++ b/sntp/libopts/autoopts.h
@@ -2,7 +2,7 @@
 /*
  *  Time-stamp:      "2008-11-01 20:08:06 bkorb"
  *
- *  autoopts.h  $Id: autoopts.h,v 4.41 2009/01/01 16:49:26 bkorb Exp $
+ *  autoopts.h  $Id: autoopts.h,v 4.31 2009/08/01 17:44:36 bkorb Exp $
  *
  *  This file defines all the global structures and special values
  *  used in the automated option processing library.
@@ -23,8 +23,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/autoopts/options.h b/sntp/libopts/autoopts/options.h
index 4aad8f118..e84bd8646 100644
--- a/sntp/libopts/autoopts/options.h
+++ b/sntp/libopts/autoopts/options.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (options.h)
  *  
- *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:34 PM PDT
+ *  It has been AutoGen-ed  August  1, 2009 at 11:21:11 AM by AutoGen 5.9.9pre4
  *  From the definitions    funcs.def
  *  and the template file   options_h
  *
@@ -144,7 +144,7 @@ typedef enum {
     OPTST_DEPRECATED_ID      =  26  /* support is being removed      */
 } opt_state_enum_t;
 
-#define OPTST_INIT           0U
+#define OPTST_INIT               0U
 #define OPTST_SET            (1U << OPTST_SET_ID)
 #define OPTST_PRESET         (1U << OPTST_PRESET_ID)
 #define OPTST_DEFINED        (1U << OPTST_DEFINED_ID)
@@ -173,40 +173,34 @@ typedef enum {
 #define OPTST_DEPRECATED     (1U << OPTST_DEPRECATED_ID)
 #define OPT_STATE_MASK       0x07FFFF7FU
 
-#define OPTST_SET_MASK       (  \
-        OPTST_SET | \
-        OPTST_PRESET | \
-        OPTST_RESET | \
-        OPTST_DEFINED )
-
-#define OPTST_MUTABLE_MASK   (  \
-        OPTST_SET | \
-        OPTST_PRESET | \
-        OPTST_RESET | \
-        OPTST_DEFINED | \
-        OPTST_EQUIVALENCE | \
-        OPTST_DISABLED | \
-        OPTST_ALLOC_ARG )
-
-#define OPTST_SELECTED_MASK  (  \
-        OPTST_SET | \
-        OPTST_DEFINED )
-
-#define OPTST_ARG_TYPE_MASK  (  \
-        OPTST_ARG_TYPE_1 | \
-        OPTST_ARG_TYPE_2 | \
-        OPTST_ARG_TYPE_3 | \
-        OPTST_ARG_TYPE_4 )
-
-#define OPTST_DO_NOT_SAVE_MASK   (  \
-        OPTST_NO_INIT | \
-        OPTST_DOCUMENT | \
-        OPTST_OMITTED )
-
-#define OPTST_NO_USAGE_MASK  (  \
-        OPTST_OMITTED | \
-        OPTST_NO_COMMAND | \
-        OPTST_DEPRECATED )
+#define OPTST_SET_MASK       ( \
+        OPTST_DEFINED | OPTST_PRESET |  OPTST_RESET | \
+        OPTST_SET \
+        /* 0x0000000FU */ )
+
+#define OPTST_MUTABLE_MASK   ( \
+        OPTST_ALLOC_ARG |   OPTST_DEFINED | \
+        OPTST_DISABLED |    OPTST_EQUIVALENCE | \
+        OPTST_PRESET |      OPTST_RESET | \
+        OPTST_SET \
+        /* 0x0000007FU */ )
+
+#define OPTST_SELECTED_MASK  ( \
+        OPTST_DEFINED | OPTST_SET \
+        /* 0x00000005U */ )
+
+#define OPTST_ARG_TYPE_MASK  ( \
+        OPTST_ARG_TYPE_1 | OPTST_ARG_TYPE_2 | OPTST_ARG_TYPE_3 | \
+        OPTST_ARG_TYPE_4 \
+        /* 0x0000F000U */ )
+
+#define OPTST_DO_NOT_SAVE_MASK   ( \
+        OPTST_DOCUMENT | OPTST_NO_INIT |  OPTST_OMITTED \
+        /* 0x00280100U */ )
+
+#define OPTST_NO_USAGE_MASK  ( \
+        OPTST_DEPRECATED | OPTST_NO_COMMAND | OPTST_OMITTED \
+        /* 0x06080000U */ )
 
 #ifdef NO_OPTIONAL_OPT_ARGS
 # undef  OPTST_ARG_OPTIONAL
@@ -253,7 +247,7 @@ typedef enum {
     OPTPROC_PRESETTING_ID      =  19  /* opt processing in preset state */
 } optproc_state_enum_t;
 
-#define OPTPROC_NONE           0U
+#define OPTPROC_NONE               0U
 #define OPTPROC_LONGOPT        (1U << OPTPROC_LONGOPT_ID)
 #define OPTPROC_SHORTOPT       (1U << OPTPROC_SHORTOPT_ID)
 #define OPTPROC_ERRSTOP        (1U << OPTPROC_ERRSTOP_ID)
@@ -273,9 +267,9 @@ typedef enum {
 #define OPTPROC_PRESETTING     (1U << OPTPROC_PRESETTING_ID)
 #define OPTPROC_STATE_MASK     0x000B3FFFU
 
-#define OPTPROC_NO_XLAT_MASK   (  \
-        OPTPROC_NXLAT_OPT_CFG | \
-        OPTPROC_NXLAT_OPT )
+#define OPTPROC_NO_XLAT_MASK   ( \
+        OPTPROC_NXLAT_OPT |     OPTPROC_NXLAT_OPT_CFG \
+        /* 0x00030000U */ )
 
 #define STMTS(s)  do { s; } while (0)
 
diff --git a/sntp/libopts/autoopts/usage-txt.h b/sntp/libopts/autoopts/usage-txt.h
index 83081d5f5..826da53eb 100644
--- a/sntp/libopts/autoopts/usage-txt.h
+++ b/sntp/libopts/autoopts/usage-txt.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (usage-txt.h)
  *  
- *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:33 PM PDT
+ *  It has been AutoGen-ed  August  1, 2009 at 11:21:10 AM by AutoGen 5.9.9pre4
  *  From the definitions    usage-txt.def
  *  and the template file   usage-txt.tpl
  *
diff --git a/sntp/libopts/boolean.c b/sntp/libopts/boolean.c
index 5f9446912..58a59d023 100644
--- a/sntp/libopts/boolean.c
+++ b/sntp/libopts/boolean.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: boolean.c,v 4.15 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: boolean.c,v 4.17 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2008-08-03 13:06:02 bkorb"
  *
  *   Automated Options Paged Usage module.
@@ -24,8 +24,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/compat/compat.h b/sntp/libopts/compat/compat.h
index 27c1eb45f..5c73ae8e4 100644
--- a/sntp/libopts/compat/compat.h
+++ b/sntp/libopts/compat/compat.h
@@ -4,7 +4,7 @@
  *
  *  Time-stamp:      "2008-06-14 09:36:25 bkorb"
  *
- * $Id: compat.h,v 4.22 2009/01/01 16:49:26 bkorb Exp $
+ * $Id: compat.h,v 4.21 2009/01/01 16:51:52 bkorb Exp $
  *
  *  compat.h is free software.
  *  This file is part of AutoGen.
diff --git a/sntp/libopts/compat/pathfind.c b/sntp/libopts/compat/pathfind.c
index d87bada3a..480674dda 100644
--- a/sntp/libopts/compat/pathfind.c
+++ b/sntp/libopts/compat/pathfind.c
@@ -5,10 +5,10 @@
 /*
  * Author:           Gary V Vaughan <gvaughan@oranda.demon.co.uk>
  * Time-stamp:       "2006-09-23 19:46:16 bkorb"
- * Last Modified:    $Date: 2007/10/07 16:54:54 $
+ * Last Modified:    $Date: 2007/07/04 20:51:18 $
  *            by: bkorb
  *
- * $Id: pathfind.c,v 4.12 2007/10/07 16:54:54 bkorb Exp $
+ * $Id: pathfind.c,v 4.11 2007/07/04 20:51:18 bkorb Exp $
  */
 
 /* Code: */
diff --git a/sntp/libopts/compat/windows-config.h b/sntp/libopts/compat/windows-config.h
index 1594f28ca..76a9956f0 100644
--- a/sntp/libopts/compat/windows-config.h
+++ b/sntp/libopts/compat/windows-config.h
@@ -2,7 +2,7 @@
 /*
  * Time-stamp:        "2009-07-22 18:53:59 bkorb"
  *             by: bkorb
- * Last Committed:    $Date: 2009/07/23 02:05:55 $
+ * Last Committed:    $Date: 2009/07/23 02:07:46 $
  *
  *  This file is part of AutoGen.
  *
diff --git a/sntp/libopts/configfile.c b/sntp/libopts/configfile.c
index 92b59860c..b8fdb6904 100644
--- a/sntp/libopts/configfile.c
+++ b/sntp/libopts/configfile.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: configfile.c,v 4.46 2009/01/18 22:48:51 bkorb Exp $
+ *  $Id: configfile.c,v 1.36 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2009-01-18 10:21:58 bkorb"
  *
  *  configuration/rc/ini file handling.
@@ -20,8 +20,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/cook.c b/sntp/libopts/cook.c
index 3a66751ba..baf9d81df 100644
--- a/sntp/libopts/cook.c
+++ b/sntp/libopts/cook.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: cook.c,v 4.16 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: cook.c,v 4.18 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2007-11-16 22:49:11 bkorb"
  *
  *  This file contains the routines that deal with processing quoted strings
@@ -21,8 +21,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/enumeration.c b/sntp/libopts/enumeration.c
index 6c5bad05a..1c67679b4 100644
--- a/sntp/libopts/enumeration.c
+++ b/sntp/libopts/enumeration.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: enumeration.c,v 4.25 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: enumeration.c,v 4.26 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2008-07-27 12:28:01 bkorb"
  *
  *   Automated Options Paged Usage module.
@@ -24,8 +24,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/environment.c b/sntp/libopts/environment.c
index 037140419..d201e22fd 100644
--- a/sntp/libopts/environment.c
+++ b/sntp/libopts/environment.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: environment.c,v 4.20 2009/07/21 03:21:57 bkorb Exp $
+ *  $Id: environment.c,v 4.21 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2009-07-20 20:12:24 bkorb"
  *
  *  This file contains all of the routines that must be linked into
@@ -24,8 +24,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/file.c b/sntp/libopts/file.c
index 287119a3d..2224c8b4e 100644
--- a/sntp/libopts/file.c
+++ b/sntp/libopts/file.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: file.c,v 4.7 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: file.c,v 1.9 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2009-07-23 17:23:46 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
@@ -19,8 +19,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/genshell.c b/sntp/libopts/genshell.c
index 54dddb06a..5d4e35432 100644
--- a/sntp/libopts/genshell.c
+++ b/sntp/libopts/genshell.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (genshell.c)
  *  
- *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:35 PM PDT
+ *  It has been AutoGen-ed  August  1, 2009 at 11:21:11 AM by AutoGen 5.9.9pre4
  *  From the definitions    genshell.def
  *  and the template file   options
  *
@@ -20,7 +20,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * genshellopt copyright 1999-2009 Bruce Korb - all rights reserved
+ * genshellopt copyright (c) 1999-2009 Bruce Korb - all rights reserved
  *
  * genshellopt is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/sntp/libopts/genshell.h b/sntp/libopts/genshell.h
index d075431b0..6891c9a9e 100644
--- a/sntp/libopts/genshell.h
+++ b/sntp/libopts/genshell.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (genshell.h)
  *  
- *  It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:35 PM PDT
+ *  It has been AutoGen-ed  August  1, 2009 at 11:21:11 AM by AutoGen 5.9.9pre4
  *  From the definitions    genshell.def
  *  and the template file   options
  *
@@ -20,7 +20,7 @@
  *
  * This source file is copyrighted and licensed under the following terms:
  *
- * genshellopt copyright 1999-2009 Bruce Korb - all rights reserved
+ * genshellopt copyright (c) 1999-2009 Bruce Korb - all rights reserved
  *
  * genshellopt is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/sntp/libopts/load.c b/sntp/libopts/load.c
index 2d8d8b074..f2982a7be 100644
--- a/sntp/libopts/load.c
+++ b/sntp/libopts/load.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: load.c,v 4.37 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: load.c,v 4.29 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2008-12-06 10:16:05 bkorb"
  *
  *  This file contains the routines that deal with processing text strings
@@ -23,8 +23,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/m4/libopts.m4 b/sntp/libopts/m4/libopts.m4
index 8124af147..13083120a 100644
--- a/sntp/libopts/m4/libopts.m4
+++ b/sntp/libopts/m4/libopts.m4
@@ -2,7 +2,7 @@ dnl  -*- buffer-read-only: t -*- vi: set ro:
 dnl 
 dnl DO NOT EDIT THIS FILE   (libopts.m4)
 dnl 
-dnl It has been AutoGen-ed  Thursday July 23, 2009 at 05:36:36 PM PDT
+dnl It has been AutoGen-ed  August  1, 2009 at 11:21:13 AM by AutoGen 5.9.9pre4
 dnl From the definitions    libopts.def
 dnl and the template file   conftest.tpl
 dnl
@@ -444,7 +444,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS],[
 dnl @synopsis  LIBOPTS_CHECK
 dnl
 dnl Time-stamp:        "2009-07-22 18:50:49 bkorb"
-dnl Last Committed:    $Date: 2009/07/23 02:05:55 $
+dnl Last Committed:    $Date: 2009/07/23 02:07:47 $
 dnl
 dnl If autoopts-config works, add the linking information to LIBS.
 dnl Otherwise, add ``libopts-${ao_rev}'' to SUBDIRS and run all
diff --git a/sntp/libopts/m4/liboptschk.m4 b/sntp/libopts/m4/liboptschk.m4
index a2df33c93..db3ce4a68 100644
--- a/sntp/libopts/m4/liboptschk.m4
+++ b/sntp/libopts/m4/liboptschk.m4
@@ -6,7 +6,7 @@ dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl Time-stamp:        "2009-07-22 18:53:27 bkorb"
-dnl Last Committed:    $Date: 2009/07/23 02:05:55 $
+dnl Last Committed:    $Date: 2009/07/23 02:07:46 $
 
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
diff --git a/sntp/libopts/makeshell.c b/sntp/libopts/makeshell.c
index dc7627d9a..4d9271bfb 100644
--- a/sntp/libopts/makeshell.c
+++ b/sntp/libopts/makeshell.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: makeshell.c,v 4.29 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: makeshell.c,v 4.29 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2008-07-26 16:10:51 bkorb"
  *
  *  This module will interpret the options set in the tOptions
@@ -22,8 +22,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/nested.c b/sntp/libopts/nested.c
index 400335734..fddb572da 100644
--- a/sntp/libopts/nested.c
+++ b/sntp/libopts/nested.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: nested.c,v 4.31 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: nested.c,v 4.28 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2008-07-28 19:18:28 bkorb"
  *
  *   Automated Options Nested Values module.
@@ -21,8 +21,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/numeric.c b/sntp/libopts/numeric.c
index e336ba151..1c8a4926a 100644
--- a/sntp/libopts/numeric.c
+++ b/sntp/libopts/numeric.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: numeric.c,v 4.20 2009/01/17 22:08:09 bkorb Exp $
+ *  $Id: numeric.c,v 4.23 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2009-07-23 17:25:39 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
@@ -19,8 +19,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/pgusage.c b/sntp/libopts/pgusage.c
index 5f103cdd3..d59b107ab 100644
--- a/sntp/libopts/pgusage.c
+++ b/sntp/libopts/pgusage.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: pgusage.c,v 4.17 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: pgusage.c,v 4.18 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2008-07-27 21:08:42 bkorb"
  *
  *   Automated Options Paged Usage module.
@@ -24,8 +24,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/proto.h b/sntp/libopts/proto.h
index af35d1808..10673c9aa 100644
--- a/sntp/libopts/proto.h
+++ b/sntp/libopts/proto.h
@@ -1,7 +1,7 @@
 /* -*- buffer-read-only: t -*- vi: set ro:
  *
  * Prototypes for autoopts
- * Generated Thu Jul 23 17:36:35 PDT 2009
+ * Generated Sat Aug  1 11:21:12 PDT 2009
  */
 #ifndef AUTOOPTS_PROTO_H_GUARD
 #define AUTOOPTS_PROTO_H_GUARD 1
diff --git a/sntp/libopts/putshell.c b/sntp/libopts/putshell.c
index 9aeaacd52..c0aac05d1 100644
--- a/sntp/libopts/putshell.c
+++ b/sntp/libopts/putshell.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: putshell.c,v 4.26 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: putshell.c,v 4.27 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2008-07-27 12:14:38 bkorb"
  *
  *  This module will interpret the options set in the tOptions
@@ -23,8 +23,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/reset.c b/sntp/libopts/reset.c
index d23786349..7f6dec967 100644
--- a/sntp/libopts/reset.c
+++ b/sntp/libopts/reset.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: reset.c,v 4.6 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: reset.c,v 4.4 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2008-08-02 12:25:18 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
@@ -19,8 +19,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/restore.c b/sntp/libopts/restore.c
index 2481a02ff..28b16576e 100644
--- a/sntp/libopts/restore.c
+++ b/sntp/libopts/restore.c
@@ -1,6 +1,6 @@
 
 /*
- *  restore.c  $Id: restore.c,v 4.13 2009/01/01 16:49:26 bkorb Exp $
+ *  restore.c  $Id: restore.c,v 4.15 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2007-07-04 11:34:40 bkorb"
  *
  *  This module's routines will save the current option state to memory
@@ -23,8 +23,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/save.c b/sntp/libopts/save.c
index 3b49b69ca..4a9d76e5d 100644
--- a/sntp/libopts/save.c
+++ b/sntp/libopts/save.c
@@ -1,6 +1,6 @@
 
 /*
- *  save.c  $Id: save.c,v 4.35 2009/07/21 04:01:30 bkorb Exp $
+ *  save.c  $Id: save.c,v 4.32 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2009-07-20 20:40:28 bkorb"
  *
  *  This module's routines will take the currently set options and
@@ -23,8 +23,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/sort.c b/sntp/libopts/sort.c
index 4294382f8..900581d49 100644
--- a/sntp/libopts/sort.c
+++ b/sntp/libopts/sort.c
@@ -1,6 +1,6 @@
 
 /*
- *  sort.c  $Id: sort.c,v 4.16 2009/01/01 16:49:26 bkorb Exp $
+ *  sort.c  $Id: sort.c,v 4.16 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2007-07-04 11:34:52 bkorb"
  *
  *  This module implements argument sorting.
@@ -21,8 +21,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/stack.c b/sntp/libopts/stack.c
index 10cf18a49..a0ac11be5 100644
--- a/sntp/libopts/stack.c
+++ b/sntp/libopts/stack.c
@@ -1,7 +1,7 @@
 
 /*
  *  stack.c
- *  $Id: stack.c,v 4.18 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: stack.c,v 4.19 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2008-07-30 16:56:32 bkorb"
  *
  *  This is a special option processing routine that will save the
@@ -23,8 +23,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/streqvcmp.c b/sntp/libopts/streqvcmp.c
index b5971d845..836079744 100644
--- a/sntp/libopts/streqvcmp.c
+++ b/sntp/libopts/streqvcmp.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: streqvcmp.c,v 4.16 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: streqvcmp.c,v 4.16 2009/08/01 17:44:36 bkorb Exp $
  * Time-stamp:      "2008-12-26 10:15:46 bkorb"
  *
  *  String Equivalence Comparison
@@ -26,8 +26,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  *
  * This array is designed for mapping upper and lower case letter
diff --git a/sntp/libopts/text_mmap.c b/sntp/libopts/text_mmap.c
index 566644132..34d29d03f 100644
--- a/sntp/libopts/text_mmap.c
+++ b/sntp/libopts/text_mmap.c
@@ -1,5 +1,5 @@
 /*
- * $Id: text_mmap.c,v 4.20 2009/01/01 16:49:26 bkorb Exp $
+ * $Id: text_mmap.c,v 4.20 2009/08/01 17:44:36 bkorb Exp $
  *
  * Time-stamp:      "2007-07-04 11:35:49 bkorb"
  *
@@ -19,8 +19,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/time.c b/sntp/libopts/time.c
index 484fc27e9..2d9a1d073 100644
--- a/sntp/libopts/time.c
+++ b/sntp/libopts/time.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: time.c,v 4.4 2009/01/01 16:49:26 bkorb Exp $
+ *  $Id: time.c,v 4.4 2009/08/01 17:44:36 bkorb Exp $
  *  Time-stamp:      "2008-11-16 14:51:48 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
@@ -19,8 +19,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/tokenize.c b/sntp/libopts/tokenize.c
index bc7edfba1..74295674a 100644
--- a/sntp/libopts/tokenize.c
+++ b/sntp/libopts/tokenize.c
@@ -18,8 +18,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/usage.c b/sntp/libopts/usage.c
index bd64a5949..ba6782d73 100644
--- a/sntp/libopts/usage.c
+++ b/sntp/libopts/usage.c
@@ -1,6 +1,6 @@
 
 /*
- *  usage.c  $Id: usage.c,v 4.29 2009/01/17 22:08:09 bkorb Exp $
+ *  usage.c  $Id: usage.c,v 4.31 2009/08/01 17:44:37 bkorb Exp $
  * Time-stamp:      "2009-01-17 13:18:23 bkorb"
  *
  *  This module implements the default usage procedure for
@@ -29,8 +29,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/value-type.h b/sntp/libopts/value-type.h
index 45a36048e..2eff3dbd0 100644
--- a/sntp/libopts/value-type.h
+++ b/sntp/libopts/value-type.h
@@ -1,5 +1,5 @@
 /*
- *  Generated header for gperf generated source Thu Jul 23 17:36:47 PDT 2009
+ *  Generated header for gperf generated source Sat Aug  1 11:21:22 PDT 2009
  *  This file enumerates the list of names and declares the
  *  procedure for mapping string names to the enum value.
  */
diff --git a/sntp/libopts/version.c b/sntp/libopts/version.c
index a091da51c..0005c9f7d 100644
--- a/sntp/libopts/version.c
+++ b/sntp/libopts/version.c
@@ -1,5 +1,5 @@
 
-/*  $Id: version.c,v 4.18 2009/01/01 16:49:26 bkorb Exp $
+/*  $Id: version.c,v 4.17 2009/08/01 17:44:37 bkorb Exp $
  * Time-stamp:      "2008-07-27 10:11:30 bkorb"
  *
  *  This module implements the default usage procedure for
@@ -23,8 +23,8 @@
  *
  *  These files have the following md5sums:
  *
- *  239588c55c22c60ffe159946a760a33e pkg/libopts/COPYING.gplv3
- *  fa82ca978890795162346e661b47161a pkg/libopts/COPYING.lgplv3
+ *  43b91e8ca915626ed3818ffb1b71248b pkg/libopts/COPYING.gplv3
+ *  06a1a2e4760c90ea5e1dad8dfaac4d39 pkg/libopts/COPYING.lgplv3
  *  66a5cedaf62c4b2637025f049f9b826f pkg/libopts/COPYING.mbsd
  */
 
diff --git a/sntp/libopts/xat-attribute.h b/sntp/libopts/xat-attribute.h
index e081b54f6..ae87eacae 100644
--- a/sntp/libopts/xat-attribute.h
+++ b/sntp/libopts/xat-attribute.h
@@ -1,5 +1,5 @@
 /*
- *  Generated header for gperf generated source Thu Jul 23 17:36:47 PDT 2009
+ *  Generated header for gperf generated source Sat Aug  1 11:21:22 PDT 2009
  *  This file enumerates the list of names and declares the
  *  procedure for mapping string names to the enum value.
  */