diff -Nru genparse-0.9.1/aclocal.m4 genparse-0.9.2/aclocal.m4 --- genparse-0.9.1/aclocal.m4 2012-03-22 19:32:54.000000000 +0000 +++ genparse-0.9.2/aclocal.m4 2013-10-30 18:44:17.000000000 +0000 @@ -13,23 +13,23 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(AC_AUTOCONF_VERSION, [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(AC_AUTOCONF_VERSION, [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) # =========================================================================== -# http://autoconf-archive.cryp.to/ac_check_class.html +# http://www.gnu.org/software/autoconf-archive/ax_check_class.html # =========================================================================== # # SYNOPSIS # -# AC_CHECK_CLASS +# AX_CHECK_CLASS # # DESCRIPTION # -# AC_CHECK_CLASS tests the existence of a given Java class, either in a +# AX_CHECK_CLASS tests the existence of a given Java class, either in a # jar or in a '.class' file. # # *Warning*: its success or failure can depend on a proper setting of the @@ -40,7 +40,7 @@ # on other. Unfortunately, the autoconf archive does not support the # concept of set of macros, so I had to break it for submission. The # general documentation, as well as the sample configure.in, is included -# in the AC_PROG_JAVA macro. +# in the AX_PROG_JAVA macro. # # LICENSE # @@ -72,13 +72,16 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -AC_DEFUN([AC_CHECK_CLASS],[ -AC_REQUIRE([AC_PROG_JAVA]) +#serial 5 + +AU_ALIAS([AC_CHECK_CLASS], [AX_CHECK_CLASS]) +AC_DEFUN([AX_CHECK_CLASS],[ +AC_REQUIRE([AX_PROG_JAVA]) ac_var_name=`echo $1 | sed 's/\./_/g'` dnl Normaly I'd use a AC_CACHE_CHECK here but since the variable name is dnl dynamic I need an extra level of extraction AC_MSG_CHECKING([for $1 class]) -AC_CACHE_VAL(ac_cv_class_$ac_var_name, [ +AC_CACHE_VAL(ax_cv_class_$ac_var_name, [ if test x$ac_cv_prog_uudecode_base64 = xyes; then dnl /** dnl * Test.java: used to test dynamicaly if a class exists. @@ -143,7 +146,7 @@ fi rm -f Test.class else - AC_TRY_COMPILE_JAVA([$1], , [eval "ac_cv_class_$ac_var_name=yes"], + AX_TRY_COMPILE_JAVA([$1], , [eval "ac_cv_class_$ac_var_name=yes"], [eval "ac_cv_class_$ac_var_name=no"]) fi eval "ac_var_val=$`eval echo ac_cv_class_$ac_var_name`" @@ -162,16 +165,16 @@ ]) # =========================================================================== -# http://autoconf-archive.cryp.to/ac_check_junit.html +# http://www.gnu.org/software/autoconf-archive/ax_check_junit.html # =========================================================================== # # SYNOPSIS # -# AC_CHECK_JUNIT +# AX_CHECK_JUNIT # # DESCRIPTION # -# AC_CHECK_JUNIT tests the availability of the Junit testing framework, +# AX_CHECK_JUNIT tests the availability of the Junit testing framework, # and set some variables for conditional compilation of the test suite by # automake. # @@ -205,9 +208,13 @@ # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 5 -AC_DEFUN([AC_CHECK_JUNIT],[ +AU_ALIAS([AC_CHECK_JUNIT], [AX_CHECK_JUNIT]) +AC_DEFUN([AX_CHECK_JUNIT],[ AC_CACHE_VAL(ac_cv_prog_JUNIT,[ AC_CHECK_CLASS(junit.textui.TestRunner) if test x"`eval 'echo $ac_cv_class_junit_textui_TestRunner'`" != xno ; then @@ -229,40 +236,40 @@ AC_SUBST(TESTS_JUNIT)]) # =========================================================================== -# http://autoconf-archive.cryp.to/ac_prog_java.html +# http://www.gnu.org/software/autoconf-archive/ax_prog_java.html # =========================================================================== # # SYNOPSIS # -# AC_PROG_JAVA +# AX_PROG_JAVA # # DESCRIPTION # # Here is a summary of the main macros: # -# AC_PROG_JAVAC: finds a Java compiler. +# AX_PROG_JAVAC: finds a Java compiler. # -# AC_PROG_JAVA: finds a Java virtual machine. +# AX_PROG_JAVA: finds a Java virtual machine. # -# AC_CHECK_CLASS: finds if we have the given class (beware of CLASSPATH!). +# AX_CHECK_CLASS: finds if we have the given class (beware of CLASSPATH!). # -# AC_CHECK_RQRD_CLASS: finds if we have the given class and stops +# AX_CHECK_RQRD_CLASS: finds if we have the given class and stops # otherwise. # -# AC_TRY_COMPILE_JAVA: attempt to compile user given source. +# AX_TRY_COMPILE_JAVA: attempt to compile user given source. # # AC_TRY_RUN_JAVA: attempt to compile and run user given source. # # AC_JAVA_OPTIONS: adds Java configure options. # -# AC_PROG_JAVA tests an existing Java virtual machine. It uses the +# AX_PROG_JAVA tests an existing Java virtual machine. It uses the # environment variable JAVA then tests in sequence various common Java # virtual machines. For political reasons, it starts with the free ones. -# You *must* call [AC_PROG_JAVAC] before. +# You *must* call [AX_PROG_JAVAC] before. # # If you want to force a specific VM: # -# - at the configure.in level, set JAVA=yourvm before calling AC_PROG_JAVA +# - at the configure.in level, set JAVA=yourvm before calling AX_PROG_JAVA # # (but after AC_INIT) # @@ -287,18 +294,18 @@ # This is a sample configure.in Process this file with autoconf to produce # a configure script. # -# AC_INIT(UnTag.java) +# AC_INIT(UnTag.java) # -# dnl Checks for programs. -# AC_CHECK_CLASSPATH -# AC_PROG_JAVAC -# AC_PROG_JAVA -# -# dnl Checks for classes -# AC_CHECK_RQRD_CLASS(org.xml.sax.Parser) -# AC_CHECK_RQRD_CLASS(com.jclark.xml.sax.Driver) +# dnl Checks for programs. +# AC_CHECK_CLASSPATH +# AX_PROG_JAVAC +# AX_PROG_JAVA +# +# dnl Checks for classes +# AX_CHECK_RQRD_CLASS(org.xml.sax.Parser) +# AX_CHECK_RQRD_CLASS(com.jclark.xml.sax.Driver) # -# AC_OUTPUT(Makefile) +# AC_OUTPUT(Makefile) # # LICENSE # @@ -330,25 +337,27 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -AC_DEFUN([AC_PROG_JAVA],[ -AC_REQUIRE([AC_EXEEXT])dnl +#serial 7 + +AU_ALIAS([AC_PROG_JAVA], [AX_PROG_JAVA]) +AC_DEFUN([AX_PROG_JAVA],[ if test x$JAVAPREFIX = x; then - test x$JAVA = x && AC_CHECK_PROGS(JAVA, kaffe$EXEEXT java$EXEEXT) + test x$JAVA = x && AC_CHECK_PROGS(JAVA, kaffe java) else - test x$JAVA = x && AC_CHECK_PROGS(JAVA, kaffe$EXEEXT java$EXEEXT, $JAVAPREFIX) + test x$JAVA = x && AC_CHECK_PROGS(JAVA, kaffe java, $JAVAPREFIX) fi test x$JAVA = x && AC_MSG_ERROR([no acceptable Java virtual machine found in \$PATH]) -AC_PROG_JAVA_WORKS +AX_PROG_JAVA_WORKS AC_PROVIDE([$0])dnl ]) # =========================================================================== -# http://autoconf-archive.cryp.to/ac_prog_java_works.html +# http://www.gnu.org/software/autoconf-archive/ax_prog_java_works.html # =========================================================================== # # SYNOPSIS # -# AC_PROG_JAVA_WORKS +# AX_PROG_JAVA_WORKS # # DESCRIPTION # @@ -359,7 +368,7 @@ # on other. Unfortunately, the autoconf archive does not support the # concept of set of macros, so I had to break it for submission. The # general documentation, as well as the sample configure.in, is included -# in the AC_PROG_JAVA macro. +# in the AX_PROG_JAVA macro. # # LICENSE # @@ -391,9 +400,12 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -AC_DEFUN([AC_PROG_JAVA_WORKS], [ -AC_CHECK_PROG(uudecode, uudecode$EXEEXT, yes) -if test x$uudecode = xyes; then +#serial 6 + +AU_ALIAS([AC_PROG_JAVA_WORKS], [AX_PROG_JAVA_WORKS]) +AC_DEFUN([AX_PROG_JAVA_WORKS], [ +AC_CHECK_PROG(UUDECODE, uudecode, no) +if test x$uudecode != xno; then AC_CACHE_CHECK([if uudecode can decode base 64 file], ac_cv_prog_uudecode_base64, [ dnl /** dnl * Test.java: used to test if java compiler works. @@ -419,7 +431,7 @@ AAEAAAAFKrcAErEAAAABAAgAAAAKAAIAAAAEAAQABAABABMAAAACABQ= ==== EOF -if uudecode$EXEEXT Test.uue; then +if $UUDECODE Test.uue; then ac_cv_prog_uudecode_base64=yes else echo "configure: __oline__: uudecode had trouble decoding base 64 file 'Test.uue'" >&AC_FD_CC @@ -436,7 +448,7 @@ AC_MSG_ERROR([Cannot compile java source. $JAVAC does not work properly]) fi if test x$ac_cv_prog_javac_works = x; then - AC_PROG_JAVAC + AX_PROG_JAVAC fi fi AC_CACHE_CHECK(if $JAVA works, ac_cv_prog_java_works, [ @@ -475,23 +487,23 @@ ) # =========================================================================== -# http://autoconf-archive.cryp.to/ac_prog_javac.html +# http://www.gnu.org/software/autoconf-archive/ax_prog_javac.html # =========================================================================== # # SYNOPSIS # -# AC_PROG_JAVAC +# AX_PROG_JAVAC # # DESCRIPTION # -# AC_PROG_JAVAC tests an existing Java compiler. It uses the environment +# AX_PROG_JAVAC tests an existing Java compiler. It uses the environment # variable JAVAC then tests in sequence various common Java compilers. For # political reasons, it starts with the free ones. # # If you want to force a specific compiler: # # - at the configure.in level, set JAVAC=yourcompiler before calling -# AC_PROG_JAVAC +# AX_PROG_JAVAC # # - at the configure level, setenv JAVAC # @@ -508,7 +520,7 @@ # on other. Unfortunately, the autoconf archive does not support the # concept of set of macros, so I had to break it for submission. The # general documentation, as well as the sample configure.in, is included -# in the AC_PROG_JAVA macro. +# in the AX_PROG_JAVA macro. # # LICENSE # @@ -540,25 +552,27 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -AC_DEFUN([AC_PROG_JAVAC],[ -AC_REQUIRE([AC_EXEEXT])dnl +#serial 6 + +AU_ALIAS([AC_PROG_JAVAC], [AX_PROG_JAVAC]) +AC_DEFUN([AX_PROG_JAVAC],[ if test "x$JAVAPREFIX" = x; then - test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT) + test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "gcj -C" guavac jikes javac) else - test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT, $JAVAPREFIX) + test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "gcj -C" guavac jikes javac, $JAVAPREFIX) fi test "x$JAVAC" = x && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH]) -AC_PROG_JAVAC_WORKS +AX_PROG_JAVAC_WORKS AC_PROVIDE([$0])dnl ]) # =========================================================================== -# http://autoconf-archive.cryp.to/ac_prog_javac_works.html +# http://www.gnu.org/software/autoconf-archive/ax_prog_javac_works.html # =========================================================================== # # SYNOPSIS # -# AC_PROG_JAVAC_WORKS +# AX_PROG_JAVAC_WORKS # # DESCRIPTION # @@ -569,7 +583,7 @@ # on other. Unfortunately, the autoconf archive does not support the # concept of set of macros, so I had to break it for submission. The # general documentation, as well as the sample configure.in, is included -# in the AC_PROG_JAVA macro. +# in the AX_PROG_JAVA macro. # # LICENSE # @@ -601,7 +615,10 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -AC_DEFUN([AC_PROG_JAVAC_WORKS],[ +#serial 5 + +AU_ALIAS([AC_PROG_JAVAC_WORKS], [AX_PROG_JAVAC_WORKS]) +AC_DEFUN([AX_PROG_JAVAC_WORKS],[ AC_CACHE_CHECK([if $JAVAC works], ac_cv_prog_javac_works, [ JAVA_TEST=Test.java CLASS_TEST=Test.class @@ -623,16 +640,16 @@ ]) # =========================================================================== -# http://autoconf-archive.cryp.to/ac_try_compile_java.html +# http://www.gnu.org/software/autoconf-archive/ax_try_compile_java.html # =========================================================================== # # SYNOPSIS # -# AC_TRY_COMPILE_JAVA +# AX_TRY_COMPILE_JAVA # # DESCRIPTION # -# AC_TRY_COMPILE_JAVA attempt to compile user given source. +# AX_TRY_COMPILE_JAVA attempt to compile user given source. # # *Warning*: its success or failure can depend on a proper setting of the # CLASSPATH env. variable. @@ -642,7 +659,7 @@ # on other. Unfortunately, the autoconf archive does not support the # concept of set of macros, so I had to break it for submission. The # general documentation, as well as the sample configure.in, is included -# in the AC_PROG_JAVA macro. +# in the AX_PROG_JAVA macro. # # LICENSE # @@ -650,10 +667,14 @@ # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 -AC_DEFUN([AC_TRY_COMPILE_JAVA],[ -AC_REQUIRE([AC_PROG_JAVAC])dnl +AU_ALIAS([AC_TRY_COMPILE_JAVA], [AX_TRY_COMPILE_JAVA]) +AC_DEFUN([AX_TRY_COMPILE_JAVA],[ +AC_REQUIRE([AX_PROG_JAVAC])dnl cat << \EOF > Test.java /* [#]line __oline__ "configure" */ ifelse([$1], , , [import $1;]) diff -Nru genparse-0.9.1/ChangeLog genparse-0.9.2/ChangeLog --- genparse-0.9.1/ChangeLog 2012-03-22 19:30:19.000000000 +0000 +++ genparse-0.9.2/ChangeLog 2013-11-02 08:29:35.000000000 +0000 @@ -1,3 +1,7 @@ +2013-11-02 Michael Geng + + * config.guess and config.sub updated + 2012-03-22 Michael Geng * add const attribute to generated C++ classes (thanks to Thomas Sprinkmeier) diff -Nru genparse-0.9.1/config.guess genparse-0.9.2/config.guess --- genparse-0.9.1/config.guess 2011-12-05 19:09:24.000000000 +0000 +++ genparse-0.9.2/config.guess 2013-10-29 18:33:24.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2007-12-05' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -25,16 +25,16 @@ # the same distribution terms that you use for the rest of that program. -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# Originally written by Per Bothner. Please send patches (context +# diff format) to and include a ChangeLog +# entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,7 +54,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -142,7 +143,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -168,7 +169,7 @@ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -178,7 +179,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -221,7 +222,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -267,7 +268,10 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -293,7 +297,7 @@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -322,14 +326,33 @@ case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -373,23 +396,23 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -459,8 +482,8 @@ echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -473,7 +496,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -530,7 +553,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[45]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -573,52 +596,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -638,7 +661,7 @@ # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -709,22 +732,22 @@ exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -748,14 +771,14 @@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -767,13 +790,12 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -782,25 +804,34 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in + *:Interix*:*) + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd) + authenticamd | genuineintel | EM64T) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -830,6 +861,27 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -837,20 +889,40 @@ then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -861,74 +933,33 @@ m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips64 - #undef mips64el + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 + CPU=${UNAME_MACHINE} #else CPU= #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + padre:Linux:*:*) + echo sparc-unknown-linux-gnu exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level @@ -938,14 +969,17 @@ *) echo hppa-unknown-linux-gnu ;; esac exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -953,78 +987,18 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both @@ -1032,11 +1006,11 @@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1053,7 +1027,7 @@ i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) @@ -1068,7 +1042,7 @@ fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1096,10 +1070,13 @@ exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp - exit ;; + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1134,8 +1111,18 @@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; @@ -1148,7 +1135,7 @@ rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) @@ -1168,10 +1155,10 @@ echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1197,11 +1184,11 @@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1211,6 +1198,9 @@ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1238,6 +1228,16 @@ *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} @@ -1253,6 +1253,9 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@ -1298,13 +1301,13 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1319,6 +1322,12 @@ i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1341,11 +1350,11 @@ #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif @@ -1479,9 +1488,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be diff -Nru genparse-0.9.1/config.sub genparse-0.9.2/config.sub --- genparse-0.9.1/config.sub 2011-12-05 19:09:23.000000000 +0000 +++ genparse-0.9.2/config.sub 2013-10-29 18:33:22.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2007-12-05' +timestamp='2012-04-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,7 +21,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -30,13 +30,16 @@ # Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# diff and a properly formatted GNU ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. @@ -70,7 +73,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -118,12 +122,18 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -146,10 +156,13 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) + -apple | -axis | -knuth | -cray | -microblaze) os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -164,10 +177,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -212,6 +225,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -236,24 +255,32 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ + | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ @@ -266,29 +293,42 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | rl78 | rx \ | score \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -298,6 +338,21 @@ basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -312,29 +367,36 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ + | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ @@ -349,27 +411,32 @@ | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ - | v850-* | v850e-* | vax-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) ;; # Recognize the basic CPU types without company name, with glob match. xtensa*) @@ -391,7 +458,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -437,6 +504,10 @@ basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -453,10 +524,27 @@ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` os=-linux ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -485,7 +573,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -524,6 +612,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -639,7 +731,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -697,6 +788,9 @@ basic_machine=ns32k-utek os=-sysv ;; + microblaze) + basic_machine=microblaze-xilinx + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -733,10 +827,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -801,6 +903,12 @@ np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -883,9 +991,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -979,6 +1088,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1035,17 +1147,9 @@ basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff + tile*) + basic_machine=$basic_machine-unknown + os=-linux-gnu ;; tx39) basic_machine=mipstx39-unknown @@ -1114,6 +1218,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1122,6 +1229,10 @@ basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1160,7 +1271,7 @@ we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) @@ -1207,9 +1318,12 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; @@ -1230,10 +1344,11 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -1242,9 +1357,10 @@ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1252,7 +1368,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1291,7 +1407,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1340,7 +1456,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1382,6 +1498,11 @@ -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; + -nacl*) + ;; -none) ;; *) @@ -1404,10 +1525,10 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1419,8 +1540,20 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1440,14 +1573,11 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1474,7 +1604,7 @@ *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) @@ -1579,7 +1709,7 @@ -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) diff -Nru genparse-0.9.1/configure genparse-0.9.2/configure --- genparse-0.9.1/configure 2012-03-22 19:33:00.000000000 +0000 +++ genparse-0.9.2/configure 2013-10-30 18:44:23.000000000 +0000 @@ -1,11 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68. +# Generated by GNU Autoconf 2.69. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,6 +132,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -167,7 +190,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -212,21 +236,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -328,6 +356,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -449,6 +485,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -483,16 +523,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -504,28 +544,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -636,7 +656,7 @@ HAVE_GETOPT_JAVA_TRUE HAVE_GETOPT_JAVA JAVAC -uudecode +UUDECODE JAVA CXXCPP am__fastdepCXX_FALSE @@ -1427,8 +1447,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1685,9 +1703,9 @@ if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.68 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1950,7 +1968,8 @@ main () { static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1966,7 +1985,8 @@ main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1992,7 +2012,8 @@ main () { static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2008,7 +2029,8 @@ main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2042,7 +2064,8 @@ main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2138,7 +2161,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2403,7 +2426,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2828,7 +2851,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2959,7 +2982,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -3012,7 +3035,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3098,7 +3121,7 @@ # Define the identity of the package. PACKAGE=genparse - VERSION=0.9.1 + VERSION=0.9.2 cat >>confdefs.h <<_ACEOF @@ -3150,7 +3173,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3190,7 +3213,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3267,7 +3290,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3307,7 +3330,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3360,7 +3383,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3401,7 +3424,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3459,7 +3482,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3503,7 +3526,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3949,8 +3972,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4222,7 +4244,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4262,7 +4284,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4452,7 +4474,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4518,7 +4540,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -8609,7 +8631,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_YACC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8652,7 +8674,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LEX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8684,7 +8706,8 @@ b { REJECT; } c { yymore (); } d { yyless (1); } -e { yyless (input () != 0); } +e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument. */ + yyless ((input () != 0)); } f { unput (yytext[0]); } . { BEGIN INITIAL; } %% @@ -8814,7 +8837,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_HAVE_JAVA="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8864,7 +8887,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_HAVE_JAVAC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8925,7 +8948,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8969,7 +8992,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9415,7 +9438,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9455,7 +9478,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9556,11 +9579,11 @@ int main () { -/* FIXME: Include the comments suggested by Paul. */ + #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ + /* Ultrix mips cc rejects this sort of thing. */ typedef int charset[2]; - const charset cs; + const charset cs = { 0, 0 }; /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; @@ -9577,8 +9600,9 @@ ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; @@ -9594,10 +9618,10 @@ iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this saying + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; @@ -9776,9 +9800,8 @@ - if test x$JAVAPREFIX = x; then - test x$JAVA = x && for ac_prog in kaffe$EXEEXT java$EXEEXT + test x$JAVA = x && for ac_prog in kaffe java do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -9796,7 +9819,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_JAVA="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9821,7 +9844,7 @@ done else - test x$JAVA = x && for ac_prog in kaffe$EXEEXT java$EXEEXT + test x$JAVA = x && for ac_prog in kaffe java do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -9839,7 +9862,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_JAVA="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9867,15 +9890,15 @@ fi test x$JAVA = x && as_fn_error $? "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5 -# Extract the first word of "uudecode$EXEEXT", so it can be a program name with args. -set dummy uudecode$EXEEXT; ac_word=$2 +# Extract the first word of "uudecode", so it can be a program name with args. +set dummy uudecode; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_uudecode+:} false; then : +if ${ac_cv_prog_UUDECODE+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$uudecode"; then - ac_cv_prog_uudecode="$uudecode" # Let the user override the test. + if test -n "$UUDECODE"; then + ac_cv_prog_UUDECODE="$UUDECODE" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -9883,8 +9906,8 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_uudecode="yes" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_UUDECODE="no" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -9894,17 +9917,17 @@ fi fi -uudecode=$ac_cv_prog_uudecode -if test -n "$uudecode"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $uudecode" >&5 -$as_echo "$uudecode" >&6; } +UUDECODE=$ac_cv_prog_UUDECODE +if test -n "$UUDECODE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UUDECODE" >&5 +$as_echo "$UUDECODE" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -if test x$uudecode = xyes; then +if test x$uudecode != xno; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if uudecode can decode base 64 file" >&5 $as_echo_n "checking if uudecode can decode base 64 file... " >&6; } if ${ac_cv_prog_uudecode_base64+:} false; then : @@ -9922,10 +9945,10 @@ AAEAAAAFKrcAErEAAAABAAgAAAAKAAIAAAAEAAQABAABABMAAAACABQ= ==== EOF -if uudecode$EXEEXT Test.uue; then +if $UUDECODE Test.uue; then ac_cv_prog_uudecode_base64=yes else - echo "configure: 9928: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 9951: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=no @@ -9945,7 +9968,7 @@ if test x$ac_cv_prog_javac_works = x; then if test "x$JAVAPREFIX" = x; then - test "x$JAVAC" = x && for ac_prog in "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT + test "x$JAVAC" = x && for ac_prog in "gcj -C" guavac jikes javac do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -9963,7 +9986,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_JAVAC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9988,7 +10011,7 @@ done else - test "x$JAVAC" = x && for ac_prog in "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT + test "x$JAVAC" = x && for ac_prog in "gcj -C" guavac jikes javac do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -10006,7 +10029,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_JAVAC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10043,7 +10066,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 10046 "configure" */ +/* #line 10069 "configure" */ public class Test { } EOF @@ -10078,7 +10101,7 @@ CLASS_TEST=Test.class TEST=Test cat << \EOF > $JAVA_TEST -/* [#]line 10081 "configure" */ +/* [#]line 10104 "configure" */ public class Test { public static void main (String args[]) { System.exit (0); @@ -10123,7 +10146,7 @@ ac_var_name=`echo gnu.getopt.Getopt | sed 's/\./_/g'` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnu.getopt.Getopt class" >&5 $as_echo_n "checking for gnu.getopt.Getopt class... " >&6; } -if eval \${ac_cv_class_$ac_var_name+:} false; then : +if eval \${ax_cv_class_$ac_var_name+:} false; then : $as_echo_n "(cached) " >&6 else @@ -10150,7 +10173,7 @@ if uudecode$EXEEXT Test.uue; then : else - echo "configure: 10153: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 10176: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=no @@ -10170,7 +10193,7 @@ else cat << \EOF > Test.java -/* #line 10173 "configure" */ +/* #line 10196 "configure" */ import gnu.getopt.Getopt; public class Test { @@ -10326,7 +10349,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CPPUNIT_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10440,7 +10463,7 @@ ac_var_name=`echo junit.textui.TestRunner | sed 's/\./_/g'` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for junit.textui.TestRunner class" >&5 $as_echo_n "checking for junit.textui.TestRunner class... " >&6; } -if eval \${ac_cv_class_$ac_var_name+:} false; then : +if eval \${ax_cv_class_$ac_var_name+:} false; then : $as_echo_n "(cached) " >&6 else @@ -10467,7 +10490,7 @@ if uudecode$EXEEXT Test.uue; then : else - echo "configure: 10470: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 10493: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=no @@ -10487,7 +10510,7 @@ else cat << \EOF > Test.java -/* #line 10490 "configure" */ +/* #line 10513 "configure" */ import junit.textui.TestRunner; public class Test { @@ -10576,7 +10599,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DOXYGEN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10623,7 +10646,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DOT="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10683,7 +10706,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_TEXI2HTML="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10739,7 +10762,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_TEXI2PDF="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10795,7 +10818,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MAN2HTML="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11351,16 +11374,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -11420,28 +11443,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -11463,7 +11474,7 @@ # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -11529,10 +11540,10 @@ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -11623,7 +11634,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' diff -Nru genparse-0.9.1/configure.ac genparse-0.9.2/configure.ac --- genparse-0.9.1/configure.ac 2012-03-22 19:31:34.000000000 +0000 +++ genparse-0.9.2/configure.ac 2013-10-30 18:43:29.000000000 +0000 @@ -3,7 +3,7 @@ AC_CONFIG_SRCDIR([src/genparse.cc]) dnl set up for automake -AM_INIT_AUTOMAKE(genparse,0.9.1) +AM_INIT_AUTOMAKE(genparse,0.9.2) dnl set up automake header file AC_CONFIG_HEADERS([config.h:config.in]) diff -Nru genparse-0.9.1/debian/changelog genparse-0.9.2/debian/changelog --- genparse-0.9.1/debian/changelog 2014-02-14 04:40:45.000000000 +0000 +++ genparse-0.9.2/debian/changelog 2016-11-10 12:18:01.000000000 +0000 @@ -1,8 +1,25 @@ -genparse (0.9.1-1ubuntu1) trusty; urgency=low +genparse (0.9.2-1) unstable; urgency=medium - * Use autotools-dev for arm64. + * New upstream release. + * debian/control + - (Build-Depends). Delete texi2html. See #698081 + and https://wiki.debian.org/Texi2htmlTransition + - (Homepage): update URL. + - (Standards-Version): Update to 3.9.8. + - (Vcs-*): Update to anonscm.debian.org. + * debian/copyright + - (Format): update from DEP5 to 1.0. + - Update URLs. + * debian/patches + - (10): New. (FTBFS; Closes: #802190) + - (20): New. Correct manual page. + - (30): New. Gcc fixes. + * debian/rules + - Use dh --with autoreconf (Closes: #727866). + * debian/source/options + - New file. - -- Daniel T Chen Thu, 13 Feb 2014 23:40:32 -0500 + -- Jari Aalto Thu, 10 Nov 2016 14:18:01 +0200 genparse (0.9.1-1) unstable; urgency=low diff -Nru genparse-0.9.1/debian/control genparse-0.9.2/debian/control --- genparse-0.9.1/debian/control 2014-02-14 04:39:53.000000000 +0000 +++ genparse-0.9.2/debian/control 2016-11-10 12:18:01.000000000 +0000 @@ -1,13 +1,12 @@ Source: genparse Section: devel Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Jari Aalto -Build-Depends: debhelper (>= 9), automake, autoconf, bison, flex, texinfo, doxygen, libcunit1-dev, junit, libcppunit-dev, default-jdk, install-info, texi2html, man2html, doxygen-latex, autotools-dev -Standards-Version: 3.9.3.1 -Vcs-Browser: http://git.debian.org/?p=collab-maint/genparse.git -Vcs-Git: git://git.debian.org/git/collab-maint/genparse.git -Homepage: http://genparse.sourceforge.net +Maintainer: Jari Aalto +Build-Depends: debhelper (>= 9), autotools-dev, automake, autoconf, bison, flex, texinfo, doxygen, libcunit1-dev, junit, libcppunit-dev, default-jdk, install-info, man2html, doxygen-latex +Standards-Version: 3.9.8 +Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/genparse.git +Vcs-Git: https://anonscm.debian.org/git/collab-maint/genparse.git +Homepage: https://sourceforge.net/p/genparse Package: genparse Architecture: any diff -Nru genparse-0.9.1/debian/copyright genparse-0.9.2/debian/copyright --- genparse-0.9.1/debian/copyright 2012-05-10 06:32:28.000000000 +0000 +++ genparse-0.9.2/debian/copyright 2016-11-10 12:18:01.000000000 +0000 @@ -1,11 +1,9 @@ -Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174 -X-Format: http://dep.debian.net/deps/dep5 +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0 Upstream-Name: genparse Upstream-Contact: Michael Geng , -Source: http://freshmeat.net/projects/genparse +Source: https://sourceforge.net/projects/genparse X-Upstream-Vcs: https://sourceforge.net/projects/genparse/develop -X-Upstream-Bugs: https://sourceforge.net/tracker/?group_id=4341&atid=104341 -X-Source-Sourceforge: http://sourceforge.net/projects/genparse +X-Upstream-Bugs: https://sourceforge.net/p/genparse/bugs/ Files: * Copyright: @@ -15,7 +13,7 @@ Files: debian/* Copyright: - 2010-2012 Jari Aalto + 2010-2016 Jari Aalto 2008 Luk Claes 2005 Lars Wirzenius 2005 Víctor Pérez Pereira diff -Nru genparse-0.9.1/debian/debian-save-restore.mk genparse-0.9.2/debian/debian-save-restore.mk --- genparse-0.9.1/debian/debian-save-restore.mk 2012-05-10 06:32:28.000000000 +0000 +++ genparse-0.9.2/debian/debian-save-restore.mk 1970-01-01 00:00:00.000000000 +0000 @@ -1,99 +0,0 @@ -# debian-save-restore.mk -- Save and restore original files -# -# Copyright -# -# Copyright (C) 2008-2012 Jari Aalto -# -# License -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Description -# -# This is GNU makefile part, that defines common variables, -# targets and macros to be used from debian/rules. -# -# Usage (format 3.0) -# -# PACKAGE = foo -# FILE_LIST_PRESERVE = -# -# override_dh_clean: -# $(file-state-save) -# dh_clean -# $(file-state-restore-copy) -# -# Alternative usage, in case more file updates happens during configure etc. -# -# override_dh_auto_configure: -# $(file-state-save) -# -# -# override_dh_install: -# dh_install -# $(config-restore) -# $(file-state-restore) -# -# binary-arch: -# $(file-state-restore) -# ... - -ifdef PACKAGE - prefix := $(PACKAGE). -endif - -define file-state-save - # save files - suffix=.original; \ - for file in $(FILE_LIST_PRESERVE); \ - do \ - backup=/tmp/$(prefix)$$(echo $$file | sed 's,/,%,g')$$suffix; \ - cp --archive --verbose "$$file" "$$backup"; \ - done -endef - -define file-state-restore-copy - # restore files - suffix=.original; \ - for file in $(FILE_LIST_PRESERVE); \ - do \ - backup=/tmp/$(prefix)$$(echo $$file | sed 's,/,%,g')$$suffix; \ - if [ -f "$$backup" ]; then \ - dir=$$(dirname "$$file"); \ - if [ "$$dir" != "." ]; then \ - mkdir -p "$$dir"; \ - fi; \ - cp --archive --verbose "$$backup" "$$file"; \ - fi; \ - done -endef - -define file-state-restore - # restore files - suffix=.original; \ - for file in $(FILE_LIST_PRESERVE); \ - do \ - backup=/tmp/$(prefix)$$(echo $$file | sed 's,/,%,g')$$suffix; \ - if [ -f "$$backup" ]; then \ - dir=$$(dirname "$$file"); \ - if [ "$$dir" != "." ]; then \ - mkdir -p "$$dir"; \ - fi; \ - cp --archive --verbose "$$backup" "$$file"; \ - rm "$$backup"; \ - fi; \ - done -endef - -# End of file diff -Nru genparse-0.9.1/debian/genparse.lintian-overrides genparse-0.9.2/debian/genparse.lintian-overrides --- genparse-0.9.1/debian/genparse.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ genparse-0.9.2/debian/genparse.lintian-overrides 2016-11-10 12:18:01.000000000 +0000 @@ -0,0 +1,12 @@ +# package.lintian-overrides + +# OVERRIDE EXPLANATION: There is an ASCII table with columns in README +genparse binary: spelling-error-in-readme-debian many many (duplicate word) many +genparse binary: spelling-error-in-readme-debian file file (duplicate word) file +genparse binary: spelling-error-in-readme-debian yes yes (duplicate word) yes +genparse binary: spelling-error-in-readme-debian no no (duplicate word) no +genparse binary: spelling-error-in-readme-debian parser parser (duplicate word) parser +genparse binary: spelling-error-in-readme-debian struct struct (duplicate word) struct +genparse binary: spelling-error-in-readme-debian none none (duplicate word) none + +# End o file diff -Nru genparse-0.9.1/debian/patches/10-build.patch genparse-0.9.2/debian/patches/10-build.patch --- genparse-0.9.1/debian/patches/10-build.patch 1970-01-01 00:00:00.000000000 +0000 +++ genparse-0.9.2/debian/patches/10-build.patch 2016-11-10 12:18:01.000000000 +0000 @@ -0,0 +1,32 @@ +From: Jari Aalto +Subject: Correct use of latest CUNit. Fixes FTBFS SIGSEGV on test run. +Bug: https://bugs.debian.org/802190 +Forwarded: https://sourceforge.net/p/genparse/bugs/19/ + +--- + tests/ccheck/genparse_test.h | 2 +- + tests/ccheck/gnulib_test.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/tests/ccheck/genparse_test.h ++++ b/tests/ccheck/genparse_test.h +@@ -41,7 +41,7 @@ static CU_TestInfo test_genparse[] = { + }; + + static CU_SuiteInfo suites[] = { +- { "TestGenparse", NULL, NULL, test_genparse }, ++ { "TestGenparse", NULL, NULL, NULL, NULL, test_genparse }, + CU_SUITE_INFO_NULL, + }; + +--- a/tests/ccheck/gnulib_test.h ++++ b/tests/ccheck/gnulib_test.h +@@ -35,7 +35,7 @@ static CU_TestInfo test_genparse[] = { + }; + + static CU_SuiteInfo suites[] = { +- { "TestGenparse", NULL, NULL, test_genparse }, ++ { "TestGenparse", NULL, NULL, NULL, NULL, test_genparse }, + CU_SUITE_INFO_NULL, + }; + diff -Nru genparse-0.9.1/debian/patches/20-manpage.patch genparse-0.9.2/debian/patches/20-manpage.patch --- genparse-0.9.1/debian/patches/20-manpage.patch 1970-01-01 00:00:00.000000000 +0000 +++ genparse-0.9.2/debian/patches/20-manpage.patch 2016-11-10 12:18:01.000000000 +0000 @@ -0,0 +1,28 @@ +From: Jari Aalto +Subject: Correct spelling +Forwarded: https://sourceforge.net/p/genparse/bugs/21/ + +--- + doc/genparse.1 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/doc/genparse.1 ++++ b/doc/genparse.1 +@@ -101,7 +101,7 @@ specify only the short one (and the slas + to specify a parameter that only has a long name set \fIshort_names\fP + to \fBNONE\fP. It is possible to have multiple short options, so + for example setting \fIshort_name\fP to 'aA' and \fIlong_name\fP +-to 'all' would allow to specify the command line switch as '\-a' or '\-A' ++to 'all' would allow one to specify the command line switch as '\-a' or '\-A' + or '\-\-all', all of them doing the same thing. + .sp + A \fB*\fP after \fIshort_name\fP or \fIlong_name\fP makes the argument optional. +@@ -158,7 +158,7 @@ is printed when the argument could not b + \fB__ERR_MSG__("%s: invalid argument")\fP. This message will be printed when + either the conversion function failed or when the argument was out of range. + Assumes to contain one \fB%s\fP which will be replaced with +-the agrument which could not be converted. Only available when Genparse is ++the argument which could not be converted. Only available when Genparse is + invoked with \fB--gnulib\fP, ignored otherwise. + .PP + Optionally a conversion function can be added as a second argument, e. g. diff -Nru genparse-0.9.1/debian/patches/30-gcc.patch genparse-0.9.2/debian/patches/30-gcc.patch --- genparse-0.9.1/debian/patches/30-gcc.patch 1970-01-01 00:00:00.000000000 +0000 +++ genparse-0.9.2/debian/patches/30-gcc.patch 2016-11-10 12:18:01.000000000 +0000 @@ -0,0 +1,18 @@ +From: Jari Aalto +Subject: Correct implicit declaration of function 'AddTests' +Forwarded: https://sourceforge.net/p/genparse/bugs/22/ + +--- + tests/ccheck/ftest.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/tests/ccheck/ftest.c ++++ b/tests/ccheck/ftest.c +@@ -20,6 +20,7 @@ + + #include + #include ++#include "genparse_test.h" + + int main (int argc, char* argv[]) + { diff -Nru genparse-0.9.1/debian/patches/50-texi2html.patch genparse-0.9.2/debian/patches/50-texi2html.patch --- genparse-0.9.1/debian/patches/50-texi2html.patch 1970-01-01 00:00:00.000000000 +0000 +++ genparse-0.9.2/debian/patches/50-texi2html.patch 2016-11-10 12:18:01.000000000 +0000 @@ -0,0 +1,31 @@ +From: Jari Aalto +Subject: use makeinfo for HTML. See https://wiki.debian.org/Texi2htmlTransition +Forwarded: https://sourceforge.net/p/genparse/bugs/23/ + +--- + doc/Makefile.am | 2 +- + doc/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/doc/Makefile.in ++++ b/doc/Makefile.in +@@ -904,7 +904,7 @@ htmlinfo: html/info/genparse.html + + html/info/genparse.html: genparse.texi + mkdir -p html +- @TEXI2HTML@ --subdir html/info --split section $< ++ makeinfo --html --output=html/genparse.html --split=section $< + + .PHONY: pdfinfo + pdfinfo: info.pdf +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -18,7 +18,7 @@ htmlinfo: html/info/genparse.html + + html/info/genparse.html: genparse.texi + mkdir -p html +- @TEXI2HTML@ --subdir html/info --split section $< ++ makeinfo --html --output=html/genparse.html --split=section $< + + .PHONY: pdfinfo + pdfinfo: info.pdf diff -Nru genparse-0.9.1/debian/patches/series genparse-0.9.2/debian/patches/series --- genparse-0.9.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ genparse-0.9.2/debian/patches/series 2016-11-10 12:18:01.000000000 +0000 @@ -0,0 +1,4 @@ +10-build.patch +20-manpage.patch +30-gcc.patch +50-texi2html.patch diff -Nru genparse-0.9.1/debian/rules genparse-0.9.2/debian/rules --- genparse-0.9.1/debian/rules 2014-02-14 04:40:29.000000000 +0000 +++ genparse-0.9.2/debian/rules 2016-11-10 12:18:01.000000000 +0000 @@ -6,53 +6,18 @@ export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -include debian/debian-save-restore.mk - -# Changed by the build process: files deleted and autoreconf -FILE_LIST_PRESERVE = \ - config.guess \ - config.sub \ - doc/stamp-vti \ - doc/version.texi \ - examples/echo_clp.c \ - examples/echo_clp.h \ - examples/ls_clp.c \ - examples/ls_clp.h \ - examples/mv_clp.c \ - examples/mv_clp.h \ - examples/mycopy3_clp.c \ - examples/mycopy3_clp.h \ - examples/mycopy4_clp.cc \ - examples/mycopy4_clp.h \ - examples/mycopy4_clp_cb.cc \ - examples/ping_clp.c \ - examples/ping_clp.h \ - examples/rm_clp.c \ - examples/rm_clp.h \ - examples/tail_clp.c \ - examples/tail_clp.h \ - examples/uname_clp.c \ - examples/uname_clp.h \ - examples/wc_clp.c \ - examples/wc_clp.h \ - tests/ccheck/default_clp.c \ - tests/ccheck/double_clp.c \ - tests/ccheck/intmax_clp.c \ - tests/ccheck/long_clp.c \ - tests/ccheck/longmembers_clp.c \ - tests/ccheck/uintmax_clp.c \ - tests/ccheck/ulong_clp.c \ - tests/cppcheck/default_clp.cc \ - tests/cppcheck/longmembers_clp.cc - RM = \ tests/misc/quotearg.c \ tests/misc/quotearg.h +override_dh_configure: + dh_autotools-dev_updateconfig + autoreconf -fi + dh_configure + override_dh_auto_clean: - $(file-state-save) + dh_autotools-dev_restoreconfig dh_auto_clean - $(file-state-restore-copy) override_dh_clean: dh_clean @@ -60,11 +25,10 @@ override_dh_install: dh_install - $(file-state-restore) # remove central info "dir", handled by install-info rm -f debian/$(PACKAGE)/usr/share/info/dir* %: - dh $@ --with autotools-dev + dh $@ --with autotools_dev # End of file diff -Nru genparse-0.9.1/debian/source/options genparse-0.9.2/debian/source/options --- genparse-0.9.1/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ genparse-0.9.2/debian/source/options 2016-11-10 12:18:01.000000000 +0000 @@ -0,0 +1 @@ +extend-diff-ignore = "configure|config\.(sub|guess)|Makefile|tests|examples" diff -Nru genparse-0.9.1/doc/genparse.info genparse-0.9.2/doc/genparse.info --- genparse-0.9.1/doc/genparse.info 2012-03-22 19:33:47.000000000 +0000 +++ genparse-0.9.2/doc/genparse.info 2013-10-30 18:46:29.000000000 +0000 @@ -32,7 +32,7 @@ This file documents the Genparse package for creating command line parsing routines in C, C++ and Java using a simple descriptive file. -This is edition 0.9.1, for Genparse version 0.9.1. +This is edition 0.9.2, for Genparse version 0.9.2. * Menu: diff -Nru genparse-0.9.1/doc/Makefile.in genparse-0.9.2/doc/Makefile.in --- genparse-0.9.1/doc/Makefile.in 2012-03-22 19:32:57.000000000 +0000 +++ genparse-0.9.2/doc/Makefile.in 2013-10-30 18:44:20.000000000 +0000 @@ -365,6 +365,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ +UUDECODE = @UUDECODE@ VERSION = @VERSION@ VOID_UNSETENV = @VOID_UNSETENV@ WCHAR_H = @WCHAR_H@ @@ -427,7 +428,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -uudecode = @uudecode@ info_TEXINFOS = genparse.texi dist_man_MANS = genparse.1 EXTRA_DIST = Doxyfile.in diff -Nru genparse-0.9.1/doc/stamp-vti genparse-0.9.2/doc/stamp-vti --- genparse-0.9.1/doc/stamp-vti 2012-03-22 19:33:33.000000000 +0000 +++ genparse-0.9.2/doc/stamp-vti 2013-10-30 18:46:11.000000000 +0000 @@ -1,4 +1,4 @@ @set UPDATED 18 December 2011 @set UPDATED-MONTH December 2011 -@set EDITION 0.9.1 -@set VERSION 0.9.1 +@set EDITION 0.9.2 +@set VERSION 0.9.2 diff -Nru genparse-0.9.1/doc/version.texi genparse-0.9.2/doc/version.texi --- genparse-0.9.1/doc/version.texi 2012-03-22 19:33:33.000000000 +0000 +++ genparse-0.9.2/doc/version.texi 2013-10-30 18:46:11.000000000 +0000 @@ -1,4 +1,4 @@ @set UPDATED 18 December 2011 @set UPDATED-MONTH December 2011 -@set EDITION 0.9.1 -@set VERSION 0.9.1 +@set EDITION 0.9.2 +@set VERSION 0.9.2 diff -Nru genparse-0.9.1/examples/echo_clp.c genparse-0.9.2/examples/echo_clp.c --- genparse-0.9.1/examples/echo_clp.c 2008-11-16 12:36:35.000000000 +0000 +++ genparse-0.9.2/examples/echo_clp.c 2013-11-02 08:31:26.000000000 +0000 @@ -4,7 +4,7 @@ ** ** C file for command line parser ** -** Automatically created by genparse v0.8.1 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/examples/echo_clp.h genparse-0.9.2/examples/echo_clp.h --- genparse-0.9.1/examples/echo_clp.h 2008-01-19 12:42:22.000000000 +0000 +++ genparse-0.9.2/examples/echo_clp.h 2013-11-02 08:31:26.000000000 +0000 @@ -4,7 +4,7 @@ ** ** Header file for command line parser ** -** Automatically created by genparse v0.7.6 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/examples/ls_clp.c genparse-0.9.2/examples/ls_clp.c --- genparse-0.9.1/examples/ls_clp.c 2008-11-16 12:36:35.000000000 +0000 +++ genparse-0.9.2/examples/ls_clp.c 2013-11-02 08:31:28.000000000 +0000 @@ -4,7 +4,7 @@ ** ** C file for command line parser ** -** Automatically created by genparse v0.8.1 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/examples/ls_clp.h genparse-0.9.2/examples/ls_clp.h --- genparse-0.9.1/examples/ls_clp.h 2008-01-19 12:42:22.000000000 +0000 +++ genparse-0.9.2/examples/ls_clp.h 2013-11-02 08:31:28.000000000 +0000 @@ -4,7 +4,7 @@ ** ** Header file for command line parser ** -** Automatically created by genparse v0.7.6 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/examples/Makefile.in genparse-0.9.2/examples/Makefile.in --- genparse-0.9.1/examples/Makefile.in 2012-03-22 19:32:57.000000000 +0000 +++ genparse-0.9.2/examples/Makefile.in 2013-10-30 18:44:20.000000000 +0000 @@ -405,6 +405,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ +UUDECODE = @UUDECODE@ VERSION = @VERSION@ VOID_UNSETENV = @VOID_UNSETENV@ WCHAR_H = @WCHAR_H@ @@ -467,7 +468,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -uudecode = @uudecode@ GENPARSE = ../src/genparse GNU_GENPARSE_OPTS = --longmembers --internationalize --static-headers --gnulib AM_CPPFLAGS = -I$(srcdir)/../gnulib/lib diff -Nru genparse-0.9.1/examples/mv_clp.c genparse-0.9.2/examples/mv_clp.c --- genparse-0.9.1/examples/mv_clp.c 2008-11-16 12:36:35.000000000 +0000 +++ genparse-0.9.2/examples/mv_clp.c 2013-11-02 08:31:27.000000000 +0000 @@ -4,7 +4,7 @@ ** ** C file for command line parser ** -** Automatically created by genparse v0.8.1 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/examples/mv_clp.h genparse-0.9.2/examples/mv_clp.h --- genparse-0.9.1/examples/mv_clp.h 2008-01-19 12:42:22.000000000 +0000 +++ genparse-0.9.2/examples/mv_clp.h 2013-11-02 08:31:27.000000000 +0000 @@ -4,7 +4,7 @@ ** ** Header file for command line parser ** -** Automatically created by genparse v0.7.6 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/examples/mycopy3_clp.c genparse-0.9.2/examples/mycopy3_clp.c --- genparse-0.9.1/examples/mycopy3_clp.c 2012-03-22 19:21:06.000000000 +0000 +++ genparse-0.9.2/examples/mycopy3_clp.c 2013-11-02 08:31:22.000000000 +0000 @@ -2,13 +2,13 @@ ** ** mycopy3_clp.c ** -** Thu Mar 22 20:21:06 2012 -** Linux 2.6.36 (#6 Sun Jun 5 09:23:00 CEST 2011) i686 +** Sat Nov 2 09:31:22 2013 +** Linux 3.9.11 (#15 Sat Sep 21 16:19:36 CEST 2013) i686 ** linux@mgpc (Michael Geng) ** ** C file for command line parser ** -** Automatically created by genparse v0.9.0 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/examples/mycopy3_clp.h genparse-0.9.2/examples/mycopy3_clp.h --- genparse-0.9.1/examples/mycopy3_clp.h 2012-03-22 19:21:06.000000000 +0000 +++ genparse-0.9.2/examples/mycopy3_clp.h 2013-11-02 08:31:22.000000000 +0000 @@ -2,13 +2,13 @@ ** ** mycopy3_clp.h ** -** Thu Mar 22 20:21:06 2012 -** Linux 2.6.36 (#6 Sun Jun 5 09:23:00 CEST 2011) i686 +** Sat Nov 2 09:31:22 2013 +** Linux 3.9.11 (#15 Sat Sep 21 16:19:36 CEST 2013) i686 ** linux@mgpc (Michael Geng) ** ** Header file for command line parser ** -** Automatically created by genparse v0.9.0 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/examples/mycopy4_clp_cb.cc genparse-0.9.2/examples/mycopy4_clp_cb.cc --- genparse-0.9.1/examples/mycopy4_clp_cb.cc 2012-03-22 19:21:06.000000000 +0000 +++ genparse-0.9.2/examples/mycopy4_clp_cb.cc 2013-11-02 08:31:23.000000000 +0000 @@ -2,13 +2,13 @@ ** ** mycopy4_clp_cb.cc ** -** Thu Mar 22 20:21:06 2012 -** Linux 2.6.36 (#6 Sun Jun 5 09:23:00 CEST 2011) i686 +** Sat Nov 2 09:31:23 2013 +** Linux 3.9.11 (#15 Sat Sep 21 16:19:36 CEST 2013) i686 ** linux@mgpc (Michael Geng) ** ** Callbacks for command line parser class ** -** Automatically created by genparse v0.9.0 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/examples/mycopy4_clp.cc genparse-0.9.2/examples/mycopy4_clp.cc --- genparse-0.9.1/examples/mycopy4_clp.cc 2012-03-22 19:21:06.000000000 +0000 +++ genparse-0.9.2/examples/mycopy4_clp.cc 2013-11-02 08:31:23.000000000 +0000 @@ -2,13 +2,13 @@ ** ** mycopy4_clp.cc ** -** Thu Mar 22 20:21:06 2012 -** Linux 2.6.36 (#6 Sun Jun 5 09:23:00 CEST 2011) i686 +** Sat Nov 2 09:31:23 2013 +** Linux 3.9.11 (#15 Sat Sep 21 16:19:36 CEST 2013) i686 ** linux@mgpc (Michael Geng) ** ** Definition of command line parser class ** -** Automatically created by genparse v0.9.0 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/examples/mycopy4_clp.h genparse-0.9.2/examples/mycopy4_clp.h --- genparse-0.9.1/examples/mycopy4_clp.h 2012-03-22 19:21:06.000000000 +0000 +++ genparse-0.9.2/examples/mycopy4_clp.h 2013-11-02 08:31:23.000000000 +0000 @@ -2,13 +2,13 @@ ** ** mycopy4_clp.h ** -** Thu Mar 22 20:21:06 2012 -** Linux 2.6.36 (#6 Sun Jun 5 09:23:00 CEST 2011) i686 +** Sat Nov 2 09:31:23 2013 +** Linux 3.9.11 (#15 Sat Sep 21 16:19:36 CEST 2013) i686 ** linux@mgpc (Michael Geng) ** ** Header file for command line parser class ** -** Automatically created by genparse v0.9.0 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/examples/ping_clp.c genparse-0.9.2/examples/ping_clp.c --- genparse-0.9.1/examples/ping_clp.c 2008-11-16 12:36:35.000000000 +0000 +++ genparse-0.9.2/examples/ping_clp.c 2013-11-02 08:31:30.000000000 +0000 @@ -4,7 +4,7 @@ ** ** C file for command line parser ** -** Automatically created by genparse v0.8.1 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/examples/ping_clp.h genparse-0.9.2/examples/ping_clp.h --- genparse-0.9.1/examples/ping_clp.h 2008-01-19 12:42:22.000000000 +0000 +++ genparse-0.9.2/examples/ping_clp.h 2013-11-02 08:31:30.000000000 +0000 @@ -4,7 +4,7 @@ ** ** Header file for command line parser ** -** Automatically created by genparse v0.7.6 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/examples/rm_clp.c genparse-0.9.2/examples/rm_clp.c --- genparse-0.9.1/examples/rm_clp.c 2008-11-16 12:36:35.000000000 +0000 +++ genparse-0.9.2/examples/rm_clp.c 2013-11-02 08:31:26.000000000 +0000 @@ -4,7 +4,7 @@ ** ** C file for command line parser ** -** Automatically created by genparse v0.8.1 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/examples/rm_clp.h genparse-0.9.2/examples/rm_clp.h --- genparse-0.9.1/examples/rm_clp.h 2008-01-19 12:42:24.000000000 +0000 +++ genparse-0.9.2/examples/rm_clp.h 2013-11-02 08:31:26.000000000 +0000 @@ -4,7 +4,7 @@ ** ** Header file for command line parser ** -** Automatically created by genparse v0.7.6 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/examples/tail_clp.c genparse-0.9.2/examples/tail_clp.c --- genparse-0.9.1/examples/tail_clp.c 2008-11-16 12:36:35.000000000 +0000 +++ genparse-0.9.2/examples/tail_clp.c 2013-11-02 08:31:29.000000000 +0000 @@ -4,7 +4,7 @@ ** ** C file for command line parser ** -** Automatically created by genparse v0.8.1 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/examples/tail_clp.h genparse-0.9.2/examples/tail_clp.h --- genparse-0.9.1/examples/tail_clp.h 2008-01-19 12:42:24.000000000 +0000 +++ genparse-0.9.2/examples/tail_clp.h 2013-11-02 08:31:29.000000000 +0000 @@ -4,7 +4,7 @@ ** ** Header file for command line parser ** -** Automatically created by genparse v0.7.6 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/examples/uname_clp.c genparse-0.9.2/examples/uname_clp.c --- genparse-0.9.1/examples/uname_clp.c 2008-11-16 12:36:35.000000000 +0000 +++ genparse-0.9.2/examples/uname_clp.c 2013-11-02 08:31:27.000000000 +0000 @@ -4,7 +4,7 @@ ** ** C file for command line parser ** -** Automatically created by genparse v0.8.1 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/examples/uname_clp.h genparse-0.9.2/examples/uname_clp.h --- genparse-0.9.1/examples/uname_clp.h 2008-01-19 12:42:24.000000000 +0000 +++ genparse-0.9.2/examples/uname_clp.h 2013-11-02 08:31:27.000000000 +0000 @@ -4,7 +4,7 @@ ** ** Header file for command line parser ** -** Automatically created by genparse v0.7.6 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/examples/wc_clp.c genparse-0.9.2/examples/wc_clp.c --- genparse-0.9.1/examples/wc_clp.c 2008-11-16 12:36:35.000000000 +0000 +++ genparse-0.9.2/examples/wc_clp.c 2013-11-02 08:31:29.000000000 +0000 @@ -4,7 +4,7 @@ ** ** C file for command line parser ** -** Automatically created by genparse v0.8.1 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/examples/wc_clp.h genparse-0.9.2/examples/wc_clp.h --- genparse-0.9.1/examples/wc_clp.h 2008-01-19 12:42:24.000000000 +0000 +++ genparse-0.9.2/examples/wc_clp.h 2013-11-02 08:31:29.000000000 +0000 @@ -4,7 +4,7 @@ ** ** Header file for command line parser ** -** Automatically created by genparse v0.7.6 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/gnulib/lib/Makefile.in genparse-0.9.2/gnulib/lib/Makefile.in --- genparse-0.9.1/gnulib/lib/Makefile.in 2012-03-22 19:32:57.000000000 +0000 +++ genparse-0.9.2/gnulib/lib/Makefile.in 2013-10-30 18:44:21.000000000 +0000 @@ -410,6 +410,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ +UUDECODE = @UUDECODE@ VERSION = @VERSION@ VOID_UNSETENV = @VOID_UNSETENV@ WCHAR_H = @WCHAR_H@ @@ -472,7 +473,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -uudecode = @uudecode@ AUTOMAKE_OPTIONS = 1.5 gnits SUBDIRS = noinst_HEADERS = diff -Nru genparse-0.9.1/gnulib/Makefile.in genparse-0.9.2/gnulib/Makefile.in --- genparse-0.9.1/gnulib/Makefile.in 2012-03-22 19:32:57.000000000 +0000 +++ genparse-0.9.2/gnulib/Makefile.in 2013-10-30 18:44:21.000000000 +0000 @@ -378,6 +378,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ +UUDECODE = @UUDECODE@ VERSION = @VERSION@ VOID_UNSETENV = @VOID_UNSETENV@ WCHAR_H = @WCHAR_H@ @@ -440,7 +441,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -uudecode = @uudecode@ SUBDIRS = lib all: all-recursive diff -Nru genparse-0.9.1/Makefile.in genparse-0.9.2/Makefile.in --- genparse-0.9.1/Makefile.in 2012-03-22 19:32:59.000000000 +0000 +++ genparse-0.9.2/Makefile.in 2013-10-30 18:44:22.000000000 +0000 @@ -394,6 +394,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ +UUDECODE = @UUDECODE@ VERSION = @VERSION@ VOID_UNSETENV = @VOID_UNSETENV@ WCHAR_H = @WCHAR_H@ @@ -456,7 +457,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -uudecode = @uudecode@ EXTRA_DIST = genparse.gp SUBDIRS = gnulib src doc examples tests ACLOCAL_AMFLAGS = -I gnulib/m4 diff -Nru genparse-0.9.1/src/Makefile.in genparse-0.9.2/src/Makefile.in --- genparse-0.9.1/src/Makefile.in 2012-03-22 19:32:58.000000000 +0000 +++ genparse-0.9.2/src/Makefile.in 2013-10-30 18:44:21.000000000 +0000 @@ -374,6 +374,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ +UUDECODE = @UUDECODE@ VERSION = @VERSION@ VOID_UNSETENV = @VOID_UNSETENV@ WCHAR_H = @WCHAR_H@ @@ -436,7 +437,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -uudecode = @uudecode@ AM_CXXFLAGS = -Wall genparse_SOURCES = getopt.cc getopt.h eh.cc eh.h eh_system.cc eh_system.h systime.cc systime.h \ userinfo.cc userinfo.h sysinfo.cc sysinfo.h logfile.cc logfile.h unique_int.cc unique_int.h \ diff -Nru genparse-0.9.1/tests/ccheck/default_clp.c genparse-0.9.2/tests/ccheck/default_clp.c --- genparse-0.9.1/tests/ccheck/default_clp.c 2012-03-22 19:33:48.000000000 +0000 +++ genparse-0.9.2/tests/ccheck/default_clp.c 2013-11-02 08:31:32.000000000 +0000 @@ -2,13 +2,13 @@ ** ** default_clp.c ** -** Thu Mar 22 20:33:48 2012 -** Linux 2.6.36 (#6 Sun Jun 5 09:23:00 CEST 2011) i686 +** Sat Nov 2 09:31:32 2013 +** Linux 3.9.11 (#15 Sat Sep 21 16:19:36 CEST 2013) i686 ** linux@mgpc (Michael Geng) ** ** C file for command line parser ** -** Automatically created by genparse v0.9.1 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/tests/ccheck/double_clp.c genparse-0.9.2/tests/ccheck/double_clp.c --- genparse-0.9.1/tests/ccheck/double_clp.c 2012-03-22 19:33:48.000000000 +0000 +++ genparse-0.9.2/tests/ccheck/double_clp.c 2013-11-02 08:31:32.000000000 +0000 @@ -2,13 +2,13 @@ ** ** double_clp.c ** -** Thu Mar 22 20:33:48 2012 -** Linux 2.6.36 (#6 Sun Jun 5 09:23:00 CEST 2011) i686 +** Sat Nov 2 09:31:32 2013 +** Linux 3.9.11 (#15 Sat Sep 21 16:19:36 CEST 2013) i686 ** linux@mgpc (Michael Geng) ** ** C file for command line parser ** -** Automatically created by genparse v0.9.1 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/tests/ccheck/intmax_clp.c genparse-0.9.2/tests/ccheck/intmax_clp.c --- genparse-0.9.1/tests/ccheck/intmax_clp.c 2012-03-22 19:33:48.000000000 +0000 +++ genparse-0.9.2/tests/ccheck/intmax_clp.c 2013-11-02 08:31:32.000000000 +0000 @@ -2,13 +2,13 @@ ** ** intmax_clp.c ** -** Thu Mar 22 20:33:48 2012 -** Linux 2.6.36 (#6 Sun Jun 5 09:23:00 CEST 2011) i686 +** Sat Nov 2 09:31:32 2013 +** Linux 3.9.11 (#15 Sat Sep 21 16:19:36 CEST 2013) i686 ** linux@mgpc (Michael Geng) ** ** C file for command line parser ** -** Automatically created by genparse v0.9.1 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/tests/ccheck/long_clp.c genparse-0.9.2/tests/ccheck/long_clp.c --- genparse-0.9.1/tests/ccheck/long_clp.c 2012-03-22 19:33:48.000000000 +0000 +++ genparse-0.9.2/tests/ccheck/long_clp.c 2013-11-02 08:31:32.000000000 +0000 @@ -2,13 +2,13 @@ ** ** long_clp.c ** -** Thu Mar 22 20:33:48 2012 -** Linux 2.6.36 (#6 Sun Jun 5 09:23:00 CEST 2011) i686 +** Sat Nov 2 09:31:32 2013 +** Linux 3.9.11 (#15 Sat Sep 21 16:19:36 CEST 2013) i686 ** linux@mgpc (Michael Geng) ** ** C file for command line parser ** -** Automatically created by genparse v0.9.1 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/tests/ccheck/longmembers_clp.c genparse-0.9.2/tests/ccheck/longmembers_clp.c --- genparse-0.9.1/tests/ccheck/longmembers_clp.c 2012-03-22 19:33:48.000000000 +0000 +++ genparse-0.9.2/tests/ccheck/longmembers_clp.c 2013-11-02 08:31:32.000000000 +0000 @@ -2,13 +2,13 @@ ** ** longmembers_clp.c ** -** Thu Mar 22 20:33:48 2012 -** Linux 2.6.36 (#6 Sun Jun 5 09:23:00 CEST 2011) i686 +** Sat Nov 2 09:31:32 2013 +** Linux 3.9.11 (#15 Sat Sep 21 16:19:36 CEST 2013) i686 ** linux@mgpc (Michael Geng) ** ** C file for command line parser ** -** Automatically created by genparse v0.9.1 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/tests/ccheck/Makefile.in genparse-0.9.2/tests/ccheck/Makefile.in --- genparse-0.9.1/tests/ccheck/Makefile.in 2012-03-22 19:32:58.000000000 +0000 +++ genparse-0.9.2/tests/ccheck/Makefile.in 2013-10-30 18:44:21.000000000 +0000 @@ -397,6 +397,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ +UUDECODE = @UUDECODE@ VERSION = @VERSION@ VOID_UNSETENV = @VOID_UNSETENV@ WCHAR_H = @WCHAR_H@ @@ -459,7 +460,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -uudecode = @uudecode@ GENPARSE = ../../src/genparse AM_CPPFLAGS = -I$(srcdir)/../../gnulib/lib AM_LDFLAGS = -L../../gnulib/lib diff -Nru genparse-0.9.1/tests/ccheck/uintmax_clp.c genparse-0.9.2/tests/ccheck/uintmax_clp.c --- genparse-0.9.1/tests/ccheck/uintmax_clp.c 2012-03-22 19:33:48.000000000 +0000 +++ genparse-0.9.2/tests/ccheck/uintmax_clp.c 2013-11-02 08:31:32.000000000 +0000 @@ -2,13 +2,13 @@ ** ** uintmax_clp.c ** -** Thu Mar 22 20:33:48 2012 -** Linux 2.6.36 (#6 Sun Jun 5 09:23:00 CEST 2011) i686 +** Sat Nov 2 09:31:32 2013 +** Linux 3.9.11 (#15 Sat Sep 21 16:19:36 CEST 2013) i686 ** linux@mgpc (Michael Geng) ** ** C file for command line parser ** -** Automatically created by genparse v0.9.1 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/tests/ccheck/ulong_clp.c genparse-0.9.2/tests/ccheck/ulong_clp.c --- genparse-0.9.1/tests/ccheck/ulong_clp.c 2012-03-22 19:33:48.000000000 +0000 +++ genparse-0.9.2/tests/ccheck/ulong_clp.c 2013-11-02 08:31:32.000000000 +0000 @@ -2,13 +2,13 @@ ** ** ulong_clp.c ** -** Thu Mar 22 20:33:48 2012 -** Linux 2.6.36 (#6 Sun Jun 5 09:23:00 CEST 2011) i686 +** Sat Nov 2 09:31:32 2013 +** Linux 3.9.11 (#15 Sat Sep 21 16:19:36 CEST 2013) i686 ** linux@mgpc (Michael Geng) ** ** C file for command line parser ** -** Automatically created by genparse v0.9.1 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/tests/cppcheck/default_clp.cc genparse-0.9.2/tests/cppcheck/default_clp.cc --- genparse-0.9.1/tests/cppcheck/default_clp.cc 2012-03-22 19:33:48.000000000 +0000 +++ genparse-0.9.2/tests/cppcheck/default_clp.cc 2013-11-02 08:31:32.000000000 +0000 @@ -2,13 +2,13 @@ ** ** default_clp.cc ** -** Thu Mar 22 20:33:48 2012 -** Linux 2.6.36 (#6 Sun Jun 5 09:23:00 CEST 2011) i686 +** Sat Nov 2 09:31:32 2013 +** Linux 3.9.11 (#15 Sat Sep 21 16:19:36 CEST 2013) i686 ** linux@mgpc (Michael Geng) ** ** Definition of command line parser class ** -** Automatically created by genparse v0.9.1 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/tests/cppcheck/longmembers_clp.cc genparse-0.9.2/tests/cppcheck/longmembers_clp.cc --- genparse-0.9.1/tests/cppcheck/longmembers_clp.cc 2012-03-22 19:33:48.000000000 +0000 +++ genparse-0.9.2/tests/cppcheck/longmembers_clp.cc 2013-11-02 08:31:32.000000000 +0000 @@ -2,13 +2,13 @@ ** ** longmembers_clp.cc ** -** Thu Mar 22 20:33:48 2012 -** Linux 2.6.36 (#6 Sun Jun 5 09:23:00 CEST 2011) i686 +** Sat Nov 2 09:31:32 2013 +** Linux 3.9.11 (#15 Sat Sep 21 16:19:36 CEST 2013) i686 ** linux@mgpc (Michael Geng) ** ** Definition of command line parser class ** -** Automatically created by genparse v0.9.1 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/tests/cppcheck/Makefile.in genparse-0.9.2/tests/cppcheck/Makefile.in --- genparse-0.9.1/tests/cppcheck/Makefile.in 2012-03-22 19:32:58.000000000 +0000 +++ genparse-0.9.2/tests/cppcheck/Makefile.in 2013-10-30 18:44:22.000000000 +0000 @@ -371,6 +371,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ +UUDECODE = @UUDECODE@ VERSION = @VERSION@ VOID_UNSETENV = @VOID_UNSETENV@ WCHAR_H = @WCHAR_H@ @@ -433,7 +434,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -uudecode = @uudecode@ GENPARSE = ../../src/genparse INCLUDES = $(CPPUNIT_CFLAGS) LDADD = $(CPPUNIT_LIBS) diff -Nru genparse-0.9.1/tests/javacheck/Makefile.in genparse-0.9.2/tests/javacheck/Makefile.in --- genparse-0.9.1/tests/javacheck/Makefile.in 2012-03-22 19:32:59.000000000 +0000 +++ genparse-0.9.2/tests/javacheck/Makefile.in 2013-10-30 18:44:22.000000000 +0000 @@ -341,6 +341,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ +UUDECODE = @UUDECODE@ VERSION = @VERSION@ VOID_UNSETENV = @VOID_UNSETENV@ WCHAR_H = @WCHAR_H@ @@ -403,7 +404,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -uudecode = @uudecode@ GENPARSE = ../../src/genparse EXTRA_DIST = src/test.gp \ src/tests.java \ diff -Nru genparse-0.9.1/tests/Makefile.in genparse-0.9.2/tests/Makefile.in --- genparse-0.9.1/tests/Makefile.in 2012-03-22 19:32:58.000000000 +0000 +++ genparse-0.9.2/tests/Makefile.in 2013-10-30 18:44:21.000000000 +0000 @@ -381,6 +381,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ +UUDECODE = @UUDECODE@ VERSION = @VERSION@ VOID_UNSETENV = @VOID_UNSETENV@ WCHAR_H = @WCHAR_H@ @@ -443,7 +444,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -uudecode = @uudecode@ SUBDIRS = $(am__append_1) $(am__append_2) $(am__append_3) misc all: all-recursive diff -Nru genparse-0.9.1/tests/misc/Makefile.in genparse-0.9.2/tests/misc/Makefile.in --- genparse-0.9.1/tests/misc/Makefile.in 2012-03-22 19:32:59.000000000 +0000 +++ genparse-0.9.2/tests/misc/Makefile.in 2013-10-30 18:44:22.000000000 +0000 @@ -356,6 +356,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ +UUDECODE = @UUDECODE@ VERSION = @VERSION@ VOID_UNSETENV = @VOID_UNSETENV@ WCHAR_H = @WCHAR_H@ @@ -418,7 +419,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -uudecode = @uudecode@ TESTS_ENVIRONMENT = \ PATH="$(srcdir):$(srcdir)/../../src/:$$PATH" diff -Nru genparse-0.9.1/tests/misc/new_print.c genparse-0.9.2/tests/misc/new_print.c --- genparse-0.9.1/tests/misc/new_print.c 2012-03-22 19:31:45.000000000 +0000 +++ genparse-0.9.2/tests/misc/new_print.c 2013-10-30 19:20:17.000000000 +0000 @@ -4,7 +4,7 @@ ** ** C file for command line parser ** -** Automatically created by genparse v0.9.1 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/tests/misc/new_print.cc genparse-0.9.2/tests/misc/new_print.cc --- genparse-0.9.1/tests/misc/new_print.cc 2012-03-22 19:31:53.000000000 +0000 +++ genparse-0.9.2/tests/misc/new_print.cc 2013-10-30 19:20:14.000000000 +0000 @@ -4,7 +4,7 @@ ** ** Definition of command line parser class ** -** Automatically created by genparse v0.9.1 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates ** diff -Nru genparse-0.9.1/tests/misc/new_print.java genparse-0.9.2/tests/misc/new_print.java --- genparse-0.9.1/tests/misc/new_print.java 2012-03-22 19:32:01.000000000 +0000 +++ genparse-0.9.2/tests/misc/new_print.java 2013-10-30 19:20:11.000000000 +0000 @@ -4,7 +4,7 @@ ** ** Definition of command line parser class ** -** Automatically created by genparse v0.9.1 +** Automatically created by genparse v0.9.2 ** ** See http://genparse.sourceforge.net for details and updates **