[ace-of-penguins] 13/29: Drop all patches. Applied upstream.
Markus Koschany
apo-guest at moszumanska.debian.org
Wed Jan 6 17:34:13 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository ace-of-penguins.
commit 595d02cf23eccf1ae019de192f472834882a730d
Author: Markus Koschany <apo at debian.org>
Date: Wed Jan 6 16:24:52 2016 +0100
Drop all patches. Applied upstream.
---
debian/patches/10-autoreconf-fi--2.65.patch | 1927 --------------------
.../patches/20-lib--make-imglib.c-closedir.patch | 30 -
.../30-spider.c-implicit-pointer-conversion.patch | 30 -
debian/patches/31-spider.c-license-name.patch | 13 -
debian/patches/32-mwm-hints.patch | 26 -
debian/patches/34-ts-workaround.patch | 24 -
debian/patches/35-return-fix.patch | 17 -
debian/patches/40-include.patch | 355 ----
debian/patches/45-libpng15 | 32 -
debian/patches/50-buildflags.patch | 17 -
debian/patches/55-more-buildflags.patch | 16 -
debian/patches/series | 10 -
12 files changed, 2497 deletions(-)
diff --git a/debian/patches/10-autoreconf-fi--2.65.patch b/debian/patches/10-autoreconf-fi--2.65.patch
deleted file mode 100644
index 826100c..0000000
--- a/debian/patches/10-autoreconf-fi--2.65.patch
+++ /dev/null
@@ -1,1927 +0,0 @@
-From 72f4212aaa784536cb10c7d4bf0163dfd6df12fa Mon Sep 17 00:00:00 2001
-From: Jari Aalto <jari.aalto at cante.net>
-Date: Sat, 26 Jun 2010 15:39:33 +0300
-Subject: [PATCH] autoreconf -fi 2.65
-Organization: Private
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jari Aalto <jari.aalto at cante.net>
----
- INSTALL | 114 ++++++++++++++++++++++-----
- aclocal.m4 | 49 ++++++++----
- config.guess | 149 ++++++++++++++---------------------
- config.sub | 47 ++++++++---
- configure | 243 ++++++++++++++++++++++++++++++++++-----------------------
- depcomp | 87 +++++++++++++++------
- install-sh | 5 +-
- ltmain.sh | 33 +++++---
- missing | 49 +++++++-----
- mkinstalldirs | 5 +-
- 10 files changed, 483 insertions(+), 298 deletions(-)
- mode change 100644 => 100755 ltmain.sh
-
-diff --git a/INSTALL b/INSTALL
-index 8b82ade..7d1c323 100644
---- a/INSTALL
-+++ b/INSTALL
-@@ -2,10 +2,12 @@ Installation Instructions
- *************************
-
- Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
--2006, 2007, 2008 Free Software Foundation, Inc.
-+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
-- This file is free documentation; the Free Software Foundation gives
--unlimited permission to copy, distribute and modify it.
-+ 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. This file is offered as-is,
-+without warranty of any kind.
-
- Basic Installation
- ==================
-@@ -13,7 +15,11 @@ Basic Installation
- Briefly, the shell commands `./configure; make; make install' should
- configure, build, and install this package. The following
- more-detailed instructions are generic; see the `README' file for
--instructions specific to this package.
-+instructions specific to this package. Some packages provide this
-+`INSTALL' file but do not implement all of the features documented
-+below. The lack of an optional feature in a given package is not
-+necessarily a bug. More recommendations for GNU packages can be found
-+in *note Makefile Conventions: (standards)Makefile Conventions.
-
- The `configure' shell script attempts to guess correct values for
- various system-dependent variables used during compilation. It uses
-@@ -42,7 +48,7 @@ may remove or edit it.
- you want to change it or regenerate `configure' using a newer version
- of `autoconf'.
-
--The simplest way to compile this package is:
-+ The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
-@@ -53,12 +59,22 @@ The simplest way to compile this package is:
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
-- the package.
-+ the package, generally using the just-built uninstalled binaries.
-
- 4. Type `make install' to install the programs and any data files and
-- documentation.
--
-- 5. You can remove the program binaries and object files from the
-+ documentation. When installing into a prefix owned by root, it is
-+ recommended that the package be configured and built as a regular
-+ user, and only the `make install' phase executed with root
-+ privileges.
-+
-+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
-+ this time using the binaries in their final installed location.
-+ This target does not install anything. Running this target as a
-+ regular user, particularly if the prior `make install' required
-+ root privileges, verifies that the installation completed
-+ correctly.
-+
-+ 6. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
-@@ -67,8 +83,15 @@ The simplest way to compile this package is:
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-- 6. Often, you can also type `make uninstall' to remove the installed
-- files again.
-+ 7. Often, you can also type `make uninstall' to remove the installed
-+ files again. In practice, not all packages have tested that
-+ uninstallation works correctly, even though it is required by the
-+ GNU Coding Standards.
-+
-+ 8. Some packages, particularly those that use Automake, provide `make
-+ distcheck', which can by used by developers to test that all other
-+ targets like `make install' and `make uninstall' work correctly.
-+ This target is generally not run by end users.
-
- Compilers and Options
- =====================
-@@ -93,7 +116,8 @@ same time, by placing the object files for each architecture in their
- own directory. To do this, you can use GNU `make'. `cd' to the
- directory where you want the object files and executables to go and run
- the `configure' script. `configure' automatically checks for the
--source code in the directory that `configure' is in and in `..'.
-+source code in the directory that `configure' is in and in `..'. This
-+is known as a "VPATH" build.
-
- With a non-GNU `make', it is safer to compile the package for one
- architecture at a time in the source code directory. After you have
-@@ -120,7 +144,8 @@ Installation Names
- By default, `make install' installs the package's commands under
- `/usr/local/bin', include files under `/usr/local/include', etc. You
- can specify an installation prefix other than `/usr/local' by giving
--`configure' the option `--prefix=PREFIX'.
-+`configure' the option `--prefix=PREFIX', where PREFIX must be an
-+absolute file name.
-
- You can specify separate installation prefixes for
- architecture-specific files and architecture-independent files. If you
-@@ -131,15 +156,46 @@ Documentation and other data files still use the regular prefix.
- In addition, if you use an unusual directory layout you can give
- options like `--bindir=DIR' to specify different values for particular
- kinds of files. Run `configure --help' for a list of the directories
--you can set and what kinds of files go in them.
-+you can set and what kinds of files go in them. In general, the
-+default for these options is expressed in terms of `${prefix}', so that
-+specifying just `--prefix' will affect all of the other directory
-+specifications that were not explicitly provided.
-+
-+ The most portable way to affect installation locations is to pass the
-+correct locations to `configure'; however, many packages provide one or
-+both of the following shortcuts of passing variable assignments to the
-+`make install' command line to change installation locations without
-+having to reconfigure or recompile.
-+
-+ The first method involves providing an override variable for each
-+affected directory. For example, `make install
-+prefix=/alternate/directory' will choose an alternate location for all
-+directory configuration variables that were expressed in terms of
-+`${prefix}'. Any directories that were specified during `configure',
-+but not in terms of `${prefix}', must each be overridden at install
-+time for the entire installation to be relocated. The approach of
-+makefile variable overrides for each directory variable is required by
-+the GNU Coding Standards, and ideally causes no recompilation.
-+However, some platforms have known limitations with the semantics of
-+shared libraries that end up requiring recompilation when using this
-+method, particularly noticeable in packages that use GNU Libtool.
-+
-+ The second method involves providing the `DESTDIR' variable. For
-+example, `make install DESTDIR=/alternate/directory' will prepend
-+`/alternate/directory' before all installation names. The approach of
-+`DESTDIR' overrides is not required by the GNU Coding Standards, and
-+does not work on platforms that have drive letters. On the other hand,
-+it does better at avoiding recompilation issues, and works well even
-+when some directory options were not specified in terms of `${prefix}'
-+at `configure' time.
-+
-+Optional Features
-+=================
-
- If the package supports it, you can cause programs to be installed
- with an extra prefix or suffix on their names by giving `configure' the
- option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
--Optional Features
--=================
--
- Some packages pay attention to `--enable-FEATURE' options to
- `configure', where FEATURE indicates an optional part of the package.
- They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-@@ -152,6 +208,13 @@ find the X include and library files automatically, but if it doesn't,
- you can use the `configure' options `--x-includes=DIR' and
- `--x-libraries=DIR' to specify their locations.
-
-+ Some packages offer the ability to configure how verbose the
-+execution of `make' will be. For these packages, running `./configure
-+--enable-silent-rules' sets the default to minimal output, which can be
-+overridden with `make V=1'; while running `./configure
-+--disable-silent-rules' sets the default to verbose, which can be
-+overridden with `make V=0'.
-+
- Particular systems
- ==================
-
-@@ -159,7 +222,7 @@ Particular systems
- CC is not installed, it is recommended to use the following options in
- order to use an ANSI C compiler:
-
-- ./configure CC="cc -Ae"
-+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
- and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-@@ -174,6 +237,16 @@ and if that doesn't work, try
-
- ./configure CC="cc -nodtk"
-
-+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
-+directory contains several dysfunctional programs; working variants of
-+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
-+in your `PATH', put it _after_ `/usr/bin'.
-+
-+ On Haiku, software installed for all users goes in `/boot/common',
-+not `/usr/local'. It is recommended to use the following options:
-+
-+ ./configure --prefix=/boot/common
-+
- Specifying the System Type
- ==========================
-
-@@ -189,7 +262,8 @@ type, such as `sun4', or a canonical name which has the form:
-
- where SYSTEM can have one of these forms:
-
-- OS KERNEL-OS
-+ OS
-+ KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
- `config.sub' isn't included in this package, then this package doesn't
-@@ -277,7 +351,7 @@ operates.
- `configure' can determine that directory automatically.
-
- `--prefix=DIR'
-- Use DIR as the installation prefix. *Note Installation Names::
-+ Use DIR as the installation prefix. *note Installation Names::
- for more details, including other options available for fine-tuning
- the installation locations.
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index 6812ee8..91c7b24 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -13,8 +13,8 @@
-
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
--[m4_warning([this file was generated for autoconf 2.64.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-+[m4_warning([this file was generated for autoconf 2.65.
- 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'.])])
-@@ -2460,7 +2460,7 @@ linux*oldld* | linux*aout* | linux*coff*)
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -2485,13 +2485,10 @@ linux* | k*bsd*-gnu)
- # before this can be enabled.
- hardcode_into_libs=yes
-
-- # Add ABI-specific directories to the system library path.
-- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
--
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -2503,6 +2500,18 @@ linux* | k*bsd*-gnu)
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -3090,11 +3099,11 @@ irix5* | irix6* | nonstopux*)
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- else
-@@ -3711,7 +3720,7 @@ m4_if([$1], [CXX], [
- ;;
- esac
- ;;
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- KCC*)
- # KAI C++ Compiler
-@@ -3775,7 +3784,7 @@ m4_if([$1], [CXX], [
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- ;;
- *qnx* | *nto*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -3995,7 +4004,7 @@ m4_if([$1], [CXX], [
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
- ecc*)
-@@ -4200,6 +4209,9 @@ m4_if([$1], [CXX], [
- cygwin* | mingw* | cegcc*)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-+ linux* | k*bsd*-gnu)
-+ _LT_TAGVAR(link_all_deplibs, $1)=no
-+ ;;
- *)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-@@ -4264,6 +4276,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
- openbsd*)
- with_gnu_ld=no
- ;;
-+ linux* | k*bsd*-gnu)
-+ _LT_TAGVAR(link_all_deplibs, $1)=no
-+ ;;
- esac
-
- _LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -4285,6 +4300,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
- fi
- supports_anon_versioning=no
- case `$LD -v 2>&1` in
-+ *GNU\ gold*) supports_anon_versioning=yes ;;
- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -4376,7 +4392,7 @@ _LT_EOF
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- gnu* | linux* | tpf* | k*bsd*-gnu)
-+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
- tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
- case $cc_basename in
-@@ -4446,7 +4462,7 @@ _LT_EOF
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -4621,6 +4637,7 @@ _LT_EOF
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
- fi
-+ _LT_TAGVAR(link_all_deplibs, $1)=no
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
-@@ -4859,7 +4876,7 @@ _LT_EOF
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -5855,7 +5872,7 @@ if test "$_lt_caught_CXX_error" != yes; then
- _LT_TAGVAR(inherit_rpath, $1)=yes
- ;;
-
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-diff --git a/config.guess b/config.guess
-index e3a2116..c2246a4 100755
---- a/config.guess
-+++ b/config.guess
-@@ -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, 2007, 2008, 2009
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
- # Free Software Foundation, Inc.
-
--timestamp='2009-06-10'
-+timestamp='2009-12-30'
-
- # 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
-@@ -27,16 +27,16 @@ timestamp='2009-06-10'
- # the same distribution terms that you use for the rest of that program.
-
-
--# Originally written by Per Bothner <per at bothner.com>.
--# Please send patches to <config-patches at gnu.org>. Submit a context
--# diff and a properly formatted ChangeLog entry.
-+# Originally written by Per Bothner. Please send patches (context
-+# diff format) to <config-patches at gnu.org> 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,.*/,,'`
-
-@@ -56,8 +56,9 @@ version="\
- 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, 2006, 2007, 2008 Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-+Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -333,6 +334,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- 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.*:*)
- eval $set_cc_for_build
- SUN_ARCH="i386"
-@@ -807,12 +811,12 @@ EOF
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit ;;
-- *:Interix*:[3456]*)
-+ *:Interix*:*)
- case ${UNAME_MACHINE} in
- x86)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
-- EM64T | authenticamd | genuineintel)
-+ authenticamd | genuineintel | EM64T)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
- IA64)
-@@ -854,6 +858,20 @@ EOF
- i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
- 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 \
-@@ -876,6 +894,17 @@ EOF
- frv:Linux:*:*)
- echo frv-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
- exit ;;
-@@ -901,39 +930,18 @@ EOF
- #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
-- exit ;;
-- ppc64:Linux:*:*)
-- echo powerpc64-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 ;;
- padre:Linux:*:*)
- echo sparc-unknown-linux-gnu
- exit ;;
-+ parisc64:Linux:*:* | hppa64:Linux:*:*)
-+ echo hppa64-unknown-linux-gnu
-+ exit ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
- # Look for CPU level
- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -942,8 +950,11 @@ EOF
- *) 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
-@@ -966,58 +977,6 @@ EOF
- xtensa*:Linux:*:*)
- 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"
-- ;;
-- esac
-- # Determine whether the default compiler is a.out or elf
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-- #include <features.h>
-- #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
-@@ -1247,6 +1206,16 @@ EOF
- *: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}
-diff --git a/config.sub b/config.sub
-index eb0389a..c2d1257 100755
---- a/config.sub
-+++ b/config.sub
-@@ -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, 2007, 2008, 2009
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
- # Free Software Foundation, Inc.
-
--timestamp='2009-06-11'
-+timestamp='2010-01-22'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -32,13 +32,16 @@ timestamp='2009-06-11'
-
-
- # Please send patches to <config-patches at gnu.org>. 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.
-@@ -72,8 +75,9 @@ Report bugs and patches to <config-patches at gnu.org>."
- version="\
- GNU config.sub ($timestamp)
-
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-+Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -149,7 +153,7 @@ case $os in
- -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
- ;;
-@@ -284,6 +288,7 @@ case $basic_machine in
- | pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- | pyramid \
-+ | rx \
- | score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
-@@ -291,13 +296,14 @@ case $basic_machine in
- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
- | spu | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
-+ | ubicom32 \
- | v850 | v850e \
- | we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
- | z8k | z80)
- basic_machine=$basic_machine-unknown
- ;;
-- m6811 | m68hc11 | m6812 | m68hc12)
-+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
- # Motorola 68HC11/12.
- basic_machine=$basic_machine-unknown
- os=-none
-@@ -340,7 +346,7 @@ case $basic_machine in
- | lm32-* \
- | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- | mips16-* \
- | mips64-* | mips64el-* \
-@@ -368,15 +374,17 @@ case $basic_machine in
- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- | pyramid-* \
-- | romp-* | rs6000-* \
-+ | 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-* \
-- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
-+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+ | tile-* | tilegx-* \
- | tron-* \
-+ | ubicom32-* \
- | v850-* | v850e-* | vax-* \
- | we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-@@ -726,6 +734,9 @@ case $basic_machine in
- basic_machine=ns32k-utek
- os=-sysv
- ;;
-+ microblaze)
-+ basic_machine=microblaze-xilinx
-+ ;;
- mingw32)
- basic_machine=i386-pc
- os=-mingw32
-@@ -1076,6 +1087,11 @@ case $basic_machine in
- basic_machine=tic6x-unknown
- os=-coff
- ;;
-+ # This must be matched before tile*.
-+ tilegx*)
-+ basic_machine=tilegx-unknown
-+ os=-linux-gnu
-+ ;;
- tile*)
- basic_machine=tile-unknown
- os=-linux-gnu
-@@ -1247,6 +1263,9 @@ case $os in
- # 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|'`
- ;;
-@@ -1268,8 +1287,8 @@ case $os in
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-- | -kopensolaris* \
-+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-+ | -sym* | -kopensolaris* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-@@ -1290,7 +1309,7 @@ case $os in
- | -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*)
-@@ -1423,6 +1442,8 @@ case $os in
- -dicos*)
- os=-dicos
- ;;
-+ -nacl*)
-+ ;;
- -none)
- ;;
- *)
-diff --git a/configure b/configure
-index c35f89c..23713ed 100755
---- a/configure
-+++ b/configure
-@@ -1,10 +1,12 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.64 for ace 1.3.
-+# Generated by GNU Autoconf 2.65 for ace 1.3.
-+#
- #
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
--# Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-+# Inc.
-+#
- #
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
-@@ -673,7 +675,8 @@ fi
-
-
-
--exec 7<&0 </dev/null 6>&1
-+test -n "$DJDIR" || exec 7<&0 </dev/null
-+exec 6>&1
-
- # Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-@@ -1531,7 +1534,7 @@ Some influential environment variables:
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
- nonstandard directory <lib dir>
- LIBS libraries to pass to the linker, e.g. -l<library>
-- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
- you have headers in a nonstandard directory <include dir>
- CPP C preprocessor
- XMKMF Path to xmkmf, Makefile generator for X Window System
-@@ -1603,7 +1606,7 @@ test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
- cat <<\_ACEOF
- ace configure 1.3
--generated by GNU Autoconf 2.64
-+generated by GNU Autoconf 2.65
-
- Copyright (C) 2009 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
-@@ -1650,7 +1653,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- ac_retval=1
- fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-- return $ac_retval
-+ as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_compile
-
-@@ -1696,7 +1699,7 @@ fi
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-- return $ac_retval
-+ as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_link
-
-@@ -1764,7 +1767,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- ac_retval=1
- fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-- return $ac_retval
-+ as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_cpp
-
-@@ -1806,7 +1809,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- fi
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-- return $ac_retval
-+ as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_run
-
-@@ -1968,7 +1971,7 @@ This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by ace $as_me 1.3, which was
--generated by GNU Autoconf 2.64. Invocation command line was
-+generated by GNU Autoconf 2.65. Invocation command line was
-
- $ $0 $@
-
-@@ -2221,7 +2224,7 @@ fi
- for ac_site_file in "$ac_site_file1" "$ac_site_file2"
- do
- test "x$ac_site_file" = xNONE && continue
-- if test -r "$ac_site_file"; then
-+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
- $as_echo "$as_me: loading site script $ac_site_file" >&6;}
- sed 's/^/| /' "$ac_site_file" >&5
-@@ -2230,9 +2233,9 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
- done
-
- if test -r "$cache_file"; then
-- # Some versions of bash will fail to source /dev/null (special
-- # files actually), so we avoid doing that.
-- if test -f "$cache_file"; then
-+ # Some versions of bash will fail to source /dev/null (special files
-+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
-+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
- $as_echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
-@@ -2653,6 +2656,7 @@ IFS=$as_save_IFS
-
- fi
-
-+ test -d ./--version && rmdir ./--version
- if test "${ac_cv_path_mkdir+set}" = set; then
- MKDIR_P="$ac_cv_path_mkdir -p"
- else
-@@ -2660,7 +2664,6 @@ fi
- # value for MKDIR_P within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
-- test -d ./--version && rmdir ./--version
- MKDIR_P="$ac_install_sh -d"
- fi
- fi
-@@ -3341,32 +3344,30 @@ $as_echo "$ac_try_echo"; } >&5
- ... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
-- rm -f conftest.er1 conftest.err
- fi
-+ rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- done
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--#include <stdio.h>
-+
- int
- main ()
- {
--FILE *f = fopen ("conftest.out", "w");
-- return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
--$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
- ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
- # The possible output files:
-@@ -3428,10 +3429,10 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
- else
- ac_file=''
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
--$as_echo "$ac_file" >&6; }
- if test -z "$ac_file"; then :
-- $as_echo "$as_me: failed program was:" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-@@ -3439,51 +3440,18 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { as_fn_set_status 77
- as_fn_error "C compiler cannot create executables
- See \`config.log' for more details." "$LINENO" 5; }; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
- ac_exeext=$ac_cv_exeext
-
--# Check that the compiler produces executables we can run. If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
--$as_echo_n "checking whether the C compiler works... " >&6; }
--# If not cross compiling, check that we can run a simple program.
--if test "$cross_compiling" != yes; then
-- if { ac_try='./$ac_file'
-- { { case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; }; then
-- cross_compiling=no
-- else
-- if test "$cross_compiling" = maybe; then
-- cross_compiling=yes
-- else
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run C compiled programs.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." "$LINENO" 5; }
-- fi
-- fi
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check that the compiler produces executables we can run. If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
--$as_echo_n "checking whether we are cross compiling... " >&6; }
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
--$as_echo "$cross_compiling" >&6; }
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
- $as_echo_n "checking for suffix of executables... " >&6; }
- if { { ac_try="$ac_link"
-@@ -3516,13 +3484,72 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error "cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." "$LINENO" 5; }
- fi
--rm -f conftest$ac_cv_exeext
-+rm -f conftest conftest$ac_cv_exeext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
- $as_echo "$ac_cv_exeext" >&6; }
-
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <stdio.h>
-+int
-+main ()
-+{
-+FILE *f = fopen ("conftest.out", "w");
-+ return ferror (f) || fclose (f) != 0;
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+ac_clean_files="$ac_clean_files conftest.out"
-+# Check that the compiler produces executables we can run. If not, either
-+# the compiler is broken, or we cross compile.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+if test "$cross_compiling" != yes; then
-+ { { ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_link") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }
-+ if { ac_try='./conftest$ac_cv_exeext'
-+ { { case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_try") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; }; then
-+ cross_compiling=no
-+ else
-+ if test "$cross_compiling" = maybe; then
-+ cross_compiling=yes
-+ else
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." "$LINENO" 5; }
-+ fi
-+ fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
-+
-+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-+ac_clean_files=$ac_clean_files_save
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
- if test "${ac_cv_objext+set}" = set; then :
-@@ -4497,13 +4524,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
- else
- lt_cv_nm_interface="BSD nm"
- echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:4500: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:4527: $ac_compile\"" >&5)
- (eval "$ac_compile" 2>conftest.err)
- cat conftest.err >&5
-- (eval echo "\"\$as_me:4503: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:4530: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
- cat conftest.err >&5
-- (eval echo "\"\$as_me:4506: output\"" >&5)
-+ (eval echo "\"\$as_me:4533: output\"" >&5)
- cat conftest.out >&5
- if $GREP 'External.*some_variable' conftest.out > /dev/null; then
- lt_cv_nm_interface="MS dumpbin"
-@@ -4969,11 +4996,11 @@ irix5* | irix6* | nonstopux*)
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
- else
-@@ -5709,7 +5736,7 @@ ia64-*-hpux*)
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 5712 "configure"' > conftest.$ac_ext
-+ echo '#line 5739 "configure"' > conftest.$ac_ext
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -7235,11 +7262,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:7238: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7265: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:7242: \$? = $ac_status" >&5
-+ echo "$as_me:7269: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -7404,7 +7431,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- lt_prog_compiler_static='-non_shared'
- ;;
-
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
- ecc*)
-@@ -7574,11 +7601,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:7577: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7604: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:7581: \$? = $ac_status" >&5
-+ echo "$as_me:7608: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -7679,11 +7706,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:7682: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7709: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:7686: \$? = $ac_status" >&5
-+ echo "$as_me:7713: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -7734,11 +7761,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:7737: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7764: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:7741: \$? = $ac_status" >&5
-+ echo "$as_me:7768: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -7853,6 +7880,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
- openbsd*)
- with_gnu_ld=no
- ;;
-+ linux* | k*bsd*-gnu)
-+ link_all_deplibs=no
-+ ;;
- esac
-
- ld_shlibs=yes
-@@ -7874,6 +7904,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
- fi
- supports_anon_versioning=no
- case `$LD -v 2>&1` in
-+ *GNU\ gold*) supports_anon_versioning=yes ;;
- *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -7965,7 +7996,7 @@ _LT_EOF
- archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- gnu* | linux* | tpf* | k*bsd*-gnu)
-+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
- tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
- case $cc_basename in
-@@ -8035,7 +8066,7 @@ _LT_EOF
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -8210,6 +8241,7 @@ _LT_EOF
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
- fi
-+ link_all_deplibs=no
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
-@@ -8536,7 +8568,7 @@ rm -f core conftest.err conftest.$ac_objext \
- link_all_deplibs=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -9426,7 +9458,7 @@ linux*oldld* | linux*aout* | linux*coff*)
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -9466,13 +9498,10 @@ rm -f core conftest.err conftest.$ac_objext \
- # before this can be enabled.
- hardcode_into_libs=yes
-
-- # Add ABI-specific directories to the system library path.
-- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
--
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -9484,6 +9513,18 @@ rm -f core conftest.err conftest.$ac_objext \
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -10104,7 +10145,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 10107 "configure"
-+#line 10148 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -10200,7 +10241,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 10203 "configure"
-+#line 10244 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -10792,8 +10833,8 @@ $as_echo "$ac_try_echo"; } >&5
- ... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
-- rm -f conftest.er1 conftest.err
- fi
-+ rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- done
-@@ -12945,7 +12986,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- # values after options handling.
- ac_log="
- This file was extended by ace $as_me 1.3, which was
--generated by GNU Autoconf 2.64. Invocation command line was
-+generated by GNU Autoconf 2.65. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -12981,6 +13022,7 @@ Usage: $0 [OPTION]... [TAG]...
-
- -h, --help print this help, then exit
- -V, --version print version number and configuration settings, then exit
-+ --config print configuration, then exit
- -q, --quiet, --silent
- do not print progress messages
- -d, --debug don't remove temporary files
-@@ -12998,10 +13040,11 @@ Report bugs to the package provider."
-
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
- ace config.status 1.3
--configured by $0, generated by GNU Autoconf 2.64,
-- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.65,
-+ with options \\"\$ac_cs_config\\"
-
- Copyright (C) 2009 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
-@@ -13039,6 +13082,8 @@ do
- ac_cs_recheck=: ;;
- --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- $as_echo "$ac_cs_version"; exit ;;
-+ --config | --confi | --conf | --con | --co | --c )
-+ $as_echo "$ac_cs_config"; exit ;;
- --debug | --debu | --deb | --de | --d | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
-@@ -13472,7 +13517,7 @@ s/'"$ac_delim"'$//
- t delim
- :nl
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more1
- s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
- p
-@@ -13486,7 +13531,7 @@ s/.\{148\}//
- t nl
- :delim
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more2
- s/["\\]/\\&/g; s/^/"/; s/$/"/
- p
-diff --git a/depcomp b/depcomp
-index e5f9736..df8eea7 100755
---- a/depcomp
-+++ b/depcomp
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # depcomp - compile a program generating dependencies as side-effects
-
--scriptversion=2007-03-29.01
-+scriptversion=2009-04-28.21; # UTC
-
--# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
--# Foundation, Inc.
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-+# Software Foundation, Inc.
-
- # 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
-@@ -17,9 +17,7 @@ scriptversion=2007-03-29.01
- # 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, write to the Free Software
--# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -87,6 +85,15 @@ if test "$depmode" = dashXmstdout; then
- depmode=dashmstdout
- fi
-
-+cygpath_u="cygpath -u -f -"
-+if test "$depmode" = msvcmsys; then
-+ # This is just like msvisualcpp but w/o cygpath translation.
-+ # Just convert the backslash-escaped backslashes to single forward
-+ # slashes to satisfy depend.m4
-+ cygpath_u="sed s,\\\\\\\\,/,g"
-+ depmode=msvisualcpp
-+fi
-+
- case "$depmode" in
- gcc3)
- ## gcc 3 implements dependency tracking that does exactly what
-@@ -192,14 +199,14 @@ sgi)
- ' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
- tr '
--' ' ' >> $depfile
-- echo >> $depfile
-+' ' ' >> "$depfile"
-+ echo >> "$depfile"
-
- # The second pass generates a dummy entry for each header file.
- tr ' ' '
- ' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-- >> $depfile
-+ >> "$depfile"
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
-@@ -328,7 +335,12 @@ hp2)
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
- # Add `dependent.h:' lines.
-- sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
-+ sed -ne '2,${
-+ s/^ *//
-+ s/ \\*$//
-+ s/$/:/
-+ p
-+ }' "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
-@@ -404,7 +416,7 @@ dashmstdout)
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
-- while test $1 != '--mode=compile'; do
-+ while test "X$1" != 'X--mode=compile'; do
- shift
- done
- shift
-@@ -455,32 +467,39 @@ makedepend)
- "$@" || exit $?
- # Remove any Libtool call
- if test "$libtool" = yes; then
-- while test $1 != '--mode=compile'; do
-+ while test "X$1" != 'X--mode=compile'; do
- shift
- done
- shift
- fi
- # X makedepend
- shift
-- cleared=no
-- for arg in "$@"; do
-+ cleared=no eat=no
-+ for arg
-+ do
- case $cleared in
- no)
- set ""; shift
- cleared=yes ;;
- esac
-+ if test $eat = yes; then
-+ eat=no
-+ continue
-+ fi
- case "$arg" in
- -D*|-I*)
- set fnord "$@" "$arg"; shift ;;
- # Strip any option that makedepend may not understand. Remove
- # the object too, otherwise makedepend will parse it as a source file.
-+ -arch)
-+ eat=yes ;;
- -*|$object)
- ;;
- *)
- set fnord "$@" "$arg"; shift ;;
- esac
- done
-- obj_suffix="`echo $object | sed 's/^.*\././'`"
-+ obj_suffix=`echo "$object" | sed 's/^.*\././'`
- touch "$tmpdepfile"
- ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
- rm -f "$depfile"
-@@ -500,7 +519,7 @@ cpp)
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
-- while test $1 != '--mode=compile'; do
-+ while test "X$1" != 'X--mode=compile'; do
- shift
- done
- shift
-@@ -538,13 +557,27 @@ cpp)
-
- msvisualcpp)
- # Important note: in order to support this mode, a compiler *must*
-- # always write the preprocessed file to stdout, regardless of -o,
-- # because we must use -o when running libtool.
-+ # always write the preprocessed file to stdout.
- "$@" || exit $?
-+
-+ # Remove the call to Libtool.
-+ if test "$libtool" = yes; then
-+ while test "X$1" != 'X--mode=compile'; do
-+ shift
-+ done
-+ shift
-+ fi
-+
- IFS=" "
- for arg
- do
- case "$arg" in
-+ -o)
-+ shift
-+ ;;
-+ $object)
-+ shift
-+ ;;
- "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
- set fnord "$@"
- shift
-@@ -557,16 +590,23 @@ msvisualcpp)
- ;;
- esac
- done
-- "$@" -E |
-- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-+ "$@" -E 2>/dev/null |
-+ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
-- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
-+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
- echo " " >> "$depfile"
-- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-+msvcmsys)
-+ # This case exists only to let depend.m4 do its work. It works by
-+ # looking at the text of this script. This case will never be run,
-+ # since it is checked for above.
-+ exit 1
-+ ;;
-+
- none)
- exec "$@"
- ;;
-@@ -585,5 +625,6 @@ exit 0
- # eval: (add-hook 'write-file-hooks 'time-stamp)
- # time-stamp-start: "scriptversion="
- # time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-end: "$"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
- # End:
-diff --git a/install-sh b/install-sh
-index a5897de..6781b98 100755
---- a/install-sh
-+++ b/install-sh
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # install - install a program, script, or datafile
-
--scriptversion=2006-12-25.00
-+scriptversion=2009-04-28.21; # UTC
-
- # This originates from X11R5 (mit/util/scripts/install.sh), which was
- # later released in X11R6 (xc/config/util/install.sh) with the
-@@ -515,5 +515,6 @@ done
- # eval: (add-hook 'write-file-hooks 'time-stamp)
- # time-stamp-start: "scriptversion="
- # time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-end: "$"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
- # End:
-diff --git a/ltmain.sh b/ltmain.sh
-old mode 100644
-new mode 100755
-index a72f2fd..d88da2c
---- a/ltmain.sh
-+++ b/ltmain.sh
-@@ -65,7 +65,7 @@
- # compiler: $LTCC
- # compiler flags: $LTCFLAGS
- # linker: $LD (gnu? $with_gnu_ld)
--# $progname: (GNU libtool) 2.2.6b
-+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2
- # automake: $automake_version
- # autoconf: $autoconf_version
- #
-@@ -73,7 +73,7 @@
-
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=2.2.6b
-+VERSION="2.2.6b Debian-2.2.6b-2"
- TIMESTAMP=""
- package_revision=1.3017
-
-@@ -5033,7 +5033,10 @@ func_mode_link ()
- case $pass in
- dlopen) libs="$dlfiles" ;;
- dlpreopen) libs="$dlprefiles" ;;
-- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-+ link)
-+ libs="$deplibs %DEPLIBS%"
-+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-+ ;;
- esac
- fi
- if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5344,19 +5347,19 @@ func_mode_link ()
- # It is a libtool convenience library, so add in its objects.
- convenience="$convenience $ladir/$objdir/$old_library"
- old_convenience="$old_convenience $ladir/$objdir/$old_library"
-+ tmp_libs=
-+ for deplib in $dependency_libs; do
-+ deplibs="$deplib $deplibs"
-+ if $opt_duplicate_deps ; then
-+ case "$tmp_libs " in
-+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+ esac
-+ fi
-+ tmp_libs="$tmp_libs $deplib"
-+ done
- elif test "$linkmode" != prog && test "$linkmode" != lib; then
- func_fatal_error "\`$lib' is not a convenience library"
- fi
-- tmp_libs=
-- for deplib in $dependency_libs; do
-- deplibs="$deplib $deplibs"
-- if $opt_duplicate_deps ; then
-- case "$tmp_libs " in
-- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-- esac
-- fi
-- tmp_libs="$tmp_libs $deplib"
-- done
- continue
- fi # $pass = conv
-
-@@ -5893,6 +5896,7 @@ func_mode_link ()
- if test "$link_all_deplibs" != no; then
- # Add the search paths of all dependency libraries
- for deplib in $dependency_libs; do
-+ path=
- case $deplib in
- -L*) path="$deplib" ;;
- *.la)
-@@ -6206,6 +6210,9 @@ func_mode_link ()
- revision="$number_minor"
- lt_irix_increment=no
- ;;
-+ *)
-+ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-+ ;;
- esac
- ;;
- no)
-diff --git a/missing b/missing
-index 1c8ff70..28055d2 100755
---- a/missing
-+++ b/missing
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Common stub for a few missing GNU programs while installing.
-
--scriptversion=2006-05-10.23
-+scriptversion=2009-04-28.21; # UTC
-
--# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-+# 2008, 2009 Free Software Foundation, Inc.
- # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
-
- # This program is free software; you can redistribute it and/or modify
-@@ -18,9 +18,7 @@ scriptversion=2006-05-10.23
- # 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, write to the Free Software
--# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -89,6 +87,9 @@ Supported PROGRAM values:
- tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
-
-+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-+\`g' are ignored when checking the name.
-+
- Send bug reports to <bug-automake at gnu.org>."
- exit $?
- ;;
-@@ -106,15 +107,22 @@ Send bug reports to <bug-automake at gnu.org>."
-
- esac
-
-+# normalize program name to check for.
-+program=`echo "$1" | sed '
-+ s/^gnu-//; t
-+ s/^gnu//; t
-+ s/^g//; t'`
-+
- # Now exit if we have it, but it failed. Also exit now if we
- # don't have it and --version was passed (most likely to detect
--# the program).
-+# the program). This is about non-GNU programs, so use $1 not
-+# $program.
- case $1 in
-- lex|yacc)
-+ lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
-
-- tar)
-+ tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
-@@ -138,7 +146,7 @@ esac
-
- # If it does not exist, or fails to run (possibly an outdated version),
- # try to emulate it.
--case $1 in
-+case $program in
- aclocal*)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
-@@ -148,7 +156,7 @@ WARNING: \`$1' is $msg. You should only need it if
- touch aclocal.m4
- ;;
-
-- autoconf)
-+ autoconf*)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
-@@ -157,7 +165,7 @@ WARNING: \`$1' is $msg. You should only need it if
- touch configure
- ;;
-
-- autoheader)
-+ autoheader*)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
-@@ -187,7 +195,7 @@ WARNING: \`$1' is $msg. You should only need it if
- while read f; do touch "$f"; done
- ;;
-
-- autom4te)
-+ autom4te*)
- echo 1>&2 "\
- WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
-@@ -210,7 +218,7 @@ WARNING: \`$1' is needed, but is $msg.
- fi
- ;;
-
-- bison|yacc)
-+ bison*|yacc*)
- echo 1>&2 "\
- WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
-@@ -240,7 +248,7 @@ WARNING: \`$1' $msg. You should only need it if
- fi
- ;;
-
-- lex|flex)
-+ lex*|flex*)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
-@@ -263,7 +271,7 @@ WARNING: \`$1' is $msg. You should only need it if
- fi
- ;;
-
-- help2man)
-+ help2man*)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
-@@ -277,11 +285,11 @@ WARNING: \`$1' is $msg. You should only need it if
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
-- exit 1
-+ exit $?
- fi
- ;;
-
-- makeinfo)
-+ makeinfo*)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
-@@ -310,7 +318,7 @@ WARNING: \`$1' is $msg. You should only need it if
- touch $file
- ;;
-
-- tar)
-+ tar*)
- shift
-
- # We have already tried tar in the generic part.
-@@ -363,5 +371,6 @@ exit 0
- # eval: (add-hook 'write-file-hooks 'time-stamp)
- # time-stamp-start: "scriptversion="
- # time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-end: "$"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
- # End:
-diff --git a/mkinstalldirs b/mkinstalldirs
-index ef7e16f..4191a45 100755
---- a/mkinstalldirs
-+++ b/mkinstalldirs
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # mkinstalldirs --- make directory hierarchy
-
--scriptversion=2006-05-11.19
-+scriptversion=2009-04-28.21; # UTC
-
- # Original author: Noah Friedman <friedman at prep.ai.mit.edu>
- # Created: 1993-05-16
-@@ -157,5 +157,6 @@ exit $errstatus
- # eval: (add-hook 'write-file-hooks 'time-stamp)
- # time-stamp-start: "scriptversion="
- # time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-end: "$"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
- # End:
---
-1.7.1
-
diff --git a/debian/patches/20-lib--make-imglib.c-closedir.patch b/debian/patches/20-lib--make-imglib.c-closedir.patch
deleted file mode 100644
index 49aa090..0000000
--- a/debian/patches/20-lib--make-imglib.c-closedir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From cef141128742abe692ab028890dd470d9171820b Mon Sep 17 00:00:00 2001
-From: Jari Aalto <jari.aalto at cante.net>
-Date: Mon, 25 Oct 2010 16:12:23 +0300
-Subject: [PATCH] lib/make-imglib.c: (scan_image_directory): Add closedir() call
-Organization: Private
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-
-Signed-off-by: Jari Aalto <jari.aalto at cante.net>
----
- lib/make-imglib.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/lib/make-imglib.c b/lib/make-imglib.c
-index 94ecbd6..84cda12 100644
---- a/lib/make-imglib.c
-+++ b/lib/make-imglib.c
-@@ -115,6 +115,8 @@ scan_image_directory ()
-
- fclose (f);
- }
-+
-+ closedir(dir);
- }
-
- static int print_col = 0;
---
-1.7.1
-
diff --git a/debian/patches/30-spider.c-implicit-pointer-conversion.patch b/debian/patches/30-spider.c-implicit-pointer-conversion.patch
deleted file mode 100644
index 9362bac..0000000
--- a/debian/patches/30-spider.c-implicit-pointer-conversion.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 72862f98d815087f9e050c39f64a2d07f47279f1 Mon Sep 17 00:00:00 2001
-From: Jari Aalto <jari.aalto at cante.net>
-Date: Sun, 31 Oct 2010 19:01:59 +0200
-Subject: [PATCH] Fix implicit pointer conversion by Julien Lavergne <gilir at ubuntu.com>
-Organization: Private
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jari Aalto <jari.aalto at cante.net>
----
- games/spider.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/games/spider.c b/games/spider.c
-index 0daa591..4004f0d 100644
---- a/games/spider.c
-+++ b/games/spider.c
-@@ -20,8 +20,8 @@
- #include <string.h>
- #include <time.h>
-
-+#include "imagelib.h"
- #include "cards.h"
--//#include "imagelib.h"
-
- #define W CARD_WIDTH
- #define H CARD_HEIGHT
---
-1.7.2.3
-
diff --git a/debian/patches/31-spider.c-license-name.patch b/debian/patches/31-spider.c-license-name.patch
deleted file mode 100644
index 704b75a..0000000
--- a/debian/patches/31-spider.c-license-name.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-From: Martin Pitt <martin.pitt at ubuntu.com>
-Subject: Correct file name reference license applies to.
-Debian-Bug: https://bugs.debian.org/668985
-Ubuntu-Bug: https://launchpad.net/bugs/978446
-
---- fix-978446.orig/games/spider.c 2012-04-10 18:28:05.146117000 -0500
-+++ fix-978446/games/spider.c 2012-04-10 18:29:09.474719164 -0500
-@@ -1,4 +1,4 @@
--/* The Ace of Penguins - freecell.c
-+/* The Ace of Penguins - spider.c
- Copyright (C) 1998, 2001 DJ Delorie
-
- This program is free software; you can redistribute it and/or modify
diff --git a/debian/patches/32-mwm-hints.patch b/debian/patches/32-mwm-hints.patch
deleted file mode 100644
index b71abf2..0000000
--- a/debian/patches/32-mwm-hints.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Ove Kaaven <ovek at arcticnet.no>
-Subject: Fix MWM hints on 64-bit platforms
- XChangeProperty with format 32 takes an array of longs, not an array of ints.
- This fixes inability to move fixed-size windows around on 64-bit platforms.
-
----
- lib/xwin.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/lib/xwin.c
-+++ b/lib/xwin.c
-@@ -88,10 +88,10 @@
- /* Motif window hints */
- typedef struct
- {
-- unsigned flags;
-- unsigned functions;
-- unsigned decorations;
-- int inputMode;
-+ unsigned long flags;
-+ unsigned long functions;
-+ unsigned long decorations;
-+ long inputMode;
- } PropMotifWmHints;
-
- typedef PropMotifWmHints PropMwmHints;
diff --git a/debian/patches/34-ts-workaround.patch b/debian/patches/34-ts-workaround.patch
deleted file mode 100644
index 3127bae..0000000
--- a/debian/patches/34-ts-workaround.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Ove Kaaven <ovek at arcticnet.no>
-Subject: Workaround for touchscreen issue
- Since ButtonMotionMask is used, MotionNotify events should only be sent
- while a button is held down. However, for touchscreen devices,
- a MotionNotify event might be sent immediately before a ButtonPress event.
- (Possibly a bug in the X server.) This patch ignores MotionNotify events
- if no buttons are being held down.
-
-
----
- lib/xwin.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/lib/xwin.c
-+++ b/lib/xwin.c
-@@ -424,6 +424,8 @@
-
- case MotionNotify:
-
-+ if (!(event.xmotion.state & ButtonMask))
-+ break;
- while (XCheckMaskEvent(display, ButtonMotionMask, &event));
- if (!XQueryPointer(display, event.xmotion.window,
- &root, &child, &root_x, &root_y,
diff --git a/debian/patches/35-return-fix.patch b/debian/patches/35-return-fix.patch
deleted file mode 100644
index a9b6a06..0000000
--- a/debian/patches/35-return-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Piotr Sokołowski <piotrsok2 at gmail.com>
-Subject: Correct return statement.
- Fix FTBFS with clang instead of gcc.
-Bug-Debian: https://bugs.debian.org/741609
-
-diff -ur ace-of-penguins-1.3/lib/make-imglib.c ace-of-penguins-1.3-clang/lib/make-imglib.c
---- ace-of-penguins-1.3/lib/make-imglib.c 2014-03-14 14:09:28.000000000 +0100
-+++ ace-of-penguins-1.3-clang/lib/make-imglib.c 2014-03-10 12:39:16.457216105 +0100
-@@ -202,7 +202,7 @@
- char *rv;
- if (string) {
- next = string;
-- return;
-+ return 0;
- }
- while (*next && !isgraph(*next)) next++;
- if (!*next) return 0;
diff --git a/debian/patches/40-include.patch b/debian/patches/40-include.patch
deleted file mode 100644
index 3bf08ff..0000000
--- a/debian/patches/40-include.patch
+++ /dev/null
@@ -1,355 +0,0 @@
-From a59b6ea5d5904f3b69ba7f2a16e9dc9d694398ee Mon Sep 17 00:00:00 2001
-From: Jari Aalto <jari.aalto at cante.net>
-Date: Sat, 9 Apr 2011 16:04:54 +0300
-Subject: [PATCH] Gcc 4.5 fix
-Organization: Private
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jari Aalto <jari.aalto at cante.net>
----
- games/freecell.c | 2 ++
- games/golf.c | 3 +++
- games/minesweeper.c | 2 ++
- games/pegged.c | 2 ++
- games/solitaire.c | 2 ++
- games/spider.c | 1 +
- games/taipedit.c | 2 ++
- games/taipei.c | 2 ++
- games/taipeilib.c | 2 ++
- lib/funcs.c | 4 ++++
- lib/help.c | 4 ++++
- lib/imagelib.c | 2 ++
- lib/stack.c | 2 ++
- lib/table.c | 3 +++
- lib/table.h | 6 ++++++
- lib/text2c.c | 1 +
- lib/xwin.c | 1 +
- lib/xwin.h | 5 +++++
- tests/penguins.c | 2 ++
- tests/test1.c | 2 ++
- tests/test3.c | 2 ++
- tests/test4.c | 2 ++
- tests/test5.c | 2 ++
- 23 files changed, 56 insertions(+), 0 deletions(-)
- create mode 100644 lib/table.h
-
-diff --git a/games/freecell.c b/games/freecell.c
-index f5f877e..15f5b92 100644
---- a/games/freecell.c
-+++ b/games/freecell.c
-@@ -16,6 +16,8 @@
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
- #include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
- #include <time.h>
- #include "imagelib.h"
- #include "cards.h"
-diff --git a/games/golf.c b/games/golf.c
-index 17a8f44..149bd79 100644
---- a/games/golf.c
-+++ b/games/golf.c
-@@ -15,6 +15,9 @@
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
- #include <X11/Xlib.h>
- #include "cards.h"
-
-diff --git a/games/minesweeper.c b/games/minesweeper.c
-index c525a0b..4b33053 100644
---- a/games/minesweeper.c
-+++ b/games/minesweeper.c
-@@ -16,6 +16,8 @@
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include "cards.h"
-
- #define C_EMPTY 0
-diff --git a/games/pegged.c b/games/pegged.c
-index d126afb..9177d0e 100644
---- a/games/pegged.c
-+++ b/games/pegged.c
-@@ -16,6 +16,8 @@
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
- #include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
- #include <time.h>
- #include <math.h>
- #include "cards.h"
-diff --git a/games/solitaire.c b/games/solitaire.c
-index 72c46db..8ba1351 100644
---- a/games/solitaire.c
-+++ b/games/solitaire.c
-@@ -16,6 +16,8 @@
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
- #include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
- #include <time.h>
- #include <math.h>
- #include "imagelib.h"
-diff --git a/games/spider.c b/games/spider.c
-index 4004f0d..7d2c93e 100644
---- a/games/spider.c
-+++ b/games/spider.c
-@@ -22,6 +22,7 @@
-
- #include "imagelib.h"
- #include "cards.h"
-+void get_image_set_display_type (int type);
-
- #define W CARD_WIDTH
- #define H CARD_HEIGHT
-diff --git a/games/taipedit.c b/games/taipedit.c
-index 3ae9513..ffd47ad 100644
---- a/games/taipedit.c
-+++ b/games/taipedit.c
-@@ -16,6 +16,8 @@
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include <X11/Xlib.h>
- #include <X11/keysym.h>
- #include "cards.h"
-diff --git a/games/taipei.c b/games/taipei.c
-index 67a5d24..29d51c5 100644
---- a/games/taipei.c
-+++ b/games/taipei.c
-@@ -16,6 +16,8 @@
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include "imagelib.h"
- #include "cards.h"
- #include "taipeilib.h"
-diff --git a/games/taipeilib.c b/games/taipeilib.c
-index 68ae809..70ab151 100644
---- a/games/taipeilib.c
-+++ b/games/taipeilib.c
-@@ -16,8 +16,10 @@
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
- #include <stdio.h>
-+#include <string.h>
- #include "imagelib.h"
- #include "taipeilib.h"
-+#include "cards.h"
-
- unsigned char grid[GRID_SX][GRID_SY][GRID_SZ];
-
-diff --git a/lib/funcs.c b/lib/funcs.c
-index 8c9e71b..af88383 100644
---- a/lib/funcs.c
-+++ b/lib/funcs.c
-@@ -15,7 +15,11 @@
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-+
-+#include <stdlib.h>
- #include "funcs.h"
-+#include "table.h"
-+#include "cards.h"
-
- static void
- default_click_cb(int x, int y, int b)
-diff --git a/lib/help.c b/lib/help.c
-index a8dcd3d..9289823 100644
---- a/lib/help.c
-+++ b/lib/help.c
-@@ -16,6 +16,8 @@
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include <ctype.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -24,6 +26,8 @@
- #include <X11/keysym.h>
-
- #include "cards.h"
-+#include "xwin.h"
-+#include "table.h"
-
- extern Display *display;
- extern int screen;
-diff --git a/lib/imagelib.c b/lib/imagelib.c
-index 315f069..f71b96a 100644
---- a/lib/imagelib.c
-+++ b/lib/imagelib.c
-@@ -1,3 +1,5 @@
-+#include <stdio.h>
-+#include <string.h>
- #include "imagelib.h"
- #include "cards.h"
-
-diff --git a/lib/stack.c b/lib/stack.c
-index 1ac156a..c58e4ee 100644
---- a/lib/stack.c
-+++ b/lib/stack.c
-@@ -17,6 +17,8 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
-+#include <time.h>
- #include <sys/time.h>
- #include <sys/types.h>
- #include <unistd.h>
-diff --git a/lib/table.c b/lib/table.c
-index 55533d9..befe696 100644
---- a/lib/table.c
-+++ b/lib/table.c
-@@ -16,6 +16,7 @@
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <assert.h>
-
-@@ -25,6 +26,8 @@
- #include <X11/Xatom.h>
- #include <X11/xpm.h>
-
-+#include "xwin.h"
-+
- #define CD printf("%d: %d %d %d %d\n", __LINE__, ex, ey, ew, eh)
- #undef CD
- #define CD
-diff --git a/lib/table.h b/lib/table.h
-new file mode 100644
-index 0000000..b1c881d
---- /dev/null
-+++ b/lib/table.h
-@@ -0,0 +1,6 @@
-+#ifndef _TABLE_H_
-+#define _TABLE_H_
-+
-+void table_no_resize();
-+
-+#endif
-diff --git a/lib/text2c.c b/lib/text2c.c
-index 934657b..d31f184 100644
---- a/lib/text2c.c
-+++ b/lib/text2c.c
-@@ -16,6 +16,7 @@
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
- #include <stdio.h>
-+#include <stdlib.h>
-
- int
- main(int argc, char **argv)
-diff --git a/lib/xwin.c b/lib/xwin.c
-index 2c8fcfa..88941c6 100644
---- a/lib/xwin.c
-+++ b/lib/xwin.c
-@@ -16,6 +16,7 @@
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <assert.h>
- #include <math.h>
-diff --git a/lib/xwin.h b/lib/xwin.h
-index 9b60e40..9cd080c 100644
---- a/lib/xwin.h
-+++ b/lib/xwin.h
-@@ -32,4 +32,9 @@ int xwin_init (int argc, char **argv);
- void xwin_create (int width, int height);
- int xwin_nextevent (XWin_Event *event);
-
-+void xwin_fixed_size (int width, int height);
-+void xwin_clip (int x, int y, int w, int h);
-+void xwin_noclip ();
-+int pixel_for (int r, int g, int b);
-+
- #endif
-diff --git a/tests/penguins.c b/tests/penguins.c
-index 50903b6..6e618c6 100644
---- a/tests/penguins.c
-+++ b/tests/penguins.c
-@@ -16,6 +16,8 @@
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
- #include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
- #include <time.h>
- #include "cards.h"
-
-diff --git a/tests/test1.c b/tests/test1.c
-index 385c201..4d2f4d6 100644
---- a/tests/test1.c
-+++ b/tests/test1.c
-@@ -15,6 +15,8 @@
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-+#include <stdio.h>
-+#include <string.h>
- #include "cards.h"
-
- static Picture *cards[4][13];
-diff --git a/tests/test3.c b/tests/test3.c
-index 478db45..52e13fa 100644
---- a/tests/test3.c
-+++ b/tests/test3.c
-@@ -16,6 +16,8 @@
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
- #include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
- #include <time.h>
- #include "cards.h"
-
-diff --git a/tests/test4.c b/tests/test4.c
-index 401e062..9c018d1 100644
---- a/tests/test4.c
-+++ b/tests/test4.c
-@@ -16,6 +16,8 @@
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
- #include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
- #include <time.h>
- #include "cards.h"
-
-diff --git a/tests/test5.c b/tests/test5.c
-index d066648..4bd4121 100644
---- a/tests/test5.c
-+++ b/tests/test5.c
-@@ -16,6 +16,8 @@
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
- #include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
- #include <time.h>
- #include "cards.h"
-
---
-1.7.4.1
-
diff --git a/debian/patches/45-libpng15 b/debian/patches/45-libpng15
deleted file mode 100644
index dce63d5..0000000
--- a/debian/patches/45-libpng15
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
-Subject: libpng 1.5 transition Bug#635741
-
---- a/lib/make-imglib.c
-+++ b/lib/make-imglib.c
-@@ -86,7 +86,7 @@
- png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0);
- info_ptr = png_create_info_struct (png_ptr);
-
-- if (setjmp (png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf((png_ptr)))) {
- fclose (f);
- continue;
- }
---- a/lib/xwin.c
-+++ b/lib/xwin.c
-@@ -825,13 +825,13 @@
- png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0);
- info_ptr = png_create_info_struct (png_ptr);
-
-- if (setjmp (png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf((png_ptr)))) {
- fprintf(stderr, "Invalid PNG image!\n");
- return;
- }
-
- file_bytes = src->file_data;
-- png_set_read_fn (png_ptr, (voidp)&file_bytes, (png_rw_ptr)png_reader);
-+ png_set_read_fn (png_ptr, (png_voidp)&file_bytes, (png_rw_ptr)png_reader);
-
- png_read_info (png_ptr, info_ptr);
-
diff --git a/debian/patches/50-buildflags.patch b/debian/patches/50-buildflags.patch
deleted file mode 100644
index a726aba..0000000
--- a/debian/patches/50-buildflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Simon Ruderich <simon at ruderich.org>,
- Steve Cotton <steve at s.cotton.clara.co.uk>
-Last-Update: 2013-06-17 by Steve Cotton <steve at s.cotton.clara.co.uk>
-Subject: Add support for CPPFLAGS
-
---- ace-of-penguins-1.3.orig/lib/Makefile.am
-+++ ace-of-penguins-1.3/lib/Makefile.am
-@@ -24,7 +24,7 @@ images.c : make-imglib Makefile images.i
- ./make-imglib -n cards -i $(srcdir)/png -d images.d $(srcdir)/images.in images.c
-
- make-imglib : make-imglib.c
-- $(BUILD_CC) $(srcdir)/make-imglib.c -o make-imglib -lpng -lz
-+ $(BUILD_CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(srcdir)/make-imglib.c -o make-imglib -lpng -lz
-
- text2c : text2c.c
-- $(BUILD_CC) $(srcdir)/text2c.c -o text2c -lpng -lz
-+ $(BUILD_CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(srcdir)/text2c.c -o text2c -lpng -lz
diff --git a/debian/patches/55-more-buildflags.patch b/debian/patches/55-more-buildflags.patch
deleted file mode 100644
index e4b1805..0000000
--- a/debian/patches/55-more-buildflags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Link libraries that libcards needs (closes: #712534)
-Author: Steve Cotton <steve at s.cotton.clara.co.uk>
-Last-Update: 2013-06-17
-Bug-Debian: https://bugs.debian.org/712534
-
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -6,7 +6,7 @@
- CLEANFILES = images.c images.d
-
- INCLUDES = $(X_CFLAGS) @PDA@
--AM_LDFLAGS = $(X_LIBS)
-+AM_LDFLAGS = $(X_LIBS) -lpng -lz -lm
-
- BUILD_CC = @BUILD_CC@
- AR = @AR@
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4d681df..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,10 +0,0 @@
-10-autoreconf-fi--2.65.patch
-20-lib--make-imglib.c-closedir.patch
-30-spider.c-implicit-pointer-conversion.patch
-31-spider.c-license-name.patch
-32-mwm-hints.patch
-34-ts-workaround.patch
-35-return-fix.patch
-40-include.patch
-50-buildflags.patch
-55-more-buildflags.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ace-of-penguins.git
More information about the Pkg-games-commits
mailing list