From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 27 Feb 2013 10:18:58 +0000 (+0000)
Subject: Upgrade to autogen-5.17.3pre4 and libopts-38.0.13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3bcf090d6ff0066a44a9cf5a25c166bdef2173c;p=thirdparty%2Fntp.git

Upgrade to autogen-5.17.3pre4 and libopts-38.0.13

bk: 512ddd92eknmlc-gPcIK02DPZqNK6Q
---

diff --git a/ChangeLog b/ChangeLog
index 7095f50491..4e6168fa1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Upgrade to autogen-5.17.3pre4 and libopts-38.0.13.
 * Upgrade to autogen-5.17.2pre and libopts-38.0.13.
 (4.2.7p356) 2013/02/19 Released by Harlan Stenn <stenn@ntp.org>
 * Added loc/debian.
diff --git a/sntp/libopts/Makefile.am b/sntp/libopts/Makefile.am
index c6e59e1c28..8b694d4dbf 100644
--- a/sntp/libopts/Makefile.am
+++ b/sntp/libopts/Makefile.am
@@ -12,10 +12,10 @@ EXTRA_DIST              = \
     COPYING.gplv3           COPYING.lgplv3          COPYING.mbsd  \
     MakeDefs.inc            README                  ag-char-map.h  \
     alias.c                 ao-strs.c               ao-strs.h  \
-    autoopts/usage-txt.h    autoopts/project.h      autoopts/options.h  \
+    autoopts/options.h      autoopts/usage-txt.h    autoopts/project.h  \
     autoopts.c              autoopts.h              boolean.c  \
-    check.c                 compat/pathfind.c       compat/snprintf.c  \
-    compat/strdup.c         compat/compat.h         compat/windows-config.h  \
+    check.c                 compat/windows-config.h compat/strdup.c  \
+    compat/compat.h         compat/snprintf.c       compat/pathfind.c  \
     compat/strchr.c         configfile.c            cook.c  \
     enum.c                  env.c                   file.c  \
     find.c                  genshell.c              genshell.h  \
diff --git a/sntp/libopts/ag-char-map.h b/sntp/libopts/ag-char-map.h
index 4b71cf0d2e..f811cb8a8b 100644
--- a/sntp/libopts/ag-char-map.h
+++ b/sntp/libopts/ag-char-map.h
@@ -1,6 +1,6 @@
 /*
  *  29 bits for 46 character classifications
- *  generated by char-mapper on 02/21/13 at 12:28:29
+ *  generated by char-mapper on 02/25/13 at 10:02:42
  *
  *  This file contains the character classifications
  *  used by AutoGen and AutoOpts for identifying tokens.
diff --git a/sntp/libopts/ao-strs.c b/sntp/libopts/ao-strs.c
index c3e9ab4fe5..1ae06e24f5 100644
--- a/sntp/libopts/ao-strs.c
+++ b/sntp/libopts/ao-strs.c
@@ -2,7 +2,7 @@
  *
  * DO NOT EDIT THIS FILE   (ao-strs.c)
  *
- * It has been AutoGen-ed  February 21, 2013 at 12:28:29 PM by AutoGen 5.17.2pre16
+ * It has been AutoGen-ed  February 25, 2013 at 10:02:42 AM by AutoGen 5.17.2
  * From the definitions    ao-strs.def
  * and the template file   strings
  *
diff --git a/sntp/libopts/ao-strs.h b/sntp/libopts/ao-strs.h
index 5fd2409530..491c502b14 100644
--- a/sntp/libopts/ao-strs.h
+++ b/sntp/libopts/ao-strs.h
@@ -2,7 +2,7 @@
  *
  * DO NOT EDIT THIS FILE   (ao-strs.h)
  *
- * It has been AutoGen-ed  February 21, 2013 at 12:28:29 PM by AutoGen 5.17.2pre16
+ * It has been AutoGen-ed  February 25, 2013 at 10:02:42 AM by AutoGen 5.17.2
  * From the definitions    ao-strs.def
  * and the template file   strings
  *
diff --git a/sntp/libopts/autoopts/options.h b/sntp/libopts/autoopts/options.h
index 695ad564e3..86dbb84ebf 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  February 21, 2013 at 12:28:36 PM by AutoGen 5.17.2pre16
+ *  It has been AutoGen-ed  February 25, 2013 at 10:02:49 AM by AutoGen 5.17.2
  *  From the definitions    funcs.def
  *  and the template file   options_h
  *
@@ -298,6 +298,7 @@ typedef uint32_t opt_state_mask_t;
 
 /** no bits in opt_state_mask_t */
 #define OPTST_INIT             0x0000000U
+/** @} */
 
 #ifdef NO_OPTIONAL_OPT_ARGS
 # undef  OPTST_ARG_OPTIONAL
diff --git a/sntp/libopts/autoopts/usage-txt.h b/sntp/libopts/autoopts/usage-txt.h
index e6dc6263e5..811976983c 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  February 21, 2013 at 12:28:34 PM by AutoGen 5.17.2pre16
+ * It has been AutoGen-ed  February 25, 2013 at 10:02:47 AM by AutoGen 5.17.2
  * From the definitions    usage-txt.def
  * and the template file   usage-txt.tpl
  *
@@ -55,7 +55,7 @@ typedef struct {
  *  strings and the text array containing untranslatable strings.
  */
 extern usage_text_t option_xlateable_txt;
-extern char const option_lib_text[4283];
+extern char const option_lib_text[4285];
 
 #if defined(AUTOOPTS_INTERNAL)
 /*
@@ -181,7 +181,7 @@ static char eng_zGnuBoolArg[]  = "=T/F";
 static char eng_zGnuKeyArg[]   = "=KWd";
 static char eng_zGnuNumArg[]   = "=num";
 static char eng_zGnuStrArg[]   = "=str";
-char const option_lib_text[4283] =
+char const option_lib_text[4285] =
 /*     0 */ "allocation of %d bytes failed\n\0"
 /*    31 */ "AutoOpts function called without option descriptor\n\0"
 /*    83 */ "\tThis exceeds the compiled library version:  \0"
@@ -220,87 +220,87 @@ char const option_lib_text[4283] =
 /*  1335 */ "%s: invalid option name: %s\n\0"
 /*  1364 */ "%s: The '%s' option requires an argument.\n\0"
 /*  1407 */ "(AutoOpts bug):  Equivalenced option '%s' was equivalenced to both\n"
-            "\t'%s' and '%s'\0"
-/*  1489 */ "%s error:  The %s option is required\n\0"
-/*  1527 */ "%s: The '%s' option cannot have an argument.\n\0"
-/*  1573 */ "%s: Command line arguments are not allowed.\n\0"
-/*  1618 */ "error %d (%s) creating %s\n\0"
-/*  1645 */ "%s error:  '%s' does not match any %s keywords.\n\0"
-/*  1694 */ "%s error: The '%s' option requires an argument.\n\0"
-/*  1743 */ "error %d (%s) stat-ing %s\n\0"
-/*  1770 */ "%s error: no saved option state\n\0"
-/*  1803 */ "'%s' is not a command line option.\n\0"
-/*  1839 */ "%s error:  '%s' is not a recognizable date/time.\n\0"
-/*  1889 */ "'%s' not defined\n\0"
-/*  1907 */ "%s error:  '%s' is not a recognizable time duration.\n\0"
-/*  1961 */ "%s error:  The %s option must appear %d times\n\0"
-/*  2008 */ "%s error:  '%s' is not a recognizable number.\n\0"
-/*  2055 */ "%s error:  %s exceeds %s keyword count\n\0"
-/*  2095 */ "Try '%s %s' for more information.\n\0"
-/*  2130 */ "one %s%s option allowed\n\0"
-/*  2155 */ "standard output\0"
-/*  2171 */ "standard error\0"
-/*  2186 */ "write\0"
-/*  2192 */ "%s error:  %s option value %ld is out of range.\n\0"
-/*  2241 */ "%s error:  %s option requires the %s option\n\0"
-/*  2286 */ "%s warning:  cannot save options - %s not regular file\n\0"
-/*  2342 */ "\t\t\t\t- an alternate for '%s'\n\0"
-/*  2371 */ "Version, usage and configuration options:\0"
-/*  2413 */ "\t\t\t\t- default option for unnamed options\n\0"
-/*  2455 */ "\t\t\t\t- disabled as '--%s'\n\0"
-/*  2481 */ " --- %-14s %s\n\0"
-/*  2496 */ "This option has been disabled\0"
-/*  2526 */ "\t\t\t\t- enabled by default\n\0"
-/*  2552 */ "%s error:  only \0"
-/*  2569 */ " - examining environment variables named %s_*\n\0"
-/*  2616 */ "\t\t\t\t- file must not pre-exist\n\0"
-/*  2647 */ "\t\t\t\t- file must pre-exist\n\0"
-/*  2674 */ "Options are specified by doubled hyphens and their name or by a single\n"
+            "\t'%s' and '%s'.\0"
+/*  1490 */ "%s error:  The %s option is required\n\0"
+/*  1528 */ "%s: The '%s' option cannot have an argument.\n\0"
+/*  1574 */ "%s: Command line arguments are not allowed.\n\0"
+/*  1619 */ "error %d (%s) creating %s\n\0"
+/*  1646 */ "%s error:  '%s' does not match any %s keywords.\n\0"
+/*  1695 */ "%s error: The '%s' option requires an argument.\n\0"
+/*  1744 */ "error %d (%s) stat-ing %s\n\0"
+/*  1771 */ "%s error: no saved option state\n\0"
+/*  1804 */ "'%s' is not a command line option.\n\0"
+/*  1840 */ "%s error:  '%s' is not a recognizable date/time.\n\0"
+/*  1890 */ "'%s' not defined\n\0"
+/*  1908 */ "%s error:  '%s' is not a recognizable time duration.\n\0"
+/*  1962 */ "%s error:  The %s option must appear %d times.\n\0"
+/*  2010 */ "%s error:  '%s' is not a recognizable number.\n\0"
+/*  2057 */ "%s error:  %s exceeds %s keyword count\n\0"
+/*  2097 */ "Try '%s %s' for more information.\n\0"
+/*  2132 */ "one %s%s option allowed\n\0"
+/*  2157 */ "standard output\0"
+/*  2173 */ "standard error\0"
+/*  2188 */ "write\0"
+/*  2194 */ "%s error:  %s option value %ld is out of range.\n\0"
+/*  2243 */ "%s error:  %s option requires the %s option\n\0"
+/*  2288 */ "%s warning:  cannot save options - %s not regular file\n\0"
+/*  2344 */ "\t\t\t\t- an alternate for '%s'\n\0"
+/*  2373 */ "Version, usage and configuration options:\0"
+/*  2415 */ "\t\t\t\t- default option for unnamed options\n\0"
+/*  2457 */ "\t\t\t\t- disabled as '--%s'\n\0"
+/*  2483 */ " --- %-14s %s\n\0"
+/*  2498 */ "This option has been disabled\0"
+/*  2528 */ "\t\t\t\t- enabled by default\n\0"
+/*  2554 */ "%s error:  only \0"
+/*  2571 */ " - examining environment variables named %s_*\n\0"
+/*  2618 */ "\t\t\t\t- file must not pre-exist\n\0"
+/*  2649 */ "\t\t\t\t- file must pre-exist\n\0"
+/*  2676 */ "Options are specified by doubled hyphens and their name or by a single\n"
             "hyphen and the flag character.\n\0"
-/*  2777 */ "\n"
+/*  2779 */ "\n"
             "= = = = = = = =\n\n"
             "This incarnation of genshell will produce\n"
             "a shell script to parse the options for %s:\n\n\0"
-/*  2883 */ "  or an integer mask with any of the lower %d bits set\n\0"
-/*  2939 */ "\t\t\t\t- is a set membership option\n\0"
-/*  2973 */ "\t\t\t\t- must appear between %d and %d times\n\0"
-/*  3016 */ "Options are specified by single or double hyphens and their name.\n\0"
-/*  3083 */ "\t\t\t\t- may appear multiple times\n\0"
-/*  3116 */ "\t\t\t\t- may not be preset\n\0"
-/*  3141 */ "   Arg Option-Name    Description\n\0"
-/*  3176 */ "  Flg Arg Option-Name    Description\n\0"
-/*  3214 */ " %3s %s\0"
-/*  3222 */ "The '-#<number>' option may omit the hash char\n\0"
-/*  3270 */ "All arguments are named options.\n\0"
-/*  3304 */ " - reading file %s\0"
-/*  3323 */ "\n"
-            "please send bug reports to:  <%s>\n\0"
-/*  3359 */ "\t\t\t\t- may NOT appear - preset only\n\0"
-/*  3395 */ "\n"
+/*  2885 */ "  or an integer mask with any of the lower %d bits set\n\0"
+/*  2941 */ "\t\t\t\t- is a set membership option\n\0"
+/*  2975 */ "\t\t\t\t- must appear between %d and %d times\n\0"
+/*  3018 */ "Options are specified by single or double hyphens and their name.\n\0"
+/*  3085 */ "\t\t\t\t- may appear multiple times\n\0"
+/*  3118 */ "\t\t\t\t- may not be preset\n\0"
+/*  3143 */ "   Arg Option-Name    Description\n\0"
+/*  3178 */ "  Flg Arg Option-Name    Description\n\0"
+/*  3216 */ " %3s %s\0"
+/*  3224 */ "The '-#<number>' option may omit the hash char\n\0"
+/*  3272 */ "All arguments are named options.\n\0"
+/*  3306 */ " - reading file %s\0"
+/*  3325 */ "\n"
+            "Please send bug reports to:  <%s>\n\0"
+/*  3361 */ "\t\t\t\t- may NOT appear - preset only\n\0"
+/*  3397 */ "\n"
             "The following option preset mechanisms are supported:\n\0"
-/*  3451 */ "prohibits these options:\n\0"
-/*  3477 */ "prohibits the option '%s'\n\0"
-/*  3504 */ "%s%ld to %ld\0"
-/*  3517 */ "%sgreater than or equal to %ld\0"
-/*  3548 */ "%s%ld exactly\0"
-/*  3562 */ "%sit must lie in one of the ranges:\n\0"
-/*  3599 */ "%sit must be in the range:\n\0"
-/*  3627 */ ", or\n\0"
-/*  3633 */ "%sis scalable with a suffix: k/K/m/M/g/G/t/T\n\0"
-/*  3679 */ "%sless than or equal to %ld\0"
-/*  3707 */ "Operands and options may be intermixed.  They will be reordered.\n\0"
-/*  3773 */ "requires the option '%s'\n\0"
-/*  3799 */ "requires these options:\n\0"
-/*  3824 */ "   Arg Option-Name   Req?  Description\n\0"
-/*  3864 */ "  Flg Arg Option-Name   Req?  Description\n\0"
-/*  3907 */ "or you may use a numeric representation.  Preceding these with a '!'\n"
+/*  3453 */ "prohibits these options:\n\0"
+/*  3479 */ "prohibits the option '%s'\n\0"
+/*  3506 */ "%s%ld to %ld\0"
+/*  3519 */ "%sgreater than or equal to %ld\0"
+/*  3550 */ "%s%ld exactly\0"
+/*  3564 */ "%sit must lie in one of the ranges:\n\0"
+/*  3601 */ "%sit must be in the range:\n\0"
+/*  3629 */ ", or\n\0"
+/*  3635 */ "%sis scalable with a suffix: k/K/m/M/g/G/t/T\n\0"
+/*  3681 */ "%sless than or equal to %ld\0"
+/*  3709 */ "Operands and options may be intermixed.  They will be reordered.\n\0"
+/*  3775 */ "requires the option '%s'\n\0"
+/*  3801 */ "requires these options:\n\0"
+/*  3826 */ "   Arg Option-Name   Req?  Description\n\0"
+/*  3866 */ "  Flg Arg Option-Name   Req?  Description\n\0"
+/*  3909 */ "or you may use a numeric representation.  Preceding these with a '!'\n"
             "will clear the bits, specifying 'none' will clear all bits, and 'all'\n"
             "will set them all.  Multiple entries may be passed as an option\n"
             "argument list.\n\0"
-/*  4126 */ "\t\t\t\t- may appear up to %d times\n\0"
-/*  4159 */ "The valid \"%s\" option keywords are:\n\0"
-/*  4196 */ "The next option supports vendor supported extra options:\0"
-/*  4253 */ "These additional options are:";
+/*  4128 */ "\t\t\t\t- may appear up to %d times\n\0"
+/*  4161 */ "The valid \"%s\" option keywords are:\n\0"
+/*  4198 */ "The next option supports vendor supported extra options:\0"
+/*  4255 */ "These additional options are:";
 
 /*
  *  Now, define (and initialize) the structure that contains
@@ -322,30 +322,30 @@ usage_text_t option_xlateable_txt = {
     option_lib_text + 1146, option_lib_text + 1159, option_lib_text + 1185,
     option_lib_text + 1211, option_lib_text + 1254, option_lib_text + 1290,
     option_lib_text + 1335, option_lib_text + 1364, option_lib_text + 1407,
-    option_lib_text + 1489, option_lib_text + 1527, option_lib_text + 1573,
-    option_lib_text + 1618, option_lib_text + 1645, option_lib_text + 1694,
-    option_lib_text + 1743, option_lib_text + 1770, option_lib_text + 1803,
-    option_lib_text + 1839, option_lib_text + 1889, option_lib_text + 1907,
-    option_lib_text + 1961, option_lib_text + 2008, option_lib_text + 2055,
-    option_lib_text + 2095, option_lib_text + 2130, option_lib_text + 2155,
-    option_lib_text + 2171, option_lib_text + 2186, option_lib_text + 2192,
-    option_lib_text + 2241, option_lib_text + 2286, option_lib_text + 2342,
-    option_lib_text + 2371, option_lib_text + 2413, option_lib_text + 2455,
-    option_lib_text + 2481, option_lib_text + 2496, option_lib_text + 2526,
-    option_lib_text + 2552, option_lib_text + 2569, option_lib_text + 2616,
-    option_lib_text + 2647, option_lib_text + 2674, option_lib_text + 2777,
-    option_lib_text + 2883, option_lib_text + 2939, option_lib_text + 2973,
-    option_lib_text + 3016, option_lib_text + 3083, option_lib_text + 3116,
-    option_lib_text + 3141, option_lib_text + 3176, option_lib_text + 3214,
-    option_lib_text + 3222, option_lib_text + 3270, option_lib_text + 3304,
-    option_lib_text + 3323, option_lib_text + 3359, option_lib_text + 3395,
-    option_lib_text + 3451, option_lib_text + 3477, option_lib_text + 3504,
-    option_lib_text + 3517, option_lib_text + 3548, option_lib_text + 3562,
-    option_lib_text + 3599, option_lib_text + 3627, option_lib_text + 3633,
-    option_lib_text + 3679, option_lib_text + 3707, option_lib_text + 3773,
-    option_lib_text + 3799, option_lib_text + 3824, option_lib_text + 3864,
-    option_lib_text + 3907, option_lib_text + 4126, option_lib_text + 4159,
-    option_lib_text + 4196, option_lib_text + 4253
+    option_lib_text + 1490, option_lib_text + 1528, option_lib_text + 1574,
+    option_lib_text + 1619, option_lib_text + 1646, option_lib_text + 1695,
+    option_lib_text + 1744, option_lib_text + 1771, option_lib_text + 1804,
+    option_lib_text + 1840, option_lib_text + 1890, option_lib_text + 1908,
+    option_lib_text + 1962, option_lib_text + 2010, option_lib_text + 2057,
+    option_lib_text + 2097, option_lib_text + 2132, option_lib_text + 2157,
+    option_lib_text + 2173, option_lib_text + 2188, option_lib_text + 2194,
+    option_lib_text + 2243, option_lib_text + 2288, option_lib_text + 2344,
+    option_lib_text + 2373, option_lib_text + 2415, option_lib_text + 2457,
+    option_lib_text + 2483, option_lib_text + 2498, option_lib_text + 2528,
+    option_lib_text + 2554, option_lib_text + 2571, option_lib_text + 2618,
+    option_lib_text + 2649, option_lib_text + 2676, option_lib_text + 2779,
+    option_lib_text + 2885, option_lib_text + 2941, option_lib_text + 2975,
+    option_lib_text + 3018, option_lib_text + 3085, option_lib_text + 3118,
+    option_lib_text + 3143, option_lib_text + 3178, option_lib_text + 3216,
+    option_lib_text + 3224, option_lib_text + 3272, option_lib_text + 3306,
+    option_lib_text + 3325, option_lib_text + 3361, option_lib_text + 3397,
+    option_lib_text + 3453, option_lib_text + 3479, option_lib_text + 3506,
+    option_lib_text + 3519, option_lib_text + 3550, option_lib_text + 3564,
+    option_lib_text + 3601, option_lib_text + 3629, option_lib_text + 3635,
+    option_lib_text + 3681, option_lib_text + 3709, option_lib_text + 3775,
+    option_lib_text + 3801, option_lib_text + 3826, option_lib_text + 3866,
+    option_lib_text + 3909, option_lib_text + 4128, option_lib_text + 4161,
+    option_lib_text + 4198, option_lib_text + 4255
   } };
 #endif /* AUTOOPTS_INTERNAL */
 
@@ -388,7 +388,7 @@ static void dummy_func(void) {
   puts(_("could not locate the 'help' option"));
 #line 351 "../autoopts.c"
   puts(_("optionProcess() was called with invalid data"));
-#line 770 "../usage.c"
+#line 783 "../usage.c"
   puts(_("invalid argument type specified"));
 #line 589 "../find.c"
   puts(_("defaulted to option with optional arg"));
@@ -437,9 +437,9 @@ static void dummy_func(void) {
   puts(_("  or an integer from %d through %d\n"));
 #line 164 "../enum.c"
   puts(_("  or an integer from %d through %d\n"));
-#line 769 "../usage.c"
+#line 782 "../usage.c"
   puts(_("%s error:  invalid option descriptor for %s\n"));
-#line 1097 "../usage.c"
+#line 1110 "../usage.c"
   puts(_("%s error:  invalid option descriptor for %s\n"));
 #line 379 "../find.c"
   puts(_("%s: invalid option name: %s\n"));
@@ -447,7 +447,7 @@ static void dummy_func(void) {
   puts(_("%s: The '%s' option requires an argument.\n"));
 #line 171 "../autoopts.c"
   puts(_("(AutoOpts bug):  Equivalenced option '%s' was equivalenced to both\n"
-       "\t'%s' and '%s'"));
+       "\t'%s' and '%s'."));
 #line 94 "../check.c"
   puts(_("%s error:  The %s option is required\n"));
 #line 623 "../find.c"
@@ -475,7 +475,7 @@ static void dummy_func(void) {
 #line 53 "../time.c"
   puts(_("%s error:  '%s' is not a recognizable time duration.\n"));
 #line 92 "../check.c"
-  puts(_("%s error:  The %s option must appear %d times\n"));
+  puts(_("%s error:  The %s option must appear %d times.\n"));
 #line 157 "../numeric.c"
   puts(_("%s error:  '%s' is not a recognizable number.\n"));
 #line 195 "../enum.c"
@@ -492,7 +492,7 @@ static void dummy_func(void) {
   puts(_("standard output"));
 #line 451 "../usage.c"
   puts(_("standard output"));
-#line 647 "../usage.c"
+#line 660 "../usage.c"
   puts(_("standard output"));
 #line 175 "../version.c"
   puts(_("standard output"));
@@ -500,7 +500,7 @@ static void dummy_func(void) {
   puts(_("standard error"));
 #line 451 "../usage.c"
   puts(_("standard error"));
-#line 647 "../usage.c"
+#line 660 "../usage.c"
   puts(_("standard error"));
 #line 175 "../version.c"
   puts(_("standard error"));
@@ -512,7 +512,7 @@ static void dummy_func(void) {
   puts(_("write"));
 #line 450 "../usage.c"
   puts(_("write"));
-#line 646 "../usage.c"
+#line 659 "../usage.c"
   puts(_("write"));
 #line 174 "../version.c"
   puts(_("write"));
@@ -533,23 +533,23 @@ static void dummy_func(void) {
   /* END-LIBOPTS-MESSAGES */
 
   /* USAGE-TEXT: */
-#line 895 "../usage.c"
+#line 908 "../usage.c"
   puts(_("\t\t\t\t- an alternate for '%s'\n"));
-#line 1164 "../usage.c"
+#line 1177 "../usage.c"
   puts(_("Version, usage and configuration options:"));
-#line 946 "../usage.c"
+#line 959 "../usage.c"
   puts(_("\t\t\t\t- default option for unnamed options\n"));
-#line 859 "../usage.c"
+#line 872 "../usage.c"
   puts(_("\t\t\t\t- disabled as '--%s'\n"));
-#line 1133 "../usage.c"
+#line 1146 "../usage.c"
   puts(_(" --- %-14s %s\n"));
-#line 1131 "../usage.c"
+#line 1144 "../usage.c"
   puts(_("This option has been disabled"));
-#line 886 "../usage.c"
+#line 899 "../usage.c"
   puts(_("\t\t\t\t- enabled by default\n"));
 #line 40 "../alias.c"
   puts(_("%s error:  only "));
-#line 1208 "../usage.c"
+#line 1221 "../usage.c"
   puts(_(" - examining environment variables named %s_*\n"));
 #line 168 "../file.c"
   puts(_("\t\t\t\t- file must not pre-exist\n"));
@@ -565,52 +565,52 @@ static void dummy_func(void) {
        "a shell script to parse the options for %s:\n\n"));
 #line 161 "../enum.c"
   puts(_("  or an integer mask with any of the lower %d bits set\n"));
-#line 919 "../usage.c"
+#line 932 "../usage.c"
   puts(_("\t\t\t\t- is a set membership option\n"));
-#line 940 "../usage.c"
+#line 953 "../usage.c"
   puts(_("\t\t\t\t- must appear between %d and %d times\n"));
 #line 418 "../usage.c"
   puts(_("Options are specified by single or double hyphens and their name.\n"));
-#line 926 "../usage.c"
+#line 939 "../usage.c"
   puts(_("\t\t\t\t- may appear multiple times\n"));
-#line 913 "../usage.c"
+#line 926 "../usage.c"
   puts(_("\t\t\t\t- may not be preset\n"));
-#line 1323 "../usage.c"
+#line 1336 "../usage.c"
   puts(_("   Arg Option-Name    Description\n"));
-#line 1259 "../usage.c"
+#line 1272 "../usage.c"
   puts(_("  Flg Arg Option-Name    Description\n"));
-#line 1317 "../usage.c"
+#line 1330 "../usage.c"
   puts(_("  Flg Arg Option-Name    Description\n"));
-#line 1318 "../usage.c"
+#line 1331 "../usage.c"
   puts(_(" %3s %s"));
-#line 1324 "../usage.c"
+#line 1337 "../usage.c"
   puts(_(" %3s %s"));
 #line 423 "../usage.c"
   puts(_("The '-#<number>' option may omit the hash char\n"));
 #line 419 "../usage.c"
   puts(_("All arguments are named options.\n"));
-#line 993 "../usage.c"
+#line 1006 "../usage.c"
   puts(_(" - reading file %s"));
 #line 445 "../usage.c"
   puts(_("\n"
-       "please send bug reports to:  <%s>\n"));
+       "Please send bug reports to:  <%s>\n"));
 #line 100 "../version.c"
   puts(_("\n"
-       "please send bug reports to:  <%s>\n"));
+       "Please send bug reports to:  <%s>\n"));
 #line 129 "../version.c"
   puts(_("\n"
-       "please send bug reports to:  <%s>\n"));
-#line 925 "../usage.c"
+       "Please send bug reports to:  <%s>\n"));
+#line 938 "../usage.c"
   puts(_("\t\t\t\t- may NOT appear - preset only\n"));
-#line 965 "../usage.c"
+#line 978 "../usage.c"
   puts(_("\n"
        "The following option preset mechanisms are supported:\n"));
-#line 1206 "../usage.c"
+#line 1219 "../usage.c"
   puts(_("\n"
        "The following option preset mechanisms are supported:\n"));
-#line 704 "../usage.c"
+#line 717 "../usage.c"
   puts(_("prohibits these options:\n"));
-#line 699 "../usage.c"
+#line 712 "../usage.c"
   puts(_("prohibits the option '%s'\n"));
 #line 81 "../numeric.c"
   puts(_("%s%ld to %ld"));
@@ -630,26 +630,26 @@ static void dummy_func(void) {
   puts(_("%sless than or equal to %ld"));
 #line 426 "../usage.c"
   puts(_("Operands and options may be intermixed.  They will be reordered.\n"));
-#line 674 "../usage.c"
+#line 687 "../usage.c"
   puts(_("requires the option '%s'\n"));
-#line 677 "../usage.c"
+#line 690 "../usage.c"
   puts(_("requires these options:\n"));
-#line 1335 "../usage.c"
+#line 1348 "../usage.c"
   puts(_("   Arg Option-Name   Req?  Description\n"));
-#line 1329 "../usage.c"
+#line 1342 "../usage.c"
   puts(_("  Flg Arg Option-Name   Req?  Description\n"));
 #line 162 "../enum.c"
   puts(_("or you may use a numeric representation.  Preceding these with a '!'\n"
        "will clear the bits, specifying 'none' will clear all bits, and 'all'\n"
        "will set them all.  Multiple entries may be passed as an option\n"
        "argument list.\n"));
-#line 932 "../usage.c"
+#line 945 "../usage.c"
   puts(_("\t\t\t\t- may appear up to %d times\n"));
 #line 72 "../enum.c"
   puts(_("The valid \"%s\" option keywords are:\n"));
-#line 1168 "../usage.c"
+#line 1181 "../usage.c"
   puts(_("The next option supports vendor supported extra options:"));
-#line 795 "../usage.c"
+#line 808 "../usage.c"
   puts(_("These additional options are:"));
   /* END-USAGE-TEXT */
 }
diff --git a/sntp/libopts/configfile.c b/sntp/libopts/configfile.c
index ab883f92e1..8c71111c5b 100644
--- a/sntp/libopts/configfile.c
+++ b/sntp/libopts/configfile.c
@@ -62,14 +62,14 @@ cook_xml_text(char * pzData);
 static char *
 handle_struct(tOptions * opts, tOptState * ost, char * txt, int dir);
 
-static char *
-parse_keyword(tOptions * opts, char * txt, tOptionValue * typ);
+static char const *
+parse_keyword(tOptions * opts, char const * txt, tOptionValue * typ);
 
-static char *
-parse_set_mem(tOptions * opts, char * txt, tOptionValue * typ);
+static char const *
+parse_set_mem(tOptions * opts, char const * txt, tOptionValue * typ);
 
-static char *
-parse_value(char * txt, tOptionValue * typ);
+static char const *
+parse_value(char const * txt, tOptionValue * typ);
 /* = = = END-STATIC-FORWARD = = = */
 
 /**
@@ -77,8 +77,8 @@ parse_value(char * txt, tOptionValue * typ);
  *  @param[in] txt   start of skpped text
  *  @returns   character after skipped text
  */
-inline static char *
-skip_unkn(char * txt)
+inline static char const *
+skip_unkn(char const * txt)
 {
     txt = BRK_END_XML_TOKEN_CHARS(txt);
     return (*txt == NUL) ? NULL : txt;
@@ -924,7 +924,8 @@ handle_struct(tOptions * opts, tOptState * ost, char * txt, int dir)
     switch (*txt) {
     case ' ':
     case '\t':
-        txt = parse_attrs(opts, SPN_WHITESPACE_CHARS(txt), &mode, &valu);
+        txt = (void *)parse_attrs(
+            opts, SPN_WHITESPACE_CHARS(txt), &mode, &valu);
         if (txt == NULL)
             return txt;
         if (*txt == '>')
@@ -1191,15 +1192,21 @@ optionLoadOpt(tOptions * opts, tOptDesc * odesc)
  *
  * @returns NULL on failure, otherwise the scan point
  */
-LOCAL char*
-parse_attrs(tOptions * opts, char * txt, tOptionLoadMode * pMode,
+LOCAL char const *
+parse_attrs(tOptions * opts, char const * txt, tOptionLoadMode * pMode,
             tOptionValue * pType)
 {
-    size_t len;
+    size_t len = 0;
 
     for (;;) {
         len = (size_t)(SPN_LOWER_CASE_CHARS(txt) - txt);
 
+        /*
+         * The enumeration used in this switch is derived from this switch
+         * statement itself.  The "find_option_xat_attribute_cmd" function
+         * will return XAT_CMD_MEMBERS for the "txt" string value
+         * "members", etc.
+         */
         switch (find_option_xat_attribute_cmd(txt, len)) {
         case XAT_CMD_TYPE:
             txt = parse_value(txt+len, pType);
@@ -1266,8 +1273,8 @@ parse_attrs(tOptions * opts, char * txt, tOptionLoadMode * pMode,
  *  @param     type  unused value type
  *  @returns   pointer after skipped text
  */
-static char *
-parse_keyword(tOptions * opts, char * txt, tOptionValue * typ)
+static char const *
+parse_keyword(tOptions * opts, char const * txt, tOptionValue * typ)
 {
     (void)opts;
     (void)typ;
@@ -1285,8 +1292,8 @@ parse_keyword(tOptions * opts, char * txt, tOptionValue * typ)
  *  @param     type  unused value type
  *  @returns   pointer after skipped text
  */
-static char *
-parse_set_mem(tOptions * opts, char * txt, tOptionValue * typ)
+static char const *
+parse_set_mem(tOptions * opts, char const * txt, tOptionValue * typ)
 {
     (void)opts;
     (void)typ;
@@ -1302,8 +1309,8 @@ parse_set_mem(tOptions * opts, char * txt, tOptionValue * typ)
  *  @param[out] typ  where to store the type found
  *  @returns    the next byte after the type name
  */
-static char *
-parse_value(char * txt, tOptionValue * typ)
+static char const *
+parse_value(char const * txt, tOptionValue * typ)
 {
     size_t len = 0;
 
@@ -1318,6 +1325,12 @@ parse_value(char * txt, tOptionValue * typ)
         return skip_unkn(txt + len);
     }
 
+    /*
+     * The enumeration used in this switch is derived from this switch
+     * statement itself.  The "find_option_value_type_cmd" function
+     * will return VTP_CMD_INTEGER for the "txt" string value
+     * "integer", etc.
+     */
     switch (find_option_value_type_cmd(txt, len)) {
     default:
     case VTP_INVALID_CMD: goto woops;
diff --git a/sntp/libopts/genshell.c b/sntp/libopts/genshell.c
index 3bbe837faa..e6f2ccc471 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  February 21, 2013 at 12:28:33 PM by AutoGen 5.17.2pre16
+ *  It has been AutoGen-ed  February 25, 2013 at 10:02:45 AM by AutoGen 5.17.2
  *  From the definitions    genshell.def
  *  and the template file   options
  *
@@ -60,8 +60,8 @@ extern tUsageProc genshelloptUsage;
 #  define NULL 0
 #endif
 
-/*
- *  genshellopt option static const strings
+/**
+ *  static const strings for genshellopt options
  */
 static char const genshellopt_opt_strs[1710] =
 /*     0 */ "genshellopt 1\n"
@@ -104,23 +104,33 @@ static char const genshellopt_opt_strs[1710] =
             "by the newly generated text.  The first '#!' line will be regenerated.\n\0"
 /*  1696 */ "genshellopt 1";
 
-/*
+/**
  *  script option description:
  */
+/** Descriptive text for the script option */
 #define SCRIPT_DESC      (genshellopt_opt_strs+898)
+/** Upper-cased name for the script option */
 #define SCRIPT_NAME      (genshellopt_opt_strs+917)
+/** Name string for the script option */
 #define SCRIPT_name      (genshellopt_opt_strs+924)
+/** Compiled in flag settings for the script option */
 #define SCRIPT_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
-/*
+/**
  *  shell option description:
  */
+/** Descriptive text for the shell option */
 #define SHELL_DESC      (genshellopt_opt_strs+931)
+/** Upper-cased name for the shell option */
 #define SHELL_NAME      (genshellopt_opt_strs+963)
+/** disablement name for the shell option */
 #define NOT_SHELL_name  (genshellopt_opt_strs+969)
+/** disablement prefix for the shell option */
 #define NOT_SHELL_PFX   (genshellopt_opt_strs+978)
+/** Name string for the shell option */
 #define SHELL_name      (NOT_SHELL_name + 3)
+/** Compiled in flag settings for the shell option */
 #define SHELL_FLAGS     (OPTST_INITENABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
@@ -146,7 +156,7 @@ static char const genshellopt_opt_strs[1710] =
 #endif
 #define VER_DESC        (genshellopt_opt_strs+1085)
 #define VER_name        (genshellopt_opt_strs+1121)
-/*
+/**
  *  Declare option callback procedures
  */
 extern tOptProc
@@ -229,19 +239,24 @@ static tOptDesc optDesc[GENSHELL_OPTION_CT] = {
 };
 
 
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *  Define the genshellopt Option Environment
- */
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/** Reference to the upper cased version of genshellopt. */
 #define zPROGNAME       (genshellopt_opt_strs+1129)
+/** Reference to the title line for genshellopt usage. */
 #define zUsageTitle     (genshellopt_opt_strs+1141)
+/** There is no genshellopt configuration file. */
 #define zRcName         NULL
+/** There are no directories to search for genshellopt config files. */
 #define apzHomeList     NULL
+/** The genshellopt program bug email address. */
 #define zBugsAddr       (genshellopt_opt_strs+1262)
+/** Clarification/explanation of what genshellopt does. */
 #define zExplain        (genshellopt_opt_strs+1298)
+/** Extra detail explaining what genshellopt does. */
 #define zDetail         (genshellopt_opt_strs+1475)
+/** The full version string for genshellopt. */
 #define zFullVersion    (genshellopt_opt_strs+1696)
-/* extracted from optcode.tlib near line 364 */
+/* extracted from optcode.tlib near line 371 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -262,8 +277,8 @@ static tOptDesc optDesc[GENSHELL_OPTION_CT] = {
 /**
  * The callout function that invokes the genshelloptUsage function.
  *
- * @param pOptions the AutoOpts option description structure
- * @param pOptDesc the descriptor for the "help" (usage) option.
+ * @param[in] pOptions the AutoOpts option description structure
+ * @param[in] pOptDesc the descriptor for the "help" (usage) option.
  * @noreturn
  */
 static void
@@ -290,6 +305,7 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
 #ifndef  WITH_PACKAGER
 # define genshellopt_packager_info NULL
 #else
+/** Packager information for genshellopt. */
 static char const genshellopt_packager_info[] =
     "Packaged by " WITH_PACKAGER
 
@@ -343,7 +359,7 @@ tOptions genshelloptOptions = {
 };
 
 #if ENABLE_NLS
-/*
+/**
  * This code is designed to translate translatable option text for the
  * genshellopt program.  These translations happen upon entry
  * to optionProcess().
@@ -452,6 +468,7 @@ translate_option_strings(void)
 #endif /* ENABLE_NLS */
 
 #ifdef DO_NOT_COMPILE_THIS_CODE_IT_IS_FOR_GETTEXT
+/** I18N function strictly for xgettext.  Do not compile. */
 static void bogus_function(void) {
   /* TRANSLATORS:
 
diff --git a/sntp/libopts/genshell.h b/sntp/libopts/genshell.h
index 90aef35f09..cba1cfe732 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  February 21, 2013 at 12:28:33 PM by AutoGen 5.17.2pre16
+ *  It has been AutoGen-ed  February 25, 2013 at 10:02:45 AM by AutoGen 5.17.2
  *  From the definitions    genshell.def
  *  and the template file   options
  *
@@ -37,7 +37,7 @@
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.";
  */
-/*
+/**
  *  This file contains the programmatic interface to the Automated
  *  Options generated for the genshellopt program.
  *  These macros are documented in the AutoGen info file in the
@@ -47,7 +47,7 @@
 #define AUTOOPTS_GENSHELL_H_GUARD 1
 #include <autoopts/options.h>
 
-/*
+/**
  *  Ensure that the library used for compiling this generated header is at
  *  least as new as the version current when the header template was released
  *  (not counting patch version increments).  Also ensure that the oldest
@@ -61,8 +61,8 @@
   Choke Me.
 #endif
 
-/*
- *  Enumeration of each option:
+/**
+ *  Enumeration of each option type for genshellopt
  */
 typedef enum {
     INDEX_GENSHELL_OPT_SCRIPT      =  0,
@@ -71,34 +71,51 @@ typedef enum {
     INDEX_GENSHELL_OPT_HELP        =  3,
     INDEX_GENSHELL_OPT_MORE_HELP   =  4
 } teGenshell_OptIndex;
-
+/** count of all options for genshellopt */
 #define GENSHELL_OPTION_CT    5
+/** genshellopt version */
 #define GENSHELLOPT_VERSION       "1"
+/** Full genshellopt version text */
 #define GENSHELLOPT_FULL_VERSION  "genshellopt 1"
 
-/*
+/**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
  *  option name (as in the teGenshell_OptIndex enumeration above).
  *  e.g. HAVE_GENSHELL_OPT(SCRIPT)
  */
 #define GENSHELL_DESC(n) (genshelloptOptions.pOptDesc[INDEX_GENSHELL_OPT_## n])
+/** 'true' if an option has been specified in any way */
 #define     HAVE_GENSHELL_OPT(n) (! UNUSED_OPT(& GENSHELL_DESC(n)))
+/** The string argument to an option. The argument type must be "string". */
 #define      GENSHELL_OPT_ARG(n) (GENSHELL_DESC(n).optArg.argString)
+/** Mask the option state revealing how an option was specified.
+ *  It will be one and only one of \a OPTST_SET, \a OPTST_PRESET,
+ * \a OPTST_DEFINED, \a OPTST_RESET or zero.
+ */
 #define    STATE_GENSHELL_OPT(n) (GENSHELL_DESC(n).fOptState & OPTST_SET_MASK)
+/** Count of option's occurrances *on the command line*. */
 #define    COUNT_GENSHELL_OPT(n) (GENSHELL_DESC(n).optOccCt)
+/** mask of \a OPTST_SET and \a OPTST_DEFINED. */
 #define    ISSEL_GENSHELL_OPT(n) (SELECTED_OPT(&GENSHELL_DESC(n)))
+/** 'true' if \a HAVE_OPT would yield 'false'. */
 #define ISUNUSED_GENSHELL_OPT(n) (UNUSED_OPT(& GENSHELL_DESC(n)))
+/** 'true' if OPTST_DISABLED bit not set. */
 #define  ENABLED_GENSHELL_OPT(n) (! DISABLED_OPT(& GENSHELL_DESC(n)))
+/** number of stacked option arguments.
+ *  Valid only for stacked option arguments. */
 #define  STACKCT_GENSHELL_OPT(n) (((tArgList*)(GENSHELL_DESC(n).optCookie))->useCt)
+/** stacked argument vector.
+ *  Valid only for stacked option arguments. */
 #define STACKLST_GENSHELL_OPT(n) (((tArgList*)(GENSHELL_DESC(n).optCookie))->apzArgs)
+/** Reset an option. */
 #define    CLEAR_GENSHELL_OPT(n) STMTS( \
                 GENSHELL_DESC(n).fOptState &= OPTST_PERSISTENT_MASK;   \
                 if ((GENSHELL_DESC(n).fOptState & OPTST_INITENABLED) == 0) \
                     GENSHELL_DESC(n).fOptState |= OPTST_DISABLED; \
                 GENSHELL_DESC(n).optCookie = NULL )
 
-/* * * * * *
- *
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/**
  *  Enumeration of genshellopt exit codes
  */
 typedef enum {
@@ -107,14 +124,18 @@ typedef enum {
     GENSHELLOPT_EXIT_USAGE_ERROR    = 64,
     GENSHELLOPT_EXIT_LIBOPTS_FAILURE = 70
 } genshellopt_exit_code_t;
-/* * * * * *
- *
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/**
  *  Interface defines for specific options.
+ * @{
  */
 #define VALUE_GENSHELL_OPT_SCRIPT 'o'
 #define VALUE_GENSHELL_OPT_SHELL 's'
+/** option flag (value) for " (get "val-name") " option */
 #define VALUE_GENSHELL_OPT_HELP '?'
+/** option flag (value) for " (get "val-name") " option */
 #define VALUE_GENSHELL_OPT_MORE_HELP '!'
+/** option flag (value) for " (get "val-name") " option */
 #define VALUE_GENSHELL_OPT_VERSION 'v'
 /*
  *  Interface defines not associated with particular options
@@ -126,7 +147,7 @@ typedef enum {
                 genshelloptOptions.pzCurOpt  = NULL )
 #define START_GENSHELL_OPT       RESTART_GENSHELL_OPT(1)
 #define GENSHELL_USAGE(c)        (*genshelloptOptions.pUsageProc)(&genshelloptOptions, c)
-/* extracted from opthead.tlib near line 498 */
+/* extracted from opthead.tlib near line 538 */
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/sntp/libopts/m4/libopts.m4 b/sntp/libopts/m4/libopts.m4
index ea54394112..1c83a7234d 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  February 21, 2013 at 12:28:26 PM by AutoGen 5.17.2pre16
+dnl It has been AutoGen-ed  February 25, 2013 at 10:02:38 AM by AutoGen 5.17.2
 dnl From the definitions    libopts.def
 dnl and the template file   conftest.tpl
 dnl
@@ -11,6 +11,7 @@ dnl
 AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
   AC_REQUIRE([AC_HEADER_STDC])
   AC_HEADER_DIRENT
+
   # =================
   # AC_CHECK_HEADERS
   # =================
@@ -21,18 +22,23 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
       fcntl.h       libgen.h      libintl.h     memory.h \
       netinet/in.h  setjmp.h      stdbool.h     sysexits.h \
       unistd.h      utime.h])
+
   AC_CHECK_HEADERS([stdarg.h     varargs.h],
       [lo_have_arg_hdr=true;break],
       [lo_have_arg_hdr=false])
+
   AC_CHECK_HEADERS([string.h     strings.h],
       [lo_have_str_hdr=true;break],
       [lo_have_str_hdr=false])
+
   AC_CHECK_HEADERS([limits.h     sys/limits.h  values.h],
       [lo_have_lim_hdr=true;break],
       [lo_have_lim_hdr=false])
+
   AC_CHECK_HEADERS([inttypes.h   stdint.h],
       [lo_have_typ_hdr=true;break],
       [lo_have_typ_hdr=false])
+
   # ----------------------------------------------------------------------
   # check for various programs used during the build.
   # On OS/X, "wchar.h" needs "runetype.h" to work properly.
@@ -43,27 +49,39 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
   # include <runetype.h>
   #endif
   ])
+
+  AC_ARG_ENABLE([nls],
+  AS_HELP_STRING([--disable-nls],[disable nls support in libopts]))
+  AS_IF([test "x$enable_nls" != "xno" && \
+  test "X${ac_cv_header_libintl_h}" = Xyes], [
+  AC_DEFINE([ENABLE_NLS],[1],[nls support in libopts])])
+
   # --------------------------------------------
   # Verify certain entries from AC_CHECK_HEADERS
   # --------------------------------------------
-  [for f in sys_types sys_mman sys_param sys_stat sys_wait \
-           string errno stdlib memory setjmp
-  do eval as_ac_var=\${ac_cv_header_${f}_h+set}
-     test "${as_ac_var}" = set || {
-       ]AC_MSG_ERROR([you must have ${f}.h on your system])[
-     }
-  done
-  test "X${ac_cv_header_inttypes_h-no}" = Xyes || \
-    echo '#include <stdint.h>' > inttypes.h
-  ${lo_have_arg_hdr} || \
+  [${lo_have_arg_hdr} || \
     ]AC_MSG_ERROR([you must have stdarg.h or varargs.h on your system])[
+
   ${lo_have_str_hdr} || \
     ]AC_MSG_ERROR([you must have string.h or strings.h on your system])[
+
   ${lo_have_lim_hdr} || \
     ]AC_MSG_ERROR(
       [you must have one of limits.h, sys/limits.h or values.h])[
+
   ${lo_have_typ_hdr} || \
-    ]AC_MSG_ERROR([you must have inttypes.h or stdint.h on your system])
+    ]AC_MSG_ERROR([you must have inttypes.h or stdint.h on your system])[
+
+  for f in sys_types sys_mman sys_param sys_stat sys_wait \
+           string errno stdlib memory setjmp
+  do eval as_ac_var=\${ac_cv_header_${f}_h}
+     test "X${as_ac_var}" = Xyes || {
+       ]AC_MSG_ERROR([you must have ${f}.h on your system])[
+     }
+  done
+  test "X${ac_cv_header_inttypes_h-no}" = Xyes || \
+    echo '#include <stdint.h>' > inttypes.h]
+
   # ----------------------------------------------------------------------
   # Checks for typedefs
   # ----------------------------------------------------------------------
@@ -83,6 +101,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
   AC_CHECK_SIZEOF(int,   4)
   AC_CHECK_SIZEOF(long,  8)
   AC_CHECK_SIZEOF(short, 2)
+
   # ----------------------------------------------------------------------
   # AC_CHECK_LIB for SVR4 libgen, and use it if it defines pathfind.
   # ----------------------------------------------------------------------
@@ -131,7 +150,7 @@ AC_DEFUN([LIBOPTS_WITH_REGEX_HEADER],[
   else
     AC_DEFINE([REGEX_HEADER],[<regex.h>],[name of regex header file])
   fi
-  
+
 ]) # end of AC_DEFUN of LIBOPTS_WITH_REGEX_HEADER
 
 
@@ -231,7 +250,7 @@ int main() {
     LIBS="${libopts_save_LIBS}"
     AC_MSG_ERROR([the regex library does not work])
   fi
-  
+
 ]) # end of AC_DEFUN of LIBOPTS_WITHLIB_REGEX
 
 
@@ -253,7 +272,7 @@ int main (int argc, char** argv) {
     AC_DEFINE([HAVE_PATHFIND],[1],
         [Define this if pathfind(3) works])
   fi
-  
+
 ]) # end of AC_DEFUN of LIBOPTS_RUN_PATHFIND
 
 
@@ -274,7 +293,7 @@ echo ${dzero}`
     AC_DEFINE([HAVE_DEV_ZERO],[1],
         [Define this if /dev/zero is readable device])
   fi
-  
+
 ]) # end of AC_DEFUN of LIBOPTS_TEST_DEV_ZERO
 
 
@@ -301,7 +320,7 @@ choke me!!
     AC_DEFINE([HAVE_REALPATH],[1],
         [Define this if we have a functional realpath(3C)])
   fi
-  
+
 ]) # end of AC_DEFUN of LIBOPTS_RUN_REALPATH
 
 
@@ -334,7 +353,7 @@ int main() {
     AC_DEFINE([HAVE_STRFTIME],[1],
         [Define this if strftime() works])
   fi
-  
+
 ]) # end of AC_DEFUN of LIBOPTS_RUN_STRFTIME
 
 
@@ -357,7 +376,7 @@ return (fp == NULL) ? 1 : fclose(fp); }],
     AC_DEFINE([FOPEN_BINARY_FLAG],"",
 	[fopen(3) accepts a 'b' in the mode flag])
   fi
-  
+
 ]) # end of AC_DEFUN of LIBOPTS_RUN_FOPEN_BINARY
 
 
@@ -380,7 +399,7 @@ return (fp == NULL) ? 1 : fclose(fp); }],
     AC_DEFINE([FOPEN_TEXT_FLAG],"",
 	[fopen(3) accepts a 't' in the mode flag])
   fi
-  
+
 ]) # end of AC_DEFUN of LIBOPTS_RUN_FOPEN_TEXT
 
 
@@ -396,7 +415,7 @@ AC_DEFUN([LIBOPTS_DISABLE_OPTIONAL_ARGS],[
     AC_DEFINE([NO_OPTIONAL_OPT_ARGS], [1],
           [Define this if optional arguments are disallowed])
   fi
-  
+
 ]) # end of AC_DEFUN of LIBOPTS_DISABLE_OPTIONAL_ARGS
 
 
diff --git a/sntp/libopts/nested.c b/sntp/libopts/nested.c
index e5991639ec..bf55f6f18a 100644
--- a/sntp/libopts/nested.c
+++ b/sntp/libopts/nested.c
@@ -457,8 +457,8 @@ scan_xml_name(char const * name, size_t * nm_len, tOptionValue * val)
         /*
          * There are attributes following the name.  Parse 'em.
          */
-        scan = parse_attrs(NULL, SPN_WHITESPACE_CHARS(scan),
-                           &option_load_mode, val);
+        scan = SPN_WHITESPACE_CHARS(scan);
+        scan = parse_attrs(NULL, scan, &option_load_mode, val);
         if (scan == NULL)
             return NULL; /* oops */
     }
@@ -738,10 +738,6 @@ optionLoadNested(char const * text, char const * name, size_t nm_len)
         return NULL;
     }
     res_val = AGALOC(sizeof(*res_val) + nm_len + 1, "nest args");
-    if (res_val == NULL) {
-        errno = ENOMEM;
-        return NULL;
-    }
     res_val->valType = OPARG_TYPE_HIERARCHY;
     res_val->pzName  = (char*)(res_val + 1);
     memcpy(res_val->pzName, name, nm_len);
@@ -749,10 +745,6 @@ optionLoadNested(char const * text, char const * name, size_t nm_len)
 
     {
         tArgList * arg_list = AGALOC(sizeof(*arg_list), "nest arg l");
-        if (arg_list == NULL) {
-            AGFREE(res_val);
-            return NULL;
-        }
 
         res_val->v.nestVal = arg_list;
         arg_list->useCt   = 0;
diff --git a/sntp/libopts/option-value-type.c b/sntp/libopts/option-value-type.c
index 566a5d9315..c9260423e3 100644
--- a/sntp/libopts/option-value-type.c
+++ b/sntp/libopts/option-value-type.c
@@ -2,7 +2,7 @@
  *
  *  DO NOT EDIT THIS FILE   (stdin.c)
  *
- *  It has been AutoGen-ed  February 21, 2013 at 12:28:32 PM by AutoGen 5.17.2pre16
+ *  It has been AutoGen-ed  February 25, 2013 at 10:02:44 AM by AutoGen 5.17.2
  *  From the definitions    stdin
  *  and the template file   str2enum
  *
@@ -45,13 +45,13 @@
 // %omit-struct-type
 // %readonly-tables
 // %compare-strncmp
-// 
+//
 // %define slot-name               vtp_name
 // %define hash-function-name      option_value_type_hash
 // %define lookup-function-name    find_option_value_type_name
 // %define word-array-name         option_value_type_table
 // %define initializer-suffix      ,VTP_COUNT_CMD
-// 
+//
 # endif
 
 #include "option-value-type.h"
diff --git a/sntp/libopts/option-value-type.h b/sntp/libopts/option-value-type.h
index 0c010fa87d..597dcbe4f6 100644
--- a/sntp/libopts/option-value-type.h
+++ b/sntp/libopts/option-value-type.h
@@ -2,7 +2,7 @@
  *
  *  DO NOT EDIT THIS FILE   (stdin.h)
  *
- *  It has been AutoGen-ed  February 21, 2013 at 12:28:32 PM by AutoGen 5.17.2pre16
+ *  It has been AutoGen-ed  February 25, 2013 at 10:02:44 AM by AutoGen 5.17.2
  *  From the definitions    stdin
  *  and the template file   str2enum
  *
@@ -43,8 +43,8 @@ typedef enum {
     VTP_INVALID_CMD = 0,
     VTP_CMD_STRING         = 1,
     VTP_CMD_INTEGER        = 2,
-    VTP_CMD_BOOLEAN        = 3,
-    VTP_CMD_BOOL           = 4,
+    VTP_CMD_BOOL           = 3,
+    VTP_CMD_BOOLEAN        = 4,
     VTP_CMD_KEYWORD        = 5,
     VTP_CMD_SET            = 6,
     VTP_CMD_SET_MEMBERSHIP = 7,
diff --git a/sntp/libopts/option-xat-attribute.c b/sntp/libopts/option-xat-attribute.c
index 4bff2c9377..dd7a21bc75 100644
--- a/sntp/libopts/option-xat-attribute.c
+++ b/sntp/libopts/option-xat-attribute.c
@@ -2,7 +2,7 @@
  *
  *  DO NOT EDIT THIS FILE   (stdin.c)
  *
- *  It has been AutoGen-ed  February 21, 2013 at 12:28:31 PM by AutoGen 5.17.2pre16
+ *  It has been AutoGen-ed  February 25, 2013 at 10:02:43 AM by AutoGen 5.17.2
  *  From the definitions    stdin
  *  and the template file   str2enum
  *
@@ -45,13 +45,13 @@
 // %omit-struct-type
 // %readonly-tables
 // %compare-strncmp
-// 
+//
 // %define slot-name               xat_name
 // %define hash-function-name      option_xat_attribute_hash
 // %define lookup-function-name    find_option_xat_attribute_name
 // %define word-array-name         option_xat_attribute_table
 // %define initializer-suffix      ,XAT_COUNT_CMD
-// 
+//
 # endif
 
 #include "option-xat-attribute.h"
diff --git a/sntp/libopts/option-xat-attribute.h b/sntp/libopts/option-xat-attribute.h
index b62786e752..19773a0fd7 100644
--- a/sntp/libopts/option-xat-attribute.h
+++ b/sntp/libopts/option-xat-attribute.h
@@ -2,7 +2,7 @@
  *
  *  DO NOT EDIT THIS FILE   (stdin.h)
  *
- *  It has been AutoGen-ed  February 21, 2013 at 12:28:31 PM by AutoGen 5.17.2pre16
+ *  It has been AutoGen-ed  February 25, 2013 at 10:02:43 AM by AutoGen 5.17.2
  *  From the definitions    stdin
  *  and the template file   str2enum
  *
diff --git a/sntp/libopts/proto.h b/sntp/libopts/proto.h
index 7e268f8d90..4a72a61731 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 Feb 21 12:28:43 PST 2013
+ * Generated Mon Feb 25 10:02:56 PST 2013
  */
 #ifndef AUTOOPTS_PROTO_H_GUARD
 #define AUTOOPTS_PROTO_H_GUARD 1
@@ -45,8 +45,8 @@ is_consistent(tOptions * pOpts);
 static void
 intern_file_load(tOptions * opts);
 
-static char*
-parse_attrs(tOptions * opts, char * txt, tOptionLoadMode * pMode,
+static char const *
+parse_attrs(tOptions * opts, char const * txt, tOptionLoadMode * pMode,
             tOptionValue * pType);
 
 /*
diff --git a/sntp/libopts/usage.c b/sntp/libopts/usage.c
index a9a320b2c0..e34ab7cb7c 100644
--- a/sntp/libopts/usage.c
+++ b/sntp/libopts/usage.c
@@ -455,19 +455,23 @@ static void
 print_one_paragraph(char const * text, bool plain, FILE * fp)
 {
     if (plain) {
+#ifdef ENABLE_NLS
 #ifdef HAVE_LIBINTL_H
+#ifdef DEBUG_ENABLED
 #undef gettext
+#endif
         char * buf = dgettext("libopts", text);
         if (buf == text)
             text = gettext(text);
-#endif
+#endif /* HAVE_LIBINTL_H */
+#endif /* ENABLE_NLS */
         fputs(text, fp);
     }
 
     else {
-        text = optionQuoteString(text, LINE_SPLICE);
-        fprintf(fp, PUTS_FMT, text);
-        AGFREE(text);
+        char const * t = optionQuoteString(text, LINE_SPLICE);
+        fprintf(fp, PUTS_FMT, t);
+        AGFREE((void *)t);
     }
 }
  
@@ -491,16 +495,25 @@ print_one_paragraph(char const * text, bool plain, FILE * fp)
  *  with at least one space character but fewer than 8 space characters.
  *  Lines indented with tabs or more than 7 spaces are considered continuation
  *  lines.
+ *
+ *  If 'plain' is true, we are emitting text for a user to see.  So, if it is
+ *  true and NLS is not enabled, then just write the whole thing at once.
 =*/
 void
 optionPrintParagraphs(char const * text, bool plain, FILE * fp)
 {
     size_t len = strlen(text);
     char * buf;
-    if (len < 256) {
+#ifndef ENABLE_NLS
+    if (plain || (len < 256))
+#else
+    if (len < 256)
+#endif
+    {
         print_one_paragraph(text, plain, fp);
         return;
     }
+
     AGDUPSTR(buf, text, "ppara");
     text = buf;