Merge branch 'master' of git+ssh://openadk.org/git/openadk

18 files changed, 99 insertions, 345059 deletions

diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index fc5366e61..05a6c007b 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -19,7 +19,7 @@ PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_
 PKG_NOPARALLEL:=	1
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el
+PKG_ARCH_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el native
 PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 01164ec2c..84e6474c9 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -28,6 +28,7 @@ $(eval $(call PKG_template,LIBFUSE_DEV,libfuse-dev,${PKG_VERSION}-${PKG_RELEASE}
 CONFIGURE_ARGS+=	--enable-lib \
 			--enable-util \
 			--enable-example \
+			--with-libiconv-prefix="${STAGING_TARGET_DIR}/usr" \
 			--disable-auto-modprobe \
 			--disable-mtab \
 			--disable-kernel-module
diff --git a/package/gdbm/Makefile b/package/gdbm/Makefile
index 42dfeacfd..7f4283e70 100644
--- a/package/gdbm/Makefile
+++ b/package/gdbm/Makefile
@@ -12,18 +12,23 @@ PKG_SECTION:=		libs
 PKG_URL:=		http://www.gnu.org/software/gdbm/
 PKG_SITES:=		${MASTER_SITE_GNU:=gdbm/}
 
-PKG_SUBPKGS:=		LIBGDBM
+PKG_SUBPKGS:=		LIBGDBM LIBGDBM_DEV
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBGDBM,libgdbm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBGDBM_DEV,libgdbm-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 XAKE_FLAGS+=		BINOWN=`id -u` \
 			BINGRP=`id -g` \
 			INSTALL_ROOT="${WRKINST}"
 
-post-install:
+libgdbm-install:
 	${INSTALL_DIR} ${IDIR_LIBGDBM}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libgdbm.so* ${IDIR_LIBGDBM}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libgdbm.so* ${IDIR_LIBGDBM}/usr/lib
+
+libgdbm-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBGDBM_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBGDBM_DEV}/usr/include
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/grep/Makefile b/package/grep/Makefile
index b59a2f69f..4227e3a45 100644
--- a/package/grep/Makefile
+++ b/package/grep/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		grep
-PKG_VERSION:=		2.5.4
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		92258031d98d4f12dfc6a6d24057e672
+PKG_VERSION:=		2.7
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		e848f07e3e79aa7899345d17c7e4115e
 PKG_DESCR:=		global search for a regular expression and print out matched lines
 PKG_SECTION:=		utils
 PKG_DEPENDS:=		libpcre
@@ -19,6 +19,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GREP,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_LDFLAGS+=	-liconv
 CONFIGURE_ARGS+=	--without-included-regex
 
 post-install:
diff --git a/package/grep/patches/patch-src_system_h b/package/grep/patches/patch-src_system_h
deleted file mode 100644
index 1eb3e7f03..000000000
--- a/package/grep/patches/patch-src_system_h
+++ /dev/null
@@ -1,18 +0,0 @@
---- grep-2.5.4.orig/src/system.h	2009-01-31 06:39:54.000000000 +0100
-+++ grep-2.5.4/src/system.h	2010-05-29 00:08:24.703125000 +0200
-@@ -56,6 +56,7 @@ extern char *sys_errlist[];
- #ifdef __BEOS__
- # undef O_BINARY /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */
- #endif
-+/*
- #ifdef HAVE_DOS_FILE_CONTENTS
- # include <io.h>
- # ifdef HAVE_SETMODE
-@@ -64,6 +65,7 @@ extern char *sys_errlist[];
- #  define SET_BINARY(fd)  _setmode (fd, O_BINARY)
- # endif
- #endif
-+*/
- 
- #ifdef HAVE_DOS_FILE_NAMES
- # define IS_SLASH(c) ((c) == '/' || (c) == '\\')
diff --git a/package/gzip/Makefile b/package/gzip/Makefile
new file mode 100644
index 000000000..bb6513099
--- /dev/null
+++ b/package/gzip/Makefile
@@ -0,0 +1,25 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		gzip
+PKG_VERSION:=		1.2.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		618b61219aa2d812893281bf6c66f158
+PKG_DESCR:=		a compression utility
+PKG_SECTION:=		archive
+PKG_URL:=		http://www.gzip.org/
+PKG_SITES:=		${MASTER_SITE_GNU:=gzip/}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GZIP,gzip,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+FAKE_FLAGS+=		prefix=${WRKINST}
+
+gzip-install:
+	$(INSTALL_DIR) $(IDIR_GZIP)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/bin/{gunzip,zcat,zgrep,gzip} $(IDIR_GZIP)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libIDL/Makefile b/package/libIDL/Makefile
index 749782019..89c0311d6 100644
--- a/package/libIDL/Makefile
+++ b/package/libIDL/Makefile
@@ -17,10 +17,19 @@ include $(TOPDIR)/mk/package.mk
 CONFIGURE_ENV+=		libIDL_cv_long_long_format=ll
 
 $(eval $(call PKG_template,LIBIDL,libidl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBIDL_DEV,libidl-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-post-install:
+libidl-install:
 	$(INSTALL_DIR) $(IDIR_LIBIDL)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libIDL*.so* \
 		$(IDIR_LIBIDL)/usr/lib
 
+libidl-dev-install:
+	$(INSTALL_DIR) $(IDIR_LIBIDL_DEV)/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/libIDL-config-2 \
+		$(IDIR_LIBIDL_DEV)/usr/bin
+	$(INSTALL_DIR) $(IDIR_LIBIDL_DEV)/usr/lib/pkgconfig
+	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
+		$(IDIR_LIBIDL_DEV)/usr/lib/pkgconfig
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libIDL/patches/patch-Makefile_in b/package/libIDL/patches/patch-Makefile_in
new file mode 100644
index 000000000..a1291b434
--- /dev/null
+++ b/package/libIDL/patches/patch-Makefile_in
@@ -0,0 +1,20 @@
+--- libIDL-0.8.14.orig/Makefile.in	2010-03-30 12:37:04.000000000 +0200
++++ libIDL-0.8.14/Makefile.in	2011-03-01 22:26:10.000000000 +0100
+@@ -37,7 +37,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-noinst_PROGRAMS = tstidl$(EXEEXT)
++noinst_PROGRAMS = 
+ subdir = .
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/Makefile.msc.in \
+@@ -1276,7 +1276,7 @@ lexer.c: $(srcdir)/lexer.l parser.h
+ 	$(AM_V_GEN) $(LEX) $(LFLAGS) -t $(srcdir)/lexer.l | sed -e 's/yy/__IDL_/g' >$@
+ 
+ stamp-parser: $(srcdir)/parser.y
+-	$(AM_V_GEN) $(YACC) $(YFLAGS) $(srcdir)/parser.y
++	-$(AM_V_GEN) $(YACC) $(YFLAGS) $(srcdir)/parser.y
+ 	@touch $@
+ 
+ parser.c: stamp-parser
diff --git a/package/libfontenc/Makefile b/package/libfontenc/Makefile
index bc40cd015..0b9193798 100644
--- a/package/libfontenc/Makefile
+++ b/package/libfontenc/Makefile
@@ -13,10 +13,14 @@ PKG_DEPENDS:=		zlib
 PKG_BUILDDEP:=		xproto zlib
 PKG_SITES:=		${MASTER_SITE_XORG}
 
+PKG_SUBPKGS:=		LIBFONTENC LIBFONTENC_DEV
+PKGSC_LIBFONTENC_DEV:=	devel
+PKGSD_LIBFONTENC_DEV:=	libfontenc headers
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBFONTENC,libfontenc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBFONTENC_DEV,libfontenc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBFONTENC_DEV,libfontenc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBFONTENC_DEV},${PKGSC_LIBFONTENC_DEV}))
 
 libfontenc-install:
 	${INSTALL_DIR} ${IDIR_LIBFONTENC}/usr/lib
diff --git a/package/libgssglue/Makefile b/package/libgssglue/Makefile
index 4cd325af8..4cb96da37 100644
--- a/package/libgssglue/Makefile
+++ b/package/libgssglue/Makefile
@@ -11,17 +11,24 @@ PKG_DESCR:=		GSS glue library for NFSv4
 PKG_SECTION:=		libs
 PKG_SITES:=		http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/
 
+PKG_SUBPKGS:=		LIBGSSGLUE LIBGSSGLUE_DEV
+PKGSD_LIBGSSGLUE_DEV:=	GSS glue headers for NFSv4
+PKGSC_LIBGSSGLUE_DEV:=	devel
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBGSSGLUE,libgssglue,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBGSSGLUE_DEV,libgssglue-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBGSSGLUE_DEV,libgssglue-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGSSGLUE_DEV},${PKGSC_LIBGSSGLUE_DEV}))
 
 libgssglue-install:
 	$(INSTALL_DIR) $(IDIR_LIBGSSGLUE)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libgssglue.so* $(IDIR_LIBGSSGLUE)/usr/lib/
+	$(CP) $(WRKINST)/usr/lib/libgssglue.so* $(IDIR_LIBGSSGLUE)/usr/lib
 
 libgssglue-dev-install:
 	$(INSTALL_DIR) $(IDIR_LIBGSSGLUE_DEV)/usr/include
 	${CP} $(WRKINST)/usr/include/* $(IDIR_LIBGSSGLUE_DEV)/usr/include
+	$(INSTALL_DIR) $(IDIR_LIBGSSGLUE_DEV)/usr/lib/pkgconfig
+	${INSTALL_DATA} $(WRKINST)/usr/lib/pkgconfig/libgssglue.pc \
+		$(IDIR_LIBGSSGLUE_DEV)/usr/lib/pkgconfig
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index 6b2f09072..1c97682c7 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -37,6 +37,7 @@ CONFIGURE_ARGS+=	--enable-ipv6
 else
 CONFIGURE_ARGS+=	--disable-ipv6
 endif
+XAKE_FLAGS+=		M4=m4
 
 libpcap-install:
 	${INSTALL_DIR} ${IDIR_LIBPCAP}/usr/lib
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index ef8433da8..940cf91a3 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -27,10 +27,9 @@ ifeq (${ADK_HOST_OPENBSD},y)
 XAKE_FLAGS+=		AUTOCONF_VERSION=2.62
 endif
 
-CONFIGURE_ARGS+=	--enable-ltdl-install \
-			--disable-cxx
+CONFIGURE_ARGS+=	--enable-ltdl-install
 
-post-install:
+libtool-install:
 	${INSTALL_DIR} ${IDIR_LIBTOOL}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/libtool ${IDIR_LIBTOOL}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/libtoolize ${IDIR_LIBTOOL}/usr/bin
diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile
index b854a4b4f..a50dec13f 100644
--- a/package/libxcb/Makefile
+++ b/package/libxcb/Makefile
@@ -12,8 +12,7 @@ PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		python2 libpthread-stubs libxslt libXau xcb-proto
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_SUBPKGS:=		LIBXCB LIBXCB_DEVEL
-
+PKG_SUBPKGS:=		LIBXCB LIBXCB_DEV
 PKGSD_LIBXCB_DEV:=	XML-XCB protocol headers
 PKGSS_LIBXCB_DEV:=	libxcb
 PKGSC_LIBXCB_DEV:=	x11/devel
diff --git a/package/monit/Makefile b/package/monit/Makefile
index d507d1abc..3ba33eef1 100644
--- a/package/monit/Makefile
+++ b/package/monit/Makefile
@@ -16,14 +16,14 @@ PKG_SITES:=		http://www.tildeslash.com/monit/dist/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,MONIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MONIT,monit,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--with-ssl --with-ssl-dir="${STAGING_TARGET_DIR}/usr"
 
-post-install:
+monit-install:
 	${INSTALL_DIR} ${IDIR_MONIT}/etc
-	install -m0600 ${WRKBUILD}/monitrc ${IDIR_MONIT}/etc/
+	install -m0600 ${WRKBUILD}/monitrc ${IDIR_MONIT}/etc
 	${INSTALL_DIR} ${IDIR_MONIT}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/monit ${IDIR_MONIT}/usr/sbin/monit
+	${INSTALL_BIN} ${WRKBUILD}/monit ${IDIR_MONIT}/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/python2/Makefile b/package/python2/Makefile
index 0af3abe5c..4c72c2e1c 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -63,6 +63,6 @@ post-install:
 	${CP} ${WRKINST}/usr/include/python2.7/* ${IDIR_PYTHON2}/usr/include/python2.7
 	-find ${IDIR_PYTHON2} -name "\*.pyc" -o -name "*\.pyo" -exec rm {} \;
 	# workaround, copy host python-config to target scripts directory
-	${CP} ${STAGING_HOST_DIR}/usr/bin/python*-config ${STAGING_TARGET_DIR}/scripts
+	${CP} ${STAGING_HOST_DIR}/usr/bin/python*-config ${STAGING_DIR}/scripts
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/squid/Makefile b/package/squid/Makefile
index 2fce59548..392b42cdf 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		squid
-PKG_VERSION:=		3.1.4
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		c70ef1198e6a6c1ae80bc57cd3592e36
+PKG_VERSION:=		3.1.11
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		08de963a4d0ba86c59d33af89fa46384
 PKG_DESCR:=		squid web and cache proxy
 PKG_SECTION:=		proxy
 PKG_DEPENDS:=		libopenssl libpthread
@@ -98,7 +98,8 @@ CONFIGURE_ENV+=		ac_cv_sizeof_void_p=4 \
 			ac_cv_epoll_works=yes \
 			ac_cv_lib_nsl_main=no \
 			ac_cv_func_strnstr=no \
-			squid_cv_pf_inet6=yes
+			squid_cv_pf_inet6=yes \
+			ac_cv_have_squid=yes
 XAKE_FLAGS+=		MKDIR_P="mkdir -p"
 CONFIGURE_ARGS+=	--datadir=/usr/share/squid \
 			--libexecdir=/usr/lib/squid \
diff --git a/package/squid/patches/autotool.patch b/package/squid/patches/autotool.patch
deleted file mode 100644
index cccadad14..000000000
--- a/package/squid/patches/autotool.patch
+++ /dev/null
@@ -1,345016 +0,0 @@
-diff -Nur squid-3.1.4.orig/aclocal.m4 squid-3.1.4/aclocal.m4
---- squid-3.1.4.orig/aclocal.m4	2010-05-30 15:21:20.000000000 +0200
-+++ squid-3.1.4/aclocal.m4	2010-06-11 18:57:29.141613640 +0200
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
- 
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
- # 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.
-@@ -13,108 +13,194 @@
- 
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(AC_AUTOCONF_VERSION, [2.62],,
--[m4_warning([this file was generated for autoconf 2.62.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-+[m4_warning([this file was generated for autoconf 2.65.
- You have another version of autoconf.  It may work, but is not guaranteed to.
- If you have problems, you may need to regenerate the build system entirely.
- To do so, use the procedure documented by the package, typically `autoreconf'.])])
- 
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-+#
-+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-+#                 2006, 2007, 2008 Free Software Foundation, Inc.
-+#   Written by Gordon Matzigkeit, 1996
-+#
-+# 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.
-+
-+m4_define([_LT_COPYING], [dnl
-+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-+#                 2006, 2007, 2008 Free Software Foundation, Inc.
-+#   Written by Gordon Matzigkeit, 1996
-+#
-+#   This file is part of GNU Libtool.
-+#
-+# GNU Libtool is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License as
-+# published by the Free Software Foundation; either version 2 of
-+# the License, or (at your option) any later version.
-+#
-+# As a special exception to the GNU General Public License,
-+# if you distribute this file as part of a program or library that
-+# is built using GNU Libtool, you may include this file under the
-+# same distribution terms that you use for the rest of that program.
-+#
-+# GNU Libtool is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with GNU Libtool; see the file COPYING.  If not, a copy
-+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-+# obtained by writing to the Free Software Foundation, Inc.,
-+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+])
- 
--# serial 52 AC_PROG_LIBTOOL
-+# serial 56 LT_INIT
- 
- 
--# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
--# -----------------------------------------------------------
--# If this macro is not defined by Autoconf, define it here.
--m4_ifdef([AC_PROVIDE_IFELSE],
--         [],
--         [m4_define([AC_PROVIDE_IFELSE],
--	         [m4_ifdef([AC_PROVIDE_$1],
--		           [$2], [$3])])])
-+# LT_PREREQ(VERSION)
-+# ------------------
-+# Complain and exit if this libtool version is less that VERSION.
-+m4_defun([LT_PREREQ],
-+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-+       [m4_default([$3],
-+		   [m4_fatal([Libtool version $1 or higher is required],
-+		             63)])],
-+       [$2])])
- 
- 
--# AC_PROG_LIBTOOL
--# ---------------
--AC_DEFUN([AC_PROG_LIBTOOL],
--[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
--dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
--dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
--  AC_PROVIDE_IFELSE([AC_PROG_CXX],
--    [AC_LIBTOOL_CXX],
--    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
--  ])])
--dnl And a similar setup for Fortran 77 support
--  AC_PROVIDE_IFELSE([AC_PROG_F77],
--    [AC_LIBTOOL_F77],
--    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
--])])
--
--dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
--dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
--dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
--  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
--    [AC_LIBTOOL_GCJ],
--    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
--      [AC_LIBTOOL_GCJ],
--      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
--	[AC_LIBTOOL_GCJ],
--      [ifdef([AC_PROG_GCJ],
--	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
--       ifdef([A][M_PROG_GCJ],
--	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
--       ifdef([LT_AC_PROG_GCJ],
--	     [define([LT_AC_PROG_GCJ],
--		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
--])])# AC_PROG_LIBTOOL
-+# _LT_CHECK_BUILDDIR
-+# ------------------
-+# Complain if the absolute build directory name contains unusual characters
-+m4_defun([_LT_CHECK_BUILDDIR],
-+[case `pwd` in
-+  *\ * | *\	*)
-+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-+esac
-+])
- 
- 
--# _AC_PROG_LIBTOOL
--# ----------------
--AC_DEFUN([_AC_PROG_LIBTOOL],
--[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
--AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
--AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
--AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-+# LT_INIT([OPTIONS])
-+# ------------------
-+AC_DEFUN([LT_INIT],
-+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-+AC_BEFORE([$0], [LT_LANG])dnl
-+AC_BEFORE([$0], [LT_OUTPUT])dnl
-+AC_BEFORE([$0], [LTDL_INIT])dnl
-+m4_require([_LT_CHECK_BUILDDIR])dnl
-+
-+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-+dnl unless we require an AC_DEFUNed macro:
-+AC_REQUIRE([LTOPTIONS_VERSION])dnl
-+AC_REQUIRE([LTSUGAR_VERSION])dnl
-+AC_REQUIRE([LTVERSION_VERSION])dnl
-+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-+m4_require([_LT_PROG_LTMAIN])dnl
-+
-+dnl Parse OPTIONS
-+_LT_SET_OPTIONS([$0], [$1])
- 
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="$ltmain"
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- AC_SUBST(LIBTOOL)dnl
- 
--# Prevent multiple expansion
--define([AC_PROG_LIBTOOL], [])
--])# _AC_PROG_LIBTOOL
-+_LT_SETUP
- 
-+# Only expand once:
-+m4_define([LT_INIT])
-+])# LT_INIT
-+
-+# Old names:
-+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
- 
--# AC_LIBTOOL_SETUP
--# ----------------
--AC_DEFUN([AC_LIBTOOL_SETUP],
--[AC_PREREQ(2.50)dnl
--AC_REQUIRE([AC_ENABLE_SHARED])dnl
--AC_REQUIRE([AC_ENABLE_STATIC])dnl
--AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+
-+# _LT_CC_BASENAME(CC)
-+# -------------------
-+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-+m4_defun([_LT_CC_BASENAME],
-+[for cc_temp in $1""; do
-+  case $cc_temp in
-+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+])
-+
-+
-+# _LT_FILEUTILS_DEFAULTS
-+# ----------------------
-+# It is okay to use these file commands and assume they have been set
-+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-+m4_defun([_LT_FILEUTILS_DEFAULTS],
-+[: ${CP="cp -f"}
-+: ${MV="mv -f"}
-+: ${RM="rm -f"}
-+])# _LT_FILEUTILS_DEFAULTS
-+
-+
-+# _LT_SETUP
-+# ---------
-+m4_defun([_LT_SETUP],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
- AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+_LT_DECL([], [host_alias], [0], [The host system])dnl
-+_LT_DECL([], [host], [0])dnl
-+_LT_DECL([], [host_os], [0])dnl
-+dnl
-+_LT_DECL([], [build_alias], [0], [The build system])dnl
-+_LT_DECL([], [build], [0])dnl
-+_LT_DECL([], [build_os], [0])dnl
-+dnl
- AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_PROG_LD])dnl
--AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
--AC_REQUIRE([AC_PROG_NM])dnl
--
-+AC_REQUIRE([LT_PATH_LD])dnl
-+AC_REQUIRE([LT_PATH_NM])dnl
-+dnl
- AC_REQUIRE([AC_PROG_LN_S])dnl
--AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
--# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
--AC_REQUIRE([AC_OBJEXT])dnl
--AC_REQUIRE([AC_EXEEXT])dnl
-+test -z "$LN_S" && LN_S="ln -s"
-+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
- dnl
--AC_LIBTOOL_SYS_MAX_CMD_LEN
--AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
--AC_LIBTOOL_OBJDIR
-+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-+dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-+m4_require([_LT_CMD_RELOAD])dnl
-+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-+
-+_LT_CONFIG_LIBTOOL_INIT([
-+# See if we are running on zsh, and set the options which allow our
-+# commands through without removal of \ escapes INIT.
-+if test -n "\${ZSH_VERSION+set}" ; then
-+   setopt NO_GLOB_SUBST
-+fi
-+])
-+if test -n "${ZSH_VERSION+set}" ; then
-+   setopt NO_GLOB_SUBST
-+fi
- 
--AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
--_LT_AC_PROG_ECHO_BACKSLASH
-+_LT_CHECK_OBJDIR
-+
-+m4_require([_LT_TAG_COMPILER])dnl
-+_LT_PROG_ECHO_BACKSLASH
- 
- case $host_os in
- aix3*)
-@@ -130,116 +216,653 @@
- 
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
--Xsed='sed -e 1s/^X//'
--[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
- 
- # Same as above, but do not quote variable references.
--[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
- 
- # Sed substitution to delay expansion of an escaped shell variable in a
- # double_quote_subst'ed string.
- delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
- 
-+# Sed substitution to delay expansion of an escaped single quote.
-+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-+
- # Sed substitution to avoid accidental globbing in evaled expressions
- no_glob_subst='s/\*/\\\*/g'
- 
--# Constants:
--rm="rm -f"
--
- # Global variables:
--default_ofile=libtool
-+ofile=libtool
- can_build_shared=yes
- 
- # All known linkers require a `.a' archive for static linking (except MSVC,
- # which needs '.lib').
- libext=a
--ltmain="$ac_aux_dir/ltmain.sh"
--ofile="$default_ofile"
--with_gnu_ld="$lt_cv_prog_gnu_ld"
- 
--AC_CHECK_TOOL(AR, ar, false)
--AC_CHECK_TOOL(RANLIB, ranlib, :)
--AC_CHECK_TOOL(STRIP, strip, :)
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
- 
- old_CC="$CC"
- old_CFLAGS="$CFLAGS"
- 
- # Set sane defaults for various variables
--test -z "$AR" && AR=ar
--test -z "$AR_FLAGS" && AR_FLAGS=cru
--test -z "$AS" && AS=as
- test -z "$CC" && CC=cc
- test -z "$LTCC" && LTCC=$CC
- test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
--test -z "$DLLTOOL" && DLLTOOL=dlltool
- test -z "$LD" && LD=ld
--test -z "$LN_S" && LN_S="ln -s"
--test -z "$MAGIC_CMD" && MAGIC_CMD=file
--test -z "$NM" && NM=nm
--test -z "$SED" && SED=sed
--test -z "$OBJDUMP" && OBJDUMP=objdump
--test -z "$RANLIB" && RANLIB=:
--test -z "$STRIP" && STRIP=:
- test -z "$ac_objext" && ac_objext=o
- 
--# Determine commands to create old-style static archives.
--old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
--old_postinstall_cmds='chmod 644 $oldlib'
--old_postuninstall_cmds=
--
--if test -n "$RANLIB"; then
--  case $host_os in
--  openbsd*)
--    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
--    ;;
--  *)
--    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
--    ;;
--  esac
--  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
--fi
--
- _LT_CC_BASENAME([$compiler])
- 
- # Only perform the check for file, if the check method requires it
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
- case $deplibs_check_method in
- file_magic*)
-   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
--    AC_PATH_MAGIC
-+    _LT_PATH_MAGIC
-   fi
-   ;;
- esac
- 
--_LT_REQUIRED_DARWIN_CHECKS
-+# Use C for the default configuration in the libtool script
-+LT_SUPPORTED_TAG([CC])
-+_LT_LANG_C_CONFIG
-+_LT_LANG_DEFAULT_CONFIG
-+_LT_CONFIG_COMMANDS
-+])# _LT_SETUP
-+
- 
--AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
--AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
--enable_win32_dll=yes, enable_win32_dll=no)
--
--AC_ARG_ENABLE([libtool-lock],
--    [AC_HELP_STRING([--disable-libtool-lock],
--	[avoid locking (might break parallel builds)])])
--test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+# _LT_PROG_LTMAIN
-+# ---------------
-+# Note that this code is called both from `configure', and `config.status'
-+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-+# `config.status' has no value for ac_aux_dir unless we are using Automake,
-+# so we pass a copy along to make sure it has a sensible value anyway.
-+m4_defun([_LT_PROG_LTMAIN],
-+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-+ltmain="$ac_aux_dir/ltmain.sh"
-+])# _LT_PROG_LTMAIN
- 
--AC_ARG_WITH([pic],
--    [AC_HELP_STRING([--with-pic],
--	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
--    [pic_mode="$withval"],
--    [pic_mode=default])
--test -z "$pic_mode" && pic_mode=default
- 
--# Use C for the default configuration in the libtool script
--tagname=
--AC_LIBTOOL_LANG_C_CONFIG
--_LT_AC_TAGCONFIG
--])# AC_LIBTOOL_SETUP
-+
-+# So that we can recreate a full libtool script including additional
-+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-+# in macros and then make a single call at the end using the `libtool'
-+# label.
-+
-+
-+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-+# ----------------------------------------
-+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-+m4_define([_LT_CONFIG_LIBTOOL_INIT],
-+[m4_ifval([$1],
-+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-+                     [$1
-+])])])
-+
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-+
-+
-+# _LT_CONFIG_LIBTOOL([COMMANDS])
-+# ------------------------------
-+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-+m4_define([_LT_CONFIG_LIBTOOL],
-+[m4_ifval([$1],
-+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-+                     [$1
-+])])])
-+
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-+
-+
-+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-+# -----------------------------------------------------
-+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-+[_LT_CONFIG_LIBTOOL([$1])
-+_LT_CONFIG_LIBTOOL_INIT([$2])
-+])
-+
-+
-+# _LT_FORMAT_COMMENT([COMMENT])
-+# -----------------------------
-+# Add leading comment marks to the start of each line, and a trailing
-+# full-stop to the whole comment if one is not present already.
-+m4_define([_LT_FORMAT_COMMENT],
-+[m4_ifval([$1], [
-+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-+)])
-+
-+
-+
-+
-+
-+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-+# -------------------------------------------------------------------
-+# CONFIGNAME is the name given to the value in the libtool script.
-+# VARNAME is the (base) name used in the configure script.
-+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-+# VARNAME.  Any other value will be used directly.
-+m4_define([_LT_DECL],
-+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-+	[m4_ifval([$1], [$1], [$2])])
-+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-+    m4_ifval([$4],
-+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-+    lt_dict_add_subkey([lt_decl_dict], [$2],
-+	[tagged?], [m4_ifval([$5], [yes], [no])])])
-+])
-+
-+
-+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-+# --------------------------------------------------------
-+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-+
-+
-+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-+# ------------------------------------------------
-+m4_define([lt_decl_tag_varnames],
-+[_lt_decl_filter([tagged?], [yes], $@)])
-+
-+
-+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-+# ---------------------------------------------------------
-+m4_define([_lt_decl_filter],
-+[m4_case([$#],
-+  [0], [m4_fatal([$0: too few arguments: $#])],
-+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-+  [3], [lt_dict_filter([lt_decl_dict],