Updated libopts.

19 files changed, 221 insertions, 217 deletions

diff --git a/src/libopts/Makefile.am b/src/libopts/Makefile.am
index 80b01e346b..03465578ea 100644
--- a/src/libopts/Makefile.am
+++ b/src/libopts/Makefile.am
@@ -7,7 +7,7 @@ noinst_LTLIBRARIES      = libopts.la
 endif
 libopts_la_SOURCES      = libopts.c
 libopts_la_CPPFLAGS     = -I$(top_srcdir)
-libopts_la_LDFLAGS      = -version-info  36:2:11
+libopts_la_LDFLAGS      = -version-info  36:3:11
 EXTRA_DIST              = \
     ag-char-map.h           alias.c                 ao-strs.c  \
     ao-strs.h               autoopts/options.h      autoopts/project.h  \
diff --git a/src/libopts/ag-char-map.h b/src/libopts/ag-char-map.h
index 2a9105ff27..8c9b4f0c15 100644
--- a/src/libopts/ag-char-map.h
+++ b/src/libopts/ag-char-map.h
@@ -1,5 +1,5 @@
 /*
- *   Character mapping generated 02/10/12 19:53:35
+ *   Character mapping generated 02/25/12 13:14:41
  *
  *  This file contains the character classifications
  *  used by AutoGen and AutoOpts for identifying tokens.
@@ -26,6 +26,7 @@
 #ifdef HAVE_CONFIG_H
 # if defined(HAVE_INTTYPES_H)
 #   include <inttypes.h>
+
 # elif defined(HAVE_STDINT_H)
 #   include <stdint.h>
 
@@ -100,6 +101,7 @@
 //
 #endif /* 0 -- mapping spec. source */
 
+
 typedef uint32_t ag_char_map_mask_t;
 
 #define  IS_LOWER_CASE_CHAR( _c)       is_ag_char_map_char((char)( _c), 0x000001)
@@ -218,7 +220,6 @@ static ag_char_map_mask_t const ag_char_map_table[128] = {
   /* x */ 0x002801, /* y */ 0x002801, /* z */ 0x002801, /* { */ 0x00A000,
   /* | */ 0x40A800, /* } */ 0x00A000, /* ~ */ 0x00A800, /*x7F*/ 0x000000
 };
-
 static inline int
 is_ag_char_map_char(char ch, ag_char_map_mask_t mask)
 {
@@ -239,5 +240,4 @@ brk_ag_char_map_chars(char * p, ag_char_map_mask_t mask)
     while ((*p != '\0') && (! is_ag_char_map_char(*p, mask)))  p++;
     return p;
 }
-
 #endif /* AG_CHAR_MAP_H_GUARD */
diff --git a/src/libopts/alias.c b/src/libopts/alias.c
index ad9606b409..18a2fd6e1e 100644
--- a/src/libopts/alias.c
+++ b/src/libopts/alias.c
@@ -2,7 +2,7 @@
 /**
  * \file alias.c
  *
- * Time-stamp:      "2012-02-10 19:41:42 bkorb"
+ * Time-stamp:      "2012-02-12 09:41:42 bkorb"
  *
  *   Automated Options Paged Usage module.
  *
diff --git a/src/libopts/ao-strs.c b/src/libopts/ao-strs.c
index f6e835e20d..34f7843b36 100644
--- a/src/libopts/ao-strs.c
+++ b/src/libopts/ao-strs.c
@@ -2,7 +2,7 @@
  * 
  * DO NOT EDIT THIS FILE   (ao-strs.c)
  * 
- * It has been AutoGen-ed  February 10, 2012 at 07:53:35 PM by AutoGen 5.15pre7
+ * It has been AutoGen-ed  February 25, 2012 at 01:14:41 PM by AutoGen 5.15pre14
  * From the definitions    ao-strs.def
  * and the template file   strings
  *
diff --git a/src/libopts/ao-strs.h b/src/libopts/ao-strs.h
index 96f37504ca..8def7e081c 100644
--- a/src/libopts/ao-strs.h
+++ b/src/libopts/ao-strs.h
@@ -2,7 +2,7 @@
  * 
  * DO NOT EDIT THIS FILE   (ao-strs.h)
  * 
- * It has been AutoGen-ed  February 10, 2012 at 07:53:35 PM by AutoGen 5.15pre7
+ * It has been AutoGen-ed  February 25, 2012 at 01:14:41 PM by AutoGen 5.15pre14
  * From the definitions    ao-strs.def
  * and the template file   strings
  *
diff --git a/src/libopts/autoopts.h b/src/libopts/autoopts.h
index 14cbbf1650..6c3fee767b 100644
--- a/src/libopts/autoopts.h
+++ b/src/libopts/autoopts.h
@@ -2,7 +2,7 @@
 /*
  *  \file autoopts.h
  *
- *  Time-stamp:      "2012-02-10 19:04:40 bkorb"
+ *  Time-stamp:      "2012-02-12 09:04:40 bkorb"
  *
  *  This file defines all the global structures and special values
  *  used in the automated option processing library.
diff --git a/src/libopts/autoopts/options.h b/src/libopts/autoopts/options.h
index d4256118f4..c23e2ba7e6 100644
--- a/src/libopts/autoopts/options.h
+++ b/src/libopts/autoopts/options.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (options.h)
  *  
- *  It has been AutoGen-ed  February 10, 2012 at 07:53:40 PM by AutoGen 5.15pre7
+ *  It has been AutoGen-ed  February 25, 2012 at 01:14:45 PM by AutoGen 5.15pre14
  *  From the definitions    funcs.def
  *  and the template file   options_h
  *
@@ -65,8 +65,8 @@
  *  See the relevant generated header file to determine which and what
  *  values for "opt_name" are available.
  */
-#define OPTIONS_STRUCT_VERSION      147458
-#define OPTIONS_VERSION_STRING      "36:2:11"
+#define OPTIONS_STRUCT_VERSION      147459
+#define OPTIONS_VERSION_STRING      "36:3:11"
 #define OPTIONS_MINIMUM_VERSION     102400
 #define OPTIONS_MIN_VER_STRING      "25:0:0"
 #define OPTIONS_VER_TO_NUM(_v, _r)  (((_v) * 4096) + (_r))
diff --git a/src/libopts/autoopts/usage-txt.h b/src/libopts/autoopts/usage-txt.h
index 0e29fc1810..53dde87ead 100644
--- a/src/libopts/autoopts/usage-txt.h
+++ b/src/libopts/autoopts/usage-txt.h
@@ -2,12 +2,12 @@
  *  
  *  DO NOT EDIT THIS FILE   (usage-txt.h)
  *  
- *  It has been AutoGen-ed  February 10, 2012 at 07:53:38 PM by AutoGen 5.15pre7
+ *  It has been AutoGen-ed  February 25, 2012 at 01:14:43 PM by AutoGen 5.15pre14
  *  From the definitions    usage-txt.def
  *  and the template file   usage-txt.tpl
  *
  *  This file handles all the bookkeeping required for tracking all the little
- *  tiny strings used by the AutoOpts library.  There are 145
+ *  tiny strings used by the AutoOpts library.  There are 144
  *  of them.  This is not versioned because it is entirely internal to the
  *  library and accessed by client code only in a very well-controlled way:
  *  they may substitute translated strings using a procedure that steps through
@@ -50,7 +50,7 @@ typedef struct {
   char*     utpz_GnuTimeArg;
   char*     utpz_GnuNumArg;
   char*     utpz_GnuStrArg;
-  cch_t*    apz_str[ 138 ];
+  cch_t*    apz_str[ 137 ];
 } usage_text_t;
 
 /*
@@ -136,78 +136,77 @@ extern usage_text_t option_usage_text;
 #define zMust                 (option_usage_text.apz_str[ 63])
 #define zNeedOne              (option_usage_text.apz_str[ 64])
 #define zNoArg                (option_usage_text.apz_str[ 65])
-#define zNoArgv               (option_usage_text.apz_str[ 66])
-#define zNoArgs               (option_usage_text.apz_str[ 67])
-#define zNoCreat              (option_usage_text.apz_str[ 68])
-#define zNoFlags              (option_usage_text.apz_str[ 69])
-#define zNoKey                (option_usage_text.apz_str[ 70])
-#define zNoLim                (option_usage_text.apz_str[ 71])
-#define zNoPreset             (option_usage_text.apz_str[ 72])
-#define zNoResetArg           (option_usage_text.apz_str[ 73])
-#define zNoRq_NoShrtTtl       (option_usage_text.apz_str[ 74])
-#define zNoRq_ShrtTtl         (option_usage_text.apz_str[ 75])
-#define zNoStat               (option_usage_text.apz_str[ 76])
-#define zNoState              (option_usage_text.apz_str[ 77])
-#define zNone                 (option_usage_text.apz_str[ 78])
-#define zNotDef               (option_usage_text.apz_str[ 79])
-#define zNotCmdOpt            (option_usage_text.apz_str[ 80])
-#define zNotEnough            (option_usage_text.apz_str[ 81])
-#define zNotFile              (option_usage_text.apz_str[ 82])
-#define zNotNumber            (option_usage_text.apz_str[ 83])
-#define zNotDate              (option_usage_text.apz_str[ 84])
-#define zNotDuration          (option_usage_text.apz_str[ 85])
-#define zNrmOptFmt            (option_usage_text.apz_str[ 86])
-#define zNumberOpt            (option_usage_text.apz_str[ 87])
-#define zOnlyOne              (option_usage_text.apz_str[ 88])
-#define zOptsOnly             (option_usage_text.apz_str[ 89])
-#define zOutputFail           (option_usage_text.apz_str[ 90])
-#define zPathFmt              (option_usage_text.apz_str[ 91])
-#define zPlsSendBugs          (option_usage_text.apz_str[ 92])
-#define zPreset               (option_usage_text.apz_str[ 93])
-#define zPresetFile           (option_usage_text.apz_str[ 94])
-#define zPresetIntro          (option_usage_text.apz_str[ 95])
-#define zProhib               (option_usage_text.apz_str[ 96])
-#define zReorder              (option_usage_text.apz_str[ 97])
-#define zRange                (option_usage_text.apz_str[ 98])
-#define zRangeAbove           (option_usage_text.apz_str[ 99])
-#define zRangeLie             (option_usage_text.apz_str[100])
-#define zRangeOnly            (option_usage_text.apz_str[101])
-#define zRangeOr              (option_usage_text.apz_str[102])
-#define zRangeErr             (option_usage_text.apz_str[103])
-#define zRangeExact           (option_usage_text.apz_str[104])
-#define zRangeScaled          (option_usage_text.apz_str[105])
-#define zRangeUpto            (option_usage_text.apz_str[106])
-#define zResetNotConfig       (option_usage_text.apz_str[107])
-#define zReqFmt               (option_usage_text.apz_str[108])
-#define zReqOptFmt            (option_usage_text.apz_str[109])
-#define zReqThese             (option_usage_text.apz_str[110])
-#define zReq_NoShrtTtl        (option_usage_text.apz_str[111])
-#define zReq_ShrtTtl          (option_usage_text.apz_str[112])
-#define zSepChars             (option_usage_text.apz_str[113])
-#define zSetMemberSettings    (option_usage_text.apz_str[114])
-#define zShrtGnuOptFmt        (option_usage_text.apz_str[115])
-#define zSixSpaces            (option_usage_text.apz_str[116])
-#define zStdBoolArg           (option_usage_text.apz_str[117])
-#define zStdBreak             (option_usage_text.apz_str[118])
-#define zStdFileArg           (option_usage_text.apz_str[119])
-#define zStdKeyArg            (option_usage_text.apz_str[120])
-#define zStdKeyLArg           (option_usage_text.apz_str[121])
-#define zStdTimeArg           (option_usage_text.apz_str[122])
-#define zStdNestArg           (option_usage_text.apz_str[123])
-#define zStdNoArg             (option_usage_text.apz_str[124])
-#define zStdNumArg            (option_usage_text.apz_str[125])
-#define zStdOptArg            (option_usage_text.apz_str[126])
-#define zStdReqArg            (option_usage_text.apz_str[127])
-#define zStdStrArg            (option_usage_text.apz_str[128])
-#define zTabHyp               (option_usage_text.apz_str[129])
-#define zTabHypAnd            (option_usage_text.apz_str[130])
-#define zTabout               (option_usage_text.apz_str[131])
-#define zThreeSpaces          (option_usage_text.apz_str[132])
-#define zTwoSpaces            (option_usage_text.apz_str[133])
-#define zUpTo                 (option_usage_text.apz_str[134])
-#define zValidKeys            (option_usage_text.apz_str[135])
-#define zVendOptsAre          (option_usage_text.apz_str[136])
-#define zVendIntro            (option_usage_text.apz_str[137])
+#define zNoArgs               (option_usage_text.apz_str[ 66])
+#define zNoCreat              (option_usage_text.apz_str[ 67])
+#define zNoFlags              (option_usage_text.apz_str[ 68])
+#define zNoKey                (option_usage_text.apz_str[ 69])
+#define zNoLim                (option_usage_text.apz_str[ 70])
+#define zNoPreset             (option_usage_text.apz_str[ 71])
+#define zNoResetArg           (option_usage_text.apz_str[ 72])
+#define zNoRq_NoShrtTtl       (option_usage_text.apz_str[ 73])
+#define zNoRq_ShrtTtl         (option_usage_text.apz_str[ 74])
+#define zNoStat               (option_usage_text.apz_str[ 75])
+#define zNoState              (option_usage_text.apz_str[ 76])
+#define zNone                 (option_usage_text.apz_str[ 77])
+#define zNotDef               (option_usage_text.apz_str[ 78])
+#define zNotCmdOpt            (option_usage_text.apz_str[ 79])
+#define zNotEnough            (option_usage_text.apz_str[ 80])
+#define zNotFile              (option_usage_text.apz_str[ 81])
+#define zNotNumber            (option_usage_text.apz_str[ 82])
+#define zNotDate              (option_usage_text.apz_str[ 83])
+#define zNotDuration          (option_usage_text.apz_str[ 84])
+#define zNrmOptFmt            (option_usage_text.apz_str[ 85])
+#define zNumberOpt            (option_usage_text.apz_str[ 86])
+#define zOnlyOne              (option_usage_text.apz_str[ 87])
+#define zOptsOnly             (option_usage_text.apz_str[ 88])
+#define zOutputFail           (option_usage_text.apz_str[ 89])
+#define zPathFmt              (option_usage_text.apz_str[ 90])
+#define zPlsSendBugs          (option_usage_text.apz_str[ 91])
+#define zPreset               (option_usage_text.apz_str[ 92])
+#define zPresetFile           (option_usage_text.apz_str[ 93])
+#define zPresetIntro          (option_usage_text.apz_str[ 94])
+#define zProhib               (option_usage_text.apz_str[ 95])
+#define zReorder              (option_usage_text.apz_str[ 96])
+#define zRange                (option_usage_text.apz_str[ 97])
+#define zRangeAbove           (option_usage_text.apz_str[ 98])
+#define zRangeLie             (option_usage_text.apz_str[ 99])
+#define zRangeOnly            (option_usage_text.apz_str[100])
+#define zRangeOr              (option_usage_text.apz_str[101])
+#define zRangeErr             (option_usage_text.apz_str[102])
+#define zRangeExact           (option_usage_text.apz_str[103])
+#define zRangeScaled          (option_usage_text.apz_str[104])
+#define zRangeUpto            (option_usage_text.apz_str[105])
+#define zResetNotConfig       (option_usage_text.apz_str[106])
+#define zReqFmt               (option_usage_text.apz_str[107])
+#define zReqOptFmt            (option_usage_text.apz_str[108])
+#define zReqThese             (option_usage_text.apz_str[109])
+#define zReq_NoShrtTtl        (option_usage_text.apz_str[110])
+#define zReq_ShrtTtl          (option_usage_text.apz_str[111])
+#define zSepChars             (option_usage_text.apz_str[112])
+#define zSetMemberSettings    (option_usage_text.apz_str[113])
+#define zShrtGnuOptFmt        (option_usage_text.apz_str[114])
+#define zSixSpaces            (option_usage_text.apz_str[115])
+#define zStdBoolArg           (option_usage_text.apz_str[116])
+#define zStdBreak             (option_usage_text.apz_str[117])
+#define zStdFileArg           (option_usage_text.apz_str[118])
+#define zStdKeyArg            (option_usage_text.apz_str[119])
+#define zStdKeyLArg           (option_usage_text.apz_str[120])
+#define zStdTimeArg           (option_usage_text.apz_str[121])
+#define zStdNestArg           (option_usage_text.apz_str[122])
+#define zStdNoArg             (option_usage_text.apz_str[123])
+#define zStdNumArg            (option_usage_text.apz_str[124])
+#define zStdOptArg            (option_usage_text.apz_str[125])
+#define zStdReqArg            (option_usage_text.apz_str[126])
+#define zStdStrArg            (option_usage_text.apz_str[127])
+#define zTabHyp               (option_usage_text.apz_str[128])
+#define zTabHypAnd            (option_usage_text.apz_str[129])
+#define zTabout               (option_usage_text.apz_str[130])
+#define zThreeSpaces          (option_usage_text.apz_str[131])
+#define zTwoSpaces            (option_usage_text.apz_str[132])
+#define zUpTo                 (option_usage_text.apz_str[133])
+#define zValidKeys            (option_usage_text.apz_str[134])
+#define zVendOptsAre          (option_usage_text.apz_str[135])
+#define zVendIntro            (option_usage_text.apz_str[136])
 
   /*
    *  First, set up the strings.  Some of these are writable.  These are all in
@@ -222,7 +221,7 @@ extern usage_text_t option_usage_text;
   static char    eng_zGnuTimeArg[] = "=Tim";
   static char    eng_zGnuNumArg[] = "=num";
   static char    eng_zGnuStrArg[] = "=str";
-static char const usage_txt[4619] =
+static char const usage_txt[4575] =
 /*     0 */ "malloc of %d bytes failed\n\0"
 /*    27 */ "AutoOpts function called without option descriptor\n\0"
 /*    79 */ "\tThis exceeds the compiled library version:  \0"
@@ -300,85 +299,84 @@ static char const usage_txt[4619] =
 /*  2359 */ "\t\t\t\t- must appear between %d and %d times\n\0"
 /*  2402 */ "ERROR:  The %s option is required\n\0"
 /*  2437 */ "%s: option `%s' cannot have an argument\n\0"
-/*  2478 */ "%s: cannot allocate new argument vector\n\0"
-/*  2519 */ "%s: Command line arguments not allowed\n\0"
-/*  2559 */ "error %d (%s) creating %s\n\0"
-/*  2586 */ "Options are specified by single or double hyphens and their name.\n\0"
-/*  2653 */ "%s error:  `%s' does not match any %s keywords\n\0"
-/*  2701 */ "\t\t\t\t- may appear multiple times\n\0"
-/*  2734 */ "\t\t\t\t- may not be preset\n\0"
-/*  2759 */ "The 'reset-option' option requires an argument\n\0"
-/*  2807 */ "   Arg Option-Name    Description\n\0"
-/*  2842 */ "  Flg Arg Option-Name    Description\n\0"
-/*  2880 */ "error %d (%s) stat-ing %s\n\0"
-/*  2907 */ "%s(optionRestore): error: no saved option state\n\0"
-/*  2956 */ "none\0"
-/*  2961 */ "'%s' not defined\n\0"
-/*  2979 */ "'%s' is not a command line option\n\0"
-/*  3014 */ "ERROR:  The %s option must appear %d times\n\0"
-/*  3058 */ "error:  cannot load options from non-regular file %s\n\0"
-/*  3112 */ "%s error:  `%s' is not a recognizable number\n\0"
-/*  3158 */ "%s error:  `%s' is not a recognizable date/time\n\0"
-/*  3207 */ "%s error:  `%s' is not a recognizable time duration\n\0"
-/*  3260 */ " %3s %s\0"
-/*  3268 */ "The '-#<number>' option may omit the hash char\n\0"
-/*  3316 */ "one %s%s option allowed\n\0"
-/*  3341 */ "All arguments are named options.\n\0"
-/*  3375 */ "Write failure to output file\0"
-/*  3404 */ " - reading file %s\0"
-/*  3423 */ "\n"
+/*  2478 */ "%s: Command line arguments not allowed\n\0"
+/*  2518 */ "error %d (%s) creating %s\n\0"
+/*  2545 */ "Options are specified by single or double hyphens and their name.\n\0"
+/*  2612 */ "%s error:  `%s' does not match any %s keywords\n\0"
+/*  2660 */ "\t\t\t\t- may appear multiple times\n\0"
+/*  2693 */ "\t\t\t\t- may not be preset\n\0"
+/*  2718 */ "The 'reset-option' option requires an argument\n\0"
+/*  2766 */ "   Arg Option-Name    Description\n\0"
+/*  2801 */ "  Flg Arg Option-Name    Description\n\0"
+/*  2839 */ "error %d (%s) stat-ing %s\n\0"
+/*  2866 */ "%s(optionRestore): error: no saved option state\n\0"
+/*  2915 */ "none\0"
+/*  2920 */ "'%s' not defined\n\0"
+/*  2938 */ "'%s' is not a command line option\n\0"
+/*  2973 */ "ERROR:  The %s option must appear %d times\n\0"
+/*  3017 */ "error:  cannot load options from non-regular file %s\n\0"
+/*  3071 */ "%s error:  `%s' is not a recognizable number\n\0"
+/*  3117 */ "%s error:  `%s' is not a recognizable date/time\n\0"
+/*  3166 */ "%s error:  `%s' is not a recognizable time duration\n\0"
+/*  3219 */ " %3s %s\0"
+/*  3227 */ "The '-#<number>' option may omit the hash char\n\0"
+/*  3275 */ "one %s%s option allowed\n\0"
+/*  3300 */ "All arguments are named options.\n\0"
+/*  3334 */ "Write failure to output file\0"
+/*  3363 */ " - reading file %s\0"
+/*  3382 */ "\n"
             "please send bug reports to:  %s\n\0"
-/*  3457 */ "\t\t\t\t- may NOT appear - preset only\n\0"
-/*  3493 */ "#  preset/initialization file\n"
+/*  3416 */ "\t\t\t\t- may NOT appear - preset only\n\0"
+/*  3452 */ "#  preset/initialization file\n"
             "#  %s#\n\0"
-/*  3531 */ "\n"
+/*  3490 */ "\n"
             "The following option preset mechanisms are supported:\n\0"
-/*  3587 */ "prohibits these options:\n\0"
-/*  3613 */ "Operands and options may be intermixed.  They will be reordered.\n\0"
-/*  3679 */ "%s%ld to %ld\0"
-/*  3692 */ "%sgreater than or equal to %ld\0"
-/*  3723 */ "%sIt must lie in one of the ranges:\n\0"
-/*  3760 */ "%sIt must be in the range:\n\0"
-/*  3788 */ ", or\n\0"
-/*  3794 */ "%s error:  %s option value ``%s'' is out of range.\n\0"
-/*  3846 */ "%s%ld exactly\0"
-/*  3860 */ "%sis scalable with a suffix: k/K/m/M/g/G/t/T\n\0"
-/*  3906 */ "%sless than or equal to %ld\0"
-/*  3934 */ "The --reset-option has not been configured.\n\0"
-/*  3979 */ "ERROR:  %s option requires the %s option\n\0"
-/*  4021 */ " %3s %-14s %s\0"
-/*  4035 */ "requires these options:\n\0"
-/*  4060 */ "   Arg Option-Name   Req?  Description\n\0"
-/*  4100 */ "  Flg Arg Option-Name   Req?  Description\n\0"
-/*  4143 */ "-_^\0"
-/*  4147 */ "or you may use a numeric representation.  Preceding these with a '!' will\n"
+/*  3546 */ "prohibits these options:\n\0"
+/*  3572 */ "Operands and options may be intermixed.  They will be reordered.\n\0"
+/*  3638 */ "%s%ld to %ld\0"
+/*  3651 */ "%sgreater than or equal to %ld\0"
+/*  3682 */ "%sIt must lie in one of the ranges:\n\0"
+/*  3719 */ "%sIt must be in the range:\n\0"
+/*  3747 */ ", or\n\0"
+/*  3753 */ "%s error:  %s option value %ld is out of range.\n\0"
+/*  3802 */ "%s%ld exactly\0"
+/*  3816 */ "%sis scalable with a suffix: k/K/m/M/g/G/t/T\n\0"
+/*  3862 */ "%sless than or equal to %ld\0"
+/*  3890 */ "The --reset-option has not been configured.\n\0"
+/*  3935 */ "ERROR:  %s option requires the %s option\n\0"
+/*  3977 */ " %3s %-14s %s\0"
+/*  3991 */ "requires these options:\n\0"
+/*  4016 */ "   Arg Option-Name   Req?  Description\n\0"
+/*  4056 */ "  Flg Arg Option-Name   Req?  Description\n\0"
+/*  4099 */ "-_^\0"
+/*  4103 */ "or you may use a numeric representation.  Preceding these with a '!' will\n"
             "clear the bits, specifying 'none' will clear all bits, and 'all' will set them\n"
             "all.  Multiple entries may be passed as an option argument list.\n\0"
-/*  4366 */ "%s\0"
-/*  4369 */ "      \0"
-/*  4376 */ "T/F\0"
-/*  4380 */ "\n"
+/*  4322 */ "%s\0"
+/*  4325 */ "      \0"
+/*  4332 */ "T/F\0"
+/*  4336 */ "\n"
             "%s\n\n"
             "%s\0"
-/*  4388 */ "Fil\0"
-/*  4392 */ "KWd\0"
-/*  4396 */ "Mbr\0"
-/*  4400 */ "Tim\0"
-/*  4404 */ "Cpx\0"
-/*  4408 */ "no \0"
-/*  4412 */ "Num\0"
-/*  4416 */ "opt\0"
-/*  4420 */ "YES\0"
-/*  4424 */ "Str\0"
-/*  4428 */ "\t\t\t\t- \0"
-/*  4435 */ "\t\t\t\t-- and \0"
-/*  4447 */ "\t\t\t\t%s\n\0"
-/*  4455 */ "   \0"
-/*  4459 */ "  \0"
-/*  4462 */ "\t\t\t\t- may appear up to %d times\n\0"
-/*  4495 */ "The valid \"%s\" option keywords are:\n\0"
-/*  4532 */ "These additional options are:\0"
-/*  4562 */ "The next option supports vendor supported extra options:";
+/*  4344 */ "Fil\0"
+/*  4348 */ "KWd\0"
+/*  4352 */ "Mbr\0"
+/*  4356 */ "Tim\0"
+/*  4360 */ "Cpx\0"
+/*  4364 */ "no \0"
+/*  4368 */ "Num\0"
+/*  4372 */ "opt\0"
+/*  4376 */ "YES\0"
+/*  4380 */ "Str\0"
+/*  4384 */ "\t\t\t\t- \0"
+/*  4391 */ "\t\t\t\t-- and \0"
+/*  4403 */ "\t\t\t\t%s\n\0"
+/*  4411 */ "   \0"
+/*  4415 */ "  \0"
+/*  4418 */ "\t\t\t\t- may appear up to %d times\n\0"
+/*  4451 */ "The valid \"%s\" option keywords are:\n\0"
+/*  4488 */ "These additional options are:\0"
+/*  4518 */ "The next option supports vendor supported extra options:";
 
 
   /*
@@ -387,7 +385,7 @@ static char const usage_txt[4619] =
    *  Aren't you glad you don't maintain this by hand?
    */
   usage_text_t option_usage_text = {
-    145,
+    144,
     eng_zGnuBoolArg, eng_zGnuKeyArg,  eng_zGnuFileArg, eng_zGnuKeyLArg,
     eng_zGnuTimeArg, eng_zGnuNumArg,  eng_zGnuStrArg,
     {
@@ -407,25 +405,25 @@ static char const usage_txt[4619] =
       usage_txt +1966, usage_txt +1973, usage_txt +1984, usage_txt +2010,
       usage_txt +2036, usage_txt +2079, usage_txt +2115, usage_txt +2166,
       usage_txt +2222, usage_txt +2256, usage_txt +2294, usage_txt +2359,
-      usage_txt +2402, usage_txt +2437, usage_txt +2478, usage_txt +2519,
-      usage_txt +2559, usage_txt +2586, usage_txt +2653, usage_txt +2701,
-      usage_txt +2734, usage_txt +2759, usage_txt +2807, usage_txt +2842,
-      usage_txt +2880, usage_txt +2907, usage_txt +2956, usage_txt +2961,
-      usage_txt +2979, usage_txt +3014, usage_txt +3058, usage_txt +3112,
-      usage_txt +3158, usage_txt +3207, usage_txt +3260, usage_txt +3268,
-      usage_txt +3316, usage_txt +3341, usage_txt +3375, usage_txt +3404,
-      usage_txt +3423, usage_txt +3457, usage_txt +3493, usage_txt +3531,
-      usage_txt +3587, usage_txt +3613, usage_txt +3679, usage_txt +3692,
-      usage_txt +3723, usage_txt +3760, usage_txt +3788, usage_txt +3794,
-      usage_txt +3846, usage_txt +3860, usage_txt +3906, usage_txt +3934,
-      usage_txt +3979, usage_txt +4021, usage_txt +4035, usage_txt +4060,
-      usage_txt +4100, usage_txt +4143, usage_txt +4147, usage_txt +4366,
-      usage_txt +4369, usage_txt +4376, usage_txt +4380, usage_txt +4388,
-      usage_txt +4392, usage_txt +4396, usage_txt +4400, usage_txt +4404,
-      usage_txt +4408, usage_txt +4412, usage_txt +4416, usage_txt +4420,
-      usage_txt +4424, usage_txt +4428, usage_txt +4435, usage_txt +4447,
-      usage_txt +4455, usage_txt +4459, usage_txt +4462, usage_txt +4495,
-      usage_txt +4532, usage_txt +4562
+      usage_txt +2402, usage_txt +2437, usage_txt +2478, usage_txt +2518,
+      usage_txt +2545, usage_txt +2612, usage_txt +2660, usage_txt +2693,
+      usage_txt +2718, usage_txt +2766, usage_txt +2801, usage_txt +2839,
+      usage_txt +2866, usage_txt +2915, usage_txt +2920, usage_txt +2938,
+      usage_txt +2973, usage_txt +3017, usage_txt +3071, usage_txt +3117,
+      usage_txt +3166, usage_txt +3219, usage_txt +3227, usage_txt +3275,
+      usage_txt +3300, usage_txt +3334, usage_txt +3363, usage_txt +3382,
+      usage_txt +3416, usage_txt +3452, usage_txt +3490, usage_txt +3546,
+      usage_txt +3572, usage_txt +3638, usage_txt +3651, usage_txt +3682,
+      usage_txt +3719, usage_txt +3747, usage_txt +3753, usage_txt +3802,
+      usage_txt +3816, usage_txt +3862, usage_txt +3890, usage_txt +3935,
+      usage_txt +3977, usage_txt +3991, usage_txt +4016, usage_txt +4056,
+      usage_txt +4099, usage_txt +4103, usage_txt +4322, usage_txt +4325,
+      usage_txt +4332, usage_txt +4336, usage_txt +4344, usage_txt +4348,
+      usage_txt +4352, usage_txt +4356, usage_txt +4360, usage_txt +4364,
+      usage_txt +4368, usage_txt +4372, usage_txt +4376, usage_txt +4380,
+      usage_txt +4384, usage_txt +4391, usage_txt +4403, usage_txt +4411,
+      usage_txt +4415, usage_txt +4418, usage_txt +4451, usage_txt +4488,
+      usage_txt +4518
     }
   };
 
diff --git a/src/libopts/compat/compat.h b/src/libopts/compat/compat.h
index 24abed2aee..9fe9b29938 100644
--- a/src/libopts/compat/compat.h
+++ b/src/libopts/compat/compat.h
@@ -3,7 +3,7 @@
 /**
  * \file compat.h --- fake the preprocessor into handlng portability
  *
- *  Time-stamp:      "2012-02-10 17:00:09 bkorb"
+ *  Time-stamp:      "2012-02-12 09:00:09 bkorb"
  *
  *  compat.h is free software.
  *  This file is part of AutoGen.
diff --git a/src/libopts/configfile.c b/src/libopts/configfile.c
index 40d31c6bbf..e3da1bb0c4 100644
--- a/src/libopts/configfile.c
+++ b/src/libopts/configfile.c
@@ -1,7 +1,7 @@
 /**
  * \file configfile.c
  *
- *  Time-stamp:      "2012-01-29 15:57:40 bkorb"
+ *  Time-stamp:      "2012-02-25 12:54:32 bkorb"
  *
  *  configuration/rc/ini file handling.
  *
@@ -1369,7 +1369,7 @@ validate_struct(tOptions * pOpts, char const * pzProgram)
           || (pOpts->structVersion < OPTIONS_MINIMUM_VERSION )
        )  )  {
         static char const aover[] =
-            __STR(AO_CURRENT)":"__STR(AO_REVISION)":"__STR(AO_AGE)"\n";
+            STR(AO_CURRENT)":"STR(AO_REVISION)":"STR(AO_AGE)"\n";
 
         fprintf(stderr, zAO_Err, pzProgram, NUM_TO_VER(pOpts->structVersion));
         if (pOpts->structVersion > OPTIONS_STRUCT_VERSION )
diff --git a/src/libopts/cook.c b/src/libopts/cook.c
index a81ce91b09..c681ea317c 100644
--- a/src/libopts/cook.c
+++ b/src/libopts/cook.c
@@ -1,7 +1,7 @@
 /**
  * \file cook.c
  *
- *  Time-stamp:      "2012-02-10 17:00:47 bkorb"
+ *  Time-stamp:      "2012-02-12 09:00:47 bkorb"
  *
  *  This file contains the routines that deal with processing quoted strings
  *  into an internal format.
@@ -59,7 +59,7 @@ contiguous_quote(char ** pps, char * pq, int * lnct_p);
  * err:  @code{NULL} is returned if the string is mal-formed.
 =*/
 unsigned int
-ao_string_cook_escape_char( char const* pzIn, char* pRes, uint_t nl )
+ao_string_cook_escape_char(char const* pzIn, char* pRes, uint_t nl)
 {
     unsigned int  res = 1;
 
diff --git a/src/libopts/genshell.c b/src/libopts/genshell.c
index 71e2c7d891..9b62a3b013 100644
--- a/src/libopts/genshell.c
+++ b/src/libopts/genshell.c
@@ -2,11 +2,11 @@
  *  
  *  DO NOT EDIT THIS FILE   (genshell.c)
  *  
- *  It has been AutoGen-ed  February 10, 2012 at 07:53:37 PM by AutoGen 5.15pre7
+ *  It has been AutoGen-ed  February 25, 2012 at 01:14:42 PM by AutoGen 5.15pre14
  *  From the definitions    genshell.def
  *  and the template file   options
  *
- * Generated from AutoOpts 36:2:11 templates.
+ * Generated from AutoOpts 36:3:11 templates.
  *
  *  AutoOpts is a copyrighted work.  This source file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -39,14 +39,14 @@
  *  with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define OPTION_CODE_COMPILE 1
+#include "genshell.h"
 #include <sys/types.h>
 
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#define OPTION_CODE_COMPILE 1
-#include "genshell.h"
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -245,7 +245,7 @@ static tOptDesc optDesc[GENSHELL_OPTION_CT] = {
 #define zExplain        (genshellopt_opt_strs+1271)
 #define zDetail         (genshellopt_opt_strs+1452)
 #define zFullVersion    (genshellopt_opt_strs+1677)
-/* extracted from optcode.tlib near line 315 */
+/* extracted from optcode.tlib near line 349 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -263,13 +263,19 @@ static tOptDesc optDesc[GENSHELL_OPTION_CT] = {
 /*
  *  Create the static procedure(s) declared above.
  */
+/**
+ * The callout function that invokes the GENSHELL_USAGE() macro.
+ *
+ * @param pOptions the AutoOpts option description structure
+ * @param pOptDesc the descriptor for the "help" (usage) option.
+ */
 static void
 doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
 {
     (void)pOptions;
     GENSHELL_USAGE(GENSHELLOPT_EXIT_SUCCESS);
 }
-/* extracted from optmain.tlib near line 1133 */
+/* extracted from optmain.tlib near line 1093 */
 
 #ifndef  PKGDATADIR
 # define PKGDATADIR ""
diff --git a/src/libopts/genshell.h b/src/libopts/genshell.h
index eecbe44bf4..f0d36dae55 100644
--- a/src/libopts/genshell.h
+++ b/src/libopts/genshell.h
@@ -2,11 +2,11 @@
  *  
  *  DO NOT EDIT THIS FILE   (genshell.h)
  *  
- *  It has been AutoGen-ed  February 10, 2012 at 07:53:37 PM by AutoGen 5.15pre7
+ *  It has been AutoGen-ed  February 25, 2012 at 01:14:42 PM by AutoGen 5.15pre14
  *  From the definitions    genshell.def
  *  and the template file   options
  *
- * Generated from AutoOpts 36:2:11 templates.
+ * Generated from AutoOpts 36:3:11 templates.
  *
  *  AutoOpts is a copyrighted work.  This header file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -55,7 +55,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 147458
+#define AO_TEMPLATE_VERSION 147459
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
diff --git a/src/libopts/m4/libopts.m4 b/src/libopts/m4/libopts.m4
index 0a01666592..da5501165c 100644
--- a/src/libopts/m4/libopts.m4
+++ b/src/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 10, 2012 at 07:53:33 PM by AutoGen 5.15pre7
+dnl It has been AutoGen-ed  February 25, 2012 at 01:14:39 PM by AutoGen 5.15pre14
 dnl From the definitions    libopts.def
 dnl and the template file   conftest.tpl
 dnl
@@ -88,10 +88,6 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
   ])
   AC_CHECK_TYPES([int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t,
   intptr_t, uintptr_t, uint_t, pid_t, size_t])
-  
-  # =====
-  # sizes
-  # =====
   AC_CHECK_SIZEOF(char*, 8)
   AC_CHECK_SIZEOF(int,   4)
   AC_CHECK_SIZEOF(long,  8)
@@ -158,7 +154,7 @@ AC_DEFUN([LIBOPTS_WITHLIB_REGEX],[
   ) # end of AC_ARG_WITH libregex
 
   if test "${with_libregex+set}" = set && \
-     test "${withval}" = no
+     test "X${withval}" = Xno
   then ## disabled by request
     libopts_cv_with_libregex_root=no
     libopts_cv_with_libregex_cflags=no
@@ -167,14 +163,14 @@ AC_DEFUN([LIBOPTS_WITHLIB_REGEX],[
 
   AC_ARG_WITH([libregex-cflags],
     AS_HELP_STRING([--with-libregex-cflags], [libregex compile flags]),
-    [libopts_cv_with_libregex_cflags=${with_regex_cflags}],
+    [libopts_cv_with_libregex_cflags=${with_libregex_cflags}],
     AC_CACHE_CHECK([whether with-libregex-cflags was specified], libopts_cv_with_libregex_cflags,
       libopts_cv_with_libregex_cflags=no)
   ) # end of AC_ARG_WITH libregex-cflags
 
   AC_ARG_WITH([libregex-libs],
     AS_HELP_STRING([--with-libregex-libs], [libregex link command arguments]),
-    [libopts_cv_with_libregex_libs=${with_regex_libs}],
+    [libopts_cv_with_libregex_libs=${with_libregex_libs}],
     AC_CACHE_CHECK([whether with-libregex-libs was specified], libopts_cv_with_libregex_libs,
       libopts_cv_with_libregex_libs=no)
   ) # end of AC_ARG_WITH libregex-libs
@@ -446,7 +442,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS],[
 
 dnl @synopsis  LIBOPTS_CHECK
 dnl
-dnl Time-stamp:        "2011-12-13 21:26:37 bkorb"
+dnl Time-stamp:        "2012-02-25 12:54:32 bkorb"
 dnl
 dnl If autoopts-config works, add the linking information to LIBS.
 dnl Otherwise, add ``libopts-${ao_rev}'' to SUBDIRS and run all
@@ -543,20 +539,24 @@ AC_DEFUN([LIBOPTS_CHECK_COMMON],[
   m4_popdef([AO_Libopts_Dir])
 [# end of AC_DEFUN of LIBOPTS_CHECK_COMMON]
 ])
+dnl
 dnl AC_CONFIG_FILES conditionalization requires using AM_COND_IF, however
 dnl AM_COND_IF is new to Automake 1.11.  To use it on new Automake without
 dnl requiring same, a fallback implementation for older Automake is provided.
 dnl Note that disabling of AC_CONFIG_FILES requires Automake 1.11, this code
 dnl is correct only in terms of m4sh generated script.
-m4_ifndef([AM_COND_IF], [AC_DEFUN([AM_COND_IF], [
-if test -z "$$1_TRUE"; then :
-  m4_n([$2])[]dnl
-m4_ifval([$3],
-[else
-  $3
-])dnl
-fi[]dnl
-])])
+dnl
+m4_ifndef([AM_COND_IF],
+  [AC_DEFUN([AM_COND_IF], [
+    if test -z "$$1_TRUE"; then :
+      m4_n([$2])[]dnl
+      m4_ifval([$3],[
+    else
+      $3
+    ])dnl
+    fi[]dnl
+  ])dnl
+])
 dnl
 AC_DEFUN([LIBOPTS_CHECK_NOBUILD], [
   m4_pushdef([AO_Libopts_Dir],
diff --git a/src/libopts/numeric.c b/src/libopts/numeric.c
index c6e6ba7007..b709d0708f 100644
--- a/src/libopts/numeric.c
+++ b/src/libopts/numeric.c
@@ -2,7 +2,7 @@
 /**
  * \file numeric.c
  *
- *  Time-stamp:      "2012-01-29 19:10:40 bkorb"
+ *  Time-stamp:      "2012-02-25 12:54:32 bkorb"
  *
  *  This file is part of AutoOpts, a companion to AutoGen.
  *  AutoOpts is free software.
@@ -54,7 +54,7 @@ optionShowRange(tOptions * pOpts, tOptDesc * pOD, void * rng_table, int rng_ct)
         pz_indent = ONE_TAB_STR;
 
         fprintf(option_usage_fp, zRangeErr, pOpts->pzProgName,
-                pOD->pz_Name, pOD->optArg.argString);
+                pOD->pz_Name, pOD->optArg.argInt);
         pz_indent = "";
     }
 
diff --git a/src/libopts/proto.h b/src/libopts/proto.h
index 3f77b2cfc5..de5f3438f7 100644
--- a/src/libopts/proto.h
+++ b/src/libopts/proto.h
@@ -1,7 +1,7 @@
 /* -*- buffer-read-only: t -*- vi: set ro:
  *
  * Prototypes for autoopts
- * Generated Fri Feb 10 19:53:45 PST 2012
+ * Generated Sat Feb 25 13:14:51 PST 2012
  */
 #ifndef AUTOOPTS_PROTO_H_GUARD
 #define AUTOOPTS_PROTO_H_GUARD 1
diff --git a/src/libopts/putshell.c b/src/libopts/putshell.c
index 10d14bd9af..2c9dde569d 100644
--- a/src/libopts/putshell.c
+++ b/src/libopts/putshell.c
@@ -2,7 +2,7 @@
 /**
  * \file putshell.c
  *
- * Time-stamp:      "2012-02-10 19:14:49 bkorb"
+ * Time-stamp:      "2012-02-12 09:14:49 bkorb"
  *
  *  This module will interpret the options set in the tOptions
  *  structure and print them to standard out in a fashion that
diff --git a/src/libopts/value-type.h b/src/libopts/value-type.h
index a2ca5ad566..c459b7e982 100644
--- a/src/libopts/value-type.h
+++ b/src/libopts/value-type.h
@@ -1,5 +1,5 @@
 /*
- *  Generated header for gperf generated source Fri Feb 10 19:53:37 PST 2012
+ *  Generated header for gperf generated source Sat Feb 25 13:14:42 PST 2012
  *  This file enumerates the list of names and declares the
  *  procedure for mapping string names to the enum value.
  */
diff --git a/src/libopts/xat-attribute.h b/src/libopts/xat-attribute.h
index b452b309be..653c1ee8f9 100644
--- a/src/libopts/xat-attribute.h
+++ b/src/libopts/xat-attribute.h
@@ -1,5 +1,5 @@
 /*
- *  Generated header for gperf generated source Fri Feb 10 19:53:37 PST 2012
+ *  Generated header for gperf generated source Sat Feb 25 13:14:42 PST 2012
  *  This file enumerates the list of names and declares the
  *  procedure for mapping string names to the enum value.
  */