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

66 files changed, 701 insertions, 300029 deletions

diff --git a/TODO b/TODO
index 931047f23..2ec96bcab 100644
--- a/TODO
+++ b/TODO
@@ -6,6 +6,7 @@
 - check for gcc and SSP again
 - port full blown perl
 - port w3m
+- update valgrind
 - port libcec for xbmc
 - check xbmc samba/nfs support
 - add support for librtmp in xbmc
diff --git a/mk/build.mk b/mk/build.mk
index f784c99db..b44247005 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -18,13 +18,9 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_SIMPLE_NETWORK_CONFIG=n \
 			ADK_USE_CCACHE=n \
 			ADK_TOOLCHAIN_GDB=n \
-			ADK_PACKAGE_LIBAU=n \
 			ADK_PACKAGE_E2FSCK_STATIC=n \
-			ADK_PACKAGE_AUFS2_UTIL=n \
 			ADK_PACKAGE_KEXECINIT=n \
 			ADK_PACKAGE_INSTALLER=n \
-			ADK_PACKAGE_CXXTOOLS_DEV=n \
-			ADK_PACKAGE_XORG_SERVER_DEV=n \
 			ADK_PACKAGE_LM_SENSORS_DETECT=n \
 			ADK_PACKAGE_PACEMAKER=n \
 			ADK_PACKAGE_PACEMAKER_MGMTD=n \
@@ -37,20 +33,14 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_GRUB=n \
 			ADK_PACKAGE_BASE_FILES=y \
 			ADK_PACKAGE_CRYPTINIT=n \
-			ADK_PACKAGE_HEIMDAL_SERVER=n \
-			ADK_PACKAGE_LIBHEIMDAL=n \
 			ADK_PACKAGE_PAM=n \
-			ADK_PACKAGE_PYTHON=n \
 			ADK_PACKAGE_VIRTINST=n \
 			ADK_PACKAGE_URLGRABBER=n \
 			ADK_PACKAGE_PERL=n \
 			ADK_PACKAGE_LIBSSP=n \
-			ADK_PKG_DESKTOP=n \
-			ADK_PKG_LAPTOP=n \
+			ADK_PKG_XORG=n \
 			ADK_PKG_MPDBOX=n \
 			ADK_PKG_DEVELOPMENT=n \
-			ADK_PKG_VPN_CLIENT=n \
-			ADK_PKG_VPN_SERVER=n \
 			ADK_TOOLCHAIN_GCC_JAVA=n \
 			ADK_TOOLCHAIN_GCC_OBJC=n \
 			ADK_TOOLCHAIN_GCC_USE_SSP=n \
@@ -569,8 +559,9 @@ bulktoolchain:
 				$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \
 			rm .config; \
 		    ) 2>&1 | tee $(TOPDIR)/bin/toolchain_$${arch}_$${libc}/build.log; \
-		    if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \
+		    if [ -f .exit ];then break;fi \
 		done <${TOPDIR}/target/tarch.lst ;\
+		if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \
 	done
 
 # build all target architecture, target systems and libc combinations
@@ -584,12 +575,14 @@ bulk:
 		echo === building $$arch $$system $$libc on $$(date); \
 		$(GMAKE) prereq && \
 		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive defconfig; \
-		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \
+		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 		rm .config; \
             ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \
+		if [ -f .exit ]; then break;fi \
 	      done; \
-	    if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \
+	    if [ -f .exit ]; then break;fi \
 	  done <${TOPDIR}/target/arch.lst ;\
+	  if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \
 	done
 
 bulkall:
@@ -602,12 +595,14 @@ bulkall:
 		echo === building $$arch $$system $$libc on $$(date); \
 		$(GMAKE) prereq && \
 		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allconfig; \
-		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \
+		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 		rm .config; \
             ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \
+		if [ -f .exit ]; then break;fi \
 	      done; \
-	    if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \
+	      if [ -f .exit ]; then break;fi \
 	  done <${TOPDIR}/target/arch.lst ;\
+	    if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \
 	done
 
 bulkallmod:
@@ -623,9 +618,11 @@ bulkallmod:
 		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then echo $$system-$$libc >.exit; exit 1;fi; \
 		rm .config; \
             ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \
+	        if [ -f .exit ]; then break;fi \
 	      done; \
-	    if [ -f .exit ];then echo "Bulk build failed!"; cat .exit;rm .exit; exit 1;fi \
+	     if [ -f .exit ]; then break;fi \
 	  done <${TOPDIR}/target/arch.lst ;\
+	  if [ -f .exit ];then echo "Bulk build failed!"; cat .exit;rm .exit; exit 1;fi \
 	done
 
 ${TOPDIR}/bin/tools/pkgmaker: $(TOPDIR)/tools/adk/pkgmaker.c $(TOPDIR)/tools/adk/sortfile.c $(TOPDIR)/tools/adk/strmap.c
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index 8b6a4a8c8..587a97125 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -93,17 +93,18 @@ ifeq ($(strip ${_IN_PACKAGE})$(strip ${_IN_CVTC}),1)
 else
 	@$(MAKE) -s V=0 prepare WRKDIR=${WRKDIR}.orig PREVENT_PATCH=: NO_CHECKSUM=1
 endif
-	@-test -r ${WRKDIR}/.autoreconf_done && \
-		(cd ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}; \
-		env ${AUTOTOOL_ENV} autoreconf -if)
-	@rm -rf ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}/autom4te.cache
+	@-test ! -r ${WRKDIR}/.autoreconf_done || \
+		(wrkdist=$(WRKDIST) dir=$${wrkdist#$(WRKDIR)}; \
+		cd ${WRKDIR}.orig$${dir}; \
+		env ${AUTOTOOL_ENV} autoreconf -if; \
+		rm -rf ${WRKDIR}.orig$${dir}/autom4te.cache ) $(MAKE_TRACE)
 	@# restore config.sub/config.guess
-	@for i in $$(find ${WRKDIR}.orig -name config.sub);do \
+	@for i in $$(find ${WRKDIR} -name config.sub);do \
 		if [ -f $$i.bak ];then \
 			mv $$i.bak $$i; \
 		fi;\
 	done
-	@for i in $$(find ${WRKDIR}.orig -name config.guess);do \
+	@for i in $$(find ${WRKDIR} -name config.guess);do \
 		if [ -f $$i.bak ];then \
 			mv $$i.bak $$i; \
 		fi;\
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk
index 327883a95..ecab37775 100644
--- a/mk/host-bottom.mk
+++ b/mk/host-bottom.mk
@@ -20,36 +20,35 @@ ${_HOST_CONFIGURE_COOKIE}: ${_HOST_PATCH_COOKIE}
 			${CP} ${SCRIPT_DIR}/config.guess $$i; \
 	        fi; \
 	    done;
-ifneq ($(filter auto,${HOST_STYLE}),)
+ifeq ($(strip ${HOST_STYLE}),)
 	cd ${WRKBUILD}; rm -f config.{cache,status}; \
 	    env ${HOST_CONFIGURE_ENV} \
 	    ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \
 	    --program-prefix= \
 	    --program-suffix= \
-	    --prefix=${STAGING_HOST_DIR}/usr \
-	    --bindir=${STAGING_HOST_DIR}/usr/bin \
-	    --datadir=${STAGING_HOST_DIR}/usr/share \
-	    --mandir=${STAGING_HOST_DIR}/usr/share/man \
-	    --libexecdir=${STAGING_HOST_DIR}/usr/libexec \
-	    --sysconfdir=${STAGING_HOST_DIR}/etc \
+	    --prefix=/usr \
+	    --bindir=/usr/bin \
+	    --datadir=/usr/share \
+	    --mandir=/usr/share/man \
+	    --libexecdir=/usr/libexec \
+	    --localstatedir=/var \
+	    --sysconfdir=/etc \
 	    --disable-dependency-tracking \
 	    --disable-libtool-lock \
 	    --disable-nls \
 	    ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE)
-
 else
 	cd ${WRKBUILD}; rm -f config.{cache,status}; \
 	    env ${HOST_CONFIGURE_ENV} \
 	    ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \
 	    --program-prefix= \
 	    --program-suffix= \
-	    --prefix=/usr \
-	    --bindir=/usr/bin \
-	    --datadir=/usr/share \
-	    --mandir=/usr/share/man \
-	    --libexecdir=/usr/libexec \
-	    --localstatedir=/var \
-	    --sysconfdir=/etc \
+	    --prefix=${STAGING_HOST_DIR}/usr \
+	    --bindir=${STAGING_HOST_DIR}/usr/bin \
+	    --datadir=${STAGING_HOST_DIR}/usr/share \
+	    --mandir=${STAGING_HOST_DIR}/usr/share/man \
+	    --libexecdir=${STAGING_HOST_DIR}/usr/libexec \
+	    --sysconfdir=${STAGING_HOST_DIR}/etc \
 	    --disable-dependency-tracking \
 	    --disable-libtool-lock \
 	    --disable-nls \
@@ -68,20 +67,21 @@ hpkg-install: ${ALL_HOSTINST}
 host-install:
 ${_HOST_FAKE_COOKIE}: ${_HOST_BUILD_COOKIE}
 	@$(CMD_TRACE) "host installing... "
-ifneq ($(filter auto,${HOST_STYLE}),)
-	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
-	    DESTDIR='' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
-else
+ifeq ($(strip ${HOST_STYLE}),)
 	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
 	    DESTDIR='${HOST_WRKINST}' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
 	env ${HOST_MAKE_ENV} ${MAKE} hpkg-install $(MAKE_TRACE)
+else
+	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
+	    DESTDIR='' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
 endif
 	rm -rf ${WRKBUILD} ${WRKDIST} ${WRKSRC}
 	exec ${MAKE} host-extract $(MAKE_TRACE)
 	mkdir -p ${HOST_WRKINST}
-	touch $@
 	# avoid rebuild
-	touch ${_HOST_BUILD_COOKIE} ${_HOST_CONFIGURE_COOKIE}
+	touch ${_HOST_CONFIGURE_COOKIE} 
+	touch ${_HOST_BUILD_COOKIE}
+	touch $@
 
 ${_HOST_COOKIE}:
 	exec ${MAKE} hostpackage
diff --git a/mk/host.mk b/mk/host.mk
index 855adf0d1..619ec140e 100644
--- a/mk/host.mk
+++ b/mk/host.mk
@@ -20,6 +20,11 @@ HOST_FAKE_FLAGS?=
 HOST_ALL_TARGET?=	all
 HOST_INSTALL_TARGET?=	install
 
+HOST_MAKE_ENV+=		PATH='${TARGET_PATH}' \
+			CFLAGS='$(strip ${CFLAGS_FOR_BUILD})' \
+			CXXFLAGS='$(strip ${CXXFLAGS_FOR_BUILD})' \
+			CPPFLAGS='$(strip ${CPPFLAGS_FOR_BUILD})' \
+			LDFLAGS='$(strip ${LDFLAGS_FOR_BUILD})'
 HOST_MAKE_FLAGS+=	${HOST_XAKE_FLAGS} V=1
 HOST_FAKE_FLAGS+=	${HOST_XAKE_FLAGS}
 
diff --git a/mk/package.mk b/mk/package.mk
index 8eae35938..768ac0b89 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -148,7 +148,7 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
 	@echo "Package: $$(shell echo $(2) | tr '_' '-')" > $(WRKDIR)/.$(2).control
 	@echo "Section: $(6)" >> $(WRKDIR)/.$(2).control
 	@echo "Description: $(5)" >> $(WRKDIR)/.$(2).control
-	${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)} $${ICONTROL_$(1)} $(3) ${CPU_ARCH}
+	@${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)} $${ICONTROL_$(1)} $(3) ${CPU_ARCH}
 	@adeps='$$(strip $${IDEPEND_$(1)})'; if [[ -n $$$$adeps ]]; then \
 		comma=; \
 		deps=; \
@@ -168,11 +168,11 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
 		[ ! -f ./files/$(2).$$$$file ] || cp ./files/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \
 	done
 ifneq (,$(filter dev,$(7)))
-	echo "Package: $$(shell echo $(2) | tr '_' '-')-dev" > $(WRKDIR)/.$(2)-dev.control
-	echo "Section: devel" >> $(WRKDIR)/.$(2)-dev.control
-	echo "Description: development files for $(2)" >> $(WRKDIR)/.$(2)-dev.control
-	${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)_DEV} $${ICONTROL_$(1)_DEV} $(3) ${CPU_ARCH}
-	echo "Depends: $$(shell echo $(2) | tr '_' '-')" >> $${IDIR_$(1)_DEV}/CONTROL/control
+	@echo "Package: $$(shell echo $(2) | tr '_' '-')-dev" > $(WRKDIR)/.$(2)-dev.control
+	@echo "Section: devel" >> $(WRKDIR)/.$(2)-dev.control
+	@echo "Description: development files for $(2)" >> $(WRKDIR)/.$(2)-dev.control
+	@${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)_DEV} $${ICONTROL_$(1)_DEV} $(3) ${CPU_ARCH}
+	@echo "Depends: $$(shell echo $(2) | tr '_' '-')" >> $${IDIR_$(1)_DEV}/CONTROL/control
 endif
 
 $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $${_FAKE_COOKIE}
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index bf8ed4ea3..34e5405a8 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -18,9 +18,9 @@ do-configure:
 post-configure:
 ${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE}
 ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE}))
-	cd ${WRKSRC}; env ${AUTOTOOL_ENV} autoreconf -if
-	rm -rf ${WRKSRC}/autom4te.cache
-	touch ${WRKDIR}/.autoreconf_done
+	cd ${WRKSRC}; env ${AUTOTOOL_ENV} autoreconf -if $(MAKE_TRACE)
+	@rm -rf ${WRKSRC}/autom4te.cache
+	@touch ${WRKDIR}/.autoreconf_done
 endif
 	mkdir -p ${WRKBUILD}
 	@${MAKE} pre-configure $(MAKE_TRACE)
diff --git a/mk/python.mk b/mk/python.mk
index 933bd0065..1ef92e664 100644
--- a/mk/python.mk
+++ b/mk/python.mk
@@ -1,7 +1,7 @@
 PYTHON_VERSION=2.7
 ifeq ($(ADK_NATIVE),)
 PYTHON_LIBDIR:=$(STAGING_HOST_DIR)/usr/lib
-PYTHON:=${STAGING_HOST_DIR}/usr/bin/hostpython
+PYTHON:=${STAGING_HOST_DIR}/usr/bin/python
 else
 PYTHON_LIBDIR:=/usr/lib
 PYTHON:=/usr/bin/python
diff --git a/package/esound/Makefile b/package/esound/Makefile
index fe69eaba4..aabe40bd4 100644
--- a/package/esound/Makefile
+++ b/package/esound/Makefile
@@ -5,27 +5,41 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		esound
 PKG_VERSION:=		0.2.41
-PKG_RELEASE:=		5
+PKG_RELEASE:=		6
 PKG_MD5SUM:=		3d8973ed87053d7acc1f4d44af2c4688
 PKG_DESCR:=		Enlightened Sound Daemon
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		libaudiofile
-PKG_BUILDDEP:=		libaudiofile
+PKG_DEPENDS:=		libaudiofile libesd
+PKG_BUILDDEP:=		libaudiofile autotool
 PKG_URL:=		http://www.tux.org/~ricdude/EsounD.html
 PKG_SITES:=		ftp://ftp.gnome.org/pub/gnome/sources/esound/0.2/
+PKG_LIBNAME:=		libesd
 PKG_OPTS:=		dev
 
+PKG_SUBPKGS:=		ESOUND LIBESD
+PKGSC_LIBESD:=		libs
+PKGSD_LIBESD:=		Esound library
+
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+=		libmix
+endif
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,ESOUND,esound,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,ESOUND,esound,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBESD,libesd,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBESD},${PKGSC_LIBESD},${PKG_OPTS}))
 
+AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ARGS+=	--disable-alsa \
 			--disable-arts \
 			--enable-oss
 
 esound-install:
-	${INSTALL_DIR} ${IDIR_ESOUND}/usr/bin ${IDIR_ESOUND}/usr/lib
+	${INSTALL_DIR} ${IDIR_ESOUND}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/esd ${IDIR_ESOUND}/usr/bin/
-	$(CP) $(WRKINST)/usr/lib/libesd.so* $(IDIR_ESOUND)/usr/lib/
+
+libesd-install:
+	${INSTALL_DIR} ${IDIR_LIBESD}/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libesd.so* $(IDIR_LIBESD)/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/esound/patches/autotool.patch b/package/esound/patches/autotool.patch
deleted file mode 100644
index 104d068cc..000000000
--- a/package/esound/patches/autotool.patch
+++ /dev/null
@@ -1,71478 +0,0 @@
-older libtool is unecessary checking for c++
-
- * regen autotool infrastruture via 
-   "libtoolize; autoregen -vif; rm -rf automa4te"
- * add fstack-protector patch manually
-
-diff -Nur esound-0.2.41.orig/aclocal.m4 esound-0.2.41/aclocal.m4
---- esound-0.2.41.orig/aclocal.m4	2008-11-18 21:54:35.000000000 +0100
-+++ esound-0.2.41/aclocal.m4	2011-02-24 20:05:01.883551544 +0100
-@@ -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,6648 +13,12 @@
- 
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(AC_AUTOCONF_VERSION, [2.61],,
--[m4_warning([this file was generated for autoconf 2.61.
-+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-*-
--
--# serial 52 AC_PROG_LIBTOOL
--
--
--# 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])])])
--
--
--# 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
--
--
--# _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
--
--# This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
--
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--AC_SUBST(LIBTOOL)dnl
--
--# Prevent multiple expansion
--define([AC_PROG_LIBTOOL], [])
--])# _AC_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
--AC_REQUIRE([AC_CANONICAL_BUILD])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([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
--dnl
--AC_LIBTOOL_SYS_MAX_CMD_LEN
--AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
--AC_LIBTOOL_OBJDIR
--
--AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
--_LT_AC_PROG_ECHO_BACKSLASH
--
--case $host_os in
--aix3*)
--  # AIX sometimes has problems with the GCC collect2 program.  For some
--  # reason, if we set the COLLECT_NAMES environment variable, the problems
--  # vanish in a puff of smoke.
--  if test "X${COLLECT_NAMES+set}" != Xset; then
--    COLLECT_NAMES=
--    export COLLECT_NAMES
--  fi
--  ;;
--esac
--
--# 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_qu