d8d6ff
--- fastjar-0.97/m4/libtool.m4.jj	2008-10-16 10:14:54.000000000 +0200
d8d6ff
+++ fastjar-0.97/m4/libtool.m4	2014-04-10 20:41:26.563064023 +0200
d8d6ff
@@ -1263,7 +1263,7 @@ ia64-*-hpux*)
d8d6ff
   rm -rf conftest*
d8d6ff
   ;;
d8d6ff
 
d8d6ff
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
d8d6ff
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
d8d6ff
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
d8d6ff
   # Find out which ABI we are using.
d8d6ff
   echo 'int i;' > conftest.$ac_ext
d8d6ff
@@ -1277,7 +1277,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
d8d6ff
 	  x86_64-*linux*)
d8d6ff
 	    LD="${LD-ld} -m elf_i386"
d8d6ff
 	    ;;
d8d6ff
-	  ppc64-*linux*|powerpc64-*linux*)
d8d6ff
+	  powerpc64le-*linux*)
d8d6ff
+	    LD="${LD-ld} -m elf32lppclinux"
d8d6ff
+	    ;;
d8d6ff
+	  powerpc64-*linux*)
d8d6ff
 	    LD="${LD-ld} -m elf32ppclinux"
d8d6ff
 	    ;;
d8d6ff
 	  s390x-*linux*)
d8d6ff
@@ -1296,7 +1299,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
d8d6ff
 	  x86_64-*linux*)
d8d6ff
 	    LD="${LD-ld} -m elf_x86_64"
d8d6ff
 	    ;;
d8d6ff
-	  ppc*-*linux*|powerpc*-*linux*)
d8d6ff
+	  powerpcle-*linux*)
d8d6ff
+	    LD="${LD-ld} -m elf64lppc"
d8d6ff
+	    ;;
d8d6ff
+	  powerpc-*linux*)
d8d6ff
 	    LD="${LD-ld} -m elf64ppc"
d8d6ff
 	    ;;
d8d6ff
 	  s390*-*linux*|s390*-*tpf*)
d8d6ff
--- fastjar-0.97/config.sub.jj	2014-04-10 20:40:53.000000000 +0200
d8d6ff
+++ fastjar-0.97/config.sub	2014-04-10 10:38:39.000000000 +0200
d8d6ff
@@ -1,24 +1,18 @@
d8d6ff
 #! /bin/sh
d8d6ff
 # Configuration validation subroutine script.
d8d6ff
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
d8d6ff
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
d8d6ff
-#   2011, 2012 Free Software Foundation, Inc.
d8d6ff
-
d8d6ff
-timestamp='2012-04-18'
d8d6ff
-
d8d6ff
-# This file is (in principle) common to ALL GNU software.
d8d6ff
-# The presence of a machine in this file suggests that SOME GNU software
d8d6ff
-# can handle that machine.  It does not imply ALL GNU software can.
d8d6ff
-#
d8d6ff
-# This file is free software; you can redistribute it and/or modify
d8d6ff
-# it under the terms of the GNU General Public License as published by
d8d6ff
-# the Free Software Foundation; either version 2 of the License, or
d8d6ff
+#   Copyright 1992-2013 Free Software Foundation, Inc.
d8d6ff
+
d8d6ff
+timestamp='2013-10-01'
d8d6ff
+
d8d6ff
+# This file is free software; you can redistribute it and/or modify it
d8d6ff
+# under the terms of the GNU General Public License as published by
d8d6ff
+# the Free Software Foundation; either version 3 of the License, or
d8d6ff
 # (at your option) any later version.
d8d6ff
 #
d8d6ff
-# This program is distributed in the hope that it will be useful,
d8d6ff
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
d8d6ff
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
d8d6ff
-# GNU General Public License for more details.
d8d6ff
+# This program is distributed in the hope that it will be useful, but
d8d6ff
+# WITHOUT ANY WARRANTY; without even the implied warranty of
d8d6ff
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
d8d6ff
+# General Public License for more details.
d8d6ff
 #
d8d6ff
 # You should have received a copy of the GNU General Public License
d8d6ff
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
d8d6ff
@@ -26,11 +20,12 @@ timestamp='2012-04-18'
d8d6ff
 # As a special exception to the GNU General Public License, if you
d8d6ff
 # distribute this file as part of a program that contains a
d8d6ff
 # configuration script generated by Autoconf, you may include it under
d8d6ff
-# the same distribution terms that you use for the rest of that program.
d8d6ff
+# the same distribution terms that you use for the rest of that
d8d6ff
+# program.  This Exception is an additional permission under section 7
d8d6ff
+# of the GNU General Public License, version 3 ("GPLv3").
d8d6ff
 
d8d6ff
 
d8d6ff
-# Please send patches to <config-patches@gnu.org>.  Submit a context
d8d6ff
-# diff and a properly formatted GNU ChangeLog entry.
d8d6ff
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
d8d6ff
 #
d8d6ff
 # Configuration subroutine to validate and canonicalize a configuration type.
d8d6ff
 # Supply the specified configuration type as an argument.
d8d6ff
@@ -73,9 +68,7 @@ Report bugs and patches to 
d8d6ff
 version="\
d8d6ff
 GNU config.sub ($timestamp)
d8d6ff
 
d8d6ff
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
d8d6ff
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
d8d6ff
-Free Software Foundation, Inc.
d8d6ff
+Copyright 1992-2013 Free Software Foundation, Inc.
d8d6ff
 
d8d6ff
 This is free software; see the source for copying conditions.  There is NO
d8d6ff
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
d8d6ff
@@ -123,7 +116,7 @@ esac
d8d6ff
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
d8d6ff
 case $maybe_os in
d8d6ff
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
d8d6ff
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
d8d6ff
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
d8d6ff
   knetbsd*-gnu* | netbsd*-gnu* | \
d8d6ff
   kopensolaris*-gnu* | \
d8d6ff
   storm-chaos* | os2-emx* | rtmk-nova*)
d8d6ff
@@ -156,7 +149,7 @@ case $os in
d8d6ff
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
d8d6ff
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
d8d6ff
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
d8d6ff
-	-apple | -axis | -knuth | -cray | -microblaze)
d8d6ff
+	-apple | -axis | -knuth | -cray | -microblaze*)
d8d6ff
 		os=
d8d6ff
 		basic_machine=$1
d8d6ff
 		;;
d8d6ff
@@ -259,10 +252,12 @@ case $basic_machine in
d8d6ff
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
d8d6ff
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
d8d6ff
 	| am33_2.0 \
d8d6ff
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
d8d6ff
-        | be32 | be64 \
d8d6ff
+	| arc | arceb \
d8d6ff
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
d8d6ff
+	| avr | avr32 \
d8d6ff
+	| be32 | be64 \
d8d6ff
 	| bfin \
d8d6ff
-	| c4x | clipper \
d8d6ff
+	| c4x | c8051 | clipper \
d8d6ff
 	| d10v | d30v | dlx | dsp16xx \
d8d6ff
 	| epiphany \
d8d6ff
 	| fido | fr30 | frv \
d8d6ff
@@ -270,10 +265,11 @@ case $basic_machine in
d8d6ff
 	| hexagon \
d8d6ff
 	| i370 | i860 | i960 | ia64 \
d8d6ff
 	| ip2k | iq2000 \
d8d6ff
+	| k1om \
d8d6ff
 	| le32 | le64 \
d8d6ff
 	| lm32 \
d8d6ff
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
d8d6ff
-	| maxq | mb | microblaze | mcore | mep | metag \
d8d6ff
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
d8d6ff
 	| mips | mipsbe | mipseb | mipsel | mipsle \
d8d6ff
 	| mips16 \
d8d6ff
 	| mips64 | mips64el \
d8d6ff
@@ -291,16 +287,17 @@ case $basic_machine in
d8d6ff
 	| mipsisa64r2 | mipsisa64r2el \
d8d6ff
 	| mipsisa64sb1 | mipsisa64sb1el \
d8d6ff
 	| mipsisa64sr71k | mipsisa64sr71kel \
d8d6ff
+	| mipsr5900 | mipsr5900el \
d8d6ff
 	| mipstx39 | mipstx39el \
d8d6ff
 	| mn10200 | mn10300 \
d8d6ff
 	| moxie \
d8d6ff
 	| mt \
d8d6ff
 	| msp430 \
d8d6ff
 	| nds32 | nds32le | nds32be \
d8d6ff
-	| nios | nios2 \
d8d6ff
+	| nios | nios2 | nios2eb | nios2el \
d8d6ff
 	| ns16k | ns32k \
d8d6ff
 	| open8 \
d8d6ff
-	| or32 \
d8d6ff
+	| or1k | or32 \
d8d6ff
 	| pdp10 | pdp11 | pj | pjl \
d8d6ff
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
d8d6ff
 	| pyramid \
d8d6ff
@@ -328,7 +325,7 @@ case $basic_machine in
d8d6ff
 	c6x)
d8d6ff
 		basic_machine=tic6x-unknown
d8d6ff
 		;;
d8d6ff
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
d8d6ff
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
d8d6ff
 		basic_machine=$basic_machine-unknown
d8d6ff
 		os=-none
d8d6ff
 		;;
d8d6ff
@@ -370,13 +367,13 @@ case $basic_machine in
d8d6ff
 	| aarch64-* | aarch64_be-* \
d8d6ff
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
d8d6ff
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
d8d6ff
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
d8d6ff
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
d8d6ff
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
d8d6ff
 	| avr-* | avr32-* \
d8d6ff
 	| be32-* | be64-* \
d8d6ff
 	| bfin-* | bs2000-* \
d8d6ff
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
d8d6ff
-	| clipper-* | craynv-* | cydra-* \
d8d6ff
+	| c8051-* | clipper-* | craynv-* | cydra-* \
d8d6ff
 	| d10v-* | d30v-* | dlx-* \
d8d6ff
 	| elxsi-* \
d8d6ff
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
d8d6ff
@@ -385,11 +382,13 @@ case $basic_machine in
d8d6ff
 	| hexagon-* \
d8d6ff
 	| i*86-* | i860-* | i960-* | ia64-* \
d8d6ff
 	| ip2k-* | iq2000-* \
d8d6ff
+	| k1om-* \
d8d6ff
 	| le32-* | le64-* \
d8d6ff
 	| lm32-* \
d8d6ff
 	| m32c-* | m32r-* | m32rle-* \
d8d6ff
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
d8d6ff
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
d8d6ff
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
d8d6ff
+	| microblaze-* | microblazeel-* \
d8d6ff
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
d8d6ff
 	| mips16-* \
d8d6ff
 	| mips64-* | mips64el-* \
d8d6ff
@@ -407,12 +406,13 @@ case $basic_machine in
d8d6ff
 	| mipsisa64r2-* | mipsisa64r2el-* \
d8d6ff
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
d8d6ff
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
d8d6ff
+	| mipsr5900-* | mipsr5900el-* \
d8d6ff
 	| mipstx39-* | mipstx39el-* \
d8d6ff
 	| mmix-* \
d8d6ff
 	| mt-* \
d8d6ff
 	| msp430-* \
d8d6ff
 	| nds32-* | nds32le-* | nds32be-* \
d8d6ff
-	| nios-* | nios2-* \
d8d6ff
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
d8d6ff
 	| none-* | np1-* | ns16k-* | ns32k-* \
d8d6ff
 	| open8-* \
d8d6ff
 	| orion-* \
d8d6ff
@@ -788,11 +788,15 @@ case $basic_machine in
d8d6ff
 		basic_machine=ns32k-utek
d8d6ff
 		os=-sysv
d8d6ff
 		;;
d8d6ff
-	microblaze)
d8d6ff
+	microblaze*)
d8d6ff
 		basic_machine=microblaze-xilinx
d8d6ff
 		;;
d8d6ff
+	mingw64)
d8d6ff
+		basic_machine=x86_64-pc
d8d6ff
+		os=-mingw64
d8d6ff
+		;;
d8d6ff
 	mingw32)
d8d6ff
-		basic_machine=i386-pc
d8d6ff
+		basic_machine=i686-pc
d8d6ff
 		os=-mingw32
d8d6ff
 		;;
d8d6ff
 	mingw32ce)
d8d6ff
@@ -828,7 +832,7 @@ case $basic_machine in
d8d6ff
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
d8d6ff
 		;;
d8d6ff
 	msys)
d8d6ff
-		basic_machine=i386-pc
d8d6ff
+		basic_machine=i686-pc
d8d6ff
 		os=-msys
d8d6ff
 		;;
d8d6ff
 	mvs)
d8d6ff
@@ -1019,7 +1023,11 @@ case $basic_machine in
d8d6ff
 		basic_machine=i586-unknown
d8d6ff
 		os=-pw32
d8d6ff
 		;;
d8d6ff
-	rdos)
d8d6ff
+	rdos | rdos64)
d8d6ff
+		basic_machine=x86_64-pc
d8d6ff
+		os=-rdos
d8d6ff
+		;;
d8d6ff
+	rdos32)
d8d6ff
 		basic_machine=i386-pc
d8d6ff
 		os=-rdos
d8d6ff
 		;;
d8d6ff
@@ -1346,21 +1354,21 @@ case $os in
d8d6ff
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
d8d6ff
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
d8d6ff
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
d8d6ff
-	      | -sym* | -kopensolaris* \
d8d6ff
+	      | -sym* | -kopensolaris* | -plan9* \
d8d6ff
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
d8d6ff
 	      | -aos* | -aros* \
d8d6ff
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
d8d6ff
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
d8d6ff
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
d8d6ff
-	      | -openbsd* | -solidbsd* \
d8d6ff
+	      | -bitrig* | -openbsd* | -solidbsd* \
d8d6ff
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
d8d6ff
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
d8d6ff
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
d8d6ff
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
d8d6ff
 	      | -chorusos* | -chorusrdb* | -cegcc* \
d8d6ff
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
d8d6ff
-	      | -mingw32* | -linux-gnu* | -linux-android* \
d8d6ff
-	      | -linux-newlib* | -linux-uclibc* \
d8d6ff
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
d8d6ff
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
d8d6ff
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
d8d6ff
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
d8d6ff
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
d8d6ff
@@ -1492,9 +1500,6 @@ case $os in
d8d6ff
 	-aros*)
d8d6ff
 		os=-aros
d8d6ff
 		;;
d8d6ff
-	-kaos*)
d8d6ff
-		os=-kaos
d8d6ff
-		;;
d8d6ff
 	-zvmoe)
d8d6ff
 		os=-zvmoe
d8d6ff
 		;;
d8d6ff
@@ -1543,6 +1548,9 @@ case $basic_machine in
d8d6ff
 	c4x-* | tic4x-*)
d8d6ff
 		os=-coff
d8d6ff
 		;;
d8d6ff
+	c8051-*)
d8d6ff
+		os=-elf
d8d6ff
+		;;
d8d6ff
 	hexagon-*)
d8d6ff
 		os=-elf
d8d6ff
 		;;
d8d6ff
@@ -1586,6 +1594,9 @@ case $basic_machine in
d8d6ff
 	mips*-*)
d8d6ff
 		os=-elf
d8d6ff
 		;;
d8d6ff
+	or1k-*)
d8d6ff
+		os=-elf
d8d6ff
+		;;
d8d6ff
 	or32-*)
d8d6ff
 		os=-coff
d8d6ff
 		;;
d8d6ff
--- fastjar-0.97/config.guess.jj	2014-04-10 20:40:53.000000000 +0200
d8d6ff
+++ fastjar-0.97/config.guess	2014-04-10 10:38:36.000000000 +0200
d8d6ff
@@ -1,14 +1,12 @@
d8d6ff
 #! /bin/sh
d8d6ff
 # Attempt to guess a canonical system name.
d8d6ff
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
d8d6ff
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
d8d6ff
-#   2011, 2012 Free Software Foundation, Inc.
d8d6ff
+#   Copyright 1992-2013 Free Software Foundation, Inc.
d8d6ff
 
d8d6ff
-timestamp='2012-06-10'
d8d6ff
+timestamp='2013-06-10'
d8d6ff
 
d8d6ff
 # This file is free software; you can redistribute it and/or modify it
d8d6ff
 # under the terms of the GNU General Public License as published by
d8d6ff
-# the Free Software Foundation; either version 2 of the License, or
d8d6ff
+# the Free Software Foundation; either version 3 of the License, or
d8d6ff
 # (at your option) any later version.
d8d6ff
 #
d8d6ff
 # This program is distributed in the hope that it will be useful, but
d8d6ff
@@ -22,19 +20,17 @@ timestamp='2012-06-10'
d8d6ff
 # As a special exception to the GNU General Public License, if you
d8d6ff
 # distribute this file as part of a program that contains a
d8d6ff
 # configuration script generated by Autoconf, you may include it under
d8d6ff
-# the same distribution terms that you use for the rest of that program.
d8d6ff
-
d8d6ff
-
d8d6ff
-# Originally written by Per Bothner.  Please send patches (context
d8d6ff
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
d8d6ff
-# entry.
d8d6ff
+# the same distribution terms that you use for the rest of that
d8d6ff
+# program.  This Exception is an additional permission under section 7
d8d6ff
+# of the GNU General Public License, version 3 ("GPLv3").
d8d6ff
 #
d8d6ff
-# This script attempts to guess a canonical system name similar to
d8d6ff
-# config.sub.  If it succeeds, it prints the system name on stdout, and
d8d6ff
-# exits with 0.  Otherwise, it exits with 1.
d8d6ff
+# Originally written by Per Bothner.
d8d6ff
 #
d8d6ff
 # You can get the latest version of this script from:
d8d6ff
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
d8d6ff
+#
d8d6ff
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
d8d6ff
+
d8d6ff
 
d8d6ff
 me=`echo "$0" | sed -e 's,.*/,,'`
d8d6ff
 
d8d6ff
@@ -54,9 +50,7 @@ version="\
d8d6ff
 GNU config.guess ($timestamp)
d8d6ff
 
d8d6ff
 Originally written by Per Bothner.
d8d6ff
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
d8d6ff
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
d8d6ff
-Free Software Foundation, Inc.
d8d6ff
+Copyright 1992-2013 Free Software Foundation, Inc.
d8d6ff
 
d8d6ff
 This is free software; see the source for copying conditions.  There is NO
d8d6ff
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
d8d6ff
@@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
d8d6ff
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
d8d6ff
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
d8d6ff
 
d8d6ff
+case "${UNAME_SYSTEM}" in
d8d6ff
+Linux|GNU|GNU/*)
d8d6ff
+	# If the system lacks a compiler, then just pick glibc.
d8d6ff
+	# We could probably try harder.
d8d6ff
+	LIBC=gnu
d8d6ff
+
d8d6ff
+	eval $set_cc_for_build
d8d6ff
+	cat <<-EOF > $dummy.c
d8d6ff
+	#include <features.h>
d8d6ff
+	#if defined(__UCLIBC__)
d8d6ff
+	LIBC=uclibc
d8d6ff
+	#elif defined(__dietlibc__)
d8d6ff
+	LIBC=dietlibc
d8d6ff
+	#else
d8d6ff
+	LIBC=gnu
d8d6ff
+	#endif
d8d6ff
+	EOF
d8d6ff
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
d8d6ff
+	;;
d8d6ff
+esac
d8d6ff
+
d8d6ff
 # Note: order is significant - the case branches are not exclusive.
d8d6ff
 
d8d6ff
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
d8d6ff
@@ -200,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
d8d6ff
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
d8d6ff
 	echo "${machine}-${os}${release}"
d8d6ff
 	exit ;;
d8d6ff
+    *:Bitrig:*:*)
d8d6ff
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
d8d6ff
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
d8d6ff
+	exit ;;
d8d6ff
     *:OpenBSD:*:*)
d8d6ff
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
d8d6ff
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
d8d6ff
@@ -302,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
d8d6ff
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
d8d6ff
 	echo arm-acorn-riscix${UNAME_RELEASE}
d8d6ff
 	exit ;;
d8d6ff
-    arm:riscos:*:*|arm:RISCOS:*:*)
d8d6ff
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
d8d6ff
 	echo arm-unknown-riscos
d8d6ff
 	exit ;;
d8d6ff
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
d8d6ff
@@ -801,6 +820,9 @@ EOF
d8d6ff
     i*:CYGWIN*:*)
d8d6ff
 	echo ${UNAME_MACHINE}-pc-cygwin
d8d6ff
 	exit ;;
d8d6ff
+    *:MINGW64*:*)
d8d6ff
+	echo ${UNAME_MACHINE}-pc-mingw64
d8d6ff
+	exit ;;
d8d6ff
     *:MINGW*:*)
d8d6ff
 	echo ${UNAME_MACHINE}-pc-mingw32
d8d6ff
 	exit ;;
d8d6ff
@@ -852,21 +874,21 @@ EOF
d8d6ff
 	exit ;;
d8d6ff
     *:GNU:*:*)
d8d6ff
 	# the GNU system
d8d6ff
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
d8d6ff
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
d8d6ff
 	exit ;;
d8d6ff
     *:GNU/*:*:*)
d8d6ff
 	# other systems with GNU libc and userland
d8d6ff
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
d8d6ff
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     i*86:Minix:*:*)
d8d6ff
 	echo ${UNAME_MACHINE}-pc-minix
d8d6ff
 	exit ;;
d8d6ff
     aarch64:Linux:*:*)
d8d6ff
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
d8d6ff
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     aarch64_be:Linux:*:*)
d8d6ff
 	UNAME_MACHINE=aarch64_be
d8d6ff
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
d8d6ff
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     alpha:Linux:*:*)
d8d6ff
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
d8d6ff
@@ -879,59 +901,54 @@ EOF
d8d6ff
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
d8d6ff
 	esac
d8d6ff
 	objdump --private-headers /bin/sh | grep -q ld.so.1
d8d6ff
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
d8d6ff
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
d8d6ff
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
d8d6ff
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
d8d6ff
+	exit ;;
d8d6ff
+    arc:Linux:*:* | arceb:Linux:*:*)
d8d6ff
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     arm*:Linux:*:*)
d8d6ff
 	eval $set_cc_for_build
d8d6ff
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
d8d6ff
 	    | grep -q __ARM_EABI__
d8d6ff
 	then
d8d6ff
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
d8d6ff
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
d8d6ff
 	else
d8d6ff
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
d8d6ff
 		| grep -q __ARM_PCS_VFP
d8d6ff
 	    then
d8d6ff
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
d8d6ff
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
d8d6ff
 	    else
d8d6ff
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
d8d6ff
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
d8d6ff
 	    fi
d8d6ff
 	fi
d8d6ff
 	exit ;;
d8d6ff
     avr32*:Linux:*:*)
d8d6ff
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
d8d6ff
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     cris:Linux:*:*)
d8d6ff
-	echo ${UNAME_MACHINE}-axis-linux-gnu
d8d6ff
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     crisv32:Linux:*:*)
d8d6ff
-	echo ${UNAME_MACHINE}-axis-linux-gnu
d8d6ff
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     frv:Linux:*:*)
d8d6ff
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
d8d6ff
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     hexagon:Linux:*:*)
d8d6ff
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
d8d6ff
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     i*86:Linux:*:*)
d8d6ff
-	LIBC=gnu
d8d6ff
-	eval $set_cc_for_build
d8d6ff
-	sed 's/^	//' << EOF >$dummy.c
d8d6ff
-	#ifdef __dietlibc__
d8d6ff
-	LIBC=dietlibc
d8d6ff
-	#endif
d8d6ff
-EOF
d8d6ff
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
d8d6ff
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
d8d6ff
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     ia64:Linux:*:*)
d8d6ff
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
d8d6ff
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     m32r*:Linux:*:*)
d8d6ff
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
d8d6ff
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     m68*:Linux:*:*)
d8d6ff
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
d8d6ff
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     mips:Linux:*:* | mips64:Linux:*:*)
d8d6ff
 	eval $set_cc_for_build
d8d6ff
@@ -950,54 +967,63 @@ EOF
d8d6ff
 	#endif
d8d6ff
 EOF
d8d6ff
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
d8d6ff
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
d8d6ff
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
d8d6ff
 	;;
d8d6ff
+    or1k:Linux:*:*)
d8d6ff
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
d8d6ff
+	exit ;;
d8d6ff
     or32:Linux:*:*)
d8d6ff
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
d8d6ff
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     padre:Linux:*:*)
d8d6ff
-	echo sparc-unknown-linux-gnu
d8d6ff
+	echo sparc-unknown-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     parisc64:Linux:*:* | hppa64:Linux:*:*)
d8d6ff
-	echo hppa64-unknown-linux-gnu
d8d6ff
+	echo hppa64-unknown-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     parisc:Linux:*:* | hppa:Linux:*:*)
d8d6ff
 	# Look for CPU level
d8d6ff
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
d8d6ff
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
d8d6ff
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
d8d6ff
-	  *)    echo hppa-unknown-linux-gnu ;;
d8d6ff
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
d8d6ff
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
d8d6ff
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
d8d6ff
 	esac
d8d6ff
 	exit ;;
d8d6ff
     ppc64:Linux:*:*)
d8d6ff
-	echo powerpc64-unknown-linux-gnu
d8d6ff
+	echo powerpc64-unknown-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     ppc:Linux:*:*)
d8d6ff
-	echo powerpc-unknown-linux-gnu
d8d6ff
+	echo powerpc-unknown-linux-${LIBC}
d8d6ff
+	exit ;;
d8d6ff
+    ppc64le:Linux:*:*)
d8d6ff
+	echo powerpc64le-unknown-linux-${LIBC}
d8d6ff
+	exit ;;
d8d6ff
+    ppcle:Linux:*:*)
d8d6ff
+	echo powerpcle-unknown-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     s390:Linux:*:* | s390x:Linux:*:*)
d8d6ff
-	echo ${UNAME_MACHINE}-ibm-linux
d8d6ff
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     sh64*:Linux:*:*)
d8d6ff
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
d8d6ff
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     sh*:Linux:*:*)
d8d6ff
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
d8d6ff
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     sparc:Linux:*:* | sparc64:Linux:*:*)
d8d6ff
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
d8d6ff
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     tile*:Linux:*:*)
d8d6ff
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
d8d6ff
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     vax:Linux:*:*)
d8d6ff
-	echo ${UNAME_MACHINE}-dec-linux-gnu
d8d6ff
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     x86_64:Linux:*:*)
d8d6ff
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
d8d6ff
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     xtensa*:Linux:*:*)
d8d6ff
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
d8d6ff
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
d8d6ff
 	exit ;;
d8d6ff
     i*86:DYNIX/ptx:4*:*)
d8d6ff
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
d8d6ff
@@ -1201,6 +1227,9 @@ EOF
d8d6ff
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
d8d6ff
 	echo i586-pc-haiku
d8d6ff
 	exit ;;
d8d6ff
+    x86_64:Haiku:*:*)
d8d6ff
+	echo x86_64-unknown-haiku
d8d6ff
+	exit ;;
d8d6ff
     SX-4:SUPER-UX:*:*)
d8d6ff
 	echo sx4-nec-superux${UNAME_RELEASE}
d8d6ff
 	exit ;;
d8d6ff
@@ -1227,19 +1256,21 @@ EOF
d8d6ff
 	exit ;;
d8d6ff
     *:Darwin:*:*)
d8d6ff
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
d8d6ff
-	case $UNAME_PROCESSOR in
d8d6ff
-	    i386)
d8d6ff
-		eval $set_cc_for_build
d8d6ff
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
d8d6ff
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
d8d6ff
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
d8d6ff
-		      grep IS_64BIT_ARCH >/dev/null
d8d6ff
-		  then
d8d6ff
-		      UNAME_PROCESSOR="x86_64"
d8d6ff
-		  fi
d8d6ff
-		fi ;;
d8d6ff
-	    unknown) UNAME_PROCESSOR=powerpc ;;
d8d6ff
-	esac
d8d6ff
+	eval $set_cc_for_build
d8d6ff
+	if test "$UNAME_PROCESSOR" = unknown ; then
d8d6ff
+	    UNAME_PROCESSOR=powerpc
d8d6ff
+	fi
d8d6ff
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
d8d6ff
+	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
d8d6ff
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
d8d6ff
+		grep IS_64BIT_ARCH >/dev/null
d8d6ff
+	    then
d8d6ff
+		case $UNAME_PROCESSOR in
d8d6ff
+		    i386) UNAME_PROCESSOR=x86_64 ;;
d8d6ff
+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
d8d6ff
+		esac
d8d6ff
+	    fi
d8d6ff
+	fi
d8d6ff
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
d8d6ff
 	exit ;;
d8d6ff
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
d8d6ff
@@ -1330,9 +1361,6 @@ EOF
d8d6ff
 	exit ;;
d8d6ff
 esac
d8d6ff
 
d8d6ff
-#echo '(No uname command or uname output not recognized.)' 1>&2
d8d6ff
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
d8d6ff
-
d8d6ff
 eval $set_cc_for_build
d8d6ff
 cat >$dummy.c <
d8d6ff
 #ifdef _SEQUENT_
d8d6ff
--- fastjar-0.97/configure.jj	2008-10-16 10:15:10.000000000 +0200
d8d6ff
+++ fastjar-0.97/configure	2014-04-10 20:43:07.458531730 +0200
d8d6ff
@@ -6918,7 +6918,7 @@ ia64-*-hpux*)
d8d6ff
   rm -rf conftest*
d8d6ff
   ;;
d8d6ff
 
d8d6ff
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
d8d6ff
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
d8d6ff
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
d8d6ff
   # Find out which ABI we are using.
d8d6ff
   echo 'int i;' > conftest.$ac_ext
d8d6ff
@@ -6936,7 +6936,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
d8d6ff
 	  x86_64-*linux*)
d8d6ff
 	    LD="${LD-ld} -m elf_i386"
d8d6ff
 	    ;;
d8d6ff
-	  ppc64-*linux*|powerpc64-*linux*)
d8d6ff
+	  powerpc64le-*linux*)
d8d6ff
+	    LD="${LD-ld} -m elf32lppclinux"
d8d6ff
+	    ;;
d8d6ff
+	  powerpc64-*linux*)
d8d6ff
 	    LD="${LD-ld} -m elf32ppclinux"
d8d6ff
 	    ;;
d8d6ff
 	  s390x-*linux*)
d8d6ff
@@ -6955,7 +6958,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
d8d6ff
 	  x86_64-*linux*)
d8d6ff
 	    LD="${LD-ld} -m elf_x86_64"
d8d6ff
 	    ;;
d8d6ff
-	  ppc*-*linux*|powerpc*-*linux*)
d8d6ff
+	  powerpcle-*linux*)
d8d6ff
+	    LD="${LD-ld} -m elf64lppc"
d8d6ff
+	    ;;
d8d6ff
+	  powerpc-*linux*)
d8d6ff
 	    LD="${LD-ld} -m elf64ppc"
d8d6ff
 	    ;;
d8d6ff
 	  s390*-*linux*|s390*-*tpf*)