diff -rc2P gengetopt-2.7/ChangeLog gengetopt-2.7.1/ChangeLog *** gengetopt-2.7/ChangeLog Sun Jun 30 23:53:13 2002 --- gengetopt-2.7.1/ChangeLog Sun Jul 21 16:13:40 2002 *************** *** 1,2 **** --- 1,21 ---- + 2002-07-21 Lorenzo Bettini + + * NEWS: Version 2.7.1 released + + 2002-07-13 Lorenzo Bettini + + * src/skels: generators are generated with version 0.4.1 that does + not repeat default values in the .cc sources; this used to cause + problems with some gcc 3.x versions. Indeed that was an error. + + 2002-07-10 Lorenzo Bettini + + * src/Makefile.am (INCLUDES): do not add includes directory, this + way if sstream is provided by the compiler, that version is used. + + 2002-07-07 Lorenzo Bettini + + * configure.in: Added check for stl and namespaces + 2002-06-30 Lorenzo Bettini diff -rc2P gengetopt-2.7/Makefile.in gengetopt-2.7.1/Makefile.in *** gengetopt-2.7/Makefile.in Mon Jul 1 00:17:37 2002 --- gengetopt-2.7.1/Makefile.in Sun Jul 21 16:37:32 2002 *************** *** 1,5 **** ! # Makefile.in generated automatically by automake 1.4 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,5 ---- ! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 215,219 **** rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ ! test "$$subdir" = "." && dot_seen=yes; \ done; \ test "$$dot_seen" = "no" && rev=". $$rev"; \ --- 215,219 ---- rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ ! test "$$subdir" != "." || dot_seen=yes; \ done; \ test "$$dot_seen" = "no" && rev=". $$rev"; \ *************** *** 309,313 **** d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ --- 309,313 ---- d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ diff -rc2P gengetopt-2.7/NEWS gengetopt-2.7.1/NEWS *** gengetopt-2.7/NEWS Sun Jun 30 23:52:12 2002 --- gengetopt-2.7.1/NEWS Sun Jul 21 16:11:01 2002 *************** *** 5,8 **** --- 5,16 ---- Please send gengetopt bug reports to bug-gengetopt@gnu.org + Version 2.7.1 + + * Fixed a problem due to namespaces in compilation (reported by Excoffier + Denis ) with gcc 3.x. Fixed other problems + in compilation with gcc 3.x (reported by Ramasubramanian Vijay). + * Anonymous CVS Access now available at + http://savannah.gnu.org/projects/gengetopt. + Version 2.7 *************** *** 26,30 **** exit (suggested by Frans E. van Dorsselaer ) * do not exit with error if an empty desc for an option is given (thanks ! to Excoffier Denis ) * fixed a bug in creation of string for the comment header in the generated sources (thanks to Xavier Trochu ) --- 34,38 ---- exit (suggested by Frans E. van Dorsselaer ) * do not exit with error if an empty desc for an option is given (thanks ! to Excoffier Denis ) * fixed a bug in creation of string for the comment header in the generated sources (thanks to Xavier Trochu ) diff -rc2P gengetopt-2.7/README gengetopt-2.7.1/README *** gengetopt-2.7/README Sun Jun 30 23:54:42 2002 --- gengetopt-2.7.1/README Sun Jul 21 16:10:32 2002 *************** *** 1,5 **** ! GNU Gengetopt 2.7 ! June 30th, 2002 This program generates a C function that uses getopt_long function to parse --- 1,5 ---- ! GNU Gengetopt 2.7.1 ! July 20th, 2002 This program generates a C function that uses getopt_long function to parse *************** *** 42,46 **** I do not distribute Windows binaries anymore; since, they can be easily ! built by using Cygnus C/C++ compiler, available at http://www.cygnus.com/. However, if you don't feel like downloading such compiler, you can request such binaries directly to me, by e-mail (bettini@gnu.org) and I can send --- 42,46 ---- I do not distribute Windows binaries anymore; since, they can be easily ! built by using Cygnus C/C++ compiler, available at http://www.cygwin.com/. However, if you don't feel like downloading such compiler, you can request such binaries directly to me, by e-mail (bettini@gnu.org) and I can send *************** *** 55,102 **** (see below for patching from a previous version). ! Changes in this release ! * Basically this is a maintenance release: C++ is now used for developing ! Gengetopt and in particular my new tool Gengen ! (http://www.lorenzobettini.it/software/gengen/) is used for ! automatically generating the code that generates the command line ! parser. ! ! Changes in release 2.6 ! ! * fixed documentation (thanks to Francesco Potorti ) ! * function names and names used in #ifndef directives in generated ! sources are canonized, thus avoiding errors by the compiler (notified ! by Francesco Potorti and Alexey Mahotkin ) ! * fixed line number when reporting an error in a .ggo file, and '\n' is ! no longer needed at the end of a .ggo file (notified by Francesco ! Potorti) ! * in the generated parser use HAVE_STRDUP to check whether the standard ! strdup function can be used, and use EXIT_SUCCESS and EXIT_FAILURE for ! exit (suggested by Frans E. van Dorsselaer ) ! * do not exit with error if an empty desc for an option is given (thanks ! to Excoffier Denis ) ! * fixed a bug in creation of string for the comment header in the ! generated sources (thanks to Xavier Trochu ) ! * Added default values in options for integer and string options (with ! help of Ralf Zeise ) ! ! Changes in release 2.5 ! ! * much more recent versions of getopt.h, getopt.c, getopt1.c are provided ! (the previous ones were very very old!), that do not rely on alloca ! anymore. ! * when a flag option is given the corresponding _given variable is set ! (bug fixed by Guillaume Chazarain ). ! * Fixed documentation of sample1, as suggested by Lutz Maibaum ! . ! * Avoid a warning due to generated gengetopt_strdup (thanks to Brian ! Minard ) ! * the generated print_help function use a different printf for every ! option, thus avoiding a single printf with a possible very huge string ! (thanks to Herbert Thoma ) ! see also NEWS file and ChangeLog for the complete list of changes between ! versions (also summarized in old_changes.html). Installation --- 55,75 ---- (see below for patching from a previous version). ! Anonymous CVS Access ! ! This project's CVS repository can be checked out through anonymous (pserver) ! CVS with the following instruction set. When prompted for a password for ! anoncvs, simply press the Enter key. ! ! cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/gengetopt login ! cvs -z3 -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/gengetopt co gengetopt ! ! Further instructions can be found at the address: ! http://savannah.gnu.org/projects/gengetopt. ! ! Changes in this release ! * see NEWS file for a summary of new features in this release and ! * see ChangeLog for the complete list of changes sources Installation *************** *** 453,457 **** $ gengetopt --help ! gengetopt 2.7 Purpose: --- 426,430 ---- $ gengetopt --help ! gengetopt 2.7.1 Purpose: *************** *** 554,561 **** Lorenzo Bettini Roberto Arturo Tena Sanchez ! http://w3.newnet.it/bettini or http://arturo.directmail.org ! http://infostud.dsi.unifi.it/~bettini, ! (very fast if you're in University) ! . gengetopt is free software. See the file LICENSE and COPYING for copying --- 527,532 ---- Lorenzo Bettini Roberto Arturo Tena Sanchez ! http://www.lorenzobettini.it http://arturo.directmail.org ! . , gengetopt is free software. See the file LICENSE and COPYING for copying diff -rc2P gengetopt-2.7/THANKS gengetopt-2.7.1/THANKS *** gengetopt-2.7/THANKS Mon Mar 25 20:36:12 2002 --- gengetopt-2.7.1/THANKS Sun Jul 21 16:35:39 2002 *************** *** 26,29 **** --- 26,30 ---- Herbert Thoma tma@iis.fhg.de Xavier Trochu xtrochu@yahoo.com + Ramasubramanian Vijay Robert Walsh Robert.J.Walsh@eng.sun.com James R. Van Zandt jrv@vanzandt.mv.com diff -rc2P gengetopt-2.7/acinclude.m4 gengetopt-2.7.1/acinclude.m4 *** gengetopt-2.7/acinclude.m4 Fri Feb 9 19:17:14 2001 --- gengetopt-2.7.1/acinclude.m4 Tue Jul 16 20:45:49 2002 *************** *** 42,46 **** dnl configure.in dnl ! dnl @version $Id: acinclude.m4,v 1.2 2001/02/09 18:17:14 bettini Exp $ dnl @author Loic Dachary dnl --- 42,46 ---- dnl configure.in dnl ! dnl @version $Id: acinclude.m4,v 1.2.2.1 2002/07/07 14:01:18 bettini Exp $ dnl @author Loic Dachary dnl *************** *** 106,107 **** --- 106,183 ---- rm -f conftest* ])]) + + dnl @synopsis AC_CXX_NAMESPACES + dnl + dnl If the compiler can prevent names clashes using namespaces, define + dnl HAVE_NAMESPACES. + dnl + dnl @version $Id: acinclude.m4,v 1.2.2.1 2002/07/07 14:01:18 bettini Exp $ + dnl @author Luc Maisonobe + dnl + AC_DEFUN([AC_CXX_NAMESPACES], + [AC_CACHE_CHECK(whether the compiler implements namespaces, + ac_cv_cxx_namespaces, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([namespace Outer { namespace Inner { int i = 0; }}], + [using namespace Outer::Inner; return i;], + ac_cv_cxx_namespaces=yes, ac_cv_cxx_namespaces=no) + AC_LANG_RESTORE + ]) + if test "$ac_cv_cxx_namespaces" = yes; then + AC_DEFINE(HAVE_NAMESPACES,,[define if the compiler implements namespaces]) + fi + ]) + + + dnl @synopsis AC_CXX_HAVE_STL + dnl + dnl If the compiler supports the Standard Template Library, define HAVE_STL. + dnl + dnl @version $Id: acinclude.m4,v 1.2.2.1 2002/07/07 14:01:18 bettini Exp $ + dnl @author Luc Maisonobe + dnl + AC_DEFUN([AC_CXX_HAVE_STL], + [AC_CACHE_CHECK(whether the compiler supports Standard Template Library, + ac_cv_cxx_have_stl, + [AC_REQUIRE([AC_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include + #include + #ifdef HAVE_NAMESPACES + using namespace std; + #endif],[list x; x.push_back(5); + list::iterator iter = x.begin(); if (iter != x.end()) ++iter; return 0;], + ac_cv_cxx_have_stl=yes, ac_cv_cxx_have_stl=no) + AC_LANG_RESTORE + ]) + if test "$ac_cv_cxx_have_stl" = yes; then + AC_DEFINE(HAVE_STL,,[define if the compiler supports Standard Template Library]) + fi + ]) + + dnl @synopsis AC_CXX_HAVE_SSTREAM + dnl + dnl If the C++ library has a working stringstream, define HAVE_SSTREAM. + dnl + dnl @author Ben Stanley + dnl @version $Id: acinclude.m4,v 1.2.2.1 2002/07/07 14:01:18 bettini Exp $ + dnl + AC_DEFUN([AC_CXX_HAVE_SSTREAM], + [AC_CACHE_CHECK(whether the compiler has stringstream, + ac_cv_cxx_have_sstream, + [AC_REQUIRE([AC_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include + #ifdef HAVE_NAMESPACES + using namespace std; + #endif],[stringstream message; message << "Hello"; return 0;], + ac_cv_cxx_have_sstream=yes, ac_cv_cxx_have_sstream=no) + AC_LANG_RESTORE + ]) + if test "$ac_cv_cxx_have_sstream" = yes; then + AC_DEFINE(HAVE_SSTREAM,,[define if the compiler has stringstream]) + fi + ]) diff -rc2P gengetopt-2.7/aclocal.m4 gengetopt-2.7.1/aclocal.m4 *** gengetopt-2.7/aclocal.m4 Sun Jun 30 23:48:54 2002 --- gengetopt-2.7.1/aclocal.m4 Tue Jul 16 20:46:10 2002 *************** *** 1,5 **** ! dnl aclocal.m4 generated automatically by aclocal 1.4 ! dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, --- 1,5 ---- ! dnl aclocal.m4 generated automatically by aclocal 1.4-p5 ! dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, *************** *** 54,58 **** dnl configure.in dnl ! dnl @version $Id: acinclude.m4,v 1.2 2001/02/09 18:17:14 bettini Exp $ dnl @author Loic Dachary dnl --- 54,58 ---- dnl configure.in dnl ! dnl @version $Id: acinclude.m4,v 1.2.2.1 2002/07/07 14:01:18 bettini Exp $ dnl @author Loic Dachary dnl *************** *** 119,125 **** ])]) # Like AC_CONFIG_HEADER, but automatically create stamp file. ! AC_DEFUN(AM_CONFIG_HEADER, [AC_PREREQ([2.12]) AC_CONFIG_HEADER([$1]) --- 119,201 ---- ])]) + dnl @synopsis AC_CXX_NAMESPACES + dnl + dnl If the compiler can prevent names clashes using namespaces, define + dnl HAVE_NAMESPACES. + dnl + dnl @version $Id: acinclude.m4,v 1.2.2.1 2002/07/07 14:01:18 bettini Exp $ + dnl @author Luc Maisonobe + dnl + AC_DEFUN([AC_CXX_NAMESPACES], + [AC_CACHE_CHECK(whether the compiler implements namespaces, + ac_cv_cxx_namespaces, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([namespace Outer { namespace Inner { int i = 0; }}], + [using namespace Outer::Inner; return i;], + ac_cv_cxx_namespaces=yes, ac_cv_cxx_namespaces=no) + AC_LANG_RESTORE + ]) + if test "$ac_cv_cxx_namespaces" = yes; then + AC_DEFINE(HAVE_NAMESPACES,,[define if the compiler implements namespaces]) + fi + ]) + + + dnl @synopsis AC_CXX_HAVE_STL + dnl + dnl If the compiler supports the Standard Template Library, define HAVE_STL. + dnl + dnl @version $Id: acinclude.m4,v 1.2.2.1 2002/07/07 14:01:18 bettini Exp $ + dnl @author Luc Maisonobe + dnl + AC_DEFUN([AC_CXX_HAVE_STL], + [AC_CACHE_CHECK(whether the compiler supports Standard Template Library, + ac_cv_cxx_have_stl, + [AC_REQUIRE([AC_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include + #include + #ifdef HAVE_NAMESPACES + using namespace std; + #endif],[list x; x.push_back(5); + list::iterator iter = x.begin(); if (iter != x.end()) ++iter; return 0;], + ac_cv_cxx_have_stl=yes, ac_cv_cxx_have_stl=no) + AC_LANG_RESTORE + ]) + if test "$ac_cv_cxx_have_stl" = yes; then + AC_DEFINE(HAVE_STL,,[define if the compiler supports Standard Template Library]) + fi + ]) + + dnl @synopsis AC_CXX_HAVE_SSTREAM + dnl + dnl If the C++ library has a working stringstream, define HAVE_SSTREAM. + dnl + dnl @author Ben Stanley + dnl @version $Id: acinclude.m4,v 1.2.2.1 2002/07/07 14:01:18 bettini Exp $ + dnl + AC_DEFUN([AC_CXX_HAVE_SSTREAM], + [AC_CACHE_CHECK(whether the compiler has stringstream, + ac_cv_cxx_have_sstream, + [AC_REQUIRE([AC_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include + #ifdef HAVE_NAMESPACES + using namespace std; + #endif],[stringstream message; message << "Hello"; return 0;], + ac_cv_cxx_have_sstream=yes, ac_cv_cxx_have_sstream=no) + AC_LANG_RESTORE + ]) + if test "$ac_cv_cxx_have_sstream" = yes; then + AC_DEFINE(HAVE_SSTREAM,,[define if the compiler has stringstream]) + fi + ]) + # Like AC_CONFIG_HEADER, but automatically create stamp file. ! AC_DEFUN([AM_CONFIG_HEADER], [AC_PREREQ([2.12]) AC_CONFIG_HEADER([$1]) *************** *** 151,155 **** dnl AM_INIT_AUTOMAKE(package,version, [no-define]) ! AC_DEFUN(AM_INIT_AUTOMAKE, [AC_REQUIRE([AC_PROG_INSTALL]) PACKAGE=[$1] --- 227,231 ---- dnl AM_INIT_AUTOMAKE(package,version, [no-define]) ! AC_DEFUN([AM_INIT_AUTOMAKE], [AC_REQUIRE([AC_PROG_INSTALL]) PACKAGE=[$1] *************** *** 179,183 **** # ! AC_DEFUN(AM_SANITY_CHECK, [AC_MSG_CHECKING([whether build environment is sane]) # Just in case --- 255,259 ---- # ! AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) # Just in case *************** *** 220,224 **** dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) dnl The program must properly implement --version. ! AC_DEFUN(AM_MISSING_PROG, [AC_MSG_CHECKING(for working $2) # Run test in a subshell; some versions of sh will print an error if --- 296,300 ---- dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) dnl The program must properly implement --version. ! AC_DEFUN([AM_MISSING_PROG], [AC_MSG_CHECKING(for working $2) # Run test in a subshell; some versions of sh will print an error if *************** *** 237,241 **** dnl AM_PROG_LEX dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT ! AC_DEFUN(AM_PROG_LEX, [missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1) AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex") --- 313,317 ---- dnl AM_PROG_LEX dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT ! AC_DEFUN([AM_PROG_LEX], [missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1) AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex") *************** *** 245,249 **** # Define a conditional. ! AC_DEFUN(AM_CONDITIONAL, [AC_SUBST($1_TRUE) AC_SUBST($1_FALSE) --- 321,325 ---- # Define a conditional. ! AC_DEFUN([AM_CONDITIONAL], [AC_SUBST($1_TRUE) AC_SUBST($1_FALSE) diff -rc2P gengetopt-2.7/config.h.in gengetopt-2.7.1/config.h.in *** gengetopt-2.7/config.h.in Mon Dec 17 22:11:27 2001 --- gengetopt-2.7.1/config.h.in Tue Jul 16 20:46:11 2002 *************** *** 40,43 **** --- 40,52 ---- #undef VERSION + /* define if the compiler implements namespaces */ + #undef HAVE_NAMESPACES + + /* define if the compiler supports Standard Template Library */ + #undef HAVE_STL + + /* define if the compiler has stringstream */ + #undef HAVE_SSTREAM + #include "cxxconfig.h" diff -rc2P gengetopt-2.7/configure gengetopt-2.7.1/configure *** gengetopt-2.7/configure Sun Jun 30 23:48:55 2002 --- gengetopt-2.7.1/configure Tue Jul 16 20:46:10 2002 *************** *** 699,703 **** PACKAGE=gengetopt ! VERSION=2.7 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then --- 699,703 ---- PACKAGE=gengetopt ! VERSION=2.7.1 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then *************** *** 1599,1609 **** echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 ! echo "configure:1603: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 + echo "configure:1603: checking whether the compiler implements namespaces" >&5 + if eval "test \"`echo '$''{'ac_cv_cxx_namespaces'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cxx_namespaces=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cxx_namespaces=no + fi + rm -f conftest* + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CPP $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + + fi + + echo "$ac_t""$ac_cv_cxx_namespaces" 1>&6 + if test "$ac_cv_cxx_namespaces" = yes; then + cat >> confdefs.h <<\EOF + #define HAVE_NAMESPACES + EOF + + fi + + echo $ac_n "checking whether the compiler supports Standard Template Library""... $ac_c" 1>&6 + echo "configure:1652: checking whether the compiler supports Standard Template Library" >&5 + if eval "test \"`echo '$''{'ac_cv_cxx_have_stl'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext < + #include + #ifdef HAVE_NAMESPACES + using namespace std; + #endif + int main() { + list x; x.push_back(5); + list::iterator iter = x.begin(); if (iter != x.end()) ++iter; return 0; + ; return 0; } + EOF + if { (eval echo configure:1678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cxx_have_stl=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cxx_have_stl=no + fi + rm -f conftest* + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CPP $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + + fi + + echo "$ac_t""$ac_cv_cxx_have_stl" 1>&6 + if test "$ac_cv_cxx_have_stl" = yes; then + cat >> confdefs.h <<\EOF + #define HAVE_STL + EOF + + fi + + + echo $ac_n "checking whether the compiler has stringstream""... $ac_c" 1>&6 + echo "configure:1708: checking whether the compiler has stringstream" >&5 + if eval "test \"`echo '$''{'ac_cv_cxx_have_sstream'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext < + #ifdef HAVE_NAMESPACES + using namespace std; + #endif + int main() { + stringstream message; message << "Hello"; return 0; + ; return 0; } + EOF + if { (eval echo configure:1732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cxx_have_sstream=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cxx_have_sstream=no + fi + rm -f conftest* + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CPP $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + + fi + + echo "$ac_t""$ac_cv_cxx_have_sstream" 1>&6 + if test "$ac_cv_cxx_have_sstream" = yes; then + cat >> confdefs.h <<\EOF + #define HAVE_SSTREAM + EOF + + fi + + echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 ! echo "configure:1762: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes --- 1775,1779 ---- ; return 0; } EOF ! if { (eval echo configure:1778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes *************** *** 1633,1642 **** test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 ! echo "configure:1636: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:1795: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes --- 1804,1808 ---- ; return 0; } EOF ! if { (eval echo configure:1807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes *************** *** 1664,1668 **** echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 ! echo "configure:1667: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 1823,1827 ---- echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 ! echo "configure:1826: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 1674,1678 **** echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= ! if { (eval echo configure:1677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in --- 1833,1837 ---- echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= ! if { (eval echo configure:1836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *************** *** 1700,1704 **** set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1703: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 1859,1863 ---- set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1862: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 1731,1735 **** echo $ac_n "checking for the txtc compiler""... $ac_c" 1>&6 ! echo "configure:1734: checking for the txtc compiler" >&5 TXTC='$(SHELL) $(top_builddir)/txtc.sh' if test -f $srcdir/txtc.sh.in --- 1890,1894 ---- echo $ac_n "checking for the txtc compiler""... $ac_c" 1>&6 ! echo "configure:1893: checking for the txtc compiler" >&5 TXTC='$(SHELL) $(top_builddir)/txtc.sh' if test -f $srcdir/txtc.sh.in *************** *** 1750,1754 **** set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1753: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 1909,1913 ---- set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1912: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 1789,1793 **** set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1792: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 1948,1952 ---- set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1951: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 1822,1826 **** set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1825: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 1981,1985 ---- set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1984: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 1856,1860 **** esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 ! echo "configure:1859: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then --- 2015,2019 ---- esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 ! echo "configure:2018: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then *************** *** 1864,1868 **** LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" --- 2034,2038 ---- ; return 0; } EOF ! if { (eval echo configure:2037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" *************** *** 1898,1902 **** echo $ac_n "checking lex output file root""... $ac_c" 1>&6 ! echo "configure:1901: checking lex output file root" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 2057,2061 ---- echo $ac_n "checking lex output file root""... $ac_c" 1>&6 ! echo "configure:2060: checking lex output file root" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 1919,1923 **** echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6 ! echo "configure:1922: checking whether yytext is a pointer" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 2078,2082 ---- echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6 ! echo "configure:2081: checking whether yytext is a pointer" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 1931,1935 **** LIBS="$LIBS $LEXLIB" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_prog_lex_yytext_pointer=yes --- 2097,2101 ---- ; return 0; } EOF ! if { (eval echo configure:2100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_prog_lex_yytext_pointer=yes *************** *** 1961,1965 **** echo $ac_n "checking for main in -lfl""... $ac_c" 1>&6 ! echo "configure:1964: checking for main in -lfl" >&5 ac_lib_var=`echo fl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then --- 2120,2124 ---- echo $ac_n "checking for main in -lfl""... $ac_c" 1>&6 ! echo "configure:2123: checking for main in -lfl" >&5 ac_lib_var=`echo fl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then *************** *** 1969,1973 **** LIBS="-lfl $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" --- 2135,2139 ---- ; return 0; } EOF ! if { (eval echo configure:2138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" *************** *** 2007,2016 **** do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:2010: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:2169: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" --- 2194,2198 ---- ; return 0; } EOF ! if { (eval echo configure:2197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" *************** *** 2063,2072 **** echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 ! echo "configure:2066: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < --- 2222,2231 ---- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 ! echo "configure:2225: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < *************** *** 2076,2080 **** EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:2079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then --- 2235,2239 ---- EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:2238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then *************** *** 2093,2097 **** # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < --- 2252,2256 ---- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < *************** *** 2111,2115 **** # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < --- 2270,2274 ---- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < *************** *** 2132,2136 **** else cat > conftest.$ac_ext < --- 2291,2295 ---- else cat > conftest.$ac_ext < *************** *** 2143,2147 **** EOF ! if { (eval echo configure:2146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : --- 2302,2306 ---- EOF ! if { (eval echo configure:2305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : *************** *** 2170,2184 **** ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:2173: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:2183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then --- 2329,2343 ---- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:2332: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:2342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then *************** *** 2208,2217 **** echo $ac_n "checking for working const""... $ac_c" 1>&6 ! echo "configure:2211: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:2370: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes --- 2421,2425 ---- ; return 0; } EOF ! if { (eval echo configure:2424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes *************** *** 2286,2295 **** do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:2289: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:2448: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" --- 2473,2477 ---- ; return 0; } EOF ! if { (eval echo configure:2476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" *************** *** 2344,2353 **** do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:2347: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:2506: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" --- 2531,2535 ---- ; return 0; } EOF ! if { (eval echo configure:2534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" *************** *** 2403,2407 **** set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2406: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 2562,2566 ---- set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2565: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 2444,2448 **** set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2447: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CPP2HTML'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 2603,2607 ---- set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2606: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CPP2HTML'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 2485,2489 **** set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2488: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GENGEN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 2644,2648 ---- set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:2647: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GENGEN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 diff -rc2P gengetopt-2.7/configure.in gengetopt-2.7.1/configure.in *** gengetopt-2.7/configure.in Sun Jun 30 23:43:35 2002 --- gengetopt-2.7.1/configure.in Tue Jul 16 20:45:49 2002 *************** *** 22,26 **** AM_CONFIG_HEADER(config.h) ! AM_INIT_AUTOMAKE(gengetopt,2.7) dnl directory for docs (html) --- 22,26 ---- AM_CONFIG_HEADER(config.h) ! AM_INIT_AUTOMAKE(gengetopt,2.7.1) dnl directory for docs (html) *************** *** 53,56 **** --- 53,62 ---- AC_ARG_ENABLE( warnings, [ --enable-warnings enable compiler warnings], AC_COMPILE_WARNINGS ) + dnl check for STL + AC_CXX_HAVE_STL + + dnl check for sstream.h + AC_CXX_HAVE_SSTREAM + dnl for executable extensions AC_EXEEXT *************** *** 107,110 **** --- 113,117 ---- AM_CONDITIONAL(NO_CPP2HTML, test -z "$ac_cv_path_CPP2HTML" ) AM_CONDITIONAL(NO_GENGEN, test -z "$ac_cv_path_GENGEN" ) + dnl AM_CONDITIONAL(NO_SSTREAM, test -z "$ac_cv_cxx_have_sstream" ) AC_OUTPUT([Makefile txtc.sh diff -rc2P gengetopt-2.7/doc/Makefile.in gengetopt-2.7.1/doc/Makefile.in *** gengetopt-2.7/doc/Makefile.in Mon Jul 1 00:17:39 2002 --- gengetopt-2.7.1/doc/Makefile.in Sun Jul 21 16:37:34 2002 *************** *** 1,5 **** ! # Makefile.in generated automatically by automake 1.4 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,5 ---- ! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 187,192 **** DATA = $(gengetoptdoc_DATA) $(gengetoptexamples_DATA) ! DIST_COMMON = Makefile.am Makefile.in gengetopt.1.in gengetopt.html.in \ ! mdate-sh texinfo.tex --- 187,191 ---- DATA = $(gengetoptdoc_DATA) $(gengetoptexamples_DATA) ! DIST_COMMON = Makefile.am Makefile.in gengetopt.1.in gengetopt.html.in *************** *** 355,359 **** d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ --- 354,358 ---- d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ diff -rc2P gengetopt-2.7/doc/cmdline1.c gengetopt-2.7.1/doc/cmdline1.c *** gengetopt-2.7/doc/cmdline1.c Mon Jul 1 00:06:47 2002 --- gengetopt-2.7.1/doc/cmdline1.c Sun Jul 21 16:37:19 2002 *************** *** 1,4 **** /* ! File autogenerated by gengetopt version 2.7 generated with the following command: ../src/gengetopt -isample1.ggo -Fcmdline1 --long-help -u --- 1,4 ---- /* ! File autogenerated by gengetopt version 2.7.1 generated with the following command: ../src/gengetopt -isample1.ggo -Fcmdline1 --long-help -u diff -rc2P gengetopt-2.7/doc/cmdline1.c.html gengetopt-2.7.1/doc/cmdline1.c.html *** gengetopt-2.7/doc/cmdline1.c.html Mon Jul 1 00:06:47 2002 --- gengetopt-2.7.1/doc/cmdline1.c.html Sun Jul 21 16:37:19 2002 *************** *** 14,18 **** /* ! File autogenerated by gengetopt version 2.7 generated with the following command: ../src/gengetopt -isample1.ggo -Fcmdline1 --long-help -u --- 14,18 ---- /* ! File autogenerated by gengetopt version 2.7.1 generated with the following command: ../src/gengetopt -isample1.ggo -Fcmdline1 --long-help -u diff -rc2P gengetopt-2.7/doc/cmdline1.h gengetopt-2.7.1/doc/cmdline1.h *** gengetopt-2.7/doc/cmdline1.h Mon Jul 1 00:06:47 2002 --- gengetopt-2.7.1/doc/cmdline1.h Sun Jul 21 16:37:19 2002 *************** *** 1,5 **** /* cmdline1.h */ ! /* File autogenerated by gengetopt version 2.7 */ #ifndef _cmdline1_h --- 1,5 ---- /* cmdline1.h */ ! /* File autogenerated by gengetopt version 2.7.1 */ #ifndef _cmdline1_h diff -rc2P gengetopt-2.7/doc/cmdline2.c gengetopt-2.7.1/doc/cmdline2.c *** gengetopt-2.7/doc/cmdline2.c Mon Jul 1 00:06:47 2002 --- gengetopt-2.7.1/doc/cmdline2.c Sun Jul 21 16:37:19 2002 *************** *** 1,4 **** /* ! File autogenerated by gengetopt version 2.7 generated with the following command: ../src/gengetopt --input=sample2.ggo --func-name=my_cmdline_parser --file-name=cmdline2 --unamed-opts --no-handle-help --no-handle-version --- 1,4 ---- /* ! File autogenerated by gengetopt version 2.7.1 generated with the following command: ../src/gengetopt --input=sample2.ggo --func-name=my_cmdline_parser --file-name=cmdline2 --unamed-opts --no-handle-help --no-handle-version diff -rc2P gengetopt-2.7/doc/cmdline2.h gengetopt-2.7.1/doc/cmdline2.h *** gengetopt-2.7/doc/cmdline2.h Mon Jul 1 00:06:47 2002 --- gengetopt-2.7.1/doc/cmdline2.h Sun Jul 21 16:37:19 2002 *************** *** 1,5 **** /* cmdline2.h */ ! /* File autogenerated by gengetopt version 2.7 */ #ifndef _cmdline2_h --- 1,5 ---- /* cmdline2.h */ ! /* File autogenerated by gengetopt version 2.7.1 */ #ifndef _cmdline2_h diff -rc2P gengetopt-2.7/doc/gengetopt.html gengetopt-2.7.1/doc/gengetopt.html *** gengetopt-2.7/doc/gengetopt.html Sun Jun 30 23:53:46 2002 --- gengetopt-2.7.1/doc/gengetopt.html Sun Jul 21 16:08:41 2002 *************** *** 3,7 **** ! Gengetopt - GNU Project - Free Software Foundation (FSF) --- 3,7 ---- ! Gengetopt - GNU Project - Free Software Foundation (FSF) *************** *** 9,14 ****

! GNU Gengetopt 2.7

! June 30th, 2002

This program generates a C function that uses getopt_long function to parse the command line options, to validate them and fills a struct. --- 9,14 ----

! GNU Gengetopt 2.7.1

! July 20th, 2002

This program generates a C function that uses getopt_long function to parse the command line options, to validate them and fills a struct. *************** *** 41,45 **** or from one of its mirrors (see http://www.gnu.org/prep/ftp.html).

I do not distribute Windows binaries anymore; since, they can be easily ! built by using Cygnus C/C++ compiler, available at http://www.cygnus.com/. However, if you don't feel like downloading such compiler, you can request such binaries directly to me, by e-mail (bettini@gnu.org) --- 41,45 ---- or from one of its mirrors (see http://www.gnu.org/prep/ftp.html).

I do not distribute Windows binaries anymore; since, they can be easily ! built by using Cygnus C/C++ compiler, available at http://www.cygwin.com/. However, if you don't feel like downloading such compiler, you can request such binaries directly to me, by e-mail (bettini@gnu.org) *************** *** 53,130 **** (see below for patching from a previous version). !

! Changes in this release

! !
    !
  • ! Basically this is a maintenance release: C++ is now used for developing ! Gengetopt and in particular my new tool Gengen (http://www.lorenzobettini.it/software/gengen/) ! is used for automatically generating the code that generates the command ! line parser.
    • !

! Changes in release 2.6

  • ! fixed documentation (thanks to Francesco Potorti <pot@gnu.org>)
    • ! !
  • ! function names and names used in #ifndef directives in generated sources ! are canonized, thus avoiding errors by the compiler (notified by Francesco ! Potorti and Alexey Mahotkin <alexm@hsys.msk.ru>)
    • ! !
  • ! fixed line number when reporting an error in a .ggo file, and '\n' is no ! longer needed at the end of a .ggo file (notified by Francesco Potorti)
    • ! !
  • ! in the generated parser use HAVE_STRDUP to check whether the standard strdup ! function can be used, and use EXIT_SUCCESS and EXIT_FAILURE for exit ! (suggested ! by Frans E. van Dorsselaer <frans@biabv.com>)
    • ! !
  • ! do not exit with error if an empty desc for an option is given (thanks ! to Excoffier Denis <Denis.Excoffier@ens.fr>)
    • ! !
  • ! fixed a bug in creation of string for the comment header in the generated ! sources (thanks to Xavier Trochu <xtrochu@yahoo.com>)
  • ! Added default values in options for integer and string options (with help ! of Ralf Zeise <Zeise@serving-gmbh.de>)

- Changes in release 2.5

- -
    -
  • - much more recent versions of getopt.h, getopt.c, getopt1.c - are provided (the previous ones were very very old!), that do not rely - on alloca anymore.
    • - -
  • - when a flag option is given the corresponding  _given variable - is set (bug fixed by Guillaume Chazarain  <booh@altern.org>).
    • - -
  • - Fixed documentation of sample1, as suggested by Lutz Maibaum <lutz@gold.cchem.berkeley.edu>.
    • - -
  • - Avoid a warning due to generated gengetopt_strdup (thanks to Brian - Minard <bminard@flatfoot.ca>)
    • - -
  • - the generated print_help function use a different printf for every - option, thus avoiding a single printf with a possible very huge string - (thanks to Herbert Thoma <tma@iis.fhg.de>)
    • -
- see also NEWS file and ChangeLog - for the complete list of changes between versions (also summarized in old_changes.html). -

Installation

See the file INSTALL for detailed building and installation --- 53,79 ---- (see below for patching from a previous version). !

! Anonymous CVS Access

! This project's CVS repository can be checked out through anonymous (pserver) ! CVS with the following instruction set. When prompted for a password for ! anoncvs, simply press the Enter key. ! 
cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/gengetopt login
+ 
cvs -z3 -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/gengetopt co gengetopt
+ Further instructions can be found at the address: http://savannah.gnu.org/projects/gengetopt.

! Changes in this release

  • ! see NEWS file for a summary of new features in this ! release and
  • ! see ChangeLog for the complete list of changes ! sources

Installation

See the file INSTALL for detailed building and installation *************** *** 199,207 **** lex); anyway configuration phase can discover if this library is missing and in that case it sets the program to link with a source file I provide. ! This ! hack works for flex: I don't know about lex generated scanners. But, again, ! this is a problem only if you develop gengetopt and you use lex.

Should you want to act on the generated code you may want to download ! Gengen that speeds up this part (http://www.lorenzobettini.it/software/gengen/).

Patching from a previous --- 148,156 ---- lex); anyway configuration phase can discover if this library is missing and in that case it sets the program to link with a source file I provide. ! This hack works for flex: I don't know about lex generated scanners. But, ! again, this is a problem only if you develop gengetopt and you use lex.

Should you want to act on the generated code you may want to download ! Gengen ! that speeds up this part (http://www.lorenzobettini.it/software/gengen/).

Patching from a previous *************** *** 473,477 **** This is the output of gengetopt --help: 
$ gengetopt --help
! gengetopt 2.7
  
  Purpose:
--- 422,426 ----
  This is the output of gengetopt --help:
  
$ gengetopt --help
! gengetopt 2.7.1
  
  Purpose:
***************
*** 523,527 ****
  
  You may have already guessed it: gengetopt uses
! gengetopt itself for command line options, and this is its specification
  file:
  
 
--- 472,477 ----
  
  You may have already guessed it: gengetopt uses
! gengetopt
! itself for command line options, and this is its specification
  file:
  
 
***************
*** 586,593 ****
  
  Lorenzo Bettini
! 
http://w3.newnet.it/bettini 
! or
! 
http://infostud.dsi.unifi.it/~bettini
! (very fast if you're in University)
  
<bettini@gnu.org>.
  
--- 536,540 ----
  
  Lorenzo Bettini
! 
http://www.lorenzobettini.it
  
<bettini@gnu.org>.
  
diff -rc2P gengetopt-2.7/doc/gengetopt.html.in gengetopt-2.7.1/doc/gengetopt.html.in
*** gengetopt-2.7/doc/gengetopt.html.in	Sun Jun 30 23:53:36 2002
--- gengetopt-2.7.1/doc/gengetopt.html.in	Sun Jul 21 16:08:33 2002
***************
*** 3,7 ****
  
     
!    
     Gengetopt - GNU Project - Free Software Foundation (FSF)
  
--- 3,7 ----
  
     
!    
     Gengetopt - GNU Project - Free Software Foundation (FSF)
  
***************
*** 10,14 ****
  

  GNU Gengetopt @VERSION@

! June 30th, 2002
  
This program generates a C function that uses getopt_long function
  to parse the command line options, to validate them and fills a struct.
--- 10,14 ----
  

  GNU Gengetopt @VERSION@

! July 20th, 2002
  
This program generates a C function that uses getopt_long function
  to parse the command line options, to validate them and fills a struct.
***************
*** 41,45 ****
  or from one of its mirrors (see http://www.gnu.org/prep/ftp.html).
  
I do not distribute Windows binaries anymore; since, they can be easily
! built by using Cygnus C/C++ compiler, available at http://www.cygnus.com/.
  However, if you don't feel like downloading such compiler, you can request
  such binaries directly to me, by e-mail (bettini@gnu.org)
--- 41,45 ----
  or from one of its mirrors (see http://www.gnu.org/prep/ftp.html).
  
I do not distribute Windows binaries anymore; since, they can be easily
! built by using Cygnus C/C++ compiler, available at http://www.cygwin.com/.
  However, if you don't feel like downloading such compiler, you can request
  such binaries directly to me, by e-mail (bettini@gnu.org)
***************
*** 53,130 ****
  (see below for patching
  from a previous version).
! 

! Changes in this release

! 
! 
    
! 
  • 
! Basically this is a maintenance release: C++ is now used for developing
! Gengetopt and in particular my new tool Gengen (http://www.lorenzobettini.it/software/gengen/)
! is used for automatically generating the code that generates the command
! line parser.
    • 
! 

  
  

! Changes in release 2.6

  
  
    
  
  • 
! fixed documentation (thanks to Francesco Potorti <pot@gnu.org>)
    • 
! 
! 
  • 
! function names and names used in #ifndef directives in generated sources
! are canonized, thus avoiding errors by the compiler (notified by Francesco
! Potorti and Alexey Mahotkin <alexm@hsys.msk.ru>)
    • 
! 
! 
  • 
! fixed line number when reporting an error in a .ggo file, and '\n' is no
! longer needed at the end of a .ggo file (notified by Francesco Potorti)
    • 
! 
! 
  • 
! in the generated parser use HAVE_STRDUP to check whether the standard strdup
! function can be used, and use EXIT_SUCCESS and EXIT_FAILURE for exit
! (suggested
! by Frans E. van Dorsselaer <frans@biabv.com>)
    • 
! 
! 
  • 
! do not exit with error if an empty desc for an option is given (thanks
! to Excoffier Denis <Denis.Excoffier@ens.fr>)
    • 
! 
! 
  • 
! fixed a bug in creation of string for the comment header in the generated
! sources (thanks to Xavier Trochu <xtrochu@yahoo.com>)
    • 
  
  
  • 
! Added default values in options for integer and string options (with help
! of Ralf Zeise <Zeise@serving-gmbh.de>)
    • 
  

  
  

- Changes in release 2.5

- 
- 
    
- 
  • 
- much more recent versions of getopt.h, getopt.c, getopt1.c
- are provided (the previous ones were very very old!), that do not rely
- on alloca anymore.
    • 
- 
- 
  • 
- when a flag option is given the corresponding  _given variable
- is set (bug fixed by Guillaume Chazarain  <booh@altern.org>).
    • 
- 
- 
  • 
- Fixed documentation of sample1, as suggested by Lutz Maibaum <lutz@gold.cchem.berkeley.edu>.
    • 
- 
- 
  • 
- Avoid a warning due to generated gengetopt_strdup (thanks to Brian
- Minard <bminard@flatfoot.ca>)
    • 
- 
- 
  • 
- the generated print_help function use a different printf for every
- option, thus avoiding a single printf with a possible very huge string
- (thanks to Herbert Thoma <tma@iis.fhg.de>)
    • 
- 

- see also NEWS file and ChangeLog
- for the complete list of changes between versions (also summarized in old_changes.html).
- 

  Installation

  See the file INSTALL for detailed building and installation
--- 53,79 ----
  (see below for patching
  from a previous version).
! 

! Anonymous CVS Access

! This project's CVS repository can be checked out through anonymous (pserver)
! CVS with the following instruction set. When prompted for a password for
! anoncvs, simply press the Enter key.
! 
cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/gengetopt login

  
+ 
cvs -z3 -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/gengetopt co gengetopt

+ Further instructions can be found at the address: http://savannah.gnu.org/projects/gengetopt.
  

! Changes in this release

  
  
    
  
  • 
! see NEWS file for a summary of new features in this
! release and
    • 
  
  
  • 
! see ChangeLog for the complete list of changes
! sources
    • 
  

  
  

  Installation

  See the file INSTALL for detailed building and installation
***************
*** 199,207 ****
  lex); anyway configuration phase can discover if this library is missing
  and in that case it sets the program to link with a source file I provide.
! This
! hack works for flex: I don't know about lex generated scanners. But, again,
! this is a problem only if you develop gengetopt and you use lex.
  
Should you want to act on the generated code you may want to download
! Gengen that speeds up this part (http://www.lorenzobettini.it/software/gengen/).
  

  Patching from a previous
--- 148,156 ----
  lex); anyway configuration phase can discover if this library is missing
  and in that case it sets the program to link with a source file I provide.
! This hack works for flex: I don't know about lex generated scanners. But,
! again, this is a problem only if you develop gengetopt and you use lex.
  
Should you want to act on the generated code you may want to download
! Gengen
! that speeds up this part (http://www.lorenzobettini.it/software/gengen/).
  

  Patching from a previous
***************
*** 523,527 ****
  
  You may have already guessed it: gengetopt uses
! gengetopt itself for command line options, and this is its specification
  file:
  
 
--- 472,477 ----
  
  You may have already guessed it: gengetopt uses
! gengetopt
! itself for command line options, and this is its specification
  file:
  
 
***************
*** 586,593 ****
  
  Lorenzo Bettini
! 
http://w3.newnet.it/bettini 
! or
! 
http://infostud.dsi.unifi.it/~bettini
! (very fast if you're in University)
  
<bettini@gnu.org>.
  
--- 536,540 ----
  
  Lorenzo Bettini
! 
http://www.lorenzobettini.it
  
<bettini@gnu.org>.
  
Only in gengetopt-2.7/doc: mdate-sh
Only in gengetopt-2.7/doc: texinfo.tex
diff -rc2P gengetopt-2.7/missing gengetopt-2.7.1/missing
*** gengetopt-2.7/missing	Thu Dec  7 16:42:17 2000
--- gengetopt-2.7.1/missing	Thu Feb 21 08:50:56 2002
***************
*** 1,5 ****
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
! # Copyright (C) 1996, 1997 Free Software Foundation, Inc.
  # Franc,ois Pinard , 1996.
  
--- 1,5 ----
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
! # Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc.
  # Franc,ois Pinard , 1996.
  
***************
*** 24,27 ****
--- 24,35 ----
  fi
  
+ # In the cases where this matters, `missing' is being run in the
+ # srcdir already.
+ if test -f configure.in; then
+   configure_ac=configure.ac
+ else
+   configure_ac=configure.in
+ fi
+ 
  case "$1" in
  
***************
*** 62,66 ****
      echo 1>&2 "\
  WARNING: \`$1' is missing on your system.  You should only need it if
!          you modified \`acinclude.m4' or \`configure.in'.  You might want
           to install the \`Automake' and \`Perl' packages.  Grab them from
           any GNU archive site."
--- 70,74 ----
      echo 1>&2 "\
  WARNING: \`$1' is missing on your system.  You should only need it if
!          you modified \`acinclude.m4' or \`$configure_ac'.  You might want
           to install the \`Automake' and \`Perl' packages.  Grab them from
           any GNU archive site."
***************
*** 71,75 ****
      echo 1>&2 "\
  WARNING: \`$1' is missing on your system.  You should only need it if
!          you modified \`configure.in'.  You might want to install the
           \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
           archive site."
--- 79,83 ----
      echo 1>&2 "\
  WARNING: \`$1' is missing on your system.  You should only need it if
!          you modified \`$configure_ac'.  You might want to install the
           \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
           archive site."
***************
*** 80,87 ****
      echo 1>&2 "\
  WARNING: \`$1' is missing on your system.  You should only need it if
!          you modified \`acconfig.h' or \`configure.in'.  You might want
           to install the \`Autoconf' and \`GNU m4' packages.  Grab them
           from any GNU archive site."
!     files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
      test -z "$files" && files="config.h"
      touch_files=
--- 88,95 ----
      echo 1>&2 "\
  WARNING: \`$1' is missing on your system.  You should only need it if
!          you modified \`acconfig.h' or \`$configure_ac'.  You might want
           to install the \`Autoconf' and \`GNU m4' packages.  Grab them
           from any GNU archive site."
!     files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' $configure_ac`
      test -z "$files" && files="config.h"
      touch_files=
***************
*** 99,103 ****
      echo 1>&2 "\
  WARNING: \`$1' is missing on your system.  You should only need it if
!          you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
           You might want to install the \`Automake' and \`Perl' packages.
           Grab them from any GNU archive site."
--- 107,111 ----
      echo 1>&2 "\
  WARNING: \`$1' is missing on your system.  You should only need it if
!          you modified \`Makefile.am', \`acinclude.m4' or \`$configure_ac'.
           You might want to install the \`Automake' and \`Perl' packages.
           Grab them from any GNU archive site."
diff -rc2P gengetopt-2.7/src/Makefile.am gengetopt-2.7.1/src/Makefile.am
*** gengetopt-2.7/src/Makefile.am	Mon Jul  1 00:15:16 2002
--- gengetopt-2.7.1/src/Makefile.am	Tue Jul 16 20:45:49 2002
***************
*** 19,23 ****
  SUBDIRS = includes skels
  
! INCLUDES = -I@top_srcdir@/src/includes -I@top_srcdir@/src/skels
  
  SUFFIXES = .text
--- 19,23 ----
  SUBDIRS = includes skels
  
! INCLUDES = -I@top_srcdir@/src/skels
  
  SUFFIXES = .text
diff -rc2P gengetopt-2.7/src/Makefile.in gengetopt-2.7.1/src/Makefile.in
*** gengetopt-2.7/src/Makefile.in	Mon Jul  1 00:17:37 2002
--- gengetopt-2.7.1/src/Makefile.in	Sun Jul 21 16:37:33 2002
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
***************
*** 96,100 ****
  SUBDIRS = includes skels
  
! INCLUDES = -I@top_srcdir@/src/includes -I@top_srcdir@/src/skels
  
  SUFFIXES = .text
--- 96,100 ----
  SUBDIRS = includes skels
  
! INCLUDES = -I@top_srcdir@/src/skels
  
  SUFFIXES = .text
***************
*** 286,290 ****
  	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
  	  rev="$$subdir $$rev"; \
! 	  test "$$subdir" = "." && dot_seen=yes; \
  	done; \
  	test "$$dot_seen" = "no" && rev=". $$rev"; \
--- 286,290 ----
  	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
  	  rev="$$subdir $$rev"; \
! 	  test "$$subdir" != "." || dot_seen=yes; \
  	done; \
  	test "$$dot_seen" = "no" && rev=". $$rev"; \
***************
*** 347,351 ****
  	  d=$(srcdir); \
  	  if test -d $$d/$$file; then \
! 	    cp -pr $$/$$file $(distdir)/$$file; \
  	  else \
  	    test -f $(distdir)/$$file \
--- 347,351 ----
  	  d=$(srcdir); \
  	  if test -d $$d/$$file; then \
! 	    cp -pr $$d/$$file $(distdir)/$$file; \
  	  else \
  	    test -f $(distdir)/$$file \
***************
*** 366,384 ****
  argsdef.o: argsdef.c
  cmdline.o: cmdline.c ../config.h cxxconfig.h getopt.h cmdline.h
- confparsergen.o: confparsergen.cc confparsergen.h \
- 	skels/config_parser_source.h ../config.h cxxconfig.h \
- 	ggo_options.h ggos.h
  gengetopt.o: gengetopt.cc ../config.h cxxconfig.h cmdline.h gengetopt.h \
! 	argsdef.h ggos.h global_opts.h my_sstream.h includes/sstream \
! 	gm.h skels/header.h skels/c_source.h
  gm.o: gm.cc argsdef.h global_opts.h ggo_options.h ggos.h ../config.h \
  	cxxconfig.h gm.h skels/header.h skels/c_source.h my_sstream.h \
! 	includes/sstream skels/string_opt_arg.h skels/int_opt_arg.h \
! 	skels/long_opt_arg.h skels/float_opt_arg.h skels/flag_opt_arg.h \
  	skels/required_option.h skels/generic_option.h \
  	skels/handle_help.h skels/handle_version.h \
  	skels/no_short_option.h skels/handle_unamed.h
  parser.o: parser.c argsdef.h gengetopt.h
! scanner.o: scanner.c argsdef.h parser.h
  yyerror.o: yyerror.c
  
--- 366,381 ----
  argsdef.o: argsdef.c
  cmdline.o: cmdline.c ../config.h cxxconfig.h getopt.h cmdline.h
  gengetopt.o: gengetopt.cc ../config.h cxxconfig.h cmdline.h gengetopt.h \
! 	argsdef.h ggos.h global_opts.h my_sstream.h gm.h skels/header.h \
! 	skels/c_source.h
  gm.o: gm.cc argsdef.h global_opts.h ggo_options.h ggos.h ../config.h \
  	cxxconfig.h gm.h skels/header.h skels/c_source.h my_sstream.h \
! 	skels/string_opt_arg.h skels/int_opt_arg.h skels/long_opt_arg.h \
! 	skels/float_opt_arg.h skels/flag_opt_arg.h \
  	skels/required_option.h skels/generic_option.h \
  	skels/handle_help.h skels/handle_version.h \
  	skels/no_short_option.h skels/handle_unamed.h
  parser.o: parser.c argsdef.h gengetopt.h
! scanner.o: scanner.c getopt.h argsdef.h parser.h
  yyerror.o: yyerror.c
  
diff -rc2P gengetopt-2.7/src/includes/Makefile.in gengetopt-2.7.1/src/includes/Makefile.in
*** gengetopt-2.7/src/includes/Makefile.in	Mon Jul  1 00:17:38 2002
--- gengetopt-2.7.1/src/includes/Makefile.in	Sun Jul 21 16:37:33 2002
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
***************
*** 107,111 ****
  	  d=$(srcdir); \
  	  if test -d $$d/$$file; then \
! 	    cp -pr $$/$$file $(distdir)/$$file; \
  	  else \
  	    test -f $(distdir)/$$file \
--- 107,111 ----
  	  d=$(srcdir); \
  	  if test -d $$d/$$file; then \
! 	    cp -pr $$d/$$file $(distdir)/$$file; \
  	  else \
  	    test -f $(distdir)/$$file \
diff -rc2P gengetopt-2.7/src/parser.c gengetopt-2.7.1/src/parser.c
*** gengetopt-2.7/src/parser.c	Mon Mar 11 21:04:21 2002
--- gengetopt-2.7.1/src/parser.c	Tue Jul 16 20:46:40 2002
***************
*** 1,21 ****
! 
! /*  A Bison parser, made from parser.y
!     by GNU Bison version 1.28  */
  
  #define YYBISON 1  /* Identify Bison output.  */
  
! #define	TOK_PACKAGE	257
! #define	TOK_VERSION	258
! #define	TOK_OPTION	259
! #define	TOK_YES	260
! #define	TOK_NO	261
! #define	TOK_FLAG	262
! #define	TOK_PURPOSE	263
! #define	TOK_ONOFF	264
! #define	TOK_STRING	265
! #define	TOK_DEFAULT	266
! #define	TOK_MLSTRING	267
! #define	TOK_CHAR	268
! #define	TOK_ARGTYPE	269
  
  #line 22 "parser.y"
--- 1,20 ----
! /* A Bison parser, made from parser.y
!    by GNU bison 1.32.  */
  
  #define YYBISON 1  /* Identify Bison output.  */
  
! # define	TOK_PACKAGE	257
! # define	TOK_VERSION	258
! # define	TOK_OPTION	259
! # define	TOK_YES	260
! # define	TOK_NO	261
! # define	TOK_FLAG	262
! # define	TOK_PURPOSE	263
! # define	TOK_ONOFF	264
! # define	TOK_STRING	265
! # define	TOK_DEFAULT	266
! # define	TOK_MLSTRING	267
! # define	TOK_CHAR	268
! # define	TOK_ARGTYPE	269
  
  #line 22 "parser.y"
***************
*** 44,47 ****
--- 43,47 ----
  
  #line 46 "parser.y"
+ #ifndef YYSTYPE
  typedef union {
  char * str;
***************
*** 49,59 ****
  int argtype;
  int bool;
! } YYSTYPE;
! #include 
! 
! #ifndef __cplusplus
! #ifndef __STDC__
! #define const
  #endif
  #endif
  
--- 49,57 ----
  int argtype;
  int bool;
! } yystype;
! # define YYSTYPE yystype
  #endif
+ #ifndef YYDEBUG
+ # define YYDEBUG 0
  #endif
  
***************
*** 64,161 ****
  #define	YYNTBASE	17
  
  #define YYTRANSLATE(x) ((unsigned)(x) <= 269 ? yytranslate[x] : 23)
  
! static const char yytranslate[] = {     0,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!     16,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!      2,     2,     2,     2,     2,     1,     3,     4,     5,     6,
!      7,     8,     9,    10,    11,    12,    13,    14,    15
  };
  
! #if YYDEBUG != 0
! static const short yyprhs[] = {     0,
!      0,     1,     4,     6,     8,    10,    12,    15,    18,    21,
!     24,    30,    37,    44,    52,    53
  };
! 
! static const short yyrhs[] = {    -1,
!     17,    21,     0,    11,     0,    13,     0,     6,     0,     7,
!      0,     3,    11,     0,     4,    11,     0,     9,    19,     0,
!      9,    18,     0,     5,    11,    14,    18,     7,     0,     5,
!     11,    14,    18,     8,    10,     0,     5,    11,    14,    18,
!     15,    20,     0,     5,    11,    14,    18,    15,    22,    20,
!      0,     0,    12,    16,    11,     0
  };
  
  #endif
  
! #if YYDEBUG != 0
! static const short yyrline[] = { 0,
!     75,    76,    80,    83,    87,    88,    92,    96,    99,   102,
!    104,   108,   112,   115,   134,   135
  };
  #endif
  
  
! #if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
  
! static const char * const yytname[] = {   "$","error","$undefined.","TOK_PACKAGE",
! "TOK_VERSION","TOK_OPTION","TOK_YES","TOK_NO","TOK_FLAG","TOK_PURPOSE","TOK_ONOFF",
! "TOK_STRING","TOK_DEFAULT","TOK_MLSTRING","TOK_CHAR","TOK_ARGTYPE","'='","input",
! "exp_str","exp_mlstr","exp_yesno","exp","def_value", NULL
  };
  #endif
  
! static const short yyr1[] = {     0,
!     17,    17,    18,    19,    20,    20,    21,    21,    21,    21,
!     21,    21,    21,    21,    22,    22
  };
  
! static const short yyr2[] = {     0,
!      0,     2,     1,     1,     1,     1,     2,     2,     2,     2,
!      5,     6,     6,     7,     0,     3
  };
  
! static const short yydefact[] = {     1,
!      0,     0,     0,     0,     0,     2,     7,     8,     0,     3,
!      4,    10,     9,     0,     0,    11,     0,     0,    12,     5,
!      6,     0,    13,     0,     0,    14,    16,     0,     0
  };
  
! static const short yydefgoto[] = {     1,
!     12,    13,    23,     6,    24
  };
  
! static const short yypact[] = {-32768,
!      0,    -3,     1,     6,     2,-32768,-32768,-32768,     5,-32768,
! -32768,-32768,-32768,     7,    -1,-32768,    10,     4,-32768,-32768,
! -32768,     8,-32768,    -5,    11,-32768,-32768,    21,-32768
  };
  
! static const short yypgoto[] = {-32768,
!      9,-32768,     3,-32768,-32768
  };
  
--- 62,179 ----
  #define	YYNTBASE	17
  
+ /* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
  #define YYTRANSLATE(x) ((unsigned)(x) <= 269 ? yytranslate[x] : 23)
  
! /* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
! static const char yytranslate[] =
! {
!        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,    16,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
!        2,     2,     2,     2,     2,     2,     1,     3,     4,     5,
!        6,     7,     8,     9,    10,    11,    12,    13,    14,    15
  };
  
! #if YYDEBUG
! static const short yyprhs[] =
! {
!        0,     0,     1,     4,     6,     8,    10,    12,    15,    18,
!       21,    24,    30,    37,    44,    52,    53
  };
! static const short yyrhs[] =
! {
!       -1,    17,    21,     0,    11,     0,    13,     0,     6,     0,
!        7,     0,     3,    11,     0,     4,    11,     0,     9,    19,
!        0,     9,    18,     0,     5,    11,    14,    18,     7,     0,
!        5,    11,    14,    18,     8,    10,     0,     5,    11,    14,
!       18,    15,    20,     0,     5,    11,    14,    18,    15,    22,
!       20,     0,     0,    12,    16,    11,     0
  };
  
  #endif
  
! #if YYDEBUG
! /* YYRLINE[YYN] -- source line where rule number YYN was defined. */
! static const short yyrline[] =
! {
!        0,    75,    76,    80,    83,    87,    88,    92,    96,    99,
!      102,   104,   108,   112,   115,   134,   135
  };
  #endif
  
  
! #if (YYDEBUG) || defined YYERROR_VERBOSE
  
! /* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
! static const char *const yytname[] =
! {
!   "$", "error", "$undefined.", "TOK_PACKAGE", "TOK_VERSION", "TOK_OPTION", 
!   "TOK_YES", "TOK_NO", "TOK_FLAG", "TOK_PURPOSE", "TOK_ONOFF", 
!   "TOK_STRING", "TOK_DEFAULT", "TOK_MLSTRING", "TOK_CHAR", "TOK_ARGTYPE", 
!   "'='", "input", "exp_str", "exp_mlstr", "exp_yesno", "exp", "def_value", NULL
  };
  #endif
  
! /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
! static const short yyr1[] =
! {
!        0,    17,    17,    18,    19,    20,    20,    21,    21,    21,
!       21,    21,    21,    21,    21,    22,    22
  };
  
! /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
! static const short yyr2[] =
! {
!        0,     0,     2,     1,     1,     1,     1,     2,     2,     2,
!        2,     5,     6,     6,     7,     0,     3
  };
  
! /* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
!    doesn't specify something else to do.  Zero means the default is an
!    error. */
! static const short yydefact[] =
! {
!        1,     0,     0,     0,     0,     0,     2,     7,     8,     0,
!        3,     4,    10,     9,     0,     0,    11,     0,     0,    12,
!        5,     6,     0,    13,     0,     0,    14,    16,     0,     0
  };
  
! static const short yydefgoto[] =
! {
!        1,    12,    13,    23,     6,    24
  };
  
! static const short yypact[] =
! {
!   -32768,     0,    -3,     1,     6,     2,-32768,-32768,-32768,     5,
!   -32768,-32768,-32768,-32768,     7,    -1,-32768,    10,     4,-32768,
!   -32768,-32768,     8,-32768,    -5,    11,-32768,-32768,    21,-32768
  };
  
! static const short yypgoto[] =
! {
!   -32768,     9,-32768,     3,-32768,-32768
  };
  
***************
*** 164,184 ****
  
  
! static const short yytable[] = {    28,
!     20,    21,     2,     3,     4,    16,    17,     7,     5,    20,
!     21,     8,    10,    18,    11,    22,     9,    10,    14,    19,
!     29,    27,    15,    25,     0,     0,    26
  };
  
! static const short yycheck[] = {     0,
!      6,     7,     3,     4,     5,     7,     8,    11,     9,     6,
!      7,    11,    11,    15,    13,    12,    11,    11,    14,    10,
!      0,    11,    14,    16,    -1,    -1,    24
  };
  /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
! #line 3 "/usr/lib/bison.simple"
! /* This file comes from bison-1.28.  */
  
  /* Skeleton output parser for bison,
!    Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 182,203 ----
  
  
! static const short yytable[] =
! {
!       28,    20,    21,     2,     3,     4,    16,    17,     7,     5,
!       20,    21,     8,    10,    18,    11,    22,     9,    10,    14,
!       19,    29,    27,    15,    25,     0,     0,    26
  };
  
! static const short yycheck[] =
! {
!        0,     6,     7,     3,     4,     5,     7,     8,    11,     9,
!        6,     7,    11,    11,    15,    13,    12,    11,    11,    14,
!       10,     0,    11,    14,    16,    -1,    -1,    24
  };
  /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
! #line 3 "/usr/share/bison/bison.simple"
  
  /* Skeleton output parser for bison,
!    Copyright (C) 1984, 1989, 1990, 2000, 2001 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
***************
*** 202,261 ****
     in version 1.24 of Bison.  */
  
! /* This is the parser code that is written into each bison parser
!   when the %semantic_parser declaration is not specified in the grammar.
!   It was written by Richard Stallman by simplifying the hairy parser
!   used when %semantic_parser is specified.  */
! 
! #ifndef YYSTACK_USE_ALLOCA
! #ifdef alloca
! #define YYSTACK_USE_ALLOCA
! #else /* alloca not defined */
! #ifdef __GNUC__
! #define YYSTACK_USE_ALLOCA
! #define alloca __builtin_alloca
! #else /* not GNU C.  */
! #if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
! #define YYSTACK_USE_ALLOCA
! #include 
! #else /* not sparc */
! /* We think this test detects Watcom and Microsoft C.  */
! /* This used to test MSDOS, but that is a bad idea
!    since that symbol is in the user namespace.  */
! #if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
! #if 0 /* No need for malloc.h, which pollutes the namespace;
! 	 instead, just don't use alloca.  */
! #include 
! #endif
! #else /* not MSDOS, or __TURBOC__ */
! #if defined(_AIX)
! /* I don't know what this was needed for, but it pollutes the namespace.
!    So I turned it off.   rms, 2 May 1997.  */
! /* #include   */
!  #pragma alloca
! #define YYSTACK_USE_ALLOCA
! #else /* not MSDOS, or __TURBOC__, or _AIX */
! #if 0
! #ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
! 		 and on HPUX 10.  Eventually we can turn this on.  */
! #define YYSTACK_USE_ALLOCA
! #define alloca __builtin_alloca
! #endif /* __hpux */
! #endif
! #endif /* not _AIX */
! #endif /* not MSDOS, or __TURBOC__ */
! #endif /* not sparc */
! #endif /* not GNU C */
! #endif /* alloca not defined */
! #endif /* YYSTACK_USE_ALLOCA not defined */
  
! #ifdef YYSTACK_USE_ALLOCA
! #define YYSTACK_ALLOC alloca
  #else
! #define YYSTACK_ALLOC malloc
  #endif
  
! /* Note: there must be only one dollar sign in this file.
!    It is replaced by the list of actions, each action
!    as one case of the switch.  */
  
  #define yyerrok		(yyerrstatus = 0)
--- 221,344 ----
     in version 1.24 of Bison.  */
  
! /* This is the parser code that is written into each bison parser when
!    the %semantic_parser declaration is not specified in the grammar.
!    It was written by Richard Stallman by simplifying the hairy parser
!    used when %semantic_parser is specified.  */
! 
! /* All symbols defined below should begin with yy or YY, to avoid
!    infringing on user name space.  This should be done even for local
!    variables, as they might otherwise be expanded by user macros.
!    There are some unavoidable exceptions within include files to
!    define necessary library symbols; they are noted "INFRINGES ON
!    USER NAME SPACE" below.  */
  
! #ifdef __cplusplus
! # define YYSTD(x) std::x
  #else
! # define YYSTD(x) x
  #endif
  
! #if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
! 
! /* The parser invokes alloca or malloc; define the necessary symbols.  */
! 
! # if YYSTACK_USE_ALLOCA
! #  define YYSTACK_ALLOC alloca
! #  define YYSIZE_T YYSTD (size_t)
! # else
! #  ifndef YYSTACK_USE_ALLOCA
! #   if defined (alloca) || defined (_ALLOCA_H)
! #    define YYSTACK_ALLOC alloca
! #    define YYSIZE_T YYSTD (size_t)
! #   else
! #    ifdef __GNUC__
! #     define YYSTACK_ALLOC __builtin_alloca
! #    endif
! #   endif
! #  endif
! # endif
! 
! # ifdef YYSTACK_ALLOC
!    /* Pacify GCC's `empty if-body' warning. */
! #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
! # else
! #  ifdef __cplusplus
! #   include  /* INFRINGES ON USER NAME SPACE */
! #   define YYSIZE_T std::size_t
! #  else
! #   ifdef __STDC__
! #    include  /* INFRINGES ON USER NAME SPACE */
! #    define YYSIZE_T size_t
! #   endif
! #  endif
! #  define YYSTACK_ALLOC YYSTD (malloc)
! #  define YYSTACK_FREE YYSTD (free)
! # endif
! 
! /* A type that is properly aligned for any stack member.  */
! union yyalloc
! {
!   short yyss;
!   YYSTYPE yyvs;
! # if YYLSP_NEEDED
!   YYLTYPE yyls;
! # endif
! };
! 
! /* The size of the maximum gap between one aligned stack and the next.  */
! # define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
! 
! /* The size of an array large to enough to hold all stacks, each with
!    N elements.  */
! # if YYLSP_NEEDED
! #  define YYSTACK_BYTES(N) \
!      ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE))	\
!       + 2 * YYSTACK_GAP_MAX)
! # else
! #  define YYSTACK_BYTES(N) \
!      ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
!       + YYSTACK_GAP_MAX)
! # endif
! 
! /* Relocate the TYPE STACK from its old location to the new one.  The
!    local variables YYSIZE and YYSTACKSIZE give the old and new number of
!    elements in the stack, and YYPTR gives the new location of the
!    stack.  Advance YYPTR to a properly aligned location for the next
!    stack.  */
! # define YYSTACK_RELOCATE(Type, Stack)					\
!     do									\
!       {									\
! 	YYSIZE_T yynewbytes;						\
! 	yymemcpy ((char *) yyptr, (char *) (Stack),			\
! 		  yysize * (YYSIZE_T) sizeof (Type));			\
! 	Stack = &yyptr->Stack;						\
! 	yynewbytes = yystacksize * sizeof (Type) + YYSTACK_GAP_MAX;	\
! 	yyptr += yynewbytes / sizeof (*yyptr);				\
!       }									\
!     while (0)
! 
! #endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
! 
! 
! #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
! # define YYSIZE_T __SIZE_TYPE__
! #endif
! #if ! defined (YYSIZE_T) && defined (size_t)
! # define YYSIZE_T size_t
! #endif
! #if ! defined (YYSIZE_T)
! # ifdef __cplusplus
! #  include  /* INFRINGES ON USER NAME SPACE */
! #  define YYSIZE_T std::size_t
! # else
! #  ifdef __STDC__
! #   include  /* INFRINGES ON USER NAME SPACE */
! #   define YYSIZE_T size_t
! #  endif
! # endif
! #endif
! #if ! defined (YYSIZE_T)
! # define YYSIZE_T unsigned int
! #endif
  
  #define yyerrok		(yyerrstatus = 0)
***************
*** 266,279 ****
  #define YYABORT 	goto yyabortlab
  #define YYERROR		goto yyerrlab1
! /* Like YYERROR except do call yyerror.
!    This remains here temporarily to ease the
!    transition to the new meaning of YYERROR, for GCC.
     Once GCC version 2 has supplanted version 1, this can go.  */
  #define YYFAIL		goto yyerrlab
  #define YYRECOVERING()  (!!yyerrstatus)
! #define YYBACKUP(token, value) \
  do								\
    if (yychar == YYEMPTY && yylen == 1)				\
!     { yychar = (token), yylval = (value);			\
        yychar1 = YYTRANSLATE (yychar);				\
        YYPOPSTACK;						\
--- 349,363 ----
  #define YYABORT 	goto yyabortlab
  #define YYERROR		goto yyerrlab1
! /* Like YYERROR except do call yyerror.  This remains here temporarily
!    to ease the transition to the new meaning of YYERROR, for GCC.
     Once GCC version 2 has supplanted version 1, this can go.  */
  #define YYFAIL		goto yyerrlab
  #define YYRECOVERING()  (!!yyerrstatus)
! #define YYBACKUP(Token, Value)					\
  do								\
    if (yychar == YYEMPTY && yylen == 1)				\
!     {								\
!       yychar = (Token);						\
!       yylval = (Value);						\
        yychar1 = YYTRANSLATE (yychar);				\
        YYPOPSTACK;						\
***************
*** 281,285 ****
      }								\
    else								\
!     { yyerror ("syntax error: cannot back up"); YYERROR; }	\
  while (0)
  
--- 365,372 ----
      }								\
    else								\
!     { 								\
!       yyerror ("syntax error: cannot back up");			\
!       YYERROR;							\
!     }								\
  while (0)
  
***************
*** 287,394 ****
  #define YYERRCODE	256
  
- #ifndef YYPURE
- #define YYLEX		yylex()
- #endif
- 
- #ifdef YYPURE
- #ifdef YYLSP_NEEDED
- #ifdef YYLEX_PARAM
- #define YYLEX		yylex(&yylval, &yylloc, YYLEX_PARAM)
- #else
- #define YYLEX		yylex(&yylval, &yylloc)
- #endif
- #else /* not YYLSP_NEEDED */
- #ifdef YYLEX_PARAM
- #define YYLEX		yylex(&yylval, YYLEX_PARAM)
- #else
- #define YYLEX		yylex(&yylval)
- #endif
- #endif /* not YYLSP_NEEDED */
- #endif
- 
- /* If nonreentrant, generate the variables here */
  
! #ifndef YYPURE
  
! int	yychar;			/*  the lookahead symbol		*/
! YYSTYPE	yylval;			/*  the semantic value of the		*/
! 				/*  lookahead symbol			*/
! 
! #ifdef YYLSP_NEEDED
! YYLTYPE yylloc;			/*  location data for the lookahead	*/
! 				/*  symbol				*/
  #endif
  
- int yynerrs;			/*  number of parse errors so far       */
- #endif  /* not YYPURE */
- 
- #if YYDEBUG != 0
- int yydebug;			/*  nonzero means print parse trace	*/
- /* Since this is uninitialized, it does not stop multiple parsers
-    from coexisting.  */
- #endif
  
! /*  YYINITDEPTH indicates the initial size of the parser's stacks	*/
  
  #ifndef	YYINITDEPTH
! #define YYINITDEPTH 200
  #endif
  
! /*  YYMAXDEPTH is the maximum size the stacks can grow to
!     (effective only if the built-in stack extension method is used).  */
  
  #if YYMAXDEPTH == 0
! #undef YYMAXDEPTH
  #endif
  
  #ifndef YYMAXDEPTH
! #define YYMAXDEPTH 10000
  #endif
  
! /* Define __yy_memcpy.  Note that the size argument
!    should be passed with type unsigned int, because that is what the non-GCC
!    definitions require.  With GCC, __builtin_memcpy takes an arg
!    of type size_t, but it can handle unsigned int.  */
! 
! #if __GNUC__ > 1		/* GNU C and GNU C++ define this.  */
! #define __yy_memcpy(TO,FROM,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
! #else				/* not GNU C or C++ */
! #ifndef __cplusplus
  
  /* This is the most reliable way to avoid incompatibilities
     in available built-in functions on various systems.  */
  static void
! __yy_memcpy (to, from, count)
!      char *to;
!      char *from;
!      unsigned int count;
! {
!   register char *f = from;
!   register char *t = to;
!   register int i = count;
  
!   while (i-- > 0)
!     *t++ = *f++;
  }
  
! #else /* __cplusplus */
  
! /* This is the most reliable way to avoid incompatibilities
!    in available built-in functions on various systems.  */
! static void
! __yy_memcpy (char *to, char *from, unsigned int count)
  {
!   register char *t = to;
!   register char *f = from;
!   register int i = count;
  
!   while (i-- > 0)
!     *t++ = *f++;
  }
  
! #endif
  #endif
  
! #line 217 "/usr/lib/bison.simple"
  
  /* The user can define YYPARSE_PARAM as the name of an argument to be passed
--- 374,540 ----
  #define YYERRCODE	256
  
  
! /* YYLLOC_DEFAULT -- Compute the default location (before the actions
!    are run).
  
!    When YYLLOC_DEFAULT is run, CURRENT is set the location of the
!    first token.  By default, to implement support for ranges, extend
!    its range to the last symbol.  */
! 
! #ifndef YYLLOC_DEFAULT
! # define YYLLOC_DEFAULT(Current, Rhs, N)       	\
!    Current.last_line   = Rhs[N].last_line;	\
!    Current.last_column = Rhs[N].last_column;
  #endif
  
  
! /* YYLEX -- calling `yylex' with the right arguments.  */
! 
! #if YYPURE
! # if YYLSP_NEEDED
! #  ifdef YYLEX_PARAM
! #   define YYLEX		yylex (&yylval, &yylloc, YYLEX_PARAM)
! #  else
! #   define YYLEX		yylex (&yylval, &yylloc)
! #  endif
! # else /* !YYLSP_NEEDED */
! #  ifdef YYLEX_PARAM
! #   define YYLEX		yylex (&yylval, YYLEX_PARAM)
! #  else
! #   define YYLEX		yylex (&yylval)
! #  endif
! # endif /* !YYLSP_NEEDED */
! #else /* !YYPURE */
! # define YYLEX			yylex ()
! #endif /* !YYPURE */
! 
! 
! /* Enable debugging if requested.  */
! #if YYDEBUG
! 
! # ifndef YYFPRINTF
! #  ifdef __cplusplus
! #   include   /* INFRINGES ON USER NAME SPACE */
! #  else
! #   include  /* INFRINGES ON USER NAME SPACE */
! #  endif
! #  define YYFPRINTF YYSTD (fprintf)
! # endif
! 
! # define YYDPRINTF(Args)			\
! do {						\
!   if (yydebug)					\
!     YYFPRINTF Args;				\
! } while (0)
! /* Nonzero means print parse trace. [The following comment makes no
!    sense to me.  Could someone clarify it?  --akim] Since this is
!    uninitialized, it does not stop multiple parsers from coexisting.
!    */
! int yydebug;
! #else /* !YYDEBUG */
! # define YYDPRINTF(Args)
! #endif /* !YYDEBUG */
  
+ /* YYINITDEPTH -- initial size of the parser's stacks.  */
  #ifndef	YYINITDEPTH
! # define YYINITDEPTH 200
  #endif
  
! /* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
!    if the built-in stack extension method is used).
! 
!    Do not make this value too large; the results are undefined if
!    SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
!    evaluated with infinite-precision integer arithmetic.  */
  
  #if YYMAXDEPTH == 0
! # undef YYMAXDEPTH
  #endif
  
  #ifndef YYMAXDEPTH
! # define YYMAXDEPTH 10000
  #endif
  
! #if ! defined (yyoverflow) && ! defined (yymemcpy)
! # if __GNUC__ > 1		/* GNU C and GNU C++ define this.  */
! #  define yymemcpy __builtin_memcpy
! # else				/* not GNU C or C++ */
  
  /* This is the most reliable way to avoid incompatibilities
     in available built-in functions on various systems.  */
  static void
! #  if defined (__STDC__) || defined (__cplusplus)
! yymemcpy (char *yyto, const char *yyfrom, YYSIZE_T yycount)
! #  else
! yymemcpy (yyto, yyfrom, yycount)
!      char *yyto;
!      const char *yyfrom;
!      YYSIZE_T yycount;
! #  endif
! {
!   register const char *yyf = yyfrom;
!   register char *yyt = yyto;
!   register YYSIZE_T yyi = yycount;
  
!   while (yyi-- != 0)
!     *yyt++ = *yyf++;
  }
+ # endif
+ #endif
  
! #ifdef YYERROR_VERBOSE
  
! # ifndef yystrlen
! #  if defined (__GLIBC__) && defined (_STRING_H)
! #   define yystrlen strlen
! #  else
! /* Return the length of YYSTR.  */
! static YYSIZE_T
! #   if defined (__STDC__) || defined (__cplusplus)
! yystrlen (const char *yystr)
! #   else
! yystrlen (yystr)
!      const char *yystr;
! #   endif
  {
!   register const char *yys = yystr;
  
!   while (*yys++ != '\0')
!     continue;
! 
!   return yys - yystr - 1;
  }
+ #  endif
+ # endif
  
! # ifndef yystpcpy
! #  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
! #   define yystpcpy stpcpy
! #  else
! /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
!    YYDEST.  */
! static char *
! #   if defined (__STDC__) || defined (__cplusplus)
! yystpcpy (char *yydest, const char *yysrc)
! #   else
! yystpcpy (yydest, yysrc)
!      char *yydest;
!      const char *yysrc;
! #   endif
! {
!   register char *yyd = yydest;
!   register const char *yys = yysrc;
! 
!   while ((*yyd++ = *yys++) != '\0')
!     continue;
! 
!   return yyd - 1;
! }
! #  endif
! # endif
  #endif
  
! #line 341 "/usr/share/bison/bison.simple"
! 
  
  /* The user can define YYPARSE_PARAM as the name of an argument to be passed
***************
*** 399,472 ****
  
  #ifdef YYPARSE_PARAM
! #ifdef __cplusplus
! #define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
! #define YYPARSE_PARAM_DECL
! #else /* not __cplusplus */
! #define YYPARSE_PARAM_ARG YYPARSE_PARAM
! #define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
! #endif /* not __cplusplus */
! #else /* not YYPARSE_PARAM */
! #define YYPARSE_PARAM_ARG
! #define YYPARSE_PARAM_DECL
! #endif /* not YYPARSE_PARAM */
  
  /* Prevent warning if -Wstrict-prototypes.  */
  #ifdef __GNUC__
! #ifdef YYPARSE_PARAM
  int yyparse (void *);
! #else
  int yyparse (void);
  #endif
  #endif
  
  int
! yyparse(YYPARSE_PARAM_ARG)
       YYPARSE_PARAM_DECL
  {
    register int yystate;
    register int yyn;
    register short *yyssp;
-   register YYSTYPE *yyvsp;
-   int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
-   int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
  
!   short	yyssa[YYINITDEPTH];	/*  the state stack			*/
!   YYSTYPE yyvsa[YYINITDEPTH];	/*  the semantic value stack		*/
! 
!   short *yyss = yyssa;		/*  refer to the stacks thru separate pointers */
!   YYSTYPE *yyvs = yyvsa;	/*  to allow yyoverflow to reallocate them elsewhere */
  
! #ifdef YYLSP_NEEDED
!   YYLTYPE yylsa[YYINITDEPTH];	/*  the location stack			*/
    YYLTYPE *yyls = yylsa;
    YYLTYPE *yylsp;
  
! #define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
  #else
! #define YYPOPSTACK   (yyvsp--, yyssp--)
  #endif
  
!   int yystacksize = YYINITDEPTH;
!   int yyfree_stacks = 0;
  
- #ifdef YYPURE
-   int yychar;
-   YYSTYPE yylval;
-   int yynerrs;
- #ifdef YYLSP_NEEDED
-   YYLTYPE yylloc;
- #endif
- #endif
  
!   YYSTYPE yyval;		/*  the variable used to return		*/
! 				/*  semantic values from the action	*/
! 				/*  routines				*/
  
    int yylen;
  
! #if YYDEBUG != 0
!   if (yydebug)
!     fprintf(stderr, "Starting parse\n");
! #endif
  
    yystate = 0;
--- 545,663 ----
  
  #ifdef YYPARSE_PARAM
! # ifdef __cplusplus
! #  define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
! #  define YYPARSE_PARAM_DECL
! # else /* !__cplusplus */
! #  define YYPARSE_PARAM_ARG YYPARSE_PARAM
! #  define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
! # endif /* !__cplusplus */
! #else /* !YYPARSE_PARAM */
! # define YYPARSE_PARAM_ARG
! # define YYPARSE_PARAM_DECL
! #endif /* !YYPARSE_PARAM */
  
  /* Prevent warning if -Wstrict-prototypes.  */
  #ifdef __GNUC__
! # ifdef YYPARSE_PARAM
  int yyparse (void *);
! # else
  int yyparse (void);
+ # endif
  #endif
+ 
+ /* YY_DECL_VARIABLES -- depending whether we use a pure parser,
+    variables are global, or local to YYPARSE.  */
+ 
+ #define YY_DECL_NON_LSP_VARIABLES			\
+ /* The lookahead symbol.  */				\
+ int yychar;						\
+ 							\
+ /* The semantic value of the lookahead symbol. */	\
+ YYSTYPE yylval;						\
+ 							\
+ /* Number of parse errors so far.  */			\
+ int yynerrs;
+ 
+ #if YYLSP_NEEDED
+ # define YY_DECL_VARIABLES			\
+ YY_DECL_NON_LSP_VARIABLES			\
+ 						\
+ /* Location data for the lookahead symbol.  */	\
+ YYLTYPE yylloc;
+ #else
+ # define YY_DECL_VARIABLES			\
+ YY_DECL_NON_LSP_VARIABLES
  #endif
  
+ 
+ /* If nonreentrant, generate the variables here. */
+ 
+ #if !YYPURE
+ YY_DECL_VARIABLES
+ #endif  /* !YYPURE */
+ 
  int
! yyparse (YYPARSE_PARAM_ARG)
       YYPARSE_PARAM_DECL
  {
+   /* If reentrant, generate the variables here. */
+ #if YYPURE
+   YY_DECL_VARIABLES
+ #endif  /* !YYPURE */
+ 
    register int yystate;
    register int yyn;
+   int yyresult;
+   /* Number of tokens to shift before error messages enabled.  */
+   int yyerrstatus;
+   /* Lookahead token as an internal (translated) token number.  */
+   int yychar1 = 0;
+ 
+   /* Three stacks and their tools:
+      `yyss': related to states,
+      `yyvs': related to semantic values,
+      `yyls': related to locations.
+ 
+      Refer to the stacks thru separate pointers, to allow yyoverflow
+      to reallocate them elsewhere.  */
+ 
+   /* The state stack. */
+   short	yyssa[YYINITDEPTH];
+   short *yyss = yyssa;
    register short *yyssp;
  
!   /* The semantic value stack.  */
!   YYSTYPE yyvsa[YYINITDEPTH];
!   YYSTYPE *yyvs = yyvsa;
!   register YYSTYPE *yyvsp;
  
! #if YYLSP_NEEDED
!   /* The location stack.  */
!   YYLTYPE yylsa[YYINITDEPTH];
    YYLTYPE *yyls = yylsa;
    YYLTYPE *yylsp;
+ #endif
  
! #if YYLSP_NEEDED
! # define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
  #else
! # define YYPOPSTACK   (yyvsp--, yyssp--)
  #endif
  
!   YYSIZE_T yystacksize = YYINITDEPTH;
  
  
!   /* The variables used to return semantic value and location from the
!      action routines.  */
!   YYSTYPE yyval;
! #if YYLSP_NEEDED
!   YYLTYPE yyloc;
! #endif
  
+   /* When reducing, the number of symbols on the RHS of the reduced
+      rule. */
    int yylen;
  
!   YYDPRINTF ((stderr, "Starting parse\n"));
  
    yystate = 0;
***************
*** 480,575 ****
       The wasted elements are never initialized.  */
  
!   yyssp = yyss - 1;
    yyvsp = yyvs;
! #ifdef YYLSP_NEEDED
    yylsp = yyls;
  #endif
  
! /* Push a new state, which is found in  yystate  .  */
! /* In all cases, when you get here, the value and location stacks
!    have just been pushed. so pushing a state here evens the stacks.  */
! yynewstate:
  
!   *++yyssp = yystate;
  
    if (yyssp >= yyss + yystacksize - 1)
      {
-       /* Give user a chance to reallocate the stack */
-       /* Use copies of these so that the &'s don't force the real ones into memory. */
-       YYSTYPE *yyvs1 = yyvs;
-       short *yyss1 = yyss;
- #ifdef YYLSP_NEEDED
-       YYLTYPE *yyls1 = yyls;
- #endif
- 
        /* Get the current used size of the three stacks, in elements.  */
!       int size = yyssp - yyss + 1;
  
  #ifdef yyoverflow
!       /* Each stack pointer address is followed by the size of
! 	 the data in use in that stack, in bytes.  */
! #ifdef YYLSP_NEEDED
!       /* This used to be a conditional around just the two extra args,
! 	 but that might be undefined if yyoverflow is a macro.  */
!       yyoverflow("parser stack overflow",
! 		 &yyss1, size * sizeof (*yyssp),
! 		 &yyvs1, size * sizeof (*yyvsp),
! 		 &yyls1, size * sizeof (*yylsp),
! 		 &yystacksize);
! #else
!       yyoverflow("parser stack overflow",
! 		 &yyss1, size * sizeof (*yyssp),
! 		 &yyvs1, size * sizeof (*yyvsp),
! 		 &yystacksize);
! #endif
! 
!       yyss = yyss1; yyvs = yyvs1;
! #ifdef YYLSP_NEEDED
!       yyls = yyls1;
! #endif
  #else /* no yyoverflow */
        /* Extend the stack our own way.  */
        if (yystacksize >= YYMAXDEPTH)
! 	{
! 	  yyerror("parser stack overflow");
! 	  if (yyfree_stacks)
! 	    {
! 	      free (yyss);
! 	      free (yyvs);
! #ifdef YYLSP_NEEDED
! 	      free (yyls);
! #endif
! 	    }
! 	  return 2;
! 	}
        yystacksize *= 2;
        if (yystacksize > YYMAXDEPTH)
  	yystacksize = YYMAXDEPTH;
! #ifndef YYSTACK_USE_ALLOCA
!       yyfree_stacks = 1;
! #endif
!       yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
!       __yy_memcpy ((char *)yyss, (char *)yyss1,
! 		   size * (unsigned int) sizeof (*yyssp));
!       yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
!       __yy_memcpy ((char *)yyvs, (char *)yyvs1,
! 		   size * (unsigned int) sizeof (*yyvsp));
! #ifdef YYLSP_NEEDED
!       yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
!       __yy_memcpy ((char *)yyls, (char *)yyls1,
! 		   size * (unsigned int) sizeof (*yylsp));
! #endif
  #endif /* no yyoverflow */
  
!       yyssp = yyss + size - 1;
!       yyvsp = yyvs + size - 1;
! #ifdef YYLSP_NEEDED
!       yylsp = yyls + size - 1;
  #endif
  
! #if YYDEBUG != 0
!       if (yydebug)
! 	fprintf(stderr, "Stack size increased to %d\n", yystacksize);
! #endif
  
        if (yyssp >= yyss + yystacksize - 1)
--- 671,760 ----
       The wasted elements are never initialized.  */
  
!   yyssp = yyss;
    yyvsp = yyvs;
! #if YYLSP_NEEDED
    yylsp = yyls;
  #endif
+   goto yysetstate;
  
! /*------------------------------------------------------------.
! | yynewstate -- Push a new state, which is found in yystate.  |
! `------------------------------------------------------------*/
!  yynewstate:
!   /* In all cases, when you get here, the value and location stacks
!      have just been pushed. so pushing a state here evens the stacks.
!      */
!   yyssp++;
  
!  yysetstate:
!   *yyssp = yystate;
  
    if (yyssp >= yyss + yystacksize - 1)
      {
        /* Get the current used size of the three stacks, in elements.  */
!       YYSIZE_T yysize = yyssp - yyss + 1;
  
  #ifdef yyoverflow
!       {
! 	/* Give user a chance to reallocate the stack. Use copies of
! 	   these so that the &'s don't force the real ones into
! 	   memory.  */
! 	YYSTYPE *yyvs1 = yyvs;
! 	short *yyss1 = yyss;
! 
! 	/* Each stack pointer address is followed by the size of the
! 	   data in use in that stack, in bytes.  */
! # if YYLSP_NEEDED
! 	YYLTYPE *yyls1 = yyls;
! 	/* This used to be a conditional around just the two extra args,
! 	   but that might be undefined if yyoverflow is a macro.  */
! 	yyoverflow ("parser stack overflow",
! 		    &yyss1, yysize * sizeof (*yyssp),
! 		    &yyvs1, yysize * sizeof (*yyvsp),
! 		    &yyls1, yysize * sizeof (*yylsp),
! 		    &yystacksize);
! 	yyls = yyls1;
! # else
! 	yyoverflow ("parser stack overflow",
! 		    &yyss1, yysize * sizeof (*yyssp),
! 		    &yyvs1, yysize * sizeof (*yyvsp),
! 		    &yystacksize);
! # endif
! 	yyss = yyss1;
! 	yyvs = yyvs1;
!       }
  #else /* no yyoverflow */
        /* Extend the stack our own way.  */
        if (yystacksize >= YYMAXDEPTH)
! 	goto yyoverflowlab;
        yystacksize *= 2;
        if (yystacksize > YYMAXDEPTH)
  	yystacksize = YYMAXDEPTH;
! 
!       {
! 	short *yyss1 = yyss;
! 	union yyalloc *yyptr =
! 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
! 	if (! yyptr)
! 	  goto yyoverflowlab;
! 	YYSTACK_RELOCATE (short, yyss);
! 	YYSTACK_RELOCATE (YYSTYPE, yyvs);
! # if YYLSP_NEEDED
! 	YYSTACK_RELOCATE (YYLTYPE, yyls);
! # endif
! # undef YYSTACK_RELOCATE
! 	if (yyss1 != yyssa)
! 	  YYSTACK_FREE (yyss1);
!       }
  #endif /* no yyoverflow */
  
!       yyssp = yyss + yysize - 1;
!       yyvsp = yyvs + yysize - 1;
! #if YYLSP_NEEDED
!       yylsp = yyls + yysize - 1;
  #endif
  
!       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
! 		  (unsigned long int) yystacksize));
  
        if (yyssp >= yyss + yystacksize - 1)
***************
*** 577,587 ****
      }
  
! #if YYDEBUG != 0
!   if (yydebug)
!     fprintf(stderr, "Entering state %d\n", yystate);
! #endif
  
    goto yybackup;
!  yybackup:
  
  /* Do appropriate processing given the current state.  */
--- 762,774 ----
      }
  
!   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
  
    goto yybackup;
! 
! 
! /*-----------.
! | yybackup.  |
! `-----------*/
! yybackup:
  
  /* Do appropriate processing given the current state.  */
***************
*** 602,609 ****
    if (yychar == YYEMPTY)
      {
! #if YYDEBUG != 0
!       if (yydebug)
! 	fprintf(stderr, "Reading a token: ");
! #endif
        yychar = YYLEX;
      }
--- 789,793 ----
    if (yychar == YYEMPTY)
      {
!       YYDPRINTF ((stderr, "Reading a token: "));
        yychar = YYLEX;
      }
***************
*** 616,638 ****
        yychar = YYEOF;		/* Don't call YYLEX any more */
  
! #if YYDEBUG != 0
!       if (yydebug)
! 	fprintf(stderr, "Now at end of input.\n");
! #endif
      }
    else
      {
!       yychar1 = YYTRANSLATE(yychar);
  
! #if YYDEBUG != 0
        if (yydebug)
  	{
! 	  fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
! 	  /* Give the individual parser a way to print the precise meaning
! 	     of a token, for further debugging info.  */
! #ifdef YYPRINT
  	  YYPRINT (stderr, yychar, yylval);
! #endif
! 	  fprintf (stderr, ")\n");
  	}
  #endif
--- 800,822 ----
        yychar = YYEOF;		/* Don't call YYLEX any more */
  
!       YYDPRINTF ((stderr, "Now at end of input.\n"));
      }
    else
      {
!       yychar1 = YYTRANSLATE (yychar);
  
! #if YYDEBUG
!      /* We have to keep this `#if YYDEBUG', since we use variables
! 	which are defined only if `YYDEBUG' is set.  */
        if (yydebug)
  	{
! 	  YYFPRINTF (stderr, "Next token is %d (%s",
! 		     yychar, yytname[yychar1]);
! 	  /* Give the individual parser a way to print the precise
! 	     meaning of a token, for further debugging info.  */
! # ifdef YYPRINT
  	  YYPRINT (stderr, yychar, yylval);
! # endif
! 	  YYFPRINTF (stderr, ")\n");
  	}
  #endif
***************
*** 666,674 ****
  
    /* Shift the lookahead token.  */
! 
! #if YYDEBUG != 0
!   if (yydebug)
!     fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
! #endif
  
    /* Discard the token being shifted unless it is eof.  */
--- 850,855 ----
  
    /* Shift the lookahead token.  */
!   YYDPRINTF ((stderr, "Shifting token %d (%s), ",
! 	      yychar, yytname[yychar1]));
  
    /* Discard the token being shifted unless it is eof.  */
***************
*** 677,765 ****
  
    *++yyvsp = yylval;
! #ifdef YYLSP_NEEDED
    *++yylsp = yylloc;
  #endif
  
!   /* count tokens shifted since error; after three, turn off error status.  */
!   if (yyerrstatus) yyerrstatus--;
  
    yystate = yyn;
    goto yynewstate;
  
- /* Do the default action for the current state.  */
- yydefault:
  
    yyn = yydefact[yystate];
    if (yyn == 0)
      goto yyerrlab;
  
! /* Do a reduction.  yyn is the number of a rule to reduce with.  */
  yyreduce:
    yylen = yyr2[yyn];
-   if (yylen > 0)
-     yyval = yyvsp[1-yylen]; /* implement default value of the action */
  
! #if YYDEBUG != 0
    if (yydebug)
      {
!       int i;
  
!       fprintf (stderr, "Reducing via rule %d (line %d), ",
! 	       yyn, yyrline[yyn]);
  
        /* Print the symbols being reduced, and their result.  */
!       for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
! 	fprintf (stderr, "%s ", yytname[yyrhs[i]]);
!       fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
      }
  #endif
  
- 
    switch (yyn) {
  
  case 3:
  #line 80 "parser.y"
! { yyval.str = yyvsp[0].str; ;
!     break;}
  case 4:
  #line 83 "parser.y"
! { yyval.str = yyvsp[0].str; ;
!     break;}
  case 5:
  #line 87 "parser.y"
! { yyval.bool = 1; ;
!     break;}
  case 6:
  #line 88 "parser.y"
! { yyval.bool = 0; ;
!     break;}
  case 7:
  #line 92 "parser.y"
! { if (gengetopt_package_given) { yyerror ("package redefined"); YYERROR; } else { gengetopt_package_given = 1; if (gengetopt_define_package (yyvsp[0].str)) { yyerror ("not enough memory"); YYERROR; } } ;
!     break;}
  case 8:
  #line 96 "parser.y"
! { if (gengetopt_version_given) { yyerror ("version redefined"); YYERROR; } else { gengetopt_version_given = 1; if (gengetopt_define_version (yyvsp[0].str)) { yyerror ("not enough memory"); YYERROR; } } ;
!     break;}
  case 9:
  #line 99 "parser.y"
! { if (gengetopt_purpose_given) { yyerror ("purpose redefined"); YYERROR; } else { gengetopt_purpose_given = 1; if (gengetopt_define_purpose (yyvsp[0].str)) { yyerror ("not enough memory"); YYERROR; } } ;
!     break;}
  case 10:
  #line 102 "parser.y"
! { if (gengetopt_purpose_given) { yyerror ("purpose redefined"); YYERROR; } else { gengetopt_purpose_given = 1; if (gengetopt_define_purpose (yyvsp[0].str)) { yyerror ("not enough memory"); YYERROR; } } ;
!     break;}
  case 11:
  #line 104 "parser.y"
! { int o = gengetopt_add_option (yyvsp[-3].str, yyvsp[-2].chr, yyvsp[-1].str, ARG_NO, 0, 0, 0); check_result; ;
!     break;}
  case 12:
  #line 108 "parser.y"
! { int o = gengetopt_add_option (yyvsp[-4].str, yyvsp[-3].chr, yyvsp[-2].str, ARG_FLAG, yyvsp[0].bool, 0, 0); check_result; ;
!     break;}
  case 13:
  #line 112 "parser.y"
! { int o = gengetopt_add_option (yyvsp[-4].str, yyvsp[-3].chr, yyvsp[-2].str, yyvsp[-1].argtype, 0, yyvsp[0].bool, 0); check_result; ;
!     break;}
  case 14:
  #line 116 "parser.y"
--- 858,971 ----
  
    *++yyvsp = yylval;
! #if YYLSP_NEEDED
    *++yylsp = yylloc;
  #endif
  
!   /* Count tokens shifted since error; after three, turn off error
!      status.  */
!   if (yyerrstatus)
!     yyerrstatus--;
  
    yystate = yyn;
    goto yynewstate;
  
  
+ /*-----------------------------------------------------------.
+ | yydefault -- do the default action for the current state.  |
+ `-----------------------------------------------------------*/
+ yydefault:
    yyn = yydefact[yystate];
    if (yyn == 0)
      goto yyerrlab;
+   goto yyreduce;
  
! 
! /*-----------------------------.
! | yyreduce -- Do a reduction.  |
! `-----------------------------*/
  yyreduce:
+   /* yyn is the number of a rule to reduce with.  */
    yylen = yyr2[yyn];
  
!   /* If YYLEN is nonzero, implement the default value of the action:
!      `$$ = $1'.
! 
!      Otherwise, the following line sets YYVAL to the semantic value of
!      the lookahead token.  This behavior is undocumented and Bison
!      users should not rely upon it.  Assigning to YYVAL
!      unconditionally makes the parser a bit smaller, and it avoids a
!      GCC warning that YYVAL may be used uninitialized.  */
!   yyval = yyvsp[1-yylen];
! 
! #if YYLSP_NEEDED
!   /* Similarly for the default location.  Let the user run additional
!      commands if for instance locations are ranges.  */
!   yyloc = yylsp[1-yylen];
!   YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
! #endif
! 
! #if YYDEBUG
!   /* We have to keep this `#if YYDEBUG', since we use variables which
!      are defined only if `YYDEBUG' is set.  */
    if (yydebug)
      {
!       int yyi;
  
!       YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
! 		 yyn, yyrline[yyn]);
  
        /* Print the symbols being reduced, and their result.  */
!       for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
! 	YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
!       YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
      }
  #endif
  
    switch (yyn) {
  
  case 3:
  #line 80 "parser.y"
! { yyval.str = yyvsp[0].str; }
!     break;
  case 4:
  #line 83 "parser.y"
! { yyval.str = yyvsp[0].str; }
!     break;
  case 5:
  #line 87 "parser.y"
! { yyval.bool = 1; }
!     break;
  case 6:
  #line 88 "parser.y"
! { yyval.bool = 0; }
!     break;
  case 7:
  #line 92 "parser.y"
! { if (gengetopt_package_given) { yyerror ("package redefined"); YYERROR; } else { gengetopt_package_given = 1; if (gengetopt_define_package (yyvsp[0].str)) { yyerror ("not enough memory"); YYERROR; } } }
!     break;
  case 8:
  #line 96 "parser.y"
! { if (gengetopt_version_given) { yyerror ("version redefined"); YYERROR; } else { gengetopt_version_given = 1; if (gengetopt_define_version (yyvsp[0].str)) { yyerror ("not enough memory"); YYERROR; } } }
!     break;
  case 9:
  #line 99 "parser.y"
! { if (gengetopt_purpose_given) { yyerror ("purpose redefined"); YYERROR; } else { gengetopt_purpose_given = 1; if (gengetopt_define_purpose (yyvsp[0].str)) { yyerror ("not enough memory"); YYERROR; } } }
!     break;
  case 10:
  #line 102 "parser.y"
! { if (gengetopt_purpose_given) { yyerror ("purpose redefined"); YYERROR; } else { gengetopt_purpose_given = 1; if (gengetopt_define_purpose (yyvsp[0].str)) { yyerror ("not enough memory"); YYERROR; } } }
!     break;
  case 11:
  #line 104 "parser.y"
! { int o = gengetopt_add_option (yyvsp[-3].str, yyvsp[-2].chr, yyvsp[-1].str, ARG_NO, 0, 0, 0); check_result; }
!     break;
  case 12:
  #line 108 "parser.y"
! { int o = gengetopt_add_option (yyvsp[-4].str, yyvsp[-3].chr, yyvsp[-2].str, ARG_FLAG, yyvsp[0].bool, 0, 0); check_result; }
!     break;
  case 13:
  #line 112 "parser.y"
! { int o = gengetopt_add_option (yyvsp[-4].str, yyvsp[-3].chr, yyvsp[-2].str, yyvsp[-1].argtype, 0, yyvsp[0].bool, 0); check_result; }
!     break;
  case 14:
  #line 116 "parser.y"
***************
*** 779,836 ****
          (stderr, "This problem will be fixed in future releases.\n");
      }
! ;
!     break;}
  case 15:
  #line 134 "parser.y"
! { yyval.str = 0; ;
!     break;}
  case 16:
  #line 135 "parser.y"
! { yyval.str = yyvsp[0].str; ;
!     break;}
  }
!    /* the action file gets copied in in place of this dollarsign */
! #line 543 "/usr/lib/bison.simple"
  
    yyvsp -= yylen;
    yyssp -= yylen;
! #ifdef YYLSP_NEEDED
    yylsp -= yylen;
  #endif
  
! #if YYDEBUG != 0
    if (yydebug)
      {
!       short *ssp1 = yyss - 1;
!       fprintf (stderr, "state stack now");
!       while (ssp1 != yyssp)
! 	fprintf (stderr, " %d", *++ssp1);
!       fprintf (stderr, "\n");
      }
  #endif
  
    *++yyvsp = yyval;
! 
! #ifdef YYLSP_NEEDED
!   yylsp++;
!   if (yylen == 0)
!     {
!       yylsp->first_line = yylloc.first_line;
!       yylsp->first_column = yylloc.first_column;
!       yylsp->last_line = (yylsp-1)->last_line;
!       yylsp->last_column = (yylsp-1)->last_column;
!       yylsp->text = 0;
!     }
!   else
!     {
!       yylsp->last_line = (yylsp+yylen-1)->last_line;
!       yylsp->last_column = (yylsp+yylen-1)->last_column;
!     }
  #endif
  
!   /* Now "shift" the result of the reduction.
!      Determine what state that goes to,
!      based on the state we popped back to
!      and the rule number reduced by.  */
  
    yyn = yyr1[yyn];
--- 985,1028 ----
          (stderr, "This problem will be fixed in future releases.\n");
      }
! }
!     break;
  case 15:
  #line 134 "parser.y"
! { yyval.str = 0; }
!     break;
  case 16:
  #line 135 "parser.y"
! { yyval.str = yyvsp[0].str; }
!     break;
  }
! 
! #line 727 "/usr/share/bison/bison.simple"
! 
  
    yyvsp -= yylen;
    yyssp -= yylen;
! #if YYLSP_NEEDED
    yylsp -= yylen;
  #endif
  
! #if YYDEBUG
    if (yydebug)
      {
!       short *yyssp1 = yyss - 1;
!       YYFPRINTF (stderr, "state stack now");
!       while (yyssp1 != yyssp)
! 	YYFPRINTF (stderr, " %d", *++yyssp1);
!       YYFPRINTF (stderr, "\n");
      }
  #endif
  
    *++yyvsp = yyval;
! #if YYLSP_NEEDED
!   *++yylsp = yyloc;
  #endif
  
!   /* Now `shift' the result of the reduction.  Determine what state
!      that goes to, based on the state we popped back to and the rule
!      number reduced by.  */
  
    yyn = yyr1[yyn];
***************
*** 844,851 ****
    goto yynewstate;
  
- yyerrlab:   /* here on detecting error */
  
!   if (! yyerrstatus)
!     /* If not already recovering from an error, report this error.  */
      {
        ++yynerrs;
--- 1036,1046 ----
    goto yynewstate;
  
  
! /*------------------------------------.
! | yyerrlab -- here on detecting error |
! `------------------------------------*/
! yyerrlab:
!   /* If not already recovering from an error, report this error.  */
!   if (!yyerrstatus)
      {
        ++yynerrs;
***************
*** 856,919 ****
        if (yyn > YYFLAG && yyn < YYLAST)
  	{
! 	  int size = 0;
! 	  char *msg;
! 	  int x, count;
! 
! 	  count = 0;
! 	  /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
! 	  for (x = (yyn < 0 ? -yyn : 0);
! 	       x < (sizeof(yytname) / sizeof(char *)); x++)
! 	    if (yycheck[x + yyn] == x)
! 	      size += strlen(yytname[x]) + 15, count++;
! 	  msg = (char *) malloc(size + 15);
! 	  if (msg != 0)
  	    {
! 	      strcpy(msg, "parse error");
  
! 	      if (count < 5)
  		{
! 		  count = 0;
! 		  for (x = (yyn < 0 ? -yyn : 0);
! 		       x < (sizeof(yytname) / sizeof(char *)); x++)
! 		    if (yycheck[x + yyn] == x)
  		      {
! 			strcat(msg, count == 0 ? ", expecting `" : " or `");
! 			strcat(msg, yytname[x]);
! 			strcat(msg, "'");
! 			count++;
  		      }
  		}
! 	      yyerror(msg);
! 	      free(msg);
  	    }
  	  else
! 	    yyerror ("parse error; also virtual memory exceeded");
  	}
        else
! #endif /* YYERROR_VERBOSE */
! 	yyerror("parse error");
      }
- 
    goto yyerrlab1;
- yyerrlab1:   /* here on error raised explicitly by an action */
  
    if (yyerrstatus == 3)
      {
!       /* if just tried and failed to reuse lookahead token after an error, discard it.  */
  
        /* return failure if at end of input */
        if (yychar == YYEOF)
  	YYABORT;
! 
! #if YYDEBUG != 0
!       if (yydebug)
! 	fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
! #endif
! 
        yychar = YYEMPTY;
      }
  
!   /* Else will try to reuse lookahead token
!      after shifting the error token.  */
  
    yyerrstatus = 3;		/* Each real token shifted decrements this */
--- 1051,1119 ----
        if (yyn > YYFLAG && yyn < YYLAST)
  	{
! 	  YYSIZE_T yysize = 0;
! 	  char *yymsg;
! 	  int yyx, yycount;
! 
! 	  yycount = 0;
! 	  /* Start YYX at -YYN if negative to avoid negative indexes in
! 	     YYCHECK.  */
! 	  for (yyx = yyn < 0 ? -yyn : 0;
! 	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
! 	    if (yycheck[yyx + yyn] == yyx)
! 	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
! 	  yysize += yystrlen ("parse error, unexpected ") + 1;
! 	  yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
! 	  yymsg = (char *) YYSTACK_ALLOC (yysize);
! 	  if (yymsg != 0)
  	    {
! 	      char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
! 	      yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
  
! 	      if (yycount < 5)
  		{
! 		  yycount = 0;
! 		  for (yyx = yyn < 0 ? -yyn : 0;
! 		       yyx < (int) (sizeof (yytname) / sizeof (char *));
! 		       yyx++)
! 		    if (yycheck[yyx + yyn] == yyx)
  		      {
! 			const char *yyq = ! yycount ? ", expecting " : " or ";
! 			yyp = yystpcpy (yyp, yyq);
! 			yyp = yystpcpy (yyp, yytname[yyx]);
! 			yycount++;
  		      }
  		}
! 	      yyerror (yymsg);
! 	      YYSTACK_FREE (yymsg);
  	    }
  	  else
! 	    yyerror ("parse error; also virtual memory exhausted");
  	}
        else
! #endif /* defined (YYERROR_VERBOSE) */
! 	yyerror ("parse error");
      }
    goto yyerrlab1;
  
+ 
+ /*--------------------------------------------------.
+ | yyerrlab1 -- error raised explicitly by an action |
+ `--------------------------------------------------*/
+ yyerrlab1:
    if (yyerrstatus == 3)
      {
!       /* If just tried and failed to reuse lookahead token after an
! 	 error, discard it.  */
  
        /* return failure if at end of input */
        if (yychar == YYEOF)
  	YYABORT;
!       YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
! 		  yychar, yytname[yychar1]));
        yychar = YYEMPTY;
      }
  
!   /* Else will try to reuse lookahead token after shifting the error
!      token.  */
  
    yyerrstatus = 3;		/* Each real token shifted decrements this */
***************
*** 921,955 ****
    goto yyerrhandle;
  
- yyerrdefault:  /* current state does not do anything special for the error token. */
  
  #if 0
    /* This is wrong; only states that explicitly want error tokens
       should shift them.  */
!   yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
!   if (yyn) goto yydefault;
  #endif
  
- yyerrpop:   /* pop the current state because it cannot handle the error token */
  
!   if (yyssp == yyss) YYABORT;
    yyvsp--;
    yystate = *--yyssp;
! #ifdef YYLSP_NEEDED
    yylsp--;
  #endif
  
! #if YYDEBUG != 0
    if (yydebug)
      {
!       short *ssp1 = yyss - 1;
!       fprintf (stderr, "Error: state stack now");
!       while (ssp1 != yyssp)
! 	fprintf (stderr, " %d", *++ssp1);
!       fprintf (stderr, "\n");
      }
  #endif
  
  yyerrhandle:
- 
    yyn = yypact[yystate];
    if (yyn == YYFLAG)
--- 1121,1169 ----
    goto yyerrhandle;
  
  
+ /*-------------------------------------------------------------------.
+ | yyerrdefault -- current state does not do anything special for the |
+ | error token.                                                       |
+ `-------------------------------------------------------------------*/
+ yyerrdefault:
  #if 0
    /* This is wrong; only states that explicitly want error tokens
       should shift them.  */
! 
!   /* If its default is to accept any token, ok.  Otherwise pop it.  */
!   yyn = yydefact[yystate];
!   if (yyn)
!     goto yydefault;
  #endif
  
  
! /*---------------------------------------------------------------.
! | yyerrpop -- pop the current state because it cannot handle the |
! | error token                                                    |
! `---------------------------------------------------------------*/
! yyerrpop:
!   if (yyssp == yyss)
!     YYABORT;
    yyvsp--;
    yystate = *--yyssp;
! #if YYLSP_NEEDED
    yylsp--;
  #endif
  
! #if YYDEBUG
    if (yydebug)
      {
!       short *yyssp1 = yyss - 1;
!       YYFPRINTF (stderr, "Error: state stack now");
!       while (yyssp1 != yyssp)
! 	YYFPRINTF (stderr, " %d", *++yyssp1);
!       YYFPRINTF (stderr, "\n");
      }
  #endif
  
+ /*--------------.
+ | yyerrhandle.  |
+ `--------------*/
  yyerrhandle:
    yyn = yypact[yystate];
    if (yyn == YYFLAG)
***************
*** 974,984 ****
      YYACCEPT;
  
! #if YYDEBUG != 0
!   if (yydebug)
!     fprintf(stderr, "Shifting error token, ");
! #endif
  
    *++yyvsp = yylval;
! #ifdef YYLSP_NEEDED
    *++yylsp = yylloc;
  #endif
--- 1188,1195 ----
      YYACCEPT;
  
!   YYDPRINTF ((stderr, "Shifting error token, "));
  
    *++yyvsp = yylval;
! #if YYLSP_NEEDED
    *++yylsp = yylloc;
  #endif
***************
*** 987,1013 ****
    goto yynewstate;
  
-  yyacceptlab:
-   /* YYACCEPT comes here.  */
-   if (yyfree_stacks)
-     {
-       free (yyss);
-       free (yyvs);
- #ifdef YYLSP_NEEDED
-       free (yyls);
- #endif
-     }
-   return 0;
  
!  yyabortlab:
!   /* YYABORT comes here.  */
!   if (yyfree_stacks)
!     {
!       free (yyss);
!       free (yyvs);
! #ifdef YYLSP_NEEDED
!       free (yyls);
  #endif
!     }
!   return 1;
  }
  #line 138 "parser.y"
--- 1198,1230 ----
    goto yynewstate;
  
  
! /*-------------------------------------.
! | yyacceptlab -- YYACCEPT comes here.  |
! `-------------------------------------*/
! yyacceptlab:
!   yyresult = 0;
!   goto yyreturn;
! 
! /*-----------------------------------.
! | yyabortlab -- YYABORT comes here.  |
! `-----------------------------------*/
! yyabortlab:
!   yyresult = 1;
!   goto yyreturn;
! 
! /*---------------------------------------------.
! | yyoverflowab -- parser overflow comes here.  |
! `---------------------------------------------*/
! yyoverflowlab:
!   yyerror ("parser stack overflow");
!   yyresult = 2;
!   /* Fall through.  */
! 
! yyreturn:
! #ifndef yyoverflow
!   if (yyss != yyssa)
!     YYSTACK_FREE (yyss);
  #endif
!   return yyresult;
  }
  #line 138 "parser.y"
diff -rc2P gengetopt-2.7/src/parser.h gengetopt-2.7.1/src/parser.h
*** gengetopt-2.7/src/parser.h	Fri Mar  1 23:21:26 2002
--- gengetopt-2.7.1/src/parser.h	Tue Jul 16 20:46:40 2002
***************
*** 1,2 ****
--- 1,6 ----
+ #ifndef BISON_Y_TAB_H
+ # define BISON_Y_TAB_H
+ 
+ #ifndef YYSTYPE
  typedef union {
  char * str;
***************
*** 4,22 ****
  int argtype;
  int bool;
! } YYSTYPE;
! #define	TOK_PACKAGE	257
! #define	TOK_VERSION	258
! #define	TOK_OPTION	259
! #define	TOK_YES	260
! #define	TOK_NO	261
! #define	TOK_FLAG	262
! #define	TOK_PURPOSE	263
! #define	TOK_ONOFF	264
! #define	TOK_STRING	265
! #define	TOK_DEFAULT	266
! #define	TOK_MLSTRING	267
! #define	TOK_CHAR	268
! #define	TOK_ARGTYPE	269
  
  
  extern YYSTYPE yylval;
--- 8,30 ----
  int argtype;
  int bool;
! } yystype;
! # define YYSTYPE yystype
! #endif
! # define	TOK_PACKAGE	257
! # define	TOK_VERSION	258
! # define	TOK_OPTION	259
! # define	TOK_YES	260
! # define	TOK_NO	261
! # define	TOK_FLAG	262
! # define	TOK_PURPOSE	263
! # define	TOK_ONOFF	264
! # define	TOK_STRING	265
! # define	TOK_DEFAULT	266
! # define	TOK_MLSTRING	267
! # define	TOK_CHAR	268
! # define	TOK_ARGTYPE	269
  
  
  extern YYSTYPE yylval;
+ 
+ #endif /* not BISON_Y_TAB_H */
diff -rc2P gengetopt-2.7/src/scanner.c gengetopt-2.7.1/src/scanner.c
*** gengetopt-2.7/src/scanner.c	Fri Mar  1 23:34:25 2002
--- gengetopt-2.7.1/src/scanner.c	Tue Jul 16 20:46:41 2002
***************
*** 10,13 ****
--- 10,14 ----
  
  #include 
+ #include 
  
  
***************
*** 23,27 ****
  
  #include 
- #include 
  
  /* Use prototypes in function declarations. */
--- 24,27 ----
***************
*** 1398,1406 ****
  
  
- #ifndef YY_ALWAYS_INTERACTIVE
- #ifndef YY_NEVER_INTERACTIVE
- extern int isatty YY_PROTO(( int ));
- #endif
- #endif
  
  #ifdef YY_USE_PROTOS
--- 1398,1401 ----
diff -rc2P gengetopt-2.7/src/skels/Makefile.in gengetopt-2.7.1/src/skels/Makefile.in
*** gengetopt-2.7/src/skels/Makefile.in	Mon Jul  1 00:17:38 2002
--- gengetopt-2.7.1/src/skels/Makefile.in	Sun Jul 21 16:37:34 2002
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
***************
*** 223,227 ****
  	  d=$(srcdir); \
  	  if test -d $$d/$$file; then \
! 	    cp -pr $$/$$file $(distdir)/$$file; \
  	  else \
  	    test -f $(distdir)/$$file \
--- 223,227 ----
  	  d=$(srcdir); \
  	  if test -d $$d/$$file; then \
! 	    cp -pr $$d/$$file $(distdir)/$$file; \
  	  else \
  	    test -f $(distdir)/$$file \
***************
*** 231,241 ****
  	done
  c_source.o: c_source.cc c_source.h ../../config.h ../../src/cxxconfig.h
- config_parser_handle_option.o: config_parser_handle_option.cc \
- 	config_parser_handle_option.h ../../config.h \
- 	../../src/cxxconfig.h
- config_parser_header.o: config_parser_header.cc config_parser_header.h \
- 	../../config.h ../../src/cxxconfig.h
- config_parser_source.o: config_parser_source.cc config_parser_source.h \
- 	../../config.h ../../src/cxxconfig.h
  flag_opt_arg.o: flag_opt_arg.cc flag_opt_arg.h ../../config.h \
  	../../src/cxxconfig.h
--- 231,234 ----
diff -rc2P gengetopt-2.7/src/skels/c_source.cc gengetopt-2.7.1/src/skels/c_source.cc
*** gengetopt-2.7/src/skels/c_source.cc	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/c_source.cc	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
***************
*** 8,12 ****
  
  void
! c_source_gen_class::generate_c_source(ostream &stream, unsigned int indent = 0)
  {
    string indent_str (indent, ' ');
--- 8,12 ----
  
  void
! c_source_gen_class::generate_c_source(ostream &stream, unsigned int indent)
  {
    string indent_str (indent, ' ');
diff -rc2P gengetopt-2.7/src/skels/c_source.h gengetopt-2.7.1/src/skels/c_source.h
*** gengetopt-2.7/src/skels/c_source.h	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/c_source.h	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
diff -rc2P gengetopt-2.7/src/skels/flag_opt_arg.cc gengetopt-2.7.1/src/skels/flag_opt_arg.cc
*** gengetopt-2.7/src/skels/flag_opt_arg.cc	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/flag_opt_arg.cc	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
***************
*** 8,12 ****
  
  void
! flag_opt_arg_gen_class::generate_flag_opt_arg(ostream &stream, unsigned int indent = 0)
  {
    string indent_str (indent, ' ');
--- 8,12 ----
  
  void
! flag_opt_arg_gen_class::generate_flag_opt_arg(ostream &stream, unsigned int indent)
  {
    string indent_str (indent, ' ');
diff -rc2P gengetopt-2.7/src/skels/flag_opt_arg.h gengetopt-2.7.1/src/skels/flag_opt_arg.h
*** gengetopt-2.7/src/skels/flag_opt_arg.h	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/flag_opt_arg.h	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
diff -rc2P gengetopt-2.7/src/skels/float_opt_arg.cc gengetopt-2.7.1/src/skels/float_opt_arg.cc
*** gengetopt-2.7/src/skels/float_opt_arg.cc	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/float_opt_arg.cc	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
***************
*** 8,12 ****
  
  void
! float_opt_arg_gen_class::generate_float_opt_arg(ostream &stream, unsigned int indent = 0)
  {
    string indent_str (indent, ' ');
--- 8,12 ----
  
  void
! float_opt_arg_gen_class::generate_float_opt_arg(ostream &stream, unsigned int indent)
  {
    string indent_str (indent, ' ');
diff -rc2P gengetopt-2.7/src/skels/float_opt_arg.h gengetopt-2.7.1/src/skels/float_opt_arg.h
*** gengetopt-2.7/src/skels/float_opt_arg.h	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/float_opt_arg.h	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
diff -rc2P gengetopt-2.7/src/skels/generic_option.cc gengetopt-2.7.1/src/skels/generic_option.cc
*** gengetopt-2.7/src/skels/generic_option.cc	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/generic_option.cc	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
***************
*** 8,12 ****
  
  void
! generic_option_gen_class::generate_generic_option(ostream &stream, unsigned int indent = 0)
  {
    string indent_str (indent, ' ');
--- 8,12 ----
  
  void
! generic_option_gen_class::generate_generic_option(ostream &stream, unsigned int indent)
  {
    string indent_str (indent, ' ');
diff -rc2P gengetopt-2.7/src/skels/generic_option.h gengetopt-2.7.1/src/skels/generic_option.h
*** gengetopt-2.7/src/skels/generic_option.h	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/generic_option.h	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
diff -rc2P gengetopt-2.7/src/skels/handle_help.cc gengetopt-2.7.1/src/skels/handle_help.cc
*** gengetopt-2.7/src/skels/handle_help.cc	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/handle_help.cc	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
***************
*** 8,12 ****
  
  void
! handle_help_gen_class::generate_handle_help(ostream &stream, unsigned int indent = 0)
  {
    string indent_str (indent, ' ');
--- 8,12 ----
  
  void
! handle_help_gen_class::generate_handle_help(ostream &stream, unsigned int indent)
  {
    string indent_str (indent, ' ');
diff -rc2P gengetopt-2.7/src/skels/handle_help.h gengetopt-2.7.1/src/skels/handle_help.h
*** gengetopt-2.7/src/skels/handle_help.h	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/handle_help.h	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
diff -rc2P gengetopt-2.7/src/skels/handle_unamed.cc gengetopt-2.7.1/src/skels/handle_unamed.cc
*** gengetopt-2.7/src/skels/handle_unamed.cc	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/handle_unamed.cc	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
***************
*** 8,12 ****
  
  void
! handle_unamed_gen_class::generate_handle_unamed(ostream &stream, unsigned int indent = 0)
  {
    string indent_str (indent, ' ');
--- 8,12 ----
  
  void
! handle_unamed_gen_class::generate_handle_unamed(ostream &stream, unsigned int indent)
  {
    string indent_str (indent, ' ');
diff -rc2P gengetopt-2.7/src/skels/handle_unamed.h gengetopt-2.7.1/src/skels/handle_unamed.h
*** gengetopt-2.7/src/skels/handle_unamed.h	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/handle_unamed.h	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
diff -rc2P gengetopt-2.7/src/skels/handle_version.cc gengetopt-2.7.1/src/skels/handle_version.cc
*** gengetopt-2.7/src/skels/handle_version.cc	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/handle_version.cc	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
***************
*** 8,12 ****
  
  void
! handle_version_gen_class::generate_handle_version(ostream &stream, unsigned int indent = 0)
  {
    string indent_str (indent, ' ');
--- 8,12 ----
  
  void
! handle_version_gen_class::generate_handle_version(ostream &stream, unsigned int indent)
  {
    string indent_str (indent, ' ');
diff -rc2P gengetopt-2.7/src/skels/handle_version.h gengetopt-2.7.1/src/skels/handle_version.h
*** gengetopt-2.7/src/skels/handle_version.h	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/handle_version.h	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
diff -rc2P gengetopt-2.7/src/skels/header.cc gengetopt-2.7.1/src/skels/header.cc
*** gengetopt-2.7/src/skels/header.cc	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/header.cc	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
***************
*** 8,12 ****
  
  void
! header_gen_class::generate_header(ostream &stream, unsigned int indent = 0)
  {
    string indent_str (indent, ' ');
--- 8,12 ----
  
  void
! header_gen_class::generate_header(ostream &stream, unsigned int indent)
  {
    string indent_str (indent, ' ');
diff -rc2P gengetopt-2.7/src/skels/header.h gengetopt-2.7.1/src/skels/header.h
*** gengetopt-2.7/src/skels/header.h	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/header.h	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
diff -rc2P gengetopt-2.7/src/skels/int_opt_arg.cc gengetopt-2.7.1/src/skels/int_opt_arg.cc
*** gengetopt-2.7/src/skels/int_opt_arg.cc	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/int_opt_arg.cc	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
***************
*** 8,12 ****
  
  void
! int_opt_arg_gen_class::generate_int_opt_arg(ostream &stream, unsigned int indent = 0)
  {
    string indent_str (indent, ' ');
--- 8,12 ----
  
  void
! int_opt_arg_gen_class::generate_int_opt_arg(ostream &stream, unsigned int indent)
  {
    string indent_str (indent, ' ');
diff -rc2P gengetopt-2.7/src/skels/int_opt_arg.h gengetopt-2.7.1/src/skels/int_opt_arg.h
*** gengetopt-2.7/src/skels/int_opt_arg.h	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/int_opt_arg.h	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
diff -rc2P gengetopt-2.7/src/skels/long_opt_arg.cc gengetopt-2.7.1/src/skels/long_opt_arg.cc
*** gengetopt-2.7/src/skels/long_opt_arg.cc	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/long_opt_arg.cc	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
***************
*** 8,12 ****
  
  void
! long_opt_arg_gen_class::generate_long_opt_arg(ostream &stream, unsigned int indent = 0)
  {
    string indent_str (indent, ' ');
--- 8,12 ----
  
  void
! long_opt_arg_gen_class::generate_long_opt_arg(ostream &stream, unsigned int indent)
  {
    string indent_str (indent, ' ');
diff -rc2P gengetopt-2.7/src/skels/long_opt_arg.h gengetopt-2.7.1/src/skels/long_opt_arg.h
*** gengetopt-2.7/src/skels/long_opt_arg.h	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/long_opt_arg.h	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
diff -rc2P gengetopt-2.7/src/skels/no_short_option.cc gengetopt-2.7.1/src/skels/no_short_option.cc
*** gengetopt-2.7/src/skels/no_short_option.cc	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/no_short_option.cc	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
***************
*** 8,12 ****
  
  void
! no_short_option_gen_class::generate_no_short_option(ostream &stream, unsigned int indent = 0)
  {
    string indent_str (indent, ' ');
--- 8,12 ----
  
  void
! no_short_option_gen_class::generate_no_short_option(ostream &stream, unsigned int indent)
  {
    string indent_str (indent, ' ');
diff -rc2P gengetopt-2.7/src/skels/no_short_option.h gengetopt-2.7.1/src/skels/no_short_option.h
*** gengetopt-2.7/src/skels/no_short_option.h	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/no_short_option.h	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
diff -rc2P gengetopt-2.7/src/skels/required_option.cc gengetopt-2.7.1/src/skels/required_option.cc
*** gengetopt-2.7/src/skels/required_option.cc	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/required_option.cc	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
***************
*** 8,12 ****
  
  void
! required_option_gen_class::generate_required_option(ostream &stream, unsigned int indent = 0)
  {
    string indent_str (indent, ' ');
--- 8,12 ----
  
  void
! required_option_gen_class::generate_required_option(ostream &stream, unsigned int indent)
  {
    string indent_str (indent, ' ');
diff -rc2P gengetopt-2.7/src/skels/required_option.h gengetopt-2.7.1/src/skels/required_option.h
*** gengetopt-2.7/src/skels/required_option.h	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/required_option.h	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
diff -rc2P gengetopt-2.7/src/skels/string_opt_arg.cc gengetopt-2.7.1/src/skels/string_opt_arg.cc
*** gengetopt-2.7/src/skels/string_opt_arg.cc	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/string_opt_arg.cc	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
***************
*** 8,12 ****
  
  void
! string_opt_arg_gen_class::generate_string_opt_arg(ostream &stream, unsigned int indent = 0)
  {
    string indent_str (indent, ' ');
--- 8,12 ----
  
  void
! string_opt_arg_gen_class::generate_string_opt_arg(ostream &stream, unsigned int indent)
  {
    string indent_str (indent, ' ');
diff -rc2P gengetopt-2.7/src/skels/string_opt_arg.h gengetopt-2.7.1/src/skels/string_opt_arg.h
*** gengetopt-2.7/src/skels/string_opt_arg.h	Sun Jun 30 23:36:12 2002
--- gengetopt-2.7.1/src/skels/string_opt_arg.h	Sat Jul 13 23:38:58 2002
***************
*** 1,5 ****
  /*
   * File automatically generated by
!  * gengen 0.4 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
--- 1,5 ----
  /*
   * File automatically generated by
!  * gengen 0.4.1 by Lorenzo Bettini 
   * http://www.lorenzobettini.it/software/gengen
   */
diff -rc2P gengetopt-2.7/stamp-h.in gengetopt-2.7.1/stamp-h.in
*** gengetopt-2.7/stamp-h.in	Sun Jun 30 23:48:58 2002
--- gengetopt-2.7.1/stamp-h.in	Tue Jul 16 20:46:11 2002
***************
*** 1 ****
- timestamp
--- 0 ----
diff -rc2P gengetopt-2.7/tests/Makefile.in gengetopt-2.7.1/tests/Makefile.in
*** gengetopt-2.7/tests/Makefile.in	Mon Jul  1 00:17:39 2002
--- gengetopt-2.7.1/tests/Makefile.in	Sun Jul 21 16:37:35 2002
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,5 ----
! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
***************
*** 387,391 ****
  	  d=$(srcdir); \
  	  if test -d $$d/$$file; then \
! 	    cp -pr $$/$$file $(distdir)/$$file; \
  	  else \
  	    test -f $(distdir)/$$file \
--- 387,391 ----
  	  d=$(srcdir); \
  	  if test -d $$d/$$file; then \
! 	    cp -pr $$d/$$file $(distdir)/$$file; \
  	  else \
  	    test -f $(distdir)/$$file \
***************
*** 402,407 ****
  no_unamed.o: no_unamed.c no_unamed_cmd.h
  test_all_opts.o: test_all_opts.c test_all_opts_cmd.h
- test_all_opts_cmd.o: test_all_opts_cmd.c ../config.h ../src/cxxconfig.h \
- 	../src/getopt.h test_all_opts_cmd.h
  
  check-TESTS: $(TESTS)
--- 402,405 ----
diff -rc2P gengetopt-2.7/tests/canonize-names-cmd.c.test gengetopt-2.7.1/tests/canonize-names-cmd.c.test
*** gengetopt-2.7/tests/canonize-names-cmd.c.test	Sun Jun 30 23:50:14 2002
--- gengetopt-2.7.1/tests/canonize-names-cmd.c.test	Sun Jul  7 16:01:18 2002
***************
*** 1,4 ****
  /*
!   File autogenerated by gengetopt version 2.7
    generated with the following command:
    ../src/gengetopt --input canonize-names-cmd.ggo --func-name canonize-names-cmd-parser --file-name canonize-names-cmd 
--- 1,4 ----
  /*
!   File autogenerated by gengetopt version 2.7.1
    generated with the following command:
    ../src/gengetopt --input canonize-names-cmd.ggo --func-name canonize-names-cmd-parser --file-name canonize-names-cmd 
diff -rc2P gengetopt-2.7/tests/canonize-names-cmd.h.test gengetopt-2.7.1/tests/canonize-names-cmd.h.test
*** gengetopt-2.7/tests/canonize-names-cmd.h.test	Sun Jun 30 23:50:14 2002
--- gengetopt-2.7.1/tests/canonize-names-cmd.h.test	Sun Jul  7 16:01:18 2002
***************
*** 1,5 ****
  /* canonize-names-cmd.h */
  
! /* File autogenerated by gengetopt version 2.7  */
  
  #ifndef _canonize_names_cmd_h
--- 1,5 ----
  /* canonize-names-cmd.h */
  
! /* File autogenerated by gengetopt version 2.7.1  */
  
  #ifndef _canonize_names_cmd_h
diff -rc2P gengetopt-2.7/tests/cmdline.c.test gengetopt-2.7.1/tests/cmdline.c.test
*** gengetopt-2.7/tests/cmdline.c.test	Sun Jun 30 23:50:14 2002
--- gengetopt-2.7.1/tests/cmdline.c.test	Sun Jul  7 16:01:18 2002
***************
*** 1,4 ****
  /*
!   File autogenerated by gengetopt version 2.7
    generated with the following command:
    ../src/gengetopt --input cmdline.ggo 
--- 1,4 ----
  /*
!   File autogenerated by gengetopt version 2.7.1
    generated with the following command:
    ../src/gengetopt --input cmdline.ggo 
diff -rc2P gengetopt-2.7/tests/cmdline.h.test gengetopt-2.7.1/tests/cmdline.h.test
*** gengetopt-2.7/tests/cmdline.h.test	Sun Jun 30 23:50:14 2002
--- gengetopt-2.7.1/tests/cmdline.h.test	Sun Jul  7 16:01:18 2002
***************
*** 1,5 ****
  /* cmdline.h */
  
! /* File autogenerated by gengetopt version 2.7  */
  
  #ifndef _cmdline_h
--- 1,5 ----
  /* cmdline.h */
  
! /* File autogenerated by gengetopt version 2.7.1  */
  
  #ifndef _cmdline_h
diff -rc2P gengetopt-2.7/tests/default_values_cmd.c.test gengetopt-2.7.1/tests/default_values_cmd.c.test
*** gengetopt-2.7/tests/default_values_cmd.c.test	Sun Jun 30 23:50:14 2002
--- gengetopt-2.7.1/tests/default_values_cmd.c.test	Sun Jul  7 16:01:18 2002
***************
*** 1,4 ****
  /*
!   File autogenerated by gengetopt version 2.7
    generated with the following command:
    ../src/gengetopt --input default_values_cmd.ggo --unamed-opt --func-name default_values_cmd_parser --file-name default_values_cmd 
--- 1,4 ----
  /*
!   File autogenerated by gengetopt version 2.7.1
    generated with the following command:
    ../src/gengetopt --input default_values_cmd.ggo --unamed-opt --func-name default_values_cmd_parser --file-name default_values_cmd 
diff -rc2P gengetopt-2.7/tests/default_values_cmd.h.test gengetopt-2.7.1/tests/default_values_cmd.h.test
*** gengetopt-2.7/tests/default_values_cmd.h.test	Sun Jun 30 23:50:14 2002
--- gengetopt-2.7.1/tests/default_values_cmd.h.test	Sun Jul  7 16:01:18 2002
***************
*** 1,5 ****
  /* default_values_cmd.h */
  
! /* File autogenerated by gengetopt version 2.7  */
  
  #ifndef _default_values_cmd_h
--- 1,5 ----
  /* default_values_cmd.h */
  
! /* File autogenerated by gengetopt version 2.7.1  */
  
  #ifndef _default_values_cmd_h
diff -rc2P gengetopt-2.7/tests/more_than_once_cmd.c.test gengetopt-2.7.1/tests/more_than_once_cmd.c.test
*** gengetopt-2.7/tests/more_than_once_cmd.c.test	Sun Jun 30 23:50:13 2002
--- gengetopt-2.7.1/tests/more_than_once_cmd.c.test	Sun Jul  7 16:01:18 2002
***************
*** 1,4 ****
  /*
!   File autogenerated by gengetopt version 2.7
    generated with the following command:
    ../src/gengetopt --input more_than_once_cmd.ggo --unamed-opt --func-name more_than_once_cmd_parser --file-name more_than_once_cmd 
--- 1,4 ----
  /*
!   File autogenerated by gengetopt version 2.7.1
    generated with the following command:
    ../src/gengetopt --input more_than_once_cmd.ggo --unamed-opt --func-name more_than_once_cmd_parser --file-name more_than_once_cmd 
diff -rc2P gengetopt-2.7/tests/more_than_once_cmd.h.test gengetopt-2.7.1/tests/more_than_once_cmd.h.test
*** gengetopt-2.7/tests/more_than_once_cmd.h.test	Sun Jun 30 23:50:13 2002
--- gengetopt-2.7.1/tests/more_than_once_cmd.h.test	Sun Jul  7 16:01:18 2002
***************
*** 1,5 ****
  /* more_than_once_cmd.h */
  
! /* File autogenerated by gengetopt version 2.7  */
  
  #ifndef _more_than_once_cmd_h
--- 1,5 ----
  /* more_than_once_cmd.h */
  
! /* File autogenerated by gengetopt version 2.7.1  */
  
  #ifndef _more_than_once_cmd_h
diff -rc2P gengetopt-2.7/tests/no_optgiven_cmd.c.test gengetopt-2.7.1/tests/no_optgiven_cmd.c.test
*** gengetopt-2.7/tests/no_optgiven_cmd.c.test	Sun Jun 30 23:50:13 2002
--- gengetopt-2.7.1/tests/no_optgiven_cmd.c.test	Sun Jul  7 16:01:18 2002
***************
*** 1,4 ****
  /*
!   File autogenerated by gengetopt version 2.7
    generated with the following command:
    ../src/gengetopt --input no_optgiven_cmd.ggo --unamed-opt --func-name no_optgiven_cmd_parser --file-name no_optgiven_cmd --no-handle-error 
--- 1,4 ----
  /*
!   File autogenerated by gengetopt version 2.7.1
    generated with the following command:
    ../src/gengetopt --input no_optgiven_cmd.ggo --unamed-opt --func-name no_optgiven_cmd_parser --file-name no_optgiven_cmd --no-handle-error 
diff -rc2P gengetopt-2.7/tests/no_optgiven_cmd.h.test gengetopt-2.7.1/tests/no_optgiven_cmd.h.test
*** gengetopt-2.7/tests/no_optgiven_cmd.h.test	Sun Jun 30 23:50:13 2002
--- gengetopt-2.7.1/tests/no_optgiven_cmd.h.test	Sun Jul  7 16:01:18 2002
***************
*** 1,5 ****
  /* no_optgiven_cmd.h */
  
! /* File autogenerated by gengetopt version 2.7  */
  
  #ifndef _no_optgiven_cmd_h
--- 1,5 ----
  /* no_optgiven_cmd.h */
  
! /* File autogenerated by gengetopt version 2.7.1  */
  
  #ifndef _no_optgiven_cmd_h
diff -rc2P gengetopt-2.7/tests/no_strings_cmd.c.test gengetopt-2.7.1/tests/no_strings_cmd.c.test
*** gengetopt-2.7/tests/no_strings_cmd.c.test	Sun Jun 30 23:50:13 2002
--- gengetopt-2.7.1/tests/no_strings_cmd.c.test	Sun Jul  7 16:01:18 2002
***************
*** 1,4 ****
  /*
!   File autogenerated by gengetopt version 2.7
    generated with the following command:
    ../src/gengetopt --input no_strings_cmd.ggo --unamed-opt --func-name no_strings_cmd_parser --file-name no_strings_cmd 
--- 1,4 ----
  /*
!   File autogenerated by gengetopt version 2.7.1
    generated with the following command:
    ../src/gengetopt --input no_strings_cmd.ggo --unamed-opt --func-name no_strings_cmd_parser --file-name no_strings_cmd 
diff -rc2P gengetopt-2.7/tests/no_strings_cmd.h.test gengetopt-2.7.1/tests/no_strings_cmd.h.test
*** gengetopt-2.7/tests/no_strings_cmd.h.test	Sun Jun 30 23:50:13 2002
--- gengetopt-2.7.1/tests/no_strings_cmd.h.test	Sun Jul  7 16:01:18 2002
***************
*** 1,5 ****
  /* no_strings_cmd.h */
  
! /* File autogenerated by gengetopt version 2.7  */
  
  #ifndef _no_strings_cmd_h
--- 1,5 ----
  /* no_strings_cmd.h */
  
! /* File autogenerated by gengetopt version 2.7.1  */
  
  #ifndef _no_strings_cmd_h
diff -rc2P gengetopt-2.7/tests/no_unamed_cmd.c.test gengetopt-2.7.1/tests/no_unamed_cmd.c.test
*** gengetopt-2.7/tests/no_unamed_cmd.c.test	Sun Jun 30 23:50:13 2002
--- gengetopt-2.7.1/tests/no_unamed_cmd.c.test	Sun Jul  7 16:01:18 2002
***************
*** 1,4 ****
  /*
!   File autogenerated by gengetopt version 2.7
    generated with the following command:
    ../src/gengetopt --input no_unamed_cmd.ggonu --func-name no_unamed_cmd_parser --file-name no_unamed_cmd 
--- 1,4 ----
  /*
!   File autogenerated by gengetopt version 2.7.1
    generated with the following command:
    ../src/gengetopt --input no_unamed_cmd.ggonu --func-name no_unamed_cmd_parser --file-name no_unamed_cmd 
diff -rc2P gengetopt-2.7/tests/no_unamed_cmd.h.test gengetopt-2.7.1/tests/no_unamed_cmd.h.test
*** gengetopt-2.7/tests/no_unamed_cmd.h.test	Sun Jun 30 23:50:13 2002
--- gengetopt-2.7.1/tests/no_unamed_cmd.h.test	Sun Jul  7 16:01:18 2002
***************
*** 1,5 ****
  /* no_unamed_cmd.h */
  
! /* File autogenerated by gengetopt version 2.7  */
  
  #ifndef _no_unamed_cmd_h
--- 1,5 ----
  /* no_unamed_cmd.h */
  
! /* File autogenerated by gengetopt version 2.7.1  */
  
  #ifndef _no_unamed_cmd_h
diff -rc2P gengetopt-2.7/tests/test_all_opts_cmd.c.test gengetopt-2.7.1/tests/test_all_opts_cmd.c.test
*** gengetopt-2.7/tests/test_all_opts_cmd.c.test	Sun Jun 30 23:50:14 2002
--- gengetopt-2.7.1/tests/test_all_opts_cmd.c.test	Sun Jul  7 16:01:18 2002
***************
*** 1,4 ****
  /*
!   File autogenerated by gengetopt version 2.7
    generated with the following command:
    ../src/gengetopt --input test_all_opts_cmd.ggo --unamed-opt --func-name test_all_opts_cmd_parser --file-name test_all_opts_cmd 
--- 1,4 ----
  /*
!   File autogenerated by gengetopt version 2.7.1
    generated with the following command:
    ../src/gengetopt --input test_all_opts_cmd.ggo --unamed-opt --func-name test_all_opts_cmd_parser --file-name test_all_opts_cmd 
diff -rc2P gengetopt-2.7/tests/test_all_opts_cmd.h.test gengetopt-2.7.1/tests/test_all_opts_cmd.h.test
*** gengetopt-2.7/tests/test_all_opts_cmd.h.test	Sun Jun 30 23:50:14 2002
--- gengetopt-2.7.1/tests/test_all_opts_cmd.h.test	Sun Jul  7 16:01:18 2002
***************
*** 1,5 ****
  /* test_all_opts_cmd.h */
  
! /* File autogenerated by gengetopt version 2.7  */
  
  #ifndef _test_all_opts_cmd_h
--- 1,5 ----
  /* test_all_opts_cmd.h */
  
! /* File autogenerated by gengetopt version 2.7.1  */
  
  #ifndef _test_all_opts_cmd_h