diff options
Diffstat (limited to 'package')
24 files changed, 1443 insertions, 2199 deletions
diff --git a/package/chillispot/patches/patch-Makefile b/package/chillispot/patches/patch-Makefile deleted file mode 100644 index e951e5931..000000000 --- a/package/chillispot/patches/patch-Makefile +++ /dev/null @@ -1,178 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- chillispot-1.1.0.orig/Makefile 2006-09-24 21:35:16.000000000 +0200 -+++ chillispot-1.1.0/Makefile 2009-05-21 20:42:08.000000000 +0200 -@@ -13,9 +13,9 @@ - # PARTICULAR PURPOSE. - - --srcdir = . --top_srcdir = . -- -+srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0 -+top_srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0 -+VPATH = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0 - pkgdatadir = $(datadir)/chillispot - pkglibdir = $(libdir)/chillispot - pkgincludedir = $(includedir)/chillispot -@@ -33,8 +33,8 @@ POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = i686-pc-linux-gnu --host_triplet = i686-pc-linux-gnu -+build_triplet = x86_64-pc-linux-gnu -+host_triplet = i586-pc-linux-gnu - DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/chillispot.spec.in \ - $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \ -@@ -72,24 +72,24 @@ DIST_ARCHIVES = $(distdir).tar.gz - GZIP_ENV = --best - distuninstallcheck_listfiles = find . -type f -print - distcleancheck_listfiles = find . -type f -print --ACLOCAL = ${SHELL} /home/jj/chillispot/missing --run aclocal-1.9 --AMDEP_FALSE = # --AMDEP_TRUE = --AMTAR = ${SHELL} /home/jj/chillispot/missing --run tar --AR = ar --AUTOCONF = ${SHELL} /home/jj/chillispot/missing --run autoconf --AUTOHEADER = ${SHELL} /home/jj/chillispot/missing --run autoheader --AUTOMAKE = ${SHELL} /home/jj/chillispot/missing --run automake-1.9 -+ACLOCAL = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run aclocal-1.9 -+AMDEP_FALSE = -+AMDEP_TRUE = # -+AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run tar -+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar -+AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoconf -+AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoheader -+AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run automake-1.9 - AWK = gawk --CC = gcc --CCDEPMODE = depmode=gcc3 --CFLAGS = -g -O2 --CPP = gcc -E --CPPFLAGS = --CXX = g++ --CXXCPP = g++ -E --CXXDEPMODE = depmode=gcc3 --CXXFLAGS = -g -O2 -+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -+CCDEPMODE = depmode=none -+CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E -+CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG -+CXX = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -+CXXCPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -E -+CXXDEPMODE = depmode=none -+CXXFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer - CYGPATH_W = echo - DEFS = -DHAVE_CONFIG_H - DEPDIR = .deps -@@ -99,19 +99,19 @@ ECHO_N = -n - ECHO_T = - EGREP = grep -E - EXEEXT = --F77 = f95 --FFLAGS = -g -O2 -+F77 = -+FFLAGS = - INSTALL_DATA = ${INSTALL} -m 644 - INSTALL_PROGRAM = ${INSTALL} - INSTALL_SCRIPT = ${INSTALL} - INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s --LDFLAGS = --LIBOBJS = -+LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib -+LIBOBJS = memcmp$U.o - LIBS = - LIBTOOL = $(SHELL) $(top_builddir)/libtool - LN_S = ln -s --LTLIBOBJS = --MAKEINFO = ${SHELL} /home/jj/chillispot/missing --run makeinfo -+LTLIBOBJS = memcmp$U.lo -+MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run makeinfo - OBJEXT = o - PACKAGE = chillispot - PACKAGE_BUGREPORT = bugs@chillispot.org -@@ -120,54 +120,54 @@ PACKAGE_STRING = chillispot 1.1.0 - PACKAGE_TARNAME = chillispot - PACKAGE_VERSION = 1.1.0 - PATH_SEPARATOR = : --RANLIB = ranlib -+RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib - SET_MAKE = --SHELL = /bin/sh --STRIP = strip -+SHELL = /bin/bash -+STRIP = i586-linux-strip - VERSION = 1.1.0 --ac_ct_AR = ar --ac_ct_CC = gcc --ac_ct_CXX = g++ --ac_ct_F77 = f95 --ac_ct_RANLIB = ranlib --ac_ct_STRIP = strip --am__fastdepCC_FALSE = # --am__fastdepCC_TRUE = --am__fastdepCXX_FALSE = # --am__fastdepCXX_TRUE = -+ac_ct_AR = -+ac_ct_CC = -+ac_ct_CXX = -+ac_ct_F77 = -+ac_ct_RANLIB = -+ac_ct_STRIP = -+am__fastdepCC_FALSE = -+am__fastdepCC_TRUE = # -+am__fastdepCXX_FALSE = -+am__fastdepCXX_TRUE = # - am__include = include - am__leading_dot = . - am__quote = - am__tar = ${AMTAR} chof - "$$tardir" - am__untar = ${AMTAR} xf - - bindir = ${exec_prefix}/bin --build = i686-pc-linux-gnu --build_alias = --build_cpu = i686 -+build = x86_64-pc-linux-gnu -+build_alias = x86_64-linux-gnu -+build_cpu = x86_64 - build_os = linux-gnu - build_vendor = pc --datadir = ${prefix}/share -+datadir = /usr/share - exec_prefix = ${prefix} --host = i686-pc-linux-gnu --host_alias = --host_cpu = i686 -+host = i586-pc-linux-gnu -+host_alias = i586-linux -+host_cpu = i586 - host_os = linux-gnu - host_vendor = pc - includedir = ${prefix}/include - infodir = ${prefix}/info --install_sh = /home/jj/chillispot/install-sh -+install_sh = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/install-sh - libdir = ${exec_prefix}/lib --libexecdir = ${exec_prefix}/libexec --localstatedir = ${prefix}/var --mandir = ${prefix}/man -+libexecdir = /usr/sbin -+localstatedir = /var -+mandir = /usr/share/man - mkdir_p = mkdir -p -- - oldincludedir = /usr/include --prefix = /usr/local --program_transform_name = s,x,x, -+prefix = /usr -+program_transform_name = s,$$,,;s,^,, - sbindir = ${exec_prefix}/sbin - sharedstatedir = ${prefix}/com --sysconfdir = ${prefix}/etc --target_alias = -+sysconfdir = /etc -+target_alias = i586-linux - SUBDIRS = src doc - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/package/chillispot/patches/patch-doc_Makefile b/package/chillispot/patches/patch-doc_Makefile deleted file mode 100644 index a6290fc41..000000000 --- a/package/chillispot/patches/patch-doc_Makefile +++ /dev/null @@ -1,178 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- chillispot-1.1.0.orig/doc/Makefile 2006-09-24 21:35:16.000000000 +0200 -+++ chillispot-1.1.0/doc/Makefile 2009-05-21 20:42:08.000000000 +0200 -@@ -13,9 +13,9 @@ - # PARTICULAR PURPOSE. - - --srcdir = . --top_srcdir = .. -- -+srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/doc -+top_srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0 -+VPATH = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/doc - pkgdatadir = $(datadir)/chillispot - pkglibdir = $(libdir)/chillispot - pkgincludedir = $(includedir)/chillispot -@@ -33,8 +33,8 @@ POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = i686-pc-linux-gnu --host_triplet = i686-pc-linux-gnu -+build_triplet = x86_64-pc-linux-gnu -+host_triplet = i586-pc-linux-gnu - subdir = doc - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -51,24 +51,24 @@ am__installdirs = "$(DESTDIR)$(man8dir)" - NROFF = nroff - MANS = $(man_MANS) - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --ACLOCAL = ${SHELL} /home/jj/chillispot/missing --run aclocal-1.9 --AMDEP_FALSE = # --AMDEP_TRUE = --AMTAR = ${SHELL} /home/jj/chillispot/missing --run tar --AR = ar --AUTOCONF = ${SHELL} /home/jj/chillispot/missing --run autoconf --AUTOHEADER = ${SHELL} /home/jj/chillispot/missing --run autoheader --AUTOMAKE = ${SHELL} /home/jj/chillispot/missing --run automake-1.9 -+ACLOCAL = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run aclocal-1.9 -+AMDEP_FALSE = -+AMDEP_TRUE = # -+AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run tar -+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar -+AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoconf -+AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoheader -+AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run automake-1.9 - AWK = gawk --CC = gcc --CCDEPMODE = depmode=gcc3 --CFLAGS = -g -O2 --CPP = gcc -E --CPPFLAGS = --CXX = g++ --CXXCPP = g++ -E --CXXDEPMODE = depmode=gcc3 --CXXFLAGS = -g -O2 -+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -+CCDEPMODE = depmode=none -+CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E -+CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG -+CXX = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -+CXXCPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -E -+CXXDEPMODE = depmode=none -+CXXFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer - CYGPATH_W = echo - DEFS = -DHAVE_CONFIG_H - DEPDIR = .deps -@@ -78,19 +78,19 @@ ECHO_N = -n - ECHO_T = - EGREP = grep -E - EXEEXT = --F77 = f95 --FFLAGS = -g -O2 -+F77 = -+FFLAGS = - INSTALL_DATA = ${INSTALL} -m 644 - INSTALL_PROGRAM = ${INSTALL} - INSTALL_SCRIPT = ${INSTALL} - INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s --LDFLAGS = --LIBOBJS = -+LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib -+LIBOBJS = memcmp$U.o - LIBS = - LIBTOOL = $(SHELL) $(top_builddir)/libtool - LN_S = ln -s --LTLIBOBJS = --MAKEINFO = ${SHELL} /home/jj/chillispot/missing --run makeinfo -+LTLIBOBJS = memcmp$U.lo -+MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run makeinfo - OBJEXT = o - PACKAGE = chillispot - PACKAGE_BUGREPORT = bugs@chillispot.org -@@ -99,54 +99,54 @@ PACKAGE_STRING = chillispot 1.1.0 - PACKAGE_TARNAME = chillispot - PACKAGE_VERSION = 1.1.0 - PATH_SEPARATOR = : --RANLIB = ranlib -+RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib - SET_MAKE = --SHELL = /bin/sh --STRIP = strip -+SHELL = /bin/bash -+STRIP = i586-linux-strip - VERSION = 1.1.0 --ac_ct_AR = ar --ac_ct_CC = gcc --ac_ct_CXX = g++ --ac_ct_F77 = f95 --ac_ct_RANLIB = ranlib --ac_ct_STRIP = strip --am__fastdepCC_FALSE = # --am__fastdepCC_TRUE = --am__fastdepCXX_FALSE = # --am__fastdepCXX_TRUE = -+ac_ct_AR = -+ac_ct_CC = -+ac_ct_CXX = -+ac_ct_F77 = -+ac_ct_RANLIB = -+ac_ct_STRIP = -+am__fastdepCC_FALSE = -+am__fastdepCC_TRUE = # -+am__fastdepCXX_FALSE = -+am__fastdepCXX_TRUE = # - am__include = include - am__leading_dot = . - am__quote = - am__tar = ${AMTAR} chof - "$$tardir" - am__untar = ${AMTAR} xf - - bindir = ${exec_prefix}/bin --build = i686-pc-linux-gnu --build_alias = --build_cpu = i686 -+build = x86_64-pc-linux-gnu -+build_alias = x86_64-linux-gnu -+build_cpu = x86_64 - build_os = linux-gnu - build_vendor = pc --datadir = ${prefix}/share -+datadir = /usr/share - exec_prefix = ${prefix} --host = i686-pc-linux-gnu --host_alias = --host_cpu = i686 -+host = i586-pc-linux-gnu -+host_alias = i586-linux -+host_cpu = i586 - host_os = linux-gnu - host_vendor = pc - includedir = ${prefix}/include - infodir = ${prefix}/info --install_sh = /home/jj/chillispot/install-sh -+install_sh = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/install-sh - libdir = ${exec_prefix}/lib --libexecdir = ${exec_prefix}/libexec --localstatedir = ${prefix}/var --mandir = ${prefix}/man -+libexecdir = /usr/sbin -+localstatedir = /var -+mandir = /usr/share/man - mkdir_p = mkdir -p -- - oldincludedir = /usr/include --prefix = /usr/local --program_transform_name = s,x,x, -+prefix = /usr -+program_transform_name = s,$$,,;s,^,, - sbindir = ${exec_prefix}/sbin - sharedstatedir = ${prefix}/com --sysconfdir = ${prefix}/etc --target_alias = -+sysconfdir = /etc -+target_alias = i586-linux - man_MANS = chilli.8 - man_aux = $(man_MANS:.1=.x) - EXTRA_DIST = $(man_MANS) diff --git a/package/chillispot/patches/patch-src_Makefile b/package/chillispot/patches/patch-src_Makefile deleted file mode 100644 index 975e6623e..000000000 --- a/package/chillispot/patches/patch-src_Makefile +++ /dev/null @@ -1,243 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- chillispot-1.1.0.orig/src/Makefile 2006-09-24 21:35:16.000000000 +0200 -+++ chillispot-1.1.0/src/Makefile 2009-05-21 20:42:08.000000000 +0200 -@@ -16,9 +16,9 @@ - - SOURCES = $(chilli_SOURCES) - --srcdir = . --top_srcdir = .. -- -+srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/src -+top_srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0 -+VPATH = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/src - pkgdatadir = $(datadir)/chillispot - pkglibdir = $(libdir)/chillispot - pkgincludedir = $(includedir)/chillispot -@@ -36,8 +36,8 @@ POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --build_triplet = i686-pc-linux-gnu --host_triplet = i686-pc-linux-gnu -+build_triplet = x86_64-pc-linux-gnu -+host_triplet = i586-pc-linux-gnu - sbin_PROGRAMS = chilli$(EXEEXT) - subdir = src - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -@@ -73,24 +73,24 @@ DIST_SOURCES = $(chilli_SOURCES) - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --ACLOCAL = ${SHELL} /home/jj/chillispot/missing --run aclocal-1.9 --AMDEP_FALSE = # --AMDEP_TRUE = --AMTAR = ${SHELL} /home/jj/chillispot/missing --run tar --AR = ar --AUTOCONF = ${SHELL} /home/jj/chillispot/missing --run autoconf --AUTOHEADER = ${SHELL} /home/jj/chillispot/missing --run autoheader --AUTOMAKE = ${SHELL} /home/jj/chillispot/missing --run automake-1.9 -+ACLOCAL = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run aclocal-1.9 -+AMDEP_FALSE = -+AMDEP_TRUE = # -+AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run tar -+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar -+AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoconf -+AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoheader -+AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run automake-1.9 - AWK = gawk --CC = gcc --CCDEPMODE = depmode=gcc3 --CFLAGS = -g -O2 --CPP = gcc -E --CPPFLAGS = --CXX = g++ --CXXCPP = g++ -E --CXXDEPMODE = depmode=gcc3 --CXXFLAGS = -g -O2 -+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -+CCDEPMODE = depmode=none -+CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer -+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E -+CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG -+CXX = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -+CXXCPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -E -+CXXDEPMODE = depmode=none -+CXXFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer - CYGPATH_W = echo - DEFS = -DHAVE_CONFIG_H - DEPDIR = .deps -@@ -100,19 +100,19 @@ ECHO_N = -n - ECHO_T = - EGREP = grep -E - EXEEXT = --F77 = f95 --FFLAGS = -g -O2 -+F77 = -+FFLAGS = - INSTALL_DATA = ${INSTALL} -m 644 - INSTALL_PROGRAM = ${INSTALL} - INSTALL_SCRIPT = ${INSTALL} - INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s --LDFLAGS = --LIBOBJS = -+LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib -+LIBOBJS = memcmp$U.o - LIBS = - LIBTOOL = $(SHELL) $(top_builddir)/libtool - LN_S = ln -s --LTLIBOBJS = --MAKEINFO = ${SHELL} /home/jj/chillispot/missing --run makeinfo -+LTLIBOBJS = memcmp$U.lo -+MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run makeinfo - OBJEXT = o - PACKAGE = chillispot - PACKAGE_BUGREPORT = bugs@chillispot.org -@@ -121,54 +121,54 @@ PACKAGE_STRING = chillispot 1.1.0 - PACKAGE_TARNAME = chillispot - PACKAGE_VERSION = 1.1.0 - PATH_SEPARATOR = : --RANLIB = ranlib -+RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib - SET_MAKE = --SHELL = /bin/sh --STRIP = strip -+SHELL = /bin/bash -+STRIP = i586-linux-strip - VERSION = 1.1.0 --ac_ct_AR = ar --ac_ct_CC = gcc --ac_ct_CXX = g++ --ac_ct_F77 = f95 --ac_ct_RANLIB = ranlib --ac_ct_STRIP = strip --am__fastdepCC_FALSE = # --am__fastdepCC_TRUE = --am__fastdepCXX_FALSE = # --am__fastdepCXX_TRUE = -+ac_ct_AR = -+ac_ct_CC = -+ac_ct_CXX = -+ac_ct_F77 = -+ac_ct_RANLIB = -+ac_ct_STRIP = -+am__fastdepCC_FALSE = -+am__fastdepCC_TRUE = # -+am__fastdepCXX_FALSE = -+am__fastdepCXX_TRUE = # - am__include = include - am__leading_dot = . - am__quote = - am__tar = ${AMTAR} chof - "$$tardir" - am__untar = ${AMTAR} xf - - bindir = ${exec_prefix}/bin --build = i686-pc-linux-gnu --build_alias = --build_cpu = i686 -+build = x86_64-pc-linux-gnu -+build_alias = x86_64-linux-gnu -+build_cpu = x86_64 - build_os = linux-gnu - build_vendor = pc --datadir = ${prefix}/share -+datadir = /usr/share - exec_prefix = ${prefix} --host = i686-pc-linux-gnu --host_alias = --host_cpu = i686 -+host = i586-pc-linux-gnu -+host_alias = i586-linux -+host_cpu = i586 - host_os = linux-gnu - host_vendor = pc - includedir = ${prefix}/include - infodir = ${prefix}/info --install_sh = /home/jj/chillispot/install-sh -+install_sh = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/install-sh - libdir = ${exec_prefix}/lib --libexecdir = ${exec_prefix}/libexec --localstatedir = ${prefix}/var --mandir = ${prefix}/man -+libexecdir = /usr/sbin -+localstatedir = /var -+mandir = /usr/share/man - mkdir_p = mkdir -p -- - oldincludedir = /usr/include --prefix = /usr/local --program_transform_name = s,x,x, -+prefix = /usr -+program_transform_name = s,$$,,;s,^,, - sbindir = ${exec_prefix}/sbin - sharedstatedir = ${prefix}/com --sysconfdir = ${prefix}/etc --target_alias = -+sysconfdir = /etc -+target_alias = i586-linux - - # add -pg to enable gprof - AM_CFLAGS = -D_GNU_SOURCE -fno-builtin -DSBINDIR='"$(sbindir)"' -@@ -244,38 +244,38 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - --include ./$(DEPDIR)/chilli.Po --include ./$(DEPDIR)/cmdline.Po --include ./$(DEPDIR)/dhcp.Po --include ./$(DEPDIR)/iphash.Po --include ./$(DEPDIR)/ippool.Po --include ./$(DEPDIR)/lookup.Po --include ./$(DEPDIR)/md5.Po --include ./$(DEPDIR)/radius.Po --include ./$(DEPDIR)/redir.Po --include ./$(DEPDIR)/syserr.Po --include ./$(DEPDIR)/tun.Po -+#include ./$(DEPDIR)/chilli.Po -+#include ./$(DEPDIR)/cmdline.Po -+#include ./$(DEPDIR)/dhcp.Po -+#include ./$(DEPDIR)/iphash.Po -+#include ./$(DEPDIR)/ippool.Po -+#include ./$(DEPDIR)/lookup.Po -+#include ./$(DEPDIR)/md5.Po -+#include ./$(DEPDIR)/radius.Po -+#include ./$(DEPDIR)/redir.Po -+#include ./$(DEPDIR)/syserr.Po -+#include ./$(DEPDIR)/tun.Po - - .c.o: -- if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -- then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --# source='$<' object='$@' libtool=no \ --# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ --# $(COMPILE) -c $< -+# if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -+# then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+# source='$<' object='$@' libtool=no -+# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) -+ $(COMPILE) -c $< - - .c.obj: -- if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -- then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --# source='$<' object='$@' libtool=no \ --# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ --# $(COMPILE) -c `$(CYGPATH_W) '$<'` -+# if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -+# then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+# source='$<' object='$@' libtool=no -+# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) -+ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: -- if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -- then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --# source='$<' object='$@' libtool=yes \ --# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ --# $(LTCOMPILE) -c -o $@ $< -+# if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -+# then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+# source='$<' object='$@' libtool=yes -+# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) -+ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo diff --git a/package/cxxtools/patches/patch-Makefile_in b/package/cxxtools/patches/patch-Makefile_in deleted file mode 100644 index d0936ae5d..000000000 --- a/package/cxxtools/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- cxxtools-1.4.8.orig/Makefile.in 2008-05-26 19:51:34.000000000 +0200 -+++ cxxtools-1.4.8/Makefile.in 2009-11-19 22:10:18.000000000 +0100 -@@ -200,7 +200,7 @@ subdirs = @subdirs@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - ACLOCAL_AMFLAGS = -I m4 --SUBDIRS = src include demo -+SUBDIRS = src include - bin_SCRIPTS = cxxtools-config - EXTRA_dist = \ - m4/acx_pthread.m4 \ diff --git a/package/cxxtools/patches/patch-demo_Makefile_in b/package/cxxtools/patches/patch-demo_Makefile_in deleted file mode 100644 index 0fcb3bca3..000000000 --- a/package/cxxtools/patches/patch-demo_Makefile_in +++ /dev/null @@ -1,67 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- cxxtools-1.4.8.orig/demo/Makefile.in 2008-05-26 19:51:34.000000000 +0200 -+++ cxxtools-1.4.8/demo/Makefile.in 2009-04-28 22:29:02.476545131 +0200 -@@ -40,7 +40,7 @@ host_triplet = @host@ - noinst_PROGRAMS = arg$(EXEEXT) arg-set$(EXEEXT) cgi$(EXEEXT) \ - dir$(EXEEXT) dlloader$(EXEEXT) dynbuffer$(EXEEXT) \ - getini$(EXEEXT) hd$(EXEEXT) httprequest$(EXEEXT) \ -- iconv$(EXEEXT) log$(EXEEXT) logbench$(EXEEXT) logsh$(EXEEXT) \ -+ log$(EXEEXT) logbench$(EXEEXT) logsh$(EXEEXT) \ - md5sum$(EXEEXT) mime$(EXEEXT) multifstream$(EXEEXT) \ - netcat$(EXEEXT) netio$(EXEEXT) netmsg$(EXEEXT) \ - pipestream$(EXEEXT) pool$(EXEEXT) signals$(EXEEXT) \ -@@ -96,10 +96,6 @@ am_httprequest_OBJECTS = httprequest.$(O - httprequest_OBJECTS = $(am_httprequest_OBJECTS) - httprequest_LDADD = $(LDADD) - httprequest_DEPENDENCIES = $(top_builddir)/src/libcxxtools.la --am_iconv_OBJECTS = iconv.$(OBJEXT) --iconv_OBJECTS = $(am_iconv_OBJECTS) --iconv_LDADD = $(LDADD) --iconv_DEPENDENCIES = $(top_builddir)/src/libcxxtools.la - am_log_OBJECTS = log.$(OBJEXT) - log_OBJECTS = $(am_log_OBJECTS) - log_LDADD = $(LDADD) -@@ -170,7 +166,7 @@ CXXLINK = $(LIBTOOL) --tag=CXX --mode=li - SOURCES = $(arg_SOURCES) $(arg_set_SOURCES) $(cgi_SOURCES) \ - $(cxxlog_SOURCES) $(dir_SOURCES) $(dlloader_SOURCES) \ - $(dynbuffer_SOURCES) $(getini_SOURCES) $(hd_SOURCES) \ -- $(httprequest_SOURCES) $(iconv_SOURCES) $(log_SOURCES) \ -+ $(httprequest_SOURCES) $(log_SOURCES) \ - $(logbench_SOURCES) $(logsh_SOURCES) $(md5sum_SOURCES) \ - $(mime_SOURCES) $(multifstream_SOURCES) $(netcat_SOURCES) \ - $(netio_SOURCES) $(netmsg_SOURCES) $(pipestream_SOURCES) \ -@@ -179,7 +175,7 @@ SOURCES = $(arg_SOURCES) $(arg_set_SOURC - DIST_SOURCES = $(arg_SOURCES) $(arg_set_SOURCES) $(cgi_SOURCES) \ - $(cxxlog_SOURCES) $(dir_SOURCES) $(dlloader_SOURCES) \ - $(dynbuffer_SOURCES) $(getini_SOURCES) $(hd_SOURCES) \ -- $(httprequest_SOURCES) $(iconv_SOURCES) $(log_SOURCES) \ -+ $(httprequest_SOURCES) $(log_SOURCES) \ - $(logbench_SOURCES) $(logsh_SOURCES) $(md5sum_SOURCES) \ - $(mime_SOURCES) $(multifstream_SOURCES) $(netcat_SOURCES) \ - $(netio_SOURCES) $(netmsg_SOURCES) $(pipestream_SOURCES) \ -@@ -319,7 +315,6 @@ dynbuffer_SOURCES = dynbuffer.cpp - getini_SOURCES = getini.cpp - hd_SOURCES = hd.cpp - httprequest_SOURCES = httprequest.cpp --iconv_SOURCES = iconv.cpp - log_SOURCES = log.cpp - logbench_SOURCES = logbench.cpp - logsh_SOURCES = logsh.cpp -@@ -415,9 +410,6 @@ hd$(EXEEXT): $(hd_OBJECTS) $(hd_DEPENDEN - httprequest$(EXEEXT): $(httprequest_OBJECTS) $(httprequest_DEPENDENCIES) - @rm -f httprequest$(EXEEXT) - $(CXXLINK) $(httprequest_LDFLAGS) $(httprequest_OBJECTS) $(httprequest_LDADD) $(LIBS) --iconv$(EXEEXT): $(iconv_OBJECTS) $(iconv_DEPENDENCIES) -- @rm -f iconv$(EXEEXT) -- $(CXXLINK) $(iconv_LDFLAGS) $(iconv_OBJECTS) $(iconv_LDADD) $(LIBS) - log$(EXEEXT): $(log_OBJECTS) $(log_DEPENDENCIES) - @rm -f log$(EXEEXT) - $(CXXLINK) $(log_LDFLAGS) $(log_OBJECTS) $(log_LDADD) $(LIBS) -@@ -477,7 +469,6 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getini.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hd.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httprequest.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconv.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logbench.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logsh.Po@am__quote@ diff --git a/package/dillo/Makefile b/package/dillo/Makefile index 59f0ac281..5f39f9c79 100644 --- a/package/dillo/Makefile +++ b/package/dillo/Makefile @@ -17,6 +17,7 @@ PKG_SITES:= http://www.dillo.org/download/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +PKG_TARGET_DEPENDS:= ibmx40 lemote PKG_HOST_DEPENDS:= !cygwin include $(TOPDIR)/mk/package.mk diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 47686883a..54e62d6b1 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= firefox -PKG_VERSION:= 3.6.6 +PKG_VERSION:= 3.6.8 PKG_RELEASE:= 1 -PKG_MD5SUM:= c9a071b31bb90d05edfb93117d0a7537 +PKG_MD5SUM:= 0ee5f14fd8be07513d16131027ebcb61 PKG_DESCR:= graphical webbrowser PKG_SECTION:= x11/apps PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk+ libnotify @@ -21,6 +21,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 WRKDIST= ${WRKDIR}/mozilla-1.9.2 PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle ibmx40 lemote +PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin include $(TOPDIR)/mk/package.mk @@ -28,6 +29,8 @@ $(eval $(call PKG_template,FIREFOX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${P ifeq (${ADK_LINUX_MIPS64_LEMOTE},y) CONFIGURE_ARGS+= --disable-ipc +else ifeq (${ADK_TARGET_LIB_UCLIBC},y) +CONFIGURE_ARGS+= --disable-ipc else CONFIGURE_ARGS+= --enable-ipc endif @@ -42,6 +45,8 @@ CONFIGURE_ARGS+= --enable-application=browser \ --with-system-png \ --with-system-nss \ --with-system-nspr \ + --with-libIDL-prefix=${STAGING_DIR}/usr \ + --with-glib-prefix=${STAGING_DIR}/usr \ --enable-libxul \ --disable-tests \ --disable-static \ diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure index f424b3787..28035c66a 100644 --- a/package/firefox/patches/patch-configure +++ b/package/firefox/patches/patch-configure @@ -1,6 +1,15 @@ ---- mozilla-1.9.2.orig/configure 2010-04-02 18:07:41.000000000 +0200 -+++ mozilla-1.9.2/configure 2010-04-11 14:38:39.000000000 +0200 -@@ -21012,8 +21012,8 @@ if test -n "$CROSS_COMPILE"; then +--- mozilla-1.9.2.orig/configure 2010-07-23 00:00:19.000000000 +0200 ++++ mozilla-1.9.2/configure 2010-07-30 09:52:43.000000000 +0200 +@@ -3970,7 +3970,7 @@ else + echo "$ac_t""yes" 1>&6 + fi + +- for ac_prog in $PYTHON python2.5 python2.4 python ++ for ac_prog in $PYTHON python2.6 python2.5 python2.4 python + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -21285,8 +21285,8 @@ if test -n "$CROSS_COMPILE"; then HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" fi if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then diff --git a/package/freeglut/Makefile b/package/freeglut/Makefile index 6d5bdb921..a3585b620 100644 --- a/package/freeglut/Makefile +++ b/package/freeglut/Makefile @@ -13,6 +13,7 @@ PKG_BUILDDEP+= MesaLib PKG_URL:= http://freeglut.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=freeglut/} +PKG_TARGET_DEPENDS:= ibmx40 lemote PKG_HOST_DEPENDS:= !cygwin include $(TOPDIR)/mk/package.mk diff --git a/package/git/Makefile b/package/git/Makefile index a3c9a8fd6..162cc13ab 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= git -PKG_VERSION:= 1.7.1 +PKG_VERSION:= 1.7.2.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= d2fefae2b787a19601c09d89975ce5fb +PKG_MD5SUM:= 13fc44363df744a401552e73e5476351 PKG_DESCR:= fast version control system PKG_SECTION:= scm PKG_DEPENDS:= libopenssl libcurl libexpat libpthread @@ -18,8 +18,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,GIT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -MAKE_ENV+= NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 \ - NO_CROSS_DIRECTORY_HARDLINKS=1 \ +MAKE_ENV+= NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 NO_PYTHON=1 \ CURLDIR=${STAGING_DIR} EXPATDIR=${STAGING_DIR} XAKE_FLAGS+= uname_S=Linux uname_O=GNU/Linux CONFIGURE_ENV+= ac_cv_c_c99_format=yes \ diff --git a/package/git/patches/patch-Makefile b/package/git/patches/patch-Makefile index 6f3b70e98..dcfd4dd82 100644 --- a/package/git/patches/patch-Makefile +++ b/package/git/patches/patch-Makefile @@ -1,26 +1,6 @@ ---- git-1.6.5.5.orig/Makefile 2009-12-06 04:51:25.000000000 +0100 -+++ git-1.6.5.5/Makefile 2009-12-07 20:13:40.753866786 +0100 -@@ -218,8 +218,8 @@ uname_V := $(shell sh -c 'uname -v 2>/de - - # CFLAGS and LDFLAGS are for the users to override from the command line. - --CFLAGS = -g -O2 -Wall --LDFLAGS = -+CFLAGS ?= -g -O2 -Wall -+LDFLAGS ?= - ALL_CFLAGS = $(CFLAGS) - ALL_LDFLAGS = $(LDFLAGS) - STRIP ?= strip -@@ -241,7 +241,7 @@ bindir_relative = bin - bindir = $(prefix)/$(bindir_relative) - mandir = share/man - infodir = share/info --gitexecdir = libexec/git-core -+gitexecdir = sbin/git-core - sharedir = $(prefix)/share - template_dir = share/git-core/templates - htmldir = share/doc/git-doc -@@ -1417,7 +1417,6 @@ builtin-help.o: builtin-help.c common-cm +--- git-1.7.2.1.orig/Makefile 2010-07-28 19:03:43.000000000 +0200 ++++ git-1.7.2.1/Makefile 2010-07-30 12:25:52.000000000 +0200 +@@ -1594,7 +1594,6 @@ builtin/help.s builtin/help.o: EXTRA_CPP $(BUILT_INS): git$X $(QUIET_BUILT_IN)$(RM) $@ && \ @@ -28,11 +8,31 @@ ln -s git$X $@ 2>/dev/null || \ cp git$X $@ -@@ -1749,7 +1748,6 @@ endif +@@ -1894,7 +1893,6 @@ git-http-push$X: revision.o http.o http- + + $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY) + $(QUIET_LNCP)$(RM) $@ && \ +- ln $< $@ 2>/dev/null || \ + ln -s $< $@ 2>/dev/null || \ + cp $< $@ + +@@ -2077,18 +2075,16 @@ endif + { test "$$bindir/" = "$$execdir/" || \ + { $(RM) "$$execdir/git$X" && \ + test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \ +- ln "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \ ++ ln -s "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \ cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \ - { for p in $(BUILT_INS); do \ + for p in $(BUILT_INS); do \ $(RM) "$$execdir/$$p" && \ - ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \ ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \ cp "$$execdir/git$X" "$$execdir/$$p" || exit; \ - done; } && \ + done && \ + remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \ + for p in $$remote_curl_aliases; do \ + $(RM) "$$execdir/$$p" && \ +- ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \ + ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \ + cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \ + done && \ diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index a1ce89161..174690c7b 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gpsd -PKG_VERSION:= 2.92 +PKG_VERSION:= 2.95 PKG_RELEASE:= 1 -PKG_MD5SUM:= 50b60d9f6dd51e001f4dfbaeb825c988 +PKG_MD5SUM:= 12535a9ed9fecf9ea2c5bdc9840da5ae PKG_DESCR:= An interface daemon for GPS receivers PKG_SECTION:= misc PKG_DEPENDS:= libpthread @@ -15,12 +15,12 @@ PKG_CXX:= GPSD PKG_SITES:= http://download.berlios.de/gpsd/ PKG_URL:= http://gpsd.berlios.de/ -PKG_DESCR_1:= GPS client utilities +PKG_DESCR_CLIENTS:= GPS client utilities include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GPSD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION})) +$(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_CLIENTS},${PKG_SECTION})) CONFIGURE_ENV+= EGREP="grep -E" \ CPP="$(TARGET_CC) -E" \ @@ -41,7 +41,7 @@ TLDFLAGS+= -shared -pthread endif post-extract: - @find ${WRKBUILD} -name *.rej -exec rm {} \; + #@find ${WRKBUILD} -name *.rej -exec rm {} \; ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y) # add workaround because libtool tries to link libstdc++ @@ -52,7 +52,7 @@ endif post-install: ${INSTALL_DIR} ${IDIR_GPSD}/usr/lib ${IDIR_GPSD}/usr/sbin - ${CP} ${WRKINST}/usr/lib/libgps.so.* ${IDIR_GPSD}/usr/lib + ${CP} ${WRKINST}/usr/lib/libgps.so* ${IDIR_GPSD}/usr/lib ${CP} ${WRKINST}/usr/sbin/gpsd ${IDIR_GPSD}/usr/sbin ${INSTALL_DIR} ${IDIR_GPSD_CLIENTS}/usr/bin ${CP} ${WRKINST}/usr/bin/{cgps,gpxlogger} \ diff --git a/package/gpsd/patches/patch-Makefile_in b/package/gpsd/patches/patch-Makefile_in index fe57b879b..bd45358ee 100644 --- a/package/gpsd/patches/patch-Makefile_in +++ b/package/gpsd/patches/patch-Makefile_in @@ -1,44 +1,13 @@ ---- gpsd-2.92.orig/Makefile.in 2010-03-03 14:49:11.000000000 +0100 -+++ gpsd-2.92/Makefile.in 2010-04-03 10:33:48.782836143 +0200 -@@ -615,8 +615,6 @@ libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIB - # - # Build Python binding - # --@HAVE_PYTHON_TRUE@PYEXTENSIONS = gpspacket.so gpslib.so --@HAVE_PYTHON_TRUE@noinst_SCRIPTS = gpspacket.so gpslib.so setup.py - @LIBGPSMM_ENABLE_FALSE@TESTBINS = test_float test_trig test_bits test_packet test_geoid \ - @LIBGPSMM_ENABLE_FALSE@ test_mkgmtime test_json +--- gpsd-2.95.orig/Makefile.in 2010-07-14 00:48:24.000000000 +0200 ++++ gpsd-2.95/Makefile.in 2010-07-30 13:04:19.000000000 +0200 +@@ -612,8 +612,8 @@ libgps_la_SOURCES = $(libgps_c_sources) + libgpsd_la_SOURCES = $(libgpsd_c_sources) $(libgpsd_h_sources) \ + driver_rtcm2.h packet_states.h -@@ -1946,32 +1944,6 @@ maskdump.c: gpsd.h-tail maskaudit.py - $(PYTHON) maskaudit.py -c >maskdump.c && \ - chmod a-w maskdump.c - --# Multiple-outputs hack. See --# http://www.gnu.org/software/automake/manual/automake.html#Multiple-Outputs --@HAVE_PYTHON_TRUE@$(PYEXTENSIONS): stamp-python-modules --@HAVE_PYTHON_TRUE@ +@WITNESS=stamp-python-modules; $(MULTIOUT_RECOVER_DELETED) --# TODO: Should the dependency on libgps.la be enforced inside --# setup.py? (See the variable 'needed_files' in setup.py.) --@HAVE_PYTHON_TRUE@stamp-python-modules: gpspacket.c gpsclient.c libgps.la setup.py --@HAVE_PYTHON_TRUE@ @rm -f '$@' '$@.tmp' --@HAVE_PYTHON_TRUE@ @echo 'timestamp for $@' > '$@.tmp' --@HAVE_PYTHON_TRUE@ (cd '$(srcdir)' && \ --@HAVE_PYTHON_TRUE@ env abs_builddir='$(abs_builddir)' \ --@HAVE_PYTHON_TRUE@ MAKE='$(MAKE)' \ --@HAVE_PYTHON_TRUE@ $(PYTHON) setup.py build_ext \ --@HAVE_PYTHON_TRUE@ --build-lib '$(srcdir)' \ --@HAVE_PYTHON_TRUE@ --build-temp '$(srcdir)/build' \ --@HAVE_PYTHON_TRUE@ --include-dirs '$(srcdir):.'\ --@HAVE_PYTHON_TRUE@ --mangenerator '$(MANGENERATOR)') && \ --@HAVE_PYTHON_TRUE@ mv -f '$@.tmp' '$@' -- --# Clean up after Python --@HAVE_PYTHON_TRUE@clean-local: --@HAVE_PYTHON_TRUE@ rm -rf build -- --# Install Python modules --@HAVE_PYTHON_TRUE@install-exec-local: --@HAVE_PYTHON_TRUE@ $(PYTHON) setup.py install --prefix=${prefix} # --root=$(DESTDIR) - - @HAVE_XSLT_PROCESSOR_TRUE@.xml.1: - @HAVE_XSLT_PROCESSOR_TRUE@ $(MANGENERATOR) $(MANFLAGS) $(MANTARGET) $< +-@LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = /bin/sh ./libtool --tag=CC --mode=link gcc $(libgps_la_LDFLAGS) -o $@ +-@LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = /bin/sh ./libtool --tag=CXX --mode=link g++ $(libgps_la_LDFLAGS) -o $@ ++@LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = $(SHELL) ./libtool --tag=CC --mode=link gcc $(libgps_la_LDFLAGS) -o $@ ++@LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = $(SHELL) ./libtool --tag=CXX --mode=link g++ $(libgps_la_LDFLAGS) -o $@ + nodist_libgpsd_la_SOURCES = packet_names.h ais_json.i + libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) + libgpsd_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) $(BLUEZ_LIBS) libgps.la diff --git a/package/gpsd/patches/patch-gps_1 b/package/gpsd/patches/patch-gps_1 deleted file mode 100644 index 23b1b8763..000000000 --- a/package/gpsd/patches/patch-gps_1 +++ /dev/null @@ -1,17 +0,0 @@ ---- gpsd-2.92.orig/gps.1 2010-03-01 06:00:44.000000000 +0100 -+++ gpsd-2.92/gps.1 2010-04-03 10:22:50.111390920 +0200 -@@ -2,12 +2,12 @@ - .\" Title: gps - .\" Author: [see the "AUTHORS" section] - .\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/> --.\" Date: 03/01/2010 -+.\" Date: 04/03/2010 - .\" Manual: [FIXME: manual] - .\" Source: [FIXME: source] - .\" Language: English - .\" --.TH "GPS" "1" "03/01/2010" "[FIXME: source]" "[FIXME: manual]" -+.TH "GPS" "1" "04/03/2010" "[FIXME: source]" "[FIXME: manual]" - .\" ----------------------------------------------------------------- - .\" * set default formatting - .\" ----------------------------------------------------------------- diff --git a/package/gpsd/patches/patch-gpsd_config_h b/package/gpsd/patches/patch-gpsd_config_h deleted file mode 100644 index dbc0c7b12..000000000 --- a/package/gpsd/patches/patch-gpsd_config_h +++ /dev/null @@ -1,42 +0,0 @@ ---- gpsd-2.92.orig/gpsd_config.h 2010-03-03 01:58:01.000000000 +0100 -+++ gpsd-2.92/gpsd_config.h 2010-04-03 10:22:22.423474030 +0200 -@@ -117,7 +117,7 @@ - #define HAVE_PYTHON_H 1 - - /* Define to 1 if you have the `round' function. */ --/* #undef HAVE_ROUND */ -+#define HAVE_ROUND 1 - - /* Define to 1 if you have the `setlocale' function. */ - #define HAVE_SETLOCALE 1 -@@ -141,7 +141,7 @@ - /* #undef HAVE_STRLCPY */ - - /* Define to 1 if you have the `strtonum' function. */ --/* #undef HAVE_STRTONUM */ -+#define HAVE_STRTONUM 1 - - /* Define to 1 if `struct tm' is a member of `tm_zone'. */ - #define HAVE_STRUCT_TM_TM_ZONE 1 -@@ -206,10 +206,10 @@ - #define HAVE_VSNPRINTF 1 - - /* Define to 1 if you have the <X11/xpm.h> header file. */ --#define HAVE_X11_XPM_H 1 -+/* #undef HAVE_X11_XPM_H */ - - /* Xpm available */ --#define HAVE_XPM 1 -+/* #undef HAVE_XPM */ - - /* Define to 1 if you have the <xpm.h> header file. */ - /* #undef HAVE_XPM_H */ -@@ -309,7 +309,7 @@ - #define SIZEOF_INT 4 - - /* The size of `long', as computed by sizeof. */ --#define SIZEOF_LONG 8 -+#define SIZEOF_LONG 4 - - /* The size of `long long', as computed by sizeof. */ - #define SIZEOF_LONG_LONG 8 diff --git a/package/gpsd/patches/patch-gpsd_h b/package/gpsd/patches/patch-gpsd_h deleted file mode 100644 index 86912eac7..000000000 --- a/package/gpsd/patches/patch-gpsd_h +++ /dev/null @@ -1,42 +0,0 @@ ---- gpsd-2.92.orig/gpsd.h 2010-03-03 01:58:01.000000000 +0100 -+++ gpsd-2.92/gpsd.h 2010-04-03 10:22:22.793473137 +0200 -@@ -137,7 +137,7 @@ - #define HAVE_PYTHON_H 1 - - /* Define to 1 if you have the `round' function. */ --/* #undef HAVE_ROUND */ -+#define HAVE_ROUND 1 - - /* Define to 1 if you have the `setlocale' function. */ - #define HAVE_SETLOCALE 1 -@@ -161,7 +161,7 @@ - /* #undef HAVE_STRLCPY */ - - /* Define to 1 if you have the `strtonum' function. */ --/* #undef HAVE_STRTONUM */ -+#define HAVE_STRTONUM 1 - - /* Define to 1 if `struct tm' is a member of `tm_zone'. */ - #define HAVE_STRUCT_TM_TM_ZONE 1 -@@ -226,10 +226,10 @@ - #define HAVE_VSNPRINTF 1 - - /* Define to 1 if you have the <X11/xpm.h> header file. */ --#define HAVE_X11_XPM_H 1 -+/* #undef HAVE_X11_XPM_H */ - - /* Xpm available */ --#define HAVE_XPM 1 -+/* #undef HAVE_XPM */ - - /* Define to 1 if you have the <xpm.h> header file. */ - /* #undef HAVE_XPM_H */ -@@ -329,7 +329,7 @@ - #define SIZEOF_INT 4 - - /* The size of `long', as computed by sizeof. */ --#define SIZEOF_LONG 8 -+#define SIZEOF_LONG 4 - - /* The size of `long long', as computed by sizeof. */ - #define SIZEOF_LONG_LONG 8 diff --git a/package/gpsd/patches/patch-revision_h b/package/gpsd/patches/patch-revision_h deleted file mode 100644 index 98151f235..000000000 --- a/package/gpsd/patches/patch-revision_h +++ /dev/null @@ -1,5 +0,0 @@ ---- gpsd-2.92.orig/revision.h 2010-03-03 14:49:28.000000000 +0100 -+++ gpsd-2.92/revision.h 2010-04-03 10:22:22.843473239 +0200 -@@ -1 +1 @@ --#define REVISION "svn7020" -+#define REVISION "svnexported" diff --git a/package/libtool/Makefile b/package/libtool/Makefile index d043decca..dbf2e3c05 100644 --- a/package/libtool/Makefile +++ b/package/libtool/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libtool -PKG_VERSION:= 2.2.8 +PKG_VERSION:= 2.2.10 PKG_RELEASE:= 1 -PKG_MD5SUM:= cad2a7188242bc8dbab0645532ae3d6f +PKG_MD5SUM:= b745d220e88163fcd9eea0a90ccf21b0 PKG_DESCR:= a generic dynamic object loading library PKG_SECTION:= lang PKG_URL:= http://www.gnu.org/software/libtool diff --git a/package/lynx/Makefile b/package/lynx/Makefile index ab9215be6..410c4e1e4 100644 --- a/package/lynx/Makefile +++ b/package/lynx/Makefile @@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME= lynx PKG_VERSION= 2.8.7 PKG_RELEASE= 1 -PKG_MD5SUM= 124253e635f7c76bdffc47b9d036c812 +PKG_MD5SUM= e36d70f3f09b2d502055ca67f09e363c PKG_DESCR:= Standard text browser PKG_SECTION:= browser PKG_DEPENDS:= libncurses libopenssl zlib diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure index 1c61d1a01..aad04ff2b 100644 --- a/package/mysql/patches/patch-configure +++ b/package/mysql/patches/patch-configure @@ -1,6 +1,53 @@ --- mysql-5.1.48.orig/configure 2010-06-03 17:54:47.000000000 +0200 -+++ mysql-5.1.48/configure 2010-07-12 22:51:24.267118950 +0200 -@@ -48273,197 +48273,14 @@ $as_echo "$as_me: error: unknown endiann ++++ mysql-5.1.48/configure 2010-07-30 11:04:50.000000000 +0200 +@@ -19825,45 +19825,7 @@ fi + $as_echo_n "checking \"how to check if pid exists\"... " >&6; } + PS=$ac_cv_path_PS + # Linux style +-if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null +-then +- FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" +-# Solaris +-elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null +-then +- FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" +-# BSD style +-elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null +-then +- FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null" +-# SysV style +-elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null +-then +- FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null" +-# Do anybody use this? +-elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null +-then +- FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" +-else +- case $SYSTEM_TYPE in +- *freebsd*|*dragonfly*) +- FIND_PROC="$PS p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" +- ;; +- *darwin*) +- FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null" +- ;; +- *cygwin*) +- FIND_PROC="$PS -e | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null" +- ;; +- *netware*) +- FIND_PROC= +- ;; +- *) +- { { $as_echo "$as_me:$LINENO: error: Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual." >&5 +-$as_echo "$as_me: error: Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual." >&2;} +- { (exit 1); exit 1; }; } +- esac +-fi ++FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" + + { $as_echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 + $as_echo "\"$FIND_PROC\"" >&6; } +@@ -48273,197 +48235,14 @@ $as_echo "$as_me: error: unknown endiann esac @@ -198,7 +245,7 @@ { $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5 $as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; } -@@ -48581,101 +48398,6 @@ fi +@@ -48581,101 +48360,6 @@ fi done diff --git a/package/rarpd/patches/patch-Makefile_in b/package/rarpd/patches/patch-Makefile_in new file mode 100644 index 000000000..58be90d10 --- /dev/null +++ b/package/rarpd/patches/patch-Makefile_in @@ -0,0 +1,9 @@ +--- rarpd-1.1.orig/Makefile.in 1999-10-20 22:57:13.000000000 +0200 ++++ rarpd-1.1/Makefile.in 2010-07-16 14:34:08.453125000 +0200 +@@ -13,5 +13,5 @@ rarpd: rarpd.o @LIBOBJS@ + $(CC) @LDFLAGS@ -o $@ rarpd.o @LIBOBJS@ @LIBS@ + + install: rarpd +- $(ENSUREDIR) $(DESTDIR)$(SBINDIR) 755 ++ @mkdir -p $(DESTDIR)$(SBINDIR) + $(INSTALL) -c -m 0755 rarpd $(DESTDIR)$(SBINDIR) diff --git a/package/subversion/Makefile b/package/subversion/Makefile index 32003a993..7851bd2a4 100644 --- a/package/subversion/Makefile +++ b/package/subversion/Makefile @@ -4,18 +4,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= subversion -PKG_VERSION:= 1.6.9 +PKG_VERSION:= 1.6.12 PKG_RELEASE:= 1 -PKG_MD5SUM:= facaa0ee78c8f24b9af12c74662bbd24 +PKG_MD5SUM:= ae008ac355581c90494fba86cbfc3413 PKG_DESCR:= revision control program PKG_SECTION:= scm -PKG_DEPENDS:= zlib apr apr-util libiconv libexpat libsqlite -PKG_BUILDDEP+= apr-util expat apr zlib libiconv sqlite -ifneq ($(ADK_PACKAGE_SUBVERSION_NEON),) -PKG_DEPENDS+= neon -PKG_BUILDDEP+= neon -endif +PKG_DEPENDS:= zlib apr apr-util libiconv libexpat libsqlite neon +PKG_BUILDDEP+= apr-util expat apr zlib libiconv sqlite neon PKG_SITES:= http://subversion.tigris.org/downloads/ +PKG_URL:= http://subversion.apache.org/ include ${TOPDIR}/mk/package.mk @@ -32,20 +29,7 @@ CONFIGURE_ARGS+= --without-jikes CONFIGURE_ARGS+= --without-jdk CONFIGURE_ARGS+= --disable-javahl CONFIGURE_ARGS+= --without-berkeley-db -LIBS= -lsqlite3 -laprutil-1 -lapr-1 -lexpat -liconv - -ifeq ($(ADK_PACKAGE_SUBVERSION_NEON),y) -CONFIGURE_ARGS+= -disable-neon-version-check -LIBS+= -lneon -else -CONFIGURE_ARGS+= --without-neon -endif - -ifeq ($(ADK_PACKAGE_APR_THREADING),y) -LIBS+= -pthread -endif - -CONFIGURE_ENV+= LIBS='${LIBS}' +CONFIGURE_ENV+= LIBS='-lsqlite3 -laprutil-1 -lapr-1 -lexpat -liconv' INSTALL_TARGET:= external-install local-install post-install: diff --git a/package/tslib/Makefile b/package/tslib/Makefile index 5f384b7f6..2ebd83179 100644 --- a/package/tslib/Makefile +++ b/package/tslib/Makefile @@ -27,6 +27,9 @@ CONFIGURE_ARGS+= --disable-ucb1x00 \ --disable-linear-h2200 \ --disable-arctic2 +pre-build: + @chmod u+x ${WRKBUILD}/install-sh + post-install: $(INSTALL_DIR) $(IDIR_TSLIB)/etc $(INSTALL_DIR) $(IDIR_TSLIB)/usr/lib/ts diff --git a/package/tslib/patches/autotool.patch b/package/tslib/patches/autotool.patch index 803f41800..c72fd2dc1 100644 --- a/package/tslib/patches/autotool.patch +++ b/package/tslib/patches/autotool.patch @@ -1,6 +1,1203 @@ +diff -Nur tslib-1.0.orig/INSTALL tslib-1.0/INSTALL +--- tslib-1.0.orig/INSTALL 2006-08-24 23:02:55.000000000 +0200 ++++ tslib-1.0/INSTALL 2010-07-29 13:39:15.000000000 +0200 +@@ -1,16 +1,25 @@ + Installation Instructions + ************************* + +-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free +-Software Foundation, Inc. ++Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, ++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 + ================== + +-These are generic installation instructions. ++ 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. 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 +@@ -23,9 +32,9 @@ + + It can also use an optional file (typically called `config.cache' + and enabled with `--cache-file=config.cache' or simply `-C') that saves +-the results of its tests to speed up reconfiguring. (Caching is ++the results of its tests to speed up reconfiguring. Caching is + disabled by default to prevent problems with accidental use of stale +-cache files.) ++cache files. + + If you need to do unusual things to compile the package, please try + to figure out how `configure' could check whether to do them, and mail +@@ -35,30 +44,37 @@ + may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +-`configure' by a program called `autoconf'. You only need +-`configure.ac' if you want to change it or regenerate `configure' using +-a newer version of `autoconf'. ++`configure' by a program called `autoconf'. You need `configure.ac' if ++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. If you're +- using `csh' on an old version of System V, you might need to type +- `sh ./configure' instead to prevent `csh' from trying to execute +- `configure' itself. ++ `./configure' to configure the package for your system. + +- Running `configure' takes awhile. While running, it prints some +- messages telling which features it is checking for. ++ Running `configure' might take a while. While running, it prints ++ some messages telling which features it is checking for. + + 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. ++ 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. + +- 5. You can remove the program binaries and object files from the ++ 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,65 +83,120 @@ + all sorts of other programs in order to regenerate files that came + with the distribution. + ++ 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 + ===================== + +-Some systems require unusual options for compilation or linking that the +-`configure' script does not know about. Run `./configure --help' for +-details on some of the pertinent environment variables. ++ Some systems require unusual options for compilation or linking that ++the `configure' script does not know about. Run `./configure --help' ++for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters + by setting variables in the command line or in the environment. Here + is an example: + +- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix ++ ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + + Compiling For Multiple Architectures + ==================================== + +-You can compile the package for more than one kind of computer at the ++ You can compile the package for more than one kind of computer at the + same time, by placing the object files for each architecture in their +-own directory. To do this, you must use a version of `make' that +-supports the `VPATH' variable, such as GNU `make'. `cd' to the ++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. + +- If you have to use a `make' that does not support the `VPATH' +-variable, you have to compile the package for one architecture at a +-time in the source code directory. After you have installed the +-package for one architecture, use `make distclean' before reconfiguring +-for another architecture. ++ 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 ++installed the package for one architecture, use `make distclean' before ++reconfiguring for another architecture. ++ ++ On MacOS X 10.5 and later systems, you can create libraries and ++executables that work on multiple system types--known as "fat" or ++"universal" binaries--by specifying multiple `-arch' options to the ++compiler but only a single `-arch' option to the preprocessor. Like ++this: ++ ++ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ ++ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ ++ CPP="gcc -E" CXXCPP="g++ -E" ++ ++ This is not guaranteed to produce working output in all cases, you ++may have to build one architecture at a time and combine the results ++using the `lipo' tool if you have problems. + + Installation Names + ================== + +-By default, `make install' will install the package's files in +-`/usr/local/bin', `/usr/local/man', etc. You can specify an +-installation prefix other than `/usr/local' by giving `configure' the +-option `--prefix=PREFIX'. ++ 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', where PREFIX must be an ++absolute file name. + + You can specify separate installation prefixes for + architecture-specific files and architecture-independent files. If you +-give `configure' the option `--exec-prefix=PREFIX', the package will +-use PREFIX as the prefix for installing programs and libraries. +-Documentation and other data files will still use the regular prefix. ++pass the option `--exec-prefix=PREFIX' to `configure', the package uses ++PREFIX as the prefix for installing programs and libraries. ++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 ++ 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 + is something like `gnu-as' or `x' (for the X Window System). The +@@ -137,14 +208,53 @@ + 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 ++================== ++ ++ On HP-UX, the default C compiler is not ANSI C compatible. If GNU ++CC is not installed, it is recommended to use the following options in ++order to use an ANSI C compiler: ++ ++ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" ++ ++and if that doesn't work, install pre-built binaries of GCC for HP-UX. ++ ++ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot ++parse its `<wchar.h>' header file. The option `-nodtk' can be used as ++a workaround. If GNU CC is not installed, it is therefore recommended ++to try ++ ++ ./configure CC="cc" ++ ++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 + ========================== + +-There may be some features `configure' cannot figure out automatically, +-but needs to determine by the type of machine the package will run on. +-Usually, assuming the package is built to be run on the _same_ +-architectures, `configure' can figure that out, but if it prints a +-message saying it cannot guess the machine type, give it the ++ There may be some features `configure' cannot figure out ++automatically, but needs to determine by the type of machine the package ++will run on. Usually, assuming the package is built to be run on the ++_same_ architectures, `configure' can figure that out, but if it prints ++a message saying it cannot guess the machine type, give it the + `--build=TYPE' option. TYPE can either be a short name for the system + type, such as `sun4', or a canonical name which has the form: + +@@ -152,14 +262,15 @@ + + 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 + need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +-use the `--target=TYPE' option to select the type of system they will ++use the option `--target=TYPE' to select the type of system they will + produce code for. + + If you want to _use_ a cross compiler, that generates code for a +@@ -170,9 +281,9 @@ + Sharing Defaults + ================ + +-If you want to set default values for `configure' scripts to share, you +-can create a site shell script called `config.site' that gives default +-values for variables like `CC', `cache_file', and `prefix'. ++ If you want to set default values for `configure' scripts to share, ++you can create a site shell script called `config.site' that gives ++default values for variables like `CC', `cache_file', and `prefix'. + `configure' looks for `PREFIX/share/config.site' if it exists, then + `PREFIX/etc/config.site' if it exists. Or, you can set the + `CONFIG_SITE' environment variable to the location of the site script. +@@ -181,7 +292,7 @@ + Defining Variables + ================== + +-Variables not defined in a site shell script can be set in the ++ Variables not defined in a site shell script can be set in the + environment passed to `configure'. However, some packages may run + configure again during the build, and the customized values of these + variables may be lost. In order to avoid this problem, you should set +@@ -189,17 +300,30 @@ + + ./configure CC=/usr/local2/bin/gcc + +-will cause the specified gcc to be used as the C compiler (unless it is ++causes the specified `gcc' to be used as the C compiler (unless it is + overridden in the site shell script). + ++Unfortunately, this technique does not work for `CONFIG_SHELL' due to ++an Autoconf bug. Until the bug is fixed you can use this workaround: ++ ++ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash ++ + `configure' Invocation + ====================== + +-`configure' recognizes the following options to control how it operates. ++ `configure' recognizes the following options to control how it ++operates. + + `--help' + `-h' +- Print a summary of the options to `configure', and exit. ++ Print a summary of all of the options to `configure', and exit. ++ ++`--help=short' ++`--help=recursive' ++ Print a summary of the options unique to this package's ++ `configure', and exit. The `short' variant lists options used ++ only in the top level, while the `recursive' variant lists options ++ also present in any nested packages. + + `--version' + `-V' +@@ -226,6 +350,16 @@ + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + ++`--prefix=DIR' ++ Use DIR as the installation prefix. *note Installation Names:: ++ for more details, including other options available for fine-tuning ++ the installation locations. ++ ++`--no-create' ++`-n' ++ Run the configure checks, but stop before creating any output ++ files. ++ + `configure' also accepts some other, not widely useful, options. Run + `configure --help' for more details. + +diff -Nur tslib-1.0.orig/Makefile.in tslib-1.0/Makefile.in +--- tslib-1.0.orig/Makefile.in 1970-01-01 01:00:00.000000000 +0100 ++++ tslib-1.0/Makefile.in 2010-07-29 13:39:16.000000000 +0200 +@@ -0,0 +1,800 @@ ++# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# @configure_input@ ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++@SET_MAKE@ ++ ++# ++# tslib/Makefile.am ++# ++# Copyright (C) 2001 Russell King. ++# ++# This file is placed under the LGPL. Please see the file ++# COPYING for more details. ++# ++# $Id: Makefile.am,v 1.3 2005/02/28 18:56:09 kergoth Exp $ ++# ++ ++VPATH = @srcdir@ ++pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = @build@ ++host_triplet = @host@ ++subdir = . ++DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ ++ $(srcdir)/tslib.pc.in $(top_srcdir)/configure AUTHORS COPYING \ ++ ChangeLog INSTALL NEWS config.guess config.sub depcomp \ ++ install-sh ltmain.sh missing ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/internal/libtool.m4 \ ++ $(top_srcdir)/m4/internal/ltoptions.m4 \ ++ $(top_srcdir)/m4/internal/ltsugar.m4 \ ++ $(top_srcdir)/m4/internal/ltversion.m4 \ ++ $(top_srcdir)/m4/internal/lt~obsolete.m4 \ ++ $(top_srcdir)/m4/internal/visibility.m4 \ ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ ++ configure.lineno config.status.lineno ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = config.h ++CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = ++SOURCES = ++DIST_SOURCES = ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++am__installdirs = "$(DESTDIR)$(pkgconfigdir)" ++DATA = $(pkgconfig_DATA) ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ ++ distdir dist dist-all distcheck ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++distdir = $(PACKAGE)-$(VERSION) ++top_distdir = $(distdir) ++am__remove_distdir = \ ++ { test ! -d "$(distdir)" \ ++ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ ++ && rm -fr "$(distdir)"; }; } ++am__relativize = \ ++ dir0=`pwd`; \ ++ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ ++ sed_rest='s,^[^/]*/*,,'; \ ++ sed_last='s,^.*/\([^/]*\)$$,\1,'; \ ++ sed_butlast='s,/*[^/]*$$,,'; \ ++ while test -n "$$dir1"; do \ ++ first=`echo "$$dir1" | sed -e "$$sed_first"`; \ ++ if test "$$first" != "."; then \ ++ if test "$$first" = ".."; then \ ++ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ ++ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ ++ else \ ++ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ ++ if test "$$first2" = "$$first"; then \ ++ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ ++ else \ ++ dir2="../$$dir2"; \ ++ fi; \ ++ dir0="$$dir0"/"$$first"; \ ++ fi; \ ++ fi; \ ++ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ ++ done; \ ++ reldir="$$dir2" ++DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 ++GZIP_ENV = --best ++distuninstallcheck_listfiles = find . -type f -print ++distcleancheck_listfiles = find . -type f -print ++ACLOCAL = @ACLOCAL@ ++ALLOCA = @ALLOCA@ ++AMTAR = @AMTAR@ ++AR = @AR@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ ++AWK = @AWK@ ++CC = @CC@ ++CCDEPMODE = @CCDEPMODE@ ++CFLAGS = @CFLAGS@ ++CPP = @CPP@ ++CPPFLAGS = @CPPFLAGS@ ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ ++CYGPATH_W = @CYGPATH_W@ ++DEBUGFLAGS = @DEBUGFLAGS@ ++DEFS = @DEFS@ ++DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ ++EXEEXT = @EXEEXT@ ++FGREP = @FGREP@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++LD = @LD@ ++LDFLAGS = @LDFLAGS@ ++LIBFLAGS = @LIBFLAGS@ ++LIBOBJS = @LIBOBJS@ ++LIBS = @LIBS@ ++LIBTOOL = @LIBTOOL@ ++LIPO = @LIPO@ ++LN_S = @LN_S@ ++LTLIBOBJS = @LTLIBOBJS@ ++LT_AGE = @LT_AGE@ ++LT_CURRENT = @LT_CURRENT@ ++LT_RELEASE = @LT_RELEASE@ ++LT_REVISION = @LT_REVISION@ ++MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ ++NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ ++OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ ++PACKAGE = @PACKAGE@ ++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ ++PACKAGE_DESCRIPTION = @PACKAGE_DESCRIPTION@ ++PACKAGE_NAME = @PACKAGE_NAME@ ++PACKAGE_STRING = @PACKAGE_STRING@ ++PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ ++PACKAGE_VERSION = @PACKAGE_VERSION@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ ++PLUGIN_DIR = @PLUGIN_DIR@ ++RANLIB = @RANLIB@ ++SED = @SED@ ++SET_MAKE = @SET_MAKE@ ++SHELL = @SHELL@ ++STRIP = @STRIP@ ++TS_CONF = @TS_CONF@ ++VERSION = @VERSION@ ++VIS_CFLAGS = @VIS_CFLAGS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ++am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ ++am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ ++bindir = @bindir@ ++build = @build@ ++build_alias = @build_alias@ ++build_cpu = @build_cpu@ ++build_os = @build_os@ ++build_vendor = @build_vendor@ ++builddir = @builddir@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ ++exec_prefix = @exec_prefix@ ++host = @host@ ++host_alias = @host_alias@ ++host_cpu = @host_cpu@ ++host_os = @host_os@ ++host_vendor = @host_vendor@ ++htmldir = @htmldir@ ++includedir = @includedir@ ++infodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localedir = @localedir@ ++localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++psdir = @psdir@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ ++SUBDIRS = etc src plugins tests ++EXTRA_DIST = autogen.sh ++ACLOCAL_AMFLAGS = -I m4/internal -I m4/external ++AUTOMAKE_OPTIONS = 1.6 ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = $(PACKAGE)-$(LT_RELEASE).pc ++all: config.h ++ $(MAKE) $(AM_MAKEFLAGS) all-recursive ++ ++.SUFFIXES: ++am--refresh: ++ @: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ ++ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ echo ' $(SHELL) ./config.status'; \ ++ $(SHELL) ./config.status;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ $(SHELL) ./config.status --recheck ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ $(am__cd) $(srcdir) && $(AUTOCONF) ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ++$(am__aclocal_m4_deps): ++ ++config.h: stamp-h1 ++ @if test ! -f $@; then \ ++ rm -f stamp-h1; \ ++ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ ++ else :; fi ++ ++stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status ++ @rm -f stamp-h1 ++ cd $(top_builddir) && $(SHELL) ./config.status config.h ++$(srcdir)/config.h.in: $(am__configure_deps) ++ ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) ++ rm -f stamp-h1 ++ touch $@ ++ ++distclean-hdr: ++ -rm -f config.h stamp-h1 ++ ++mostlyclean-libtool: ++ -rm -f *.lo ++ ++clean-libtool: ++ -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool config.lt ++install-pkgconfigDATA: $(pkgconfig_DATA) ++ @$(NORMAL_INSTALL) ++ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" ++ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ ++ for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ ++ done ++ ++uninstall-pkgconfigDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files ++ ++# This directory's subdirectories are mostly independent; you can cd ++# into them and run `make' without going through this Makefile. ++# To change the values of `make' variables: instead of editing Makefiles, ++# (1) if the variable is set in `config.status', edit `config.status' ++# (which will cause the Makefiles to be regenerated when you run `make'); ++# (2) otherwise, pass the desired values on the `make' command line. ++$(RECURSIVE_TARGETS): ++ @fail= failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ ++ dot_seen=no; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ dot_seen=yes; \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ ++ done; \ ++ if test "$$dot_seen" = "no"; then \ ++ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ ++ fi; test -z "$$fail" ++ ++$(RECURSIVE_CLEAN_TARGETS): ++ @fail= failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ ++ dot_seen=no; \ ++ case "$@" in \ ++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ++ *) list='$(SUBDIRS)' ;; \ ++ esac; \ ++ rev=''; for subdir in $$list; do \ ++ if test "$$subdir" = "."; then :; else \ ++ rev="$$subdir $$rev"; \ ++ fi; \ ++ done; \ ++ rev="$$rev ."; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ for subdir in $$rev; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ ++ done && test -z "$$fail" ++tags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ done ++ctags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ done ++ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ mkid -fID $$unique ++tags: TAGS ++ ++TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ set x; \ ++ here=`pwd`; \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ include_option=--etags-include; \ ++ empty_fix=.; \ ++ else \ ++ include_option=--include; \ ++ empty_fix=; \ ++ fi; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test ! -f $$subdir/TAGS || \ ++ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ ++ fi; \ ++ done; \ ++ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi ++ctags: CTAGS ++CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ ++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ++ $$unique ++ ++GTAGS: ++ here=`$(am__cd) $(top_builddir) && pwd` \ ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" ++ ++distclean-tags: ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++ ++distdir: $(DISTFILES) ++ $(am__remove_distdir) ++ test -d "$(distdir)" || mkdir "$(distdir)" ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ else \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ ++ || exit 1; \ ++ fi; \ ++ done ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ || exit 1; \ ++ fi; \ ++ done ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ ++ $(am__relativize); \ ++ new_distdir=$$reldir; \ ++ dir1=$$subdir; dir2="$(top_distdir)"; \ ++ $(am__relativize); \ ++ new_top_distdir=$$reldir; \ ++ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ ++ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ ++ ($(am__cd) $$subdir && \ ++ $(MAKE) $(AM_MAKEFLAGS) \ ++ top_distdir="$$new_top_distdir" \ ++ distdir="$$new_distdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ ++ am__skip_mode_fix=: \ ++ distdir) \ ++ || exit 1; \ ++ fi; \ ++ done ++ -test -n "$(am__skip_mode_fix)" \ ++ || find "$(distdir)" -type d ! -perm -755 \ ++ -exec chmod u+rwx,go+rx {} \; -o \ ++ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ++ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ++ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ ++ || chmod -R a+r "$(distdir)" ++dist-gzip: distdir ++ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(am__remove_distdir) ++dist-bzip2: distdir ++ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 ++ $(am__remove_distdir) ++ ++dist-lzma: distdir ++ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma ++ $(am__remove_distdir) ++ ++dist-xz: distdir ++ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz ++ $(am__remove_distdir) ++ ++dist-tarZ: distdir ++ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z ++ $(am__remove_distdir) ++ ++dist-shar: distdir ++ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz ++ $(am__remove_distdir) ++ ++dist-zip: distdir ++ -rm -f $(distdir).zip ++ zip -rq $(distdir).zip $(distdir) ++ $(am__remove_distdir) ++ ++dist dist-all: distdir ++ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 ++ $(am__remove_distdir) ++ ++# This target untars the dist file and tries a VPATH configuration. Then ++# it guarantees that the distribution is self-contained by making another ++# tarfile. ++distcheck: dist ++ case '$(DIST_ARCHIVES)' in \ ++ *.tar.gz*) \ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ ++ *.tar.bz2*) \ ++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ ++ *.tar.lzma*) \ ++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ ++ *.tar.xz*) \ ++ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ ++ *.tar.Z*) \ ++ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ ++ *.shar.gz*) \ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ ++ *.zip*) \ ++ unzip $(distdir).zip ;;\ ++ esac ++ chmod -R a-w $(distdir); chmod a+w $(distdir) ++ mkdir $(distdir)/_build ++ mkdir $(distdir)/_inst ++ chmod a-w $(distdir) ++ test -d $(distdir)/_build || exit 0; \ ++ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ ++ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ ++ && am__cwd=`pwd` \ ++ && $(am__cd) $(distdir)/_build \ ++ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ ++ $(DISTCHECK_CONFIGURE_FLAGS) \ ++ && $(MAKE) $(AM_MAKEFLAGS) \ ++ && $(MAKE) $(AM_MAKEFLAGS) dvi \ ++ && $(MAKE) $(AM_MAKEFLAGS) check \ ++ && $(MAKE) $(AM_MAKEFLAGS) install \ ++ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ ++ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ ++ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ ++ distuninstallcheck \ ++ && chmod -R a-w "$$dc_install_base" \ ++ && ({ \ ++ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ ++ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ ++ } || { rm -rf "$$dc_destdir"; exit 1; }) \ ++ && rm -rf "$$dc_destdir" \ ++ && $(MAKE) $(AM_MAKEFLAGS) dist \ ++ && rm -rf $(DIST_ARCHIVES) \ ++ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ ++ && cd "$$am__cwd" \ ++ || exit 1 ++ $(am__remove_distdir) ++ @(echo "$(distdir) archives ready for distribution: "; \ ++ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ ++ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' ++distuninstallcheck: ++ @$(am__cd) '$(distuninstallcheck_dir)' \ ++ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ ++ || { echo "ERROR: files left after uninstall:" ; \ ++ if test -n "$(DESTDIR)"; then \ ++ echo " (check DESTDIR support)"; \ ++ fi ; \ ++ $(distuninstallcheck_listfiles) ; \ ++ exit 1; } >&2 ++distcleancheck: distclean ++ @if test '$(srcdir)' = . ; then \ ++ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ ++ exit 1 ; \ ++ fi ++ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ ++ || { echo "ERROR: files left in build directory after distclean:" ; \ ++ $(distcleancheck_listfiles) ; \ ++ exit 1; } >&2 ++check-am: all-am ++check: check-recursive ++all-am: Makefile $(DATA) config.h ++installdirs: installdirs-recursive ++installdirs-am: ++ for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-recursive ++install-exec: install-exec-recursive ++install-data: install-data-recursive ++uninstall: uninstall-recursive ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-recursive ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-recursive ++ ++clean-am: clean-generic clean-libtool mostlyclean-am ++ ++distclean: distclean-recursive ++ -rm -f $(am__CONFIG_DISTCLEAN_FILES) ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic distclean-hdr \ ++ distclean-libtool distclean-tags ++ ++dvi: dvi-recursive ++ ++dvi-am: ++ ++html: html-recursive ++ ++html-am: ++ ++info: info-recursive ++ ++info-am: ++ ++install-data-am: install-pkgconfigDATA ++ ++install-dvi: install-dvi-recursive ++ ++install-dvi-am: ++ ++install-exec-am: ++ ++install-html: install-html-recursive ++ ++install-html-am: ++ ++install-info: install-info-recursive ++ ++install-info-am: ++ ++install-man: ++ ++install-pdf: install-pdf-recursive ++ ++install-pdf-am: ++ ++install-ps: install-ps-recursive ++ ++install-ps-am: ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-recursive ++ -rm -f $(am__CONFIG_DISTCLEAN_FILES) ++ -rm -rf $(top_srcdir)/autom4te.cache ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-recursive ++ ++mostlyclean-am: mostlyclean-generic mostlyclean-libtool ++ ++pdf: pdf-recursive ++ ++pdf-am: ++ ++ps: ps-recursive ++ ++ps-am: ++ ++uninstall-am: uninstall-pkgconfigDATA ++ ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ ++ ctags-recursive install-am install-strip tags-recursive ++ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am am--refresh check check-am clean clean-generic \ ++ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ ++ dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ ++ distcheck distclean distclean-generic distclean-hdr \ ++ distclean-libtool distclean-tags distcleancheck distdir \ ++ distuninstallcheck dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-pkgconfigDATA install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am uninstall-pkgconfigDATA ++ ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: diff -Nur tslib-1.0.orig/aclocal.m4 tslib-1.0/aclocal.m4 --- tslib-1.0.orig/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 -+++ tslib-1.0/aclocal.m4 2010-02-19 00:24:08.800856345 +0100 ++++ tslib-1.0/aclocal.m4 2010-07-29 13:39:11.000000000 +0200 @@ -0,0 +1,970 @@ +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- + @@ -974,7 +2171,7 @@ diff -Nur tslib-1.0.orig/aclocal.m4 tslib-1.0/aclocal.m4 +m4_include([acinclude.m4]) diff -Nur tslib-1.0.orig/config.guess tslib-1.0/config.guess --- tslib-1.0.orig/config.guess 1970-01-01 01:00:00.000000000 +0100 -+++ tslib-1.0/config.guess 2010-02-19 00:24:15.172857372 +0100 ++++ tslib-1.0/config.guess 2010-07-29 13:39:11.000000000 +0200 @@ -0,0 +1,1533 @@ +#! /bin/sh +# Attempt to guess a canonical system name. @@ -2511,7 +3708,7 @@ diff -Nur tslib-1.0.orig/config.guess tslib-1.0/config.guess +# End: diff -Nur tslib-1.0.orig/config.h.in tslib-1.0/config.h.in --- tslib-1.0.orig/config.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ tslib-1.0/config.h.in 2010-02-19 00:24:13.048855268 +0100 ++++ tslib-1.0/config.h.in 2010-07-29 13:39:11.000000000 +0200 @@ -0,0 +1,193 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + @@ -2708,7 +3905,7 @@ diff -Nur tslib-1.0.orig/config.h.in tslib-1.0/config.h.in +#undef size_t diff -Nur tslib-1.0.orig/config.sub tslib-1.0/config.sub --- tslib-1.0.orig/config.sub 1970-01-01 01:00:00.000000000 +0100 -+++ tslib-1.0/config.sub 2010-02-19 00:24:15.176867100 +0100 ++++ tslib-1.0/config.sub 2010-07-29 13:39:11.000000000 +0200 @@ -0,0 +1,1693 @@ +#! /bin/sh +# Configuration validation subroutine script. @@ -4405,7 +5602,7 @@ diff -Nur tslib-1.0.orig/config.sub tslib-1.0/config.sub +# End: diff -Nur tslib-1.0.orig/configure tslib-1.0/configure --- tslib-1.0.orig/configure 1970-01-01 01:00:00.000000000 +0100 -+++ tslib-1.0/configure 2010-02-19 00:24:11.232851881 +0100 ++++ tslib-1.0/configure 2010-07-29 13:39:15.000000000 +0200 @@ -0,0 +1,18585 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. @@ -22994,7 +24191,7 @@ diff -Nur tslib-1.0.orig/configure tslib-1.0/configure + diff -Nur tslib-1.0.orig/configure.ac tslib-1.0/configure.ac --- tslib-1.0.orig/configure.ac 2006-08-24 23:02:55.000000000 +0200 -+++ tslib-1.0/configure.ac 2010-02-19 00:23:49.132856748 +0100 ++++ tslib-1.0/configure.ac 2010-07-29 13:39:15.000000000 +0200 @@ -71,7 +71,7 @@ AM_CONDITIONAL(ENABLE_DEJITTER_MODULE, test "$dejitter_module" = "yes") @@ -23006,7 +24203,7 @@ diff -Nur tslib-1.0.orig/configure.ac tslib-1.0/configure.ac [h2200_linear_module=$enableval], diff -Nur tslib-1.0.orig/depcomp tslib-1.0/depcomp --- tslib-1.0.orig/depcomp 1970-01-01 01:00:00.000000000 +0100 -+++ tslib-1.0/depcomp 2010-02-19 00:24:15.740856531 +0100 ++++ tslib-1.0/depcomp 2010-07-29 13:39:15.000000000 +0200 @@ -0,0 +1,630 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects @@ -23640,7 +24837,7 @@ diff -Nur tslib-1.0.orig/depcomp tslib-1.0/depcomp +# End: diff -Nur tslib-1.0.orig/etc/Makefile.in tslib-1.0/etc/Makefile.in --- tslib-1.0.orig/etc/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ tslib-1.0/etc/Makefile.in 2010-02-19 00:24:15.300852155 +0100 ++++ tslib-1.0/etc/Makefile.in 2010-07-29 13:39:38.000000000 +0200 @@ -0,0 +1,430 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ @@ -23901,7 +25098,7 @@ diff -Nur tslib-1.0.orig/etc/Makefile.in tslib-1.0/etc/Makefile.in + -rm -rf .libs _libs +install-sysconfDATA: $(sysconf_DATA) + @$(NORMAL_INSTALL) -+ test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" ++ #test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" + @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -24072,402 +25269,9 @@ diff -Nur tslib-1.0.orig/etc/Makefile.in tslib-1.0/etc/Makefile.in +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: -diff -Nur tslib-1.0.orig/INSTALL tslib-1.0/INSTALL ---- tslib-1.0.orig/INSTALL 2006-08-24 23:02:55.000000000 +0200 -+++ tslib-1.0/INSTALL 2010-02-19 00:24:15.856856501 +0100 -@@ -1,16 +1,25 @@ - Installation Instructions - ************************* - --Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free --Software Foundation, Inc. -+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -+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 - ================== - --These are generic installation instructions. -+ 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. 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 -@@ -23,9 +32,9 @@ - - It can also use an optional file (typically called `config.cache' - and enabled with `--cache-file=config.cache' or simply `-C') that saves --the results of its tests to speed up reconfiguring. (Caching is -+the results of its tests to speed up reconfiguring. Caching is - disabled by default to prevent problems with accidental use of stale --cache files.) -+cache files. - - If you need to do unusual things to compile the package, please try - to figure out how `configure' could check whether to do them, and mail -@@ -35,30 +44,37 @@ - may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create --`configure' by a program called `autoconf'. You only need --`configure.ac' if you want to change it or regenerate `configure' using --a newer version of `autoconf'. -+`configure' by a program called `autoconf'. You need `configure.ac' if -+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. If you're -- using `csh' on an old version of System V, you might need to type -- `sh ./configure' instead to prevent `csh' from trying to execute -- `configure' itself. -+ `./configure' to configure the package for your system. - -- Running `configure' takes awhile. While running, it prints some -- messages telling which features it is checking for. -+ Running `configure' might take a while. While running, it prints -+ some messages telling which features it is checking for. - - 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. -+ 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. - -- 5. You can remove the program binaries and object files from the -+ 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,65 +83,120 @@ - all sorts of other programs in order to regenerate files that came - with the distribution. - -+ 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 - ===================== - --Some systems require unusual options for compilation or linking that the --`configure' script does not know about. Run `./configure --help' for --details on some of the pertinent environment variables. -+ Some systems require unusual options for compilation or linking that -+the `configure' script does not know about. Run `./configure --help' -+for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters - by setting variables in the command line or in the environment. Here - is an example: - -- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix -+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - - Compiling For Multiple Architectures - ==================================== - --You can compile the package for more than one kind of computer at the -+ You can compile the package for more than one kind of computer at the - same time, by placing the object files for each architecture in their --own directory. To do this, you must use a version of `make' that --supports the `VPATH' variable, such as GNU `make'. `cd' to the -+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. - -- If you have to use a `make' that does not support the `VPATH' --variable, you have to compile the package for one architecture at a --time in the source code directory. After you have installed the --package for one architecture, use `make distclean' before reconfiguring --for another architecture. -+ 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 -+installed the package for one architecture, use `make distclean' before -+reconfiguring for another architecture. -+ -+ On MacOS X 10.5 and later systems, you can create libraries and -+executables that work on multiple system types--known as "fat" or -+"universal" binaries--by specifying multiple `-arch' options to the -+compiler but only a single `-arch' option to the preprocessor. Like -+this: -+ -+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ -+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ -+ CPP="gcc -E" CXXCPP="g++ -E" -+ -+ This is not guaranteed to produce working output in all cases, you -+may have to build one architecture at a time and combine the results -+using the `lipo' tool if you have problems. - - Installation Names - ================== - --By default, `make install' will install the package's files in --`/usr/local/bin', `/usr/local/man', etc. You can specify an --installation prefix other than `/usr/local' by giving `configure' the --option `--prefix=PREFIX'. -+ 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', where PREFIX must be an -+absolute file name. - - You can specify separate installation prefixes for - architecture-specific files and architecture-independent files. If you --give `configure' the option `--exec-prefix=PREFIX', the package will --use PREFIX as the prefix for installing programs and libraries. --Documentation and other data files will still use the regular prefix. -+pass the option `--exec-prefix=PREFIX' to `configure', the package uses -+PREFIX as the prefix for installing programs and libraries. -+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 -+ 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 - is something like `gnu-as' or `x' (for the X Window System). The -@@ -137,14 +208,53 @@ - 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 -+================== -+ -+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU -+CC is not installed, it is recommended to use the following options in -+order to use an ANSI C compiler: -+ -+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" -+ -+and if that doesn't work, install pre-built binaries of GCC for HP-UX. -+ -+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -+parse its `<wchar.h>' header file. The option `-nodtk' can be used as -+a workaround. If GNU CC is not installed, it is therefore recommended -+to try -+ -+ ./configure CC="cc" -+ -+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 - ========================== - --There may be some features `configure' cannot figure out automatically, --but needs to determine by the type of machine the package will run on. --Usually, assuming the package is built to be run on the _same_ --architectures, `configure' can figure that out, but if it prints a --message saying it cannot guess the machine type, give it the -+ There may be some features `configure' cannot figure out -+automatically, but needs to determine by the type of machine the package -+will run on. Usually, assuming the package is built to be run on the -+_same_ architectures, `configure' can figure that out, but if it prints -+a message saying it cannot guess the machine type, give it the - `--build=TYPE' option. TYPE can either be a short name for the system - type, such as `sun4', or a canonical name which has the form: - -@@ -152,14 +262,15 @@ - - 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 - need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should --use the `--target=TYPE' option to select the type of system they will -+use the option `--target=TYPE' to select the type of system they will - produce code for. - - If you want to _use_ a cross compiler, that generates code for a -@@ -170,9 +281,9 @@ - Sharing Defaults - ================ - --If you want to set default values for `configure' scripts to share, you --can create a site shell script called `config.site' that gives default --values for variables like `CC', `cache_file', and `prefix'. -+ If you want to set default values for `configure' scripts to share, -+you can create a site shell script called `config.site' that gives -+default values for variables like `CC', `cache_file', and `prefix'. - `configure' looks for `PREFIX/share/config.site' if it exists, then - `PREFIX/etc/config.site' if it exists. Or, you can set the - `CONFIG_SITE' environment variable to the location of the site script. -@@ -181,7 +292,7 @@ - Defining Variables - ================== - --Variables not defined in a site shell script can be set in the -+ Variables not defined in a site shell script can be set in the - environment passed to `configure'. However, some packages may run - configure again during the build, and the customized values of these - variables may be lost. In order to avoid this problem, you should set -@@ -189,17 +300,30 @@ - - ./configure CC=/usr/local2/bin/gcc - --will cause the specified gcc to be used as the C compiler (unless it is -+causes the specified `gcc' to be used as the C compiler (unless it is - overridden in the site shell script). - -+Unfortunately, this technique does not work for `CONFIG_SHELL' due to -+an Autoconf bug. Until the bug is fixed you can use this workaround: -+ -+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash -+ - `configure' Invocation - ====================== - --`configure' recognizes the following options to control how it operates. -+ `configure' recognizes the following options to control how it -+operates. - - `--help' - `-h' -- Print a summary of the options to `configure', and exit. -+ Print a summary of all of the options to `configure', and exit. -+ -+`--help=short' -+`--help=recursive' -+ Print a summary of the options unique to this package's -+ `configure', and exit. The `short' variant lists options used -+ only in the top level, while the `recursive' variant lists options -+ also present in any nested packages. - - `--version' - `-V' -@@ -226,6 +350,16 @@ - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -+`--prefix=DIR' -+ Use DIR as the installation prefix. *note Installation Names:: -+ for more details, including other options available for fine-tuning -+ the installation locations. -+ -+`--no-create' -+`-n' -+ Run the configure checks, but stop before creating any output -+ files. -+ - `configure' also accepts some other, not widely useful, options. Run - `configure --help' for more details. - diff -Nur tslib-1.0.orig/install-sh tslib-1.0/install-sh --- tslib-1.0.orig/install-sh 1970-01-01 01:00:00.000000000 +0100 -+++ tslib-1.0/install-sh 2010-02-19 00:24:15.180853641 +0100 ++++ tslib-1.0/install-sh 2010-07-29 13:39:15.000000000 +0200 @@ -0,0 +1,520 @@ +#!/bin/sh +# install - install a program, script, or datafile @@ -24991,7 +25795,7 @@ diff -Nur tslib-1.0.orig/install-sh tslib-1.0/install-sh +# End: diff -Nur tslib-1.0.orig/ltmain.sh tslib-1.0/ltmain.sh --- tslib-1.0.orig/ltmain.sh 1970-01-01 01:00:00.000000000 +0100 -+++ tslib-1.0/ltmain.sh 2010-02-19 00:24:02.744855643 +0100 ++++ tslib-1.0/ltmain.sh 2010-07-29 13:39:16.000000000 +0200 @@ -0,0 +1,8413 @@ +# Generated from ltmain.m4sh. + @@ -33408,7 +34212,7 @@ diff -Nur tslib-1.0.orig/ltmain.sh tslib-1.0/ltmain.sh + diff -Nur tslib-1.0.orig/m4/internal/libtool.m4 tslib-1.0/m4/internal/libtool.m4 --- tslib-1.0.orig/m4/internal/libtool.m4 1970-01-01 01:00:00.000000000 +0100 -+++ tslib-1.0/m4/internal/libtool.m4 2010-02-19 00:24:02.812857317 +0100 ++++ tslib-1.0/m4/internal/libtool.m4 2010-07-29 13:39:16.000000000 +0200 @@ -0,0 +1,7377 @@ +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# @@ -40787,105 +41591,9 @@ diff -Nur tslib-1.0.orig/m4/internal/libtool.m4 tslib-1.0/m4/internal/libtool.m4 + ;; + esac +]) -diff -Nur tslib-1.0.orig/m4/internal/lt~obsolete.m4 tslib-1.0/m4/internal/lt~obsolete.m4 ---- tslib-1.0.orig/m4/internal/lt~obsolete.m4 1970-01-01 01:00:00.000000000 +0100 -+++ tslib-1.0/m4/internal/lt~obsolete.m4 2010-02-19 00:24:03.080854595 +0100 -@@ -0,0 +1,92 @@ -+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- -+# -+# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. -+# Written by Scott James Remnant, 2004. -+# -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+ -+# serial 4 lt~obsolete.m4 -+ -+# These exist entirely to fool aclocal when bootstrapping libtool. -+# -+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) -+# which have later been changed to m4_define as they aren't part of the -+# exported API, or moved to Autoconf or Automake where they belong. -+# -+# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN -+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us -+# using a macro with the same name in our local m4/libtool.m4 it'll -+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define -+# and doesn't know about Autoconf macros at all.) -+# -+# So we provide this file, which has a silly filename so it's always -+# included after everything else. This provides aclocal with the -+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything -+# because those macros already exist, or will be overwritten later. -+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. -+# -+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. -+# Yes, that means every name once taken will need to remain here until -+# we give up compatibility with versions before 1.7, at which point -+# we need to keep only those names which we still refer to. -+ -+# This is to help aclocal find these macros, as it can't see m4_define. -+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) -+ -+m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) -+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) -+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) -+m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) -+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) -+m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) -+m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) -+m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) -+m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) -+m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) -+m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) -+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) -+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) -+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) -+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) -+m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) -+m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) -+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) -+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) -+m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) -+m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) -+m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) -+m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) -+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) -+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) -+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) -+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) -+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) -+m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) -+m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) -+m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) -+m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) -+m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) -+m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) -+m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) -+m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) -+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) -+m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) -+m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) -+m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) -+m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) -+m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -+m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) -+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) -+m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) -+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) -+m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) -+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) -+m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) -+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) -+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) -+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) -+m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) -+m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) -+m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) diff -Nur tslib-1.0.orig/m4/internal/ltoptions.m4 tslib-1.0/m4/internal/ltoptions.m4 --- tslib-1.0.orig/m4/internal/ltoptions.m4 1970-01-01 01:00:00.000000000 +0100 -+++ tslib-1.0/m4/internal/ltoptions.m4 2010-02-19 00:24:02.872855189 +0100 ++++ tslib-1.0/m4/internal/ltoptions.m4 2010-07-29 13:39:16.000000000 +0200 @@ -0,0 +1,368 @@ +# Helper functions for option handling. -*- Autoconf -*- +# @@ -41257,7 +41965,7 @@ diff -Nur tslib-1.0.orig/m4/internal/ltoptions.m4 tslib-1.0/m4/internal/ltoption + [m4_define([_LTDL_TYPE], [convenience])]) diff -Nur tslib-1.0.orig/m4/internal/ltsugar.m4 tslib-1.0/m4/internal/ltsugar.m4 --- tslib-1.0.orig/m4/internal/ltsugar.m4 1970-01-01 01:00:00.000000000 +0100 -+++ tslib-1.0/m4/internal/ltsugar.m4 2010-02-19 00:24:02.940856593 +0100 ++++ tslib-1.0/m4/internal/ltsugar.m4 2010-07-29 13:39:16.000000000 +0200 @@ -0,0 +1,123 @@ +# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- +# @@ -41384,7 +42092,7 @@ diff -Nur tslib-1.0.orig/m4/internal/ltsugar.m4 tslib-1.0/m4/internal/ltsugar.m4 +]) diff -Nur tslib-1.0.orig/m4/internal/ltversion.m4 tslib-1.0/m4/internal/ltversion.m4 --- tslib-1.0.orig/m4/internal/ltversion.m4 1970-01-01 01:00:00.000000000 +0100 -+++ tslib-1.0/m4/internal/ltversion.m4 2010-02-19 00:24:03.008854921 +0100 ++++ tslib-1.0/m4/internal/ltversion.m4 2010-07-29 13:39:16.000000000 +0200 @@ -0,0 +1,23 @@ +# ltversion.m4 -- version numbers -*- Autoconf -*- +# @@ -41409,813 +42117,105 @@ diff -Nur tslib-1.0.orig/m4/internal/ltversion.m4 tslib-1.0/m4/internal/ltversio +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) +_LT_DECL(, macro_revision, 0) +]) -diff -Nur tslib-1.0.orig/Makefile.in tslib-1.0/Makefile.in ---- tslib-1.0.orig/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ tslib-1.0/Makefile.in 2010-02-19 00:24:15.948852025 +0100 -@@ -0,0 +1,800 @@ -+# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# @configure_input@ -+ -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. -+# This Makefile.in is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+# PARTICULAR PURPOSE. +diff -Nur tslib-1.0.orig/m4/internal/lt~obsolete.m4 tslib-1.0/m4/internal/lt~obsolete.m4 +--- tslib-1.0.orig/m4/internal/lt~obsolete.m4 1970-01-01 01:00:00.000000000 +0100 ++++ tslib-1.0/m4/internal/lt~obsolete.m4 2010-07-29 13:39:16.000000000 +0200 +@@ -0,0 +1,92 @@ ++# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- ++# ++# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. ++# Written by Scott James Remnant, 2004. ++# ++# This file is free software; the Free Software Foundation gives ++# unlimited permission to copy and/or distribute it, with or without ++# modifications, as long as this notice is preserved. + -+@SET_MAKE@ ++# serial 4 lt~obsolete.m4 + ++# These exist entirely to fool aclocal when bootstrapping libtool. +# -+# tslib/Makefile.am -+# -+# Copyright (C) 2001 Russell King. ++# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) ++# which have later been changed to m4_define as they aren't part of the ++# exported API, or moved to Autoconf or Automake where they belong. +# -+# This file is placed under the LGPL. Please see the file -+# COPYING for more details. ++# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN ++# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us ++# using a macro with the same name in our local m4/libtool.m4 it'll ++# pull the old libtool.m4 in (it doesn't see our shiny new m4_define ++# and doesn't know about Autoconf macros at all.) +# -+# $Id: Makefile.am,v 1.3 2005/02/28 18:56:09 kergoth Exp $ ++# So we provide this file, which has a silly filename so it's always ++# included after everything else. This provides aclocal with the ++# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything ++# because those macros already exist, or will be overwritten later. ++# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# ++# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. ++# Yes, that means every name once taken will need to remain here until ++# we give up compatibility with versions before 1.7, at which point ++# we need to keep only those names which we still refer to. + -+VPATH = @srcdir@ -+pkgdatadir = $(datadir)/@PACKAGE@ -+pkgincludedir = $(includedir)/@PACKAGE@ -+pkglibdir = $(libdir)/@PACKAGE@ -+pkglibexecdir = $(libexecdir)/@PACKAGE@ -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c -+INSTALL_HEADER = $(INSTALL_DATA) -+transform = $(program_transform_name) -+NORMAL_INSTALL = : -+PRE_INSTALL = : -+POST_INSTALL = : -+NORMAL_UNINSTALL = : -+PRE_UNINSTALL = : -+POST_UNINSTALL = : -+build_triplet = @build@ -+host_triplet = @host@ -+subdir = . -+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ -+ $(srcdir)/tslib.pc.in $(top_srcdir)/configure AUTHORS COPYING \ -+ ChangeLog INSTALL NEWS config.guess config.sub depcomp \ -+ install-sh ltmain.sh missing -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/m4/internal/libtool.m4 \ -+ $(top_srcdir)/m4/internal/ltoptions.m4 \ -+ $(top_srcdir)/m4/internal/ltsugar.m4 \ -+ $(top_srcdir)/m4/internal/ltversion.m4 \ -+ $(top_srcdir)/m4/internal/lt~obsolete.m4 \ -+ $(top_srcdir)/m4/internal/visibility.m4 \ -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -+ configure.lineno config.status.lineno -+mkinstalldirs = $(install_sh) -d -+CONFIG_HEADER = config.h -+CONFIG_CLEAN_FILES = -+CONFIG_CLEAN_VPATH_FILES = -+SOURCES = -+DIST_SOURCES = -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -+am__install_max = 40 -+am__nobase_strip_setup = \ -+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -+am__nobase_strip = \ -+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -+am__nobase_list = $(am__nobase_strip_setup); \ -+ for p in $$list; do echo "$$p $$p"; done | \ -+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ -+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ -+ if (++n[$$2] == $(am__install_max)) \ -+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ -+ END { for (dir in files) print dir, files[dir] }' -+am__base_list = \ -+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ -+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__installdirs = "$(DESTDIR)$(pkgconfigdir)" -+DATA = $(pkgconfig_DATA) -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive -+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+ distdir dist dist-all distcheck -+ETAGS = etags -+CTAGS = ctags -+DIST_SUBDIRS = $(SUBDIRS) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+distdir = $(PACKAGE)-$(VERSION) -+top_distdir = $(distdir) -+am__remove_distdir = \ -+ { test ! -d "$(distdir)" \ -+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ -+ && rm -fr "$(distdir)"; }; } -+am__relativize = \ -+ dir0=`pwd`; \ -+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ -+ sed_rest='s,^[^/]*/*,,'; \ -+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \ -+ sed_butlast='s,/*[^/]*$$,,'; \ -+ while test -n "$$dir1"; do \ -+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \ -+ if test "$$first" != "."; then \ -+ if test "$$first" = ".."; then \ -+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ -+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ -+ else \ -+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ -+ if test "$$first2" = "$$first"; then \ -+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ -+ else \ -+ dir2="../$$dir2"; \ -+ fi; \ -+ dir0="$$dir0"/"$$first"; \ -+ fi; \ -+ fi; \ -+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ -+ done; \ -+ reldir="$$dir2" -+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 -+GZIP_ENV = --best -+distuninstallcheck_listfiles = find . -type f -print -+distcleancheck_listfiles = find . -type f -print -+ACLOCAL = @ACLOCAL@ -+ALLOCA = @ALLOCA@ -+AMTAR = @AMTAR@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ -+AWK = @AWK@ -+CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ -+CXX = @CXX@ -+CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEBUGFLAGS = @DEBUGFLAGS@ -+DEFS = @DEFS@ -+DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ -+DUMPBIN = @DUMPBIN@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+FGREP = @FGREP@ -+GREP = @GREP@ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LD = @LD@ -+LDFLAGS = @LDFLAGS@ -+LIBFLAGS = @LIBFLAGS@ -+LIBOBJS = @LIBOBJS@ -+LIBS = @LIBS@ -+LIBTOOL = @LIBTOOL@ -+LIPO = @LIPO@ -+LN_S = @LN_S@ -+LTLIBOBJS = @LTLIBOBJS@ -+LT_AGE = @LT_AGE@ -+LT_CURRENT = @LT_CURRENT@ -+LT_RELEASE = @LT_RELEASE@ -+LT_REVISION = @LT_REVISION@ -+MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ -+NM = @NM@ -+NMEDIT = @NMEDIT@ -+OBJDUMP = @OBJDUMP@ -+OBJEXT = @OBJEXT@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ -+PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_DESCRIPTION = @PACKAGE_DESCRIPTION@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ -+PLUGIN_DIR = @PLUGIN_DIR@ -+RANLIB = @RANLIB@ -+SED = @SED@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ -+STRIP = @STRIP@ -+TS_CONF = @TS_CONF@ -+VERSION = @VERSION@ -+VIS_CFLAGS = @VIS_CFLAGS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -+am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ -+am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+builddir = @builddir@ -+datadir = @datadir@ -+datarootdir = @datarootdir@ -+docdir = @docdir@ -+dvidir = @dvidir@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+htmldir = @htmldir@ -+includedir = @includedir@ -+infodir = @infodir@ -+install_sh = @install_sh@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localedir = @localedir@ -+localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ -+mandir = @mandir@ -+mkdir_p = @mkdir_p@ -+oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+psdir = @psdir@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ -+top_build_prefix = @top_build_prefix@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ -+SUBDIRS = etc src plugins tests -+EXTRA_DIST = autogen.sh -+ACLOCAL_AMFLAGS = -I m4/internal -I m4/external -+AUTOMAKE_OPTIONS = 1.6 -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = $(PACKAGE)-$(LT_RELEASE).pc -+all: config.h -+ $(MAKE) $(AM_MAKEFLAGS) all-recursive -+ -+.SUFFIXES: -+am--refresh: -+ @: -+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ -+ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ -+ $(am__cd) $(top_srcdir) && \ -+ $(AUTOMAKE) --gnu Makefile -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ echo ' $(SHELL) ./config.status'; \ -+ $(SHELL) ./config.status;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ $(SHELL) ./config.status --recheck -+ -+$(top_srcdir)/configure: $(am__configure_deps) -+ $(am__cd) $(srcdir) && $(AUTOCONF) -+$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -+$(am__aclocal_m4_deps): -+ -+config.h: stamp-h1 -+ @if test ! -f $@; then \ -+ rm -f stamp-h1; \ -+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ -+ else :; fi -+ -+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status -+ @rm -f stamp-h1 -+ cd $(top_builddir) && $(SHELL) ./config.status config.h -+$(srcdir)/config.h.in: $(am__configure_deps) -+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) -+ rm -f stamp-h1 -+ touch $@ -+ -+distclean-hdr: -+ -rm -f config.h stamp-h1 -+ -+mostlyclean-libtool: -+ -rm -f *.lo -+ -+clean-libtool: -+ -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool config.lt -+install-pkgconfigDATA: $(pkgconfig_DATA) -+ @$(NORMAL_INSTALL) -+ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" -+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ -+ for p in $$list; do \ -+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+ echo "$$d$$p"; \ -+ done | $(am__base_list) | \ -+ while read files; do \ -+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ -+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ -+ done -+ -+uninstall-pkgconfigDATA: -+ @$(NORMAL_UNINSTALL) -+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ -+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -+ test -n "$$files" || exit 0; \ -+ echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ -+ cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files -+ -+# This directory's subdirectories are mostly independent; you can cd -+# into them and run `make' without going through this Makefile. -+# To change the values of `make' variables: instead of editing Makefiles, -+# (1) if the variable is set in `config.status', edit `config.status' -+# (which will cause the Makefiles to be regenerated when you run `make'); -+# (2) otherwise, pass the desired values on the `make' command line. -+$(RECURSIVE_TARGETS): -+ @fail= failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ -+ dot_seen=no; \ -+ target=`echo $@ | sed s/-recursive//`; \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ echo "Making $$target in $$subdir"; \ -+ if test "$$subdir" = "."; then \ -+ dot_seen=yes; \ -+ local_target="$$target-am"; \ -+ else \ -+ local_target="$$target"; \ -+ fi; \ -+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -+ || eval $$failcom; \ -+ done; \ -+ if test "$$dot_seen" = "no"; then \ -+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ -+ fi; test -z "$$fail" -+ -+$(RECURSIVE_CLEAN_TARGETS): -+ @fail= failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ -+ dot_seen=no; \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ rev=''; for subdir in $$list; do \ -+ if test "$$subdir" = "."; then :; else \ -+ rev="$$subdir $$rev"; \ -+ fi; \ -+ done; \ -+ rev="$$rev ."; \ -+ target=`echo $@ | sed s/-recursive//`; \ -+ for subdir in $$rev; do \ -+ echo "Making $$target in $$subdir"; \ -+ if test "$$subdir" = "."; then \ -+ local_target="$$target-am"; \ -+ else \ -+ local_target="$$target"; \ -+ fi; \ -+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -+ || eval $$failcom; \ -+ done && test -z "$$fail" -+tags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -+ done -+ctags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -+ done -+ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ mkid -fID $$unique -+tags: TAGS -+ -+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ set x; \ -+ here=`pwd`; \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ include_option=--etags-include; \ -+ empty_fix=.; \ -+ else \ -+ include_option=--include; \ -+ empty_fix=; \ -+ fi; \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ -+ test ! -f $$subdir/TAGS || \ -+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ -+ fi; \ -+ done; \ -+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ shift; \ -+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ if test $$# -gt 0; then \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ "$$@" $$unique; \ -+ else \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$unique; \ -+ fi; \ -+ fi -+ctags: CTAGS -+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ test -z "$(CTAGS_ARGS)$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$unique -+ -+GTAGS: -+ here=`$(am__cd) $(top_builddir) && pwd` \ -+ && $(am__cd) $(top_srcdir) \ -+ && gtags -i $(GTAGS_ARGS) "$$here" -+ -+distclean-tags: -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+ -+distdir: $(DISTFILES) -+ $(am__remove_distdir) -+ test -d "$(distdir)" || mkdir "$(distdir)" -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ -+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -+ if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test -d "$(distdir)/$$file"; then \ -+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ -+ fi; \ -+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ -+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ -+ fi; \ -+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ -+ else \ -+ test -f "$(distdir)/$$file" \ -+ || cp -p $$d/$$file "$(distdir)/$$file" \ -+ || exit 1; \ -+ fi; \ -+ done -+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ -+ fi; \ -+ done -+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ -+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ -+ $(am__relativize); \ -+ new_distdir=$$reldir; \ -+ dir1=$$subdir; dir2="$(top_distdir)"; \ -+ $(am__relativize); \ -+ new_top_distdir=$$reldir; \ -+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ -+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ -+ ($(am__cd) $$subdir && \ -+ $(MAKE) $(AM_MAKEFLAGS) \ -+ top_distdir="$$new_top_distdir" \ -+ distdir="$$new_distdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ -+ am__skip_mode_fix=: \ -+ distdir) \ -+ || exit 1; \ -+ fi; \ -+ done -+ -test -n "$(am__skip_mode_fix)" \ -+ || find "$(distdir)" -type d ! -perm -755 \ -+ -exec chmod u+rwx,go+rx {} \; -o \ -+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ -+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ -+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ -+ || chmod -R a+r "$(distdir)" -+dist-gzip: distdir -+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -+ $(am__remove_distdir) -+dist-bzip2: distdir -+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 -+ $(am__remove_distdir) -+ -+dist-lzma: distdir -+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma -+ $(am__remove_distdir) -+ -+dist-xz: distdir -+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz -+ $(am__remove_distdir) -+ -+dist-tarZ: distdir -+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z -+ $(am__remove_distdir) -+ -+dist-shar: distdir -+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz -+ $(am__remove_distdir) -+ -+dist-zip: distdir -+ -rm -f $(distdir).zip -+ zip -rq $(distdir).zip $(distdir) -+ $(am__remove_distdir) -+ -+dist dist-all: distdir -+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 -+ $(am__remove_distdir) -+ -+# This target untars the dist file and tries a VPATH configuration. Then -+# it guarantees that the distribution is self-contained by making another -+# tarfile. -+distcheck: dist -+ case '$(DIST_ARCHIVES)' in \ -+ *.tar.gz*) \ -+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ -+ *.tar.bz2*) \ -+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ -+ *.tar.lzma*) \ -+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ -+ *.tar.xz*) \ -+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ -+ *.tar.Z*) \ -+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ -+ *.shar.gz*) \ -+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ -+ *.zip*) \ -+ unzip $(distdir).zip ;;\ -+ esac -+ chmod -R a-w $(distdir); chmod a+w $(distdir) -+ mkdir $(distdir)/_build -+ mkdir $(distdir)/_inst -+ chmod a-w $(distdir) -+ test -d $(distdir)/_build || exit 0; \ -+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ -+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ -+ && am__cwd=`pwd` \ -+ && $(am__cd) $(distdir)/_build \ -+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ -+ $(DISTCHECK_CONFIGURE_FLAGS) \ -+ && $(MAKE) $(AM_MAKEFLAGS) \ -+ && $(MAKE) $(AM_MAKEFLAGS) dvi \ -+ && $(MAKE) $(AM_MAKEFLAGS) check \ -+ && $(MAKE) $(AM_MAKEFLAGS) install \ -+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ -+ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ -+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ -+ distuninstallcheck \ -+ && chmod -R a-w "$$dc_install_base" \ -+ && ({ \ -+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ -+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ -+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ -+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ -+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ -+ } || { rm -rf "$$dc_destdir"; exit 1; }) \ -+ && rm -rf "$$dc_destdir" \ -+ && $(MAKE) $(AM_MAKEFLAGS) dist \ -+ && rm -rf $(DIST_ARCHIVES) \ -+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ -+ && cd "$$am__cwd" \ -+ || exit 1 -+ $(am__remove_distdir) -+ @(echo "$(distdir) archives ready for distribution: "; \ -+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ -+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' -+distuninstallcheck: -+ @$(am__cd) '$(distuninstallcheck_dir)' \ -+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ -+ || { echo "ERROR: files left after uninstall:" ; \ -+ if test -n "$(DESTDIR)"; then \ -+ echo " (check DESTDIR support)"; \ -+ fi ; \ -+ $(distuninstallcheck_listfiles) ; \ -+ exit 1; } >&2 -+distcleancheck: distclean -+ @if test '$(srcdir)' = . ; then \ -+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ -+ exit 1 ; \ -+ fi -+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ -+ || { echo "ERROR: files left in build directory after distclean:" ; \ -+ $(distcleancheck_listfiles) ; \ -+ exit 1; } >&2 -+check-am: all-am -+check: check-recursive -+all-am: Makefile $(DATA) config.h -+installdirs: installdirs-recursive -+installdirs-am: -+ for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done -+install: install-recursive -+install-exec: install-exec-recursive -+install-data: install-data-recursive -+uninstall: uninstall-recursive -+ -+install-am: all-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ -+installcheck: installcheck-recursive -+install-strip: -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+mostlyclean-generic: -+ -+clean-generic: -+ -+distclean-generic: -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) -+ -+maintainer-clean-generic: -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+clean: clean-recursive -+ -+clean-am: clean-generic clean-libtool mostlyclean-am -+ -+distclean: distclean-recursive -+ -rm -f $(am__CONFIG_DISTCLEAN_FILES) -+ -rm -f Makefile -+distclean-am: clean-am distclean-generic distclean-hdr \ -+ distclean-libtool distclean-tags -+ -+dvi: dvi-recursive -+ -+dvi-am: -+ -+html: html-recursive -+ -+html-am: -+ -+info: info-recursive -+ -+info-am: -+ -+install-data-am: install-pkgconfigDATA -+ -+install-dvi: install-dvi-recursive -+ -+install-dvi-am: -+ -+install-exec-am: -+ -+install-html: install-html-recursive -+ -+install-html-am: -+ -+install-info: install-info-recursive -+ -+install-info-am: -+ -+install-man: -+ -+install-pdf: install-pdf-recursive -+ -+install-pdf-am: -+ -+install-ps: install-ps-recursive -+ -+install-ps-am: -+ -+installcheck-am: -+ -+maintainer-clean: maintainer-clean-recursive -+ -rm -f $(am__CONFIG_DISTCLEAN_FILES) -+ -rm -rf $(top_srcdir)/autom4te.cache -+ -rm -f Makefile -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-recursive -+ -+mostlyclean-am: mostlyclean-generic mostlyclean-libtool -+ -+pdf: pdf-recursive -+ -+pdf-am: -+ -+ps: ps-recursive -+ -+ps-am: -+ -+uninstall-am: uninstall-pkgconfigDATA -+ -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ -+ ctags-recursive install-am install-strip tags-recursive -+ -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am am--refresh check check-am clean clean-generic \ -+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ -+ dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ -+ distcheck distclean distclean-generic distclean-hdr \ -+ distclean-libtool distclean-tags distcleancheck distdir \ -+ distuninstallcheck dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-pkgconfigDATA install-ps \ -+ install-ps-am install-strip installcheck installcheck-am \ -+ installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -+ uninstall uninstall-am uninstall-pkgconfigDATA -+ ++# This is to help aclocal find these macros, as it can't see m4_define. ++AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) + -+# Tell versions [3.59,3.63) of GNU make to not export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: ++m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) ++m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) ++m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) ++m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) ++m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) ++m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) ++m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) ++m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) ++m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) ++m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) ++m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) ++m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) ++m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) ++m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) ++m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) ++m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) ++m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) ++m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) ++m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) ++m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) ++m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) ++m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) ++m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) ++m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) ++m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) ++m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) ++m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) ++m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) ++m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) ++m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) ++m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) ++m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) ++m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) ++m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) ++m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) ++m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) ++m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) ++m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) ++m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) ++m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) ++m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) ++m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) ++m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) ++m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) ++m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) ++m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) ++m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) ++m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) ++m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) ++m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) ++m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) ++m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) ++m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) ++m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) ++m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) diff -Nur tslib-1.0.orig/missing tslib-1.0/missing --- tslib-1.0.orig/missing 1970-01-01 01:00:00.000000000 +0100 -+++ tslib-1.0/missing 2010-02-19 00:24:15.184855268 +0100 ++++ tslib-1.0/missing 2010-07-29 13:39:16.000000000 +0200 @@ -0,0 +1,376 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. @@ -42595,7 +42595,7 @@ diff -Nur tslib-1.0.orig/missing tslib-1.0/missing +# End: diff -Nur tslib-1.0.orig/plugins/Makefile.in tslib-1.0/plugins/Makefile.in --- tslib-1.0.orig/plugins/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ tslib-1.0/plugins/Makefile.in 2010-02-19 00:24:15.516853426 +0100 ++++ tslib-1.0/plugins/Makefile.in 2010-07-29 13:39:16.000000000 +0200 @@ -0,0 +1,746 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ @@ -43345,7 +43345,7 @@ diff -Nur tslib-1.0.orig/plugins/Makefile.in tslib-1.0/plugins/Makefile.in +.NOEXPORT: diff -Nur tslib-1.0.orig/src/Makefile.in tslib-1.0/src/Makefile.in --- tslib-1.0.orig/src/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ tslib-1.0/src/Makefile.in 2010-02-19 00:24:15.660852771 +0100 ++++ tslib-1.0/src/Makefile.in 2010-07-29 13:39:16.000000000 +0200 @@ -0,0 +1,594 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ @@ -43943,7 +43943,7 @@ diff -Nur tslib-1.0.orig/src/Makefile.in tslib-1.0/src/Makefile.in +.NOEXPORT: diff -Nur tslib-1.0.orig/tests/Makefile.in tslib-1.0/tests/Makefile.in --- tslib-1.0.orig/tests/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ tslib-1.0/tests/Makefile.in 2010-02-19 00:24:15.824854936 +0100 ++++ tslib-1.0/tests/Makefile.in 2010-07-29 13:39:16.000000000 +0200 @@ -0,0 +1,584 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ |