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

author: Waldemar Brodkorb <wbx@openadk.org> 2014-01-14 17:53:20 +0100
committer: Waldemar Brodkorb <wbx@openadk.org> 2014-01-14 17:53:20 +0100
commit: f67b4be3be5d03a688bbbf7a54df25ca16caa475 (patch)
tree: 21b9c0f3095f1615121ea986af5e5152c8c564d2
parent: c6d7c45aeb5f365a69d93f01a0365edc24db67ce (diff)
parent: be769dc45c2063408845ccaed62ef34404f42d68 (diff)
22 files changed, 430 insertions, 1399 deletions
diff --git a/package/boost/Makefile b/package/boost/Makefile
index f204ccebe..4dbb67ae9 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		boost
 PKG_VERSION:=		1.55.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		93780777cfbf999a600f62883bd54b17
 PKG_DESCR:=		boost C++ library
 PKG_SECTION:=		libs
@@ -97,6 +97,12 @@ ifeq (${ADK_PACKAGE_BOOST_WAVE},)
 	CONFIGURE_ARGS+=--without-wave
 endif
 
+ifeq ($(ARCH),x86_64)
+BOOST_ARCH:=	x86
+else
+BOOST_ARCH:=	$(ARCH)
+endif
+
 # some variables for build
 GPP_PATH:=	${STAGING_HOST_DIR}/bin/${GNU_TARGET_NAME}-g++
 GPP_VERSION:=	"`${GPP_PATH} -v 2>&1 | tail -1 | awk '{print $$3}'`"
@@ -128,7 +134,7 @@ endif
 			-sBUILD=release \
 			-d 2 \
 			target-os=linux \
-			architecture=$(CPU_ARCH) \
+			architecture=$(BOOST_ARCH) \
 			binary-format=elf \
 			toolset=gcc-${GPP_VERSION} \
 			--build-type=minimal \
diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile
index a2cb7a709..5585ae0c1 100644
--- a/package/bzip2/Makefile
+++ b/package/bzip2/Makefile
@@ -34,8 +34,8 @@ $(eval $(call PKG_template,LIBBZ2,libbz2,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_
 HOST_STYLE:=		manual
 MAKE_FILE:=		Makefile-libbz2_so
 CONFIG_STYLE:=		manual
-TARGET_CFLAGS+=		-fPIC
-XAKE_FLAGS+=		PREFIX=${WRKINST}/usr
+TARGET_CFLAGS+=		-fPIC 
+XAKE_FLAGS+=		PREFIX=${WRKINST}/usr CROSS_COMPILE=1
 INSTALL_STYLE:=		manual
 
 host-build:
@@ -55,9 +55,9 @@ libbz2-install:
 	$(CP) ${WRKBUILD}/libbz2.so* \
 		${IDIR_LIBBZ2}/usr/lib
 	$(CP) ${WRKBUILD}/libbz2.so* \
-		${STAGING_DIR}/usr/lib
-	(cd ${STAGING_DIR}/usr/lib; ln -sf libbz2.so.1.0.6 libbz2.so)
-	$(CP) $(WRKBUILD)/bzlib.h $(STAGING_DIR)/usr/include
+		${STAGING_TARGET_DIR}/usr/lib
+	(cd ${STAGING_TARGET_DIR}/usr/lib; ln -sf libbz2.so.1.0.6 libbz2.so)
+	$(CP) $(WRKBUILD)/bzlib.h $(STAGING_TARGET_DIR)/usr/include
 	${INSTALL_DIR} $(IDIR_LIBBZ2_DEV)/usr/include
 	$(CP) $(WRKBUILD)/bzlib.h $(IDIR_LIBBZ2_DEV)/usr/include
 
diff --git a/package/bzip2/patches/patch-Makefile-libbz2_so b/package/bzip2/patches/patch-Makefile-libbz2_so
index 605be4e5c..148c7562a 100644
--- a/package/bzip2/patches/patch-Makefile-libbz2_so
+++ b/package/bzip2/patches/patch-Makefile-libbz2_so
@@ -1,19 +1,28 @@
 --- bzip2-1.0.6.orig/Makefile-libbz2_so	2010-09-11 01:07:52.000000000 +0200
-+++ bzip2-1.0.6/Makefile-libbz2_so	2014-01-10 21:37:37.000000000 +0100
-@@ -25,6 +25,12 @@ SHELL=/bin/sh
- CC=gcc
++++ bzip2-1.0.6/Makefile-libbz2_so	2014-01-13 21:51:20.000000000 +0100
+@@ -21,10 +21,18 @@
+ # ------------------------------------------------------------------
+ 
+ 
+-SHELL=/bin/sh
+-CC=gcc
++SHELL?=/bin/sh
++CC?=gcc
  BIGFILES=-D_FILE_OFFSET_BITS=64
- CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
+-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
++CFLAGS?=
++CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES)
 +OS=$(shell uname)
++LDOPT=-soname
++ifneq ($(CROSS_COMPILE),1)
 +ifeq ($(OS),Darwin)
 +LDOPT=-install_name
-+else 
-+LDOPT=-soname
++endif
 +endif
  
  OBJS= blocksort.o  \
        huffman.o    \
-@@ -35,7 +41,7 @@ OBJS= blocksort.o  \
+@@ -35,7 +43,7 @@ OBJS= blocksort.o  \
        bzlib.o
  
  all: $(OBJS)
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index 7f7f5707f..d96785f12 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dbus
-PKG_VERSION:=		1.6.12
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		a70edc50524f258eaf5c9a9994ed8748
+PKG_VERSION:=		1.6.18
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		b02e9c95027a416987b81f9893831061
 PKG_DESCR:=		DBUS library and daemon
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libexpat libx11 libuuid
@@ -28,10 +28,12 @@ TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--disable-tests \
 			--disable-abstract-sockets \
 			--enable-checks \
+			--disable-verbose-mode \
 			--with-xml=expat \
 			--with-session-socket-dir=/var/tmp \
 			--disable-dnotify \
 			--disable-kqueue \
+			--disable-systemd \
 			--disable-xml-docs \
 			--with-x \
 			--disable-doxygen-docs
@@ -44,7 +46,9 @@ pre-install:
 
 dbus-install:
 	${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib \
-		${IDIR_DBUS}/usr/bin
+		${IDIR_DBUS}/usr/bin ${IDIR_DBUS}/usr/libexec
+	${INSTALL_BIN} ${WRKINST}/usr/libexec/dbus-daemon-launch-helper \
+		${IDIR_DBUS}/usr/libexec/
 	${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc
 	${CP} ${WRKINST}/usr/lib/libdbus-1.so* ${IDIR_DBUS}/usr/lib
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin
diff --git a/package/eudev/Makefile b/package/eudev/Makefile
new file mode 100644
index 000000000..13f8c1b20
--- /dev/null
+++ b/package/eudev/Makefile
@@ -0,0 +1,48 @@
+# 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:=		eudev
+PKG_VERSION:=		1.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		164df78f6f0093578a20bdd00335845f
+PKG_DESCR:=		udev device manager
+PKG_SECTION:=		utils
+PKG_URL:=		http://www.gentoo.org/proj/en/eudev/
+PKG_SITES:=		http://dev.gentoo.org/~blueness/eudev/
+PKG_LIBNAME:=		libudev
+PKG_OPTS:=		dev
+
+PKG_SUBPKGS:=		UDEV LIBUDEV LIBGUDEV
+PKGSC_LIBGUDEV:=	libs
+PKGSD_LIBGUDEV:=	GUDEV library
+PKGSC_LIBUDEV:=		libs
+PKGSD_LIBUDEV:=		UDEV library
+PKGSD_UDEV:=		Dynamic device management subsystem
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,UDEV,udev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBUDEV,libudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBGUDEV,libgudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+CONFIGURE_ARGS+=	--disable-manpages \
+			--disable-gtk-doc
+
+udev-install:
+	${INSTALL_DIR} ${IDIR_UDEV}/usr/bin ${IDIR_UDEV}/etc/udev
+	${INSTALL_DIR} ${IDIR_UDEV}/usr/lib/udev
+	${CP} ${WRKINST}/etc/udev/* ${IDIR_UDEV}/etc/udev
+	${CP} ${WRKINST}/usr/lib/udev/* ${IDIR_UDEV}/usr/lib/udev
+	${CP} ${WRKINST}/usr/bin/udevadm ${IDIR_UDEV}/usr/bin
+
+libudev-install:
+	${INSTALL_DIR} ${IDIR_LIBUDEV}/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libudev.so* $(IDIR_LIBUDEV)/usr/lib
+
+libgudev-install:
+	${INSTALL_DIR} ${IDIR_LIBGUDEV}/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libgudev*.so* $(IDIR_LIBGUDEV)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libcap/Makefile b/package/libcap/Makefile
index 1d0f8154a..5c5f4edcf 100644
--- a/package/libcap/Makefile
+++ b/package/libcap/Makefile
@@ -20,6 +20,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBCAP,libcap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+CPPFLAGS_FOR_BUILD+=	-I$(STAGING_TARGET_DIR)/usr/include
 CONFIG_STYLE:=		manual
 
 libcap-install:
diff --git a/package/libcec/Makefile b/package/libcec/Makefile
index e085df139..dcf6e2580 100644
--- a/package/libcec/Makefile
+++ b/package/libcec/Makefile
@@ -14,7 +14,9 @@ PKG_URL:=		http://libcec.pulse-eight.com/
 PKG_SITES:=		http://www.openadk.org/distfiles
 PKG_OPTS:=		dev
 
-PKG_SYSTEM_DEPENDS:=    raspberry-pi
+PKG_DEPENDS_RASPBERRY_PI:=	bcm2835-vc
+PKG_BUILDDEP_RASPBERRY_PI:=	bcm2835-vc
+PKG_SYSTEM_DEPENDS:=    raspberry-pi ibm-x40
 PKG_LIBC_DEPENDS:=      eglibc glibc musl
 
 include $(TOPDIR)/mk/package.mk
@@ -22,9 +24,11 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBCEC,libcec,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 AUTOTOOL_STYLE:=	autoreconf
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
 CONFIGURE_ARGS+=	--enable-rpi \
 			--with-rpi-include-path=$(STAGING_TARGET_DIR)/opt/vc/include \
 			--with-rpi-lib-path=$(STAGING_TARGET_DIR)/opt/vc/lib
+endif
 
 libcec-install:
 	$(INSTALL_DIR) $(IDIR_LIBCEC)/usr/lib
diff --git a/package/libcec/patches/patch-src_lib_platform_posix_serialport_cpp b/package/libcec/patches/patch-src_lib_platform_posix_serialport_cpp
new file mode 100644
index 000000000..e677a0d22
--- /dev/null
+++ b/package/libcec/patches/patch-src_lib_platform_posix_serialport_cpp
@@ -0,0 +1,11 @@
+--- libcec-2.1.4.orig/src/lib/platform/posix/serialport.cpp	2013-12-15 12:48:14.000000000 +0100
++++ libcec-2.1.4/src/lib/platform/posix/serialport.cpp	2014-01-12 22:04:41.000000000 +0100
+@@ -37,7 +37,7 @@
+ #include "lib/platform/util/baudrate.h"
+ #include "lib/platform/posix/os-socket.h"
+ 
+-#if defined(__APPLE__) || defined(__FreeBSD__)
++#if defined(__APPLE__) || defined(__FreeBSD__) || !defined(__GLIBC__)
+ #ifndef XCASE
+ #define XCASE	0
+ #endif
diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile
index a6c593f19..9b76da0b9 100644
--- a/package/libvirt/Makefile
+++ b/package/libvirt/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		3d9f85d586c9aa3d819b626622f3fc97
 PKG_DESCR:=		virtualization API
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		libxml2 gnutls python2 libpcap parted systemd
+PKG_BUILDDEP:=		libxml2 gnutls python2 libpcap parted eudev
 PKG_DEPENDS:=		libxml2 libgnutls python2 libpcap libreadline
 PKG_DEPENDS+=		dmidecode kmod-netfilter-xt-target-checksum
 PKG_DEPENDS+=		dnsmasq qemu libnl libudev
diff --git a/package/nasm/Makefile b/package/nasm/Makefile
index 93e50f36b..39e451a70 100644
--- a/package/nasm/Makefile
+++ b/package/nasm/Makefile
@@ -4,23 +4,28 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		nasm
-PKG_VERSION:=		2.07
+PKG_VERSION:=		2.11
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		84d8e009b3d2565a810ab3ddad1f4f63
+PKG_MD5SUM:=		a884450ee65201473af4d270bdc132f8
 PKG_DESCR:=		the netwide assembler
 PKG_SECTION:=		lang
+PKG_BUILDDEP:=		nasm-host
 PKG_URL:=		http://sourceforge.net/projects/nasm/
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nasm/nasm%20sources/2.07/}
+PKG_SITES:=		http://www.nasm.us/pub/nasm/releasebuilds/${PKG_VERSION}/
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,NASM,nasm,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,NASM,nasm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 FAKE_FLAGS+=		INSTALLROOT=${WRKINST}
+HOST_STYLE:=		auto
 
 nasm-install:
 	$(INSTALL_DIR) $(IDIR_NASM)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/nasm \
 		$(IDIR_NASM)/usr/bin
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ntfs-3g/Makefile b/package/ntfs-3g/Makefile
index 6f65db548..5151bfd21 100644
--- a/package/ntfs-3g/Makefile
+++ b/package/ntfs-3g/Makefile
@@ -4,16 +4,17 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ntfs-3g
-PKG_VERSION:=		2010.1.16
+PKG_VERSION:=		2013.1.13
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e104c914e8d7d29ee83e63d46afbba25
+PKG_MD5SUM:=		2d6fb47ddf62b51733227126fe9227fe
 PKG_DESCR:=		ntfs filesystem driver
-PKG_SECTION:=		kernel
+PKG_SECTION:=		fs
 PKG_DEPENDS:=		kmod-fuse-fs
 PKG_URL:=		http://tuxera.com
 PKG_SITES:=		http://tuxera.com/opensource/
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
+DISTFILES:=		${PKG_NAME}_ntfsprogs-${PKG_VERSION}.tgz
+WRKDIST=		${WRKDIR}/${PKG_NAME}_ntfsprogs-${PKG_VERSION}
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/polkit/Makefile b/package/polkit/Makefile
index 0fbfcb439..5ed8333e3 100644
--- a/package/polkit/Makefile
+++ b/package/polkit/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		polkit
 PKG_VERSION:=		0.112
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		23973dcfd8b92ab2b7db3a925642b76d
 PKG_DESCR:=		application-level toolkit
 PKG_SECTION:=		libs
@@ -15,8 +15,6 @@ PKG_URL:=		http://www.freedesktop.org/wiki/Software/polkit/
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_OPTS:=		dev
 
-PKG_LIBC_DEPENDS:=	eglibc glibc
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,POLKIT,polkit,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
@@ -26,6 +24,7 @@ CONFIGURE_ARGS+=	--disable-man-pages \
 			--disable-examples \
 			--enable-libsystemd-login=no \
 			--without-systemdsystemunitdir \
+			--with-polkitd-user=root \
 			--with-authfw=shadow \
 			--with-os-type=unknown
 
@@ -38,5 +37,8 @@ polkit-install:
 	$(CP) $(WRKINST)/usr/lib/polkit-1/* \
 		$(IDIR_POLKIT)/usr/lib/polkit-1
 	$(CP) $(WRKINST)/usr/bin/* $(IDIR_POLKIT)/usr/bin
+	$(INSTALL_DIR) $(IDIR_POLKIT)/usr/share/dbus-1
+	$(CP) $(WRKINST)/usr/share/dbus-1/* \
+		$(IDIR_POLKIT)/usr/share/dbus-1
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/rtorrent/patches/patch-configure b/package/rtorrent/patches/patch-configure
deleted file mode 100644
index 497473f50..000000000
--- a/package/rtorrent/patches/patch-configure
+++ /dev/null
@@ -1,1295 +0,0 @@
---- rtorrent-0.9.2.orig/configure	2012-04-20 09:00:08.000000000 +0200
-+++ rtorrent-0.9.2/configure	2014-01-13 12:54:25.000000000 +0100
-@@ -1,13 +1,11 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.68 for rtorrent 0.9.2.
-+# Generated by GNU Autoconf 2.69 for rtorrent 0.9.2.
- #
- # Report bugs to <jaris@ifi.uio.no>.
- #
- #
--# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
--# Foundation, Inc.
-+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
- #
- #
- # This configure script is free software; the Free Software Foundation
-@@ -136,6 +134,31 @@ export LANGUAGE
- # CDPATH.
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
-+# Use a proper internal environment variable to ensure we don't fall
-+  # into an infinite loop, continuously re-executing ourselves.
-+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-+    _as_can_reexec=no; export _as_can_reexec;
-+    # We cannot yet assume a decent shell, so we have to provide a
-+# neutralization value for shells without unset; and this also
-+# works around shells that cannot unset nonexistent variables.
-+# Preserve -v and -x to the replacement shell.
-+BASH_ENV=/dev/null
-+ENV=/dev/null
-+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-+case $- in # ((((
-+  *v*x* | *x*v* ) as_opts=-vx ;;
-+  *v* ) as_opts=-v ;;
-+  *x* ) as_opts=-x ;;
-+  * ) as_opts= ;;
-+esac
-+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-+# Admittedly, this is quite paranoid, since all the known shells bail
-+# out after a failed `exec'.
-+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-+as_fn_exit 255
-+  fi
-+  # We don't want this to propagate to other subprocesses.
-+          { _as_can_reexec=; unset _as_can_reexec;}
- if test "x$CONFIG_SHELL" = x; then
-   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-   emulate sh
-@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test
- else
-   exitcode=1; echo positional parameters were not saved.
- fi
--test x\$exitcode = x0 || exit 1"
-+test x\$exitcode = x0 || exit 1
-+test -x / || exit 1"
-   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-@@ -222,21 +246,25 @@ IFS=$as_save_IFS
- 
- 
-       if test "x$CONFIG_SHELL" != x; then :
--  # We cannot yet assume a decent shell, so we have to provide a
--	# neutralization value for shells without unset; and this also
--	# works around shells that cannot unset nonexistent variables.
--	# Preserve -v and -x to the replacement shell.
--	BASH_ENV=/dev/null
--	ENV=/dev/null
--	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
--	export CONFIG_SHELL
--	case $- in # ((((
--	  *v*x* | *x*v* ) as_opts=-vx ;;
--	  *v* ) as_opts=-v ;;
--	  *x* ) as_opts=-x ;;
--	  * ) as_opts= ;;
--	esac
--	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
-+  export CONFIG_SHELL
-+             # We cannot yet assume a decent shell, so we have to provide a
-+# neutralization value for shells without unset; and this also
-+# works around shells that cannot unset nonexistent variables.
-+# Preserve -v and -x to the replacement shell.
-+BASH_ENV=/dev/null
-+ENV=/dev/null
-+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-+case $- in # ((((
-+  *v*x* | *x*v* ) as_opts=-vx ;;
-+  *v* ) as_opts=-v ;;
-+  *x* ) as_opts=-x ;;
-+  * ) as_opts= ;;
-+esac
-+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-+# Admittedly, this is quite paranoid, since all the known shells bail
-+# out after a failed `exec'.
-+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-+exit 255
- fi
- 
-     if test x$as_have_required = xno; then :
-@@ -339,6 +367,14 @@ $as_echo X"$as_dir" |
- 
- 
- } # as_fn_mkdir_p
-+
-+# as_fn_executable_p FILE
-+# -----------------------
-+# Test if FILE is an executable regular file.
-+as_fn_executable_p ()
-+{
-+  test -f "$1" && test -x "$1"
-+} # as_fn_executable_p
- # as_fn_append VAR VALUE
- # ----------------------
- # Append the text in VALUE to the end of the definition contained in VAR. Take
-@@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
-   chmod +x "$as_me.lineno" ||
-     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
- 
-+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-+  # already done that, so ensure we don't try to do so again and fall
-+  # in an infinite loop.  This has already happened in practice.
-+  _as_can_reexec=no; export _as_can_reexec
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
-   # original and so on.  Autoconf is especially sensitive to this).
-@@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then
-     # ... but there are two gotchas:
-     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
--    # In both cases, we have to default to `cp -p'.
-+    # In both cases, we have to default to `cp -pR'.
-     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
--      as_ln_s='cp -p'
-+      as_ln_s='cp -pR'
-   elif ln conf$$.file conf$$ 2>/dev/null; then
-     as_ln_s=ln
-   else
--    as_ln_s='cp -p'
-+    as_ln_s='cp -pR'
-   fi
- else
--  as_ln_s='cp -p'
-+  as_ln_s='cp -pR'
- fi
- rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
- rmdir conf$$.dir 2>/dev/null
-@@ -515,28 +555,8 @@ else
-   as_mkdir_p=false
- fi
- 
--if test -x / >/dev/null 2>&1; then
--  as_test_x='test -x'
--else
--  if ls -dL / >/dev/null 2>&1; then
--    as_ls_L_option=L
--  else
--    as_ls_L_option=
--  fi
--  as_test_x='
--    eval sh -c '\''
--      if test -d "$1"; then
--	test -d "$1/.";
--      else
--	case $1 in #(
--	-*)set "./$1";;
--	esac;
--	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
--	???[sx]*):;;*)false;;esac;fi
--    '\'' sh
--  '
--fi
--as_executable_p=$as_test_x
-+as_test_x='test -x'
-+as_executable_p=as_fn_executable_p
- 
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -683,9 +703,6 @@ CPPFLAGS
- LDFLAGS
- CXXFLAGS
- CXX
--CPPUNIT_LIBS
--CPPUNIT_CFLAGS
--CPPUNIT_CONFIG
- am__untar
- am__tar
- AMTAR
-@@ -750,8 +767,6 @@ SHELL'
- ac_subst_files=''
- ac_user_opts='
- enable_option_checking
--with_cppunit_prefix
--with_cppunit_exec_prefix
- enable_dependency_tracking
- enable_shared
- enable_static
-@@ -1253,8 +1268,6 @@ target=$target_alias
- if test "x$host_alias" != x; then
-   if test "x$build_alias" = x; then
-     cross_compiling=maybe
--    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
--    If a cross compiler is detected then cross compile mode will be used" >&2
-   elif test "x$build_alias" != "x$host_alias"; then
-     cross_compiling=yes
-   fi
-@@ -1418,8 +1431,10 @@ Optional Features:
-   --disable-option-checking  ignore unrecognized --enable/--with options
-   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
--  --disable-dependency-tracking  speeds up one-time build
--  --enable-dependency-tracking   do not reject slow dependency extractors
-+  --enable-dependency-tracking
-+                          do not reject slow dependency extractors
-+  --disable-dependency-tracking
-+                          speeds up one-time build
-   --enable-shared[=PKGS]  build shared libraries [default=yes]
-   --enable-static[=PKGS]  build static libraries [default=yes]
-   --enable-fast-install[=PKGS]
-@@ -1437,8 +1452,6 @@ Optional Features:
- Optional Packages:
-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
--  --with-cppunit-prefix=PFX   Prefix where CppUnit is installed (optional)
--  --with-cppunit-exec-prefix=PFX  Exec prefix where CppUnit is installed (optional)
-   --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
-                           both]
-   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-@@ -1548,9 +1561,9 @@ test -n "$ac_init_help" && exit $ac_stat
- if $ac_init_version; then
-   cat <<\_ACEOF
- rtorrent configure 0.9.2
--generated by GNU Autoconf 2.68
-+generated by GNU Autoconf 2.69
- 
--Copyright (C) 2010 Free Software Foundation, Inc.
-+Copyright (C) 2012 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1664,7 +1677,7 @@ $as_echo "$ac_try_echo"; } >&5
- 	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
- 	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
-+	 test -x conftest$ac_exeext
-        }; then :
-   ac_retval=0
- else
-@@ -1924,7 +1937,7 @@ $as_echo "$ac_try_echo"; } >&5
- 	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext && {
- 	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
-+	 test -x conftest$ac_exeext
-        }; then :
-   ac_retval=0
- else
-@@ -2038,7 +2051,7 @@ This file contains any messages produced
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by rtorrent $as_me 0.9.2, which was
--generated by GNU Autoconf 2.68.  Invocation command line was
-+generated by GNU Autoconf 2.69.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -2390,7 +2403,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- $as_echo "#define API_VERSION 6" >>confdefs.h
- 
- 
--am__api_version='1.11'
-+am__api_version='1.12'
- 
- ac_aux_dir=
- for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-@@ -2458,7 +2471,7 @@ case $as_dir/ in #((
-     # by default.
-     for ac_prog in ginstall scoinst install; do
-       for ac_exec_ext in '' $ac_executable_extensions; do
--	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
- 	  if test $ac_prog = install &&
- 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- 	    # AIX install.  It has an incompatible calling convention.
-@@ -2516,9 +2529,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA=
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
- $as_echo_n "checking whether build environment is sane... " >&6; }
--# Just in case
--sleep 1
--echo timestamp > conftest.file
- # Reject unsafe characters in $srcdir or the absolute working directory
- # name.  Accept space and tab only in the latter.
- am_lf='
-@@ -2529,32 +2539,40 @@ case `pwd` in
- esac
- case $srcdir in
-   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
--    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
- esac
- 
--# Do `set' in a subshell so we don't clobber the current shell's
-+# Do 'set' in a subshell so we don't clobber the current shell's
- # arguments.  Must try -L first in case configure is actually a
- # symlink; some systems play weird games with the mod time of symlinks
- # (eg FreeBSD returns the mod time of the symlink's containing
- # directory).
- if (
--   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
--   if test "$*" = "X"; then
--      # -L didn't work.
--      set X `ls -t "$srcdir/configure" conftest.file`
--   fi
--   rm -f conftest.file
--   if test "$*" != "X $srcdir/configure conftest.file" \
--      && test "$*" != "X conftest.file $srcdir/configure"; then
--
--      # If neither matched, then we have a broken ls.  This can happen
--      # if, for instance, CONFIG_SHELL is bash and it inherits a
--      # broken ls alias from the environment.  This has actually
--      # happened.  Such a system could not be considered "sane".
--      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
--alias in your environment" "$LINENO" 5
--   fi
-+   am_has_slept=no
-+   for am_try in 1 2; do
-+     echo "timestamp, slept: $am_has_slept" > conftest.file
-+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-+     if test "$*" = "X"; then
-+	# -L didn't work.
-+	set X `ls -t "$srcdir/configure" conftest.file`
-+     fi
-+     if test "$*" != "X $srcdir/configure conftest.file" \
-+	&& test "$*" != "X conftest.file $srcdir/configure"; then
- 
-+	# If neither matched, then we have a broken ls.  This can happen
-+	# if, for instance, CONFIG_SHELL is bash and it inherits a
-+	# broken ls alias from the environment.  This has actually
-+	# happened.  Such a system could not be considered "sane".
-+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-+  alias in your environment" "$LINENO" 5
-+     fi
-+     if test "$2" = conftest.file || test $am_try -eq 2; then
-+       break
-+     fi
-+     # Just in case.
-+     sleep 1
-+     am_has_slept=yes
-+   done
-    test "$2" = conftest.file
-    )
- then
-@@ -2566,6 +2584,16 @@ Check your system clock" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-+# If we didn't sleep, we still need to ensure time stamps of config.status and
-+# generated files are strictly newer.
-+am_sleep_pid=
-+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-+  ( sleep 1 ) &
-+  am_sleep_pid=$!
-+fi
-+
-+rm -f conftest.file
-+
- test "$program_prefix" != NONE &&
-   program_transform_name="s&^&$program_prefix&;$program_transform_name"
- # Use a double $ so make ignores it.
-@@ -2592,8 +2620,8 @@ if eval "$MISSING --run true"; then
-   am_missing_run="$MISSING --run "
- else
-   am_missing_run=
--  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
--$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
- fi
- 
- if test x"${install_sh}" != xset; then
-@@ -2605,10 +2633,10 @@ if test x"${install_sh}" != xset; then
-   esac
- fi
- 
--# Installed binaries are usually stripped using `strip' when the user
--# run `make install-strip'.  However `strip' might not be the right
-+# Installed binaries are usually stripped using 'strip' when the user
-+# run "make install-strip".  However 'strip' might not be the right
- # tool to use in cross-compilation environments, therefore Automake
--# will honor the `STRIP' environment variable to overrule this program.
-+# will honor the 'STRIP' environment variable to overrule this program.
- if test "$cross_compiling" != no; then
-   if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-@@ -2627,7 +2655,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2667,7 +2695,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_STRIP="strip"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2718,7 +2746,7 @@ do
-   test -z "$as_dir" && as_dir=.
-     for ac_prog in mkdir gmkdir; do
- 	 for ac_exec_ext in '' $ac_executable_extensions; do
--	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
- 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
- 	     'mkdir (GNU coreutils) '* | \
- 	     'mkdir (coreutils) '* | \
-@@ -2747,12 +2775,6 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
- $as_echo "$MKDIR_P" >&6; }
- 
--mkdir_p="$MKDIR_P"
--case $mkdir_p in
--  [\\/$]* | ?:[\\/]*) ;;
--  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
--esac
--
- for ac_prog in gawk mawk nawk awk
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -2771,7 +2793,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_AWK="$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2885,6 +2907,12 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
- 
- MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
- 
-+# For better backward compatibility.  To be removed once Automake 1.9.x
-+# dies out for good.  For more background, see:
-+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-+mkdir_p='$(MKDIR_P)'
-+
- # We need awk for the "check" target.  The system "awk" is bad on
- # some platforms.
- # Always define AMTAR for backward compatibility.  Yes, it's still used
-@@ -2899,147 +2927,7 @@ am__tar='$${TAR-tar} chof - "$$tardir"'
- 
- ac_config_headers="$ac_config_headers config.h"
- 
--
--
--
--# Check whether --with-cppunit-prefix was given.
--if test "${with_cppunit_prefix+set}" = set; then :
--  withval=$with_cppunit_prefix; cppunit_config_prefix="$withval"
--else
--  cppunit_config_prefix=""
--fi
--
--
--# Check whether --with-cppunit-exec-prefix was given.
--if test "${with_cppunit_exec_prefix+set}" = set; then :
--  withval=$with_cppunit_exec_prefix; cppunit_config_exec_prefix="$withval"
--else
--  cppunit_config_exec_prefix=""
--fi
--
--
--  if test x$cppunit_config_exec_prefix != x ; then
--     cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
--     if test x${CPPUNIT_CONFIG+set} != xset ; then
--        CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
--     fi
--  fi
--  if test x$cppunit_config_prefix != x ; then
--     cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
--     if test x${CPPUNIT_CONFIG+set} != xset ; then
--        CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
--     fi
--  fi
--
--  # Extract the first word of "cppunit-config", so it can be a program name with args.
--set dummy cppunit-config; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_path_CPPUNIT_CONFIG+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  case $CPPUNIT_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_CPPUNIT_CONFIG="$CPPUNIT_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_CPPUNIT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--  test -z "$ac_cv_path_CPPUNIT_CONFIG" && ac_cv_path_CPPUNIT_CONFIG="no"
--  ;;
--esac
--fi
--CPPUNIT_CONFIG=$ac_cv_path_CPPUNIT_CONFIG
--if test -n "$CPPUNIT_CONFIG"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPUNIT_CONFIG" >&5
--$as_echo "$CPPUNIT_CONFIG" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--  cppunit_version_min=1.9.6
--
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Cppunit - version >= $cppunit_version_min" >&5
--$as_echo_n "checking for Cppunit - version >= $cppunit_version_min... " >&6; }
--  no_cppunit=""
--  if test "$CPPUNIT_CONFIG" = "no" ; then
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--    no_cppunit=yes
--  else
--    CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
--    CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
--    cppunit_version=`$CPPUNIT_CONFIG --version`
--
--    cppunit_major_version=`echo $cppunit_version | \
--           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
--    cppunit_minor_version=`echo $cppunit_version | \
--           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
--    cppunit_micro_version=`echo $cppunit_version | \
--           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
--
--    cppunit_major_min=`echo $cppunit_version_min | \
--           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
--    if test "x${cppunit_major_min}" = "x" ; then
--       cppunit_major_min=0
--    fi
--
--    cppunit_minor_min=`echo $cppunit_version_min | \
--           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
--    if test "x${cppunit_minor_min}" = "x" ; then
--       cppunit_minor_min=0
--    fi
--
--    cppunit_micro_min=`echo $cppunit_version_min | \
--           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
--    if test "x${cppunit_micro_min}" = "x" ; then
--       cppunit_micro_min=0
--    fi
--
--    cppunit_version_proper=`expr \
--        $cppunit_major_version \> $cppunit_major_min \| \
--        $cppunit_major_version \= $cppunit_major_min \& \
--        $cppunit_minor_version \> $cppunit_minor_min \| \
--        $cppunit_major_version \= $cppunit_major_min \& \
--        $cppunit_minor_version \= $cppunit_minor_min \& \
--        $cppunit_micro_version \>= $cppunit_micro_min `
--
--    if test "$cppunit_version_proper" = "1" ; then
--      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&5
--$as_echo "$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&6; }
--    else
--      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--      no_cppunit=yes
--    fi
--  fi
--
--  if test "x$no_cppunit" = x ; then
--     :
--  else
--     CPPUNIT_CFLAGS=""
--     CPPUNIT_LIBS=""
--     :
--  fi
--
--
--
--
-+AM_PATH_CPPUNIT(1.9.6)
- 
- ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -3069,7 +2957,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -3113,7 +3001,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_CXX="$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -3566,7 +3454,7 @@ am__quote=
- _am_result=none
- # First try GNU make style include.
- echo "include confinc" > confmf
--# Ignore all kinds of additional output from `make'.
-+# Ignore all kinds of additional output from 'make'.
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
-   am__include=include
-@@ -3622,8 +3510,8 @@ else
-   # We make a subdir and do the tests there.  Otherwise we can end up
-   # making bogus files that we don't know about and never remove.  For
-   # instance it was reported that on HP-UX the gcc test will end up
--  # making a dummy file named `D' -- because `-MD' means `put the output
--  # in D'.
-+  # making a dummy file named 'D' -- because '-MD' means "put the output
-+  # in D".
-   rm -rf conftest.dir
-   mkdir conftest.dir
-   # Copy depcomp to subdir because otherwise we won't find it if we're
-@@ -3658,16 +3546,16 @@ else
-     : > sub/conftest.c
-     for i in 1 2 3 4 5 6; do
-       echo '#include "conftst'$i'.h"' >> sub/conftest.c
--      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
--      # Solaris 8's {/usr,}/bin/sh.
--      touch sub/conftst$i.h
-+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-+      # Solaris 10 /bin/sh.
-+      echo '/* dummy */' > sub/conftst$i.h
-     done
-     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- 
--    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-     # mode.  It turns out that the SunPro C++ compiler does not properly
--    # handle `-M -o', and we need to detect this.  Also, some Intel
--    # versions had trouble with output in subdirs
-+    # handle '-M -o', and we need to detect this.  Also, some Intel
-+    # versions had trouble with output in subdirs.
-     am__obj=sub/conftest.${OBJEXT-o}
-     am__minus_obj="-o $am__obj"
-     case $depmode in
-@@ -3676,8 +3564,8 @@ else
-       test "$am__universal" = false || continue
-       ;;
-     nosideeffect)
--      # after this tag, mechanisms are not by side-effect, so they'll
--      # only be used when explicitly requested
-+      # After this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested.
-       if test "x$enable_dependency_tracking" = xyes; then
- 	continue
-       else
-@@ -3685,7 +3573,7 @@ else
-       fi
-       ;;
-     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
--      # This compiler won't grok `-c -o', but also, the minuso test has
-+      # This compiler won't grok '-c -o', but also, the minuso test has
-       # not run yet.  These depmodes are late enough in the game, and
-       # so weak that their functioning should not be impacted.
-       am__obj=conftest.${OBJEXT-o}
-@@ -3926,7 +3814,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -3966,7 +3854,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_CC="gcc"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -4019,7 +3907,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_CC="${ac_tool_prefix}cc"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -4060,7 +3948,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-        continue
-@@ -4118,7 +4006,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -4162,7 +4050,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_CC="$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -4358,8 +4246,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
- /* end confdefs.h.  */
- #include <stdarg.h>
- #include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
-+struct stat;
- /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
- struct buf { int x; };
- FILE * (*rcsopen) (struct buf *, struct stat *, int);
-@@ -4455,8 +4342,8 @@ else
-   # We make a subdir and do the tests there.  Otherwise we can end up
-   # making bogus files that we don't know about and never remove.  For
-   # instance it was reported that on HP-UX the gcc test will end up
--  # making a dummy file named `D' -- because `-MD' means `put the output
--  # in D'.
-+  # making a dummy file named 'D' -- because '-MD' means "put the output
-+  # in D".
-   rm -rf conftest.dir
-   mkdir conftest.dir
-   # Copy depcomp to subdir because otherwise we won't find it if we're
-@@ -4491,16 +4378,16 @@ else
-     : > sub/conftest.c
-     for i in 1 2 3 4 5 6; do
-       echo '#include "conftst'$i'.h"' >> sub/conftest.c
--      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
--      # Solaris 8's {/usr,}/bin/sh.
--      touch sub/conftst$i.h
-+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-+      # Solaris 10 /bin/sh.
-+      echo '/* dummy */' > sub/conftst$i.h
-     done
-     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- 
--    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-     # mode.  It turns out that the SunPro C++ compiler does not properly
--    # handle `-M -o', and we need to detect this.  Also, some Intel
--    # versions had trouble with output in subdirs
-+    # handle '-M -o', and we need to detect this.  Also, some Intel
-+    # versions had trouble with output in subdirs.
-     am__obj=sub/conftest.${OBJEXT-o}
-     am__minus_obj="-o $am__obj"
-     case $depmode in
-@@ -4509,8 +4396,8 @@ else
-       test "$am__universal" = false || continue
-       ;;
-     nosideeffect)
--      # after this tag, mechanisms are not by side-effect, so they'll
--      # only be used when explicitly requested
-+      # After this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested.
-       if test "x$enable_dependency_tracking" = xyes; then
- 	continue
-       else
-@@ -4518,7 +4405,7 @@ else
-       fi
-       ;;
-     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
--      # This compiler won't grok `-c -o', but also, the minuso test has
-+      # This compiler won't grok '-c -o', but also, the minuso test has
-       # not run yet.  These depmodes are late enough in the game, and
-       # so weak that their functioning should not be impacted.
-       am__obj=conftest.${OBJEXT-o}
-@@ -4594,7 +4481,7 @@ do
-     for ac_prog in sed gsed; do
-     for ac_exec_ext in '' $ac_executable_extensions; do
-       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
--      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-+      as_fn_executable_p "$ac_path_SED" || continue
- # Check for GNU ac_path_SED and select it if it is found.
-   # Check for GNU $ac_path_SED
- case `"$ac_path_SED" --version 2>&1` in
-@@ -4670,7 +4557,7 @@ do
-     for ac_prog in grep ggrep; do
-     for ac_exec_ext in '' $ac_executable_extensions; do
-       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
--      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-+      as_fn_executable_p "$ac_path_GREP" || continue
- # Check for GNU ac_path_GREP and select it if it is found.
-   # Check for GNU $ac_path_GREP
- case `"$ac_path_GREP" --version 2>&1` in
-@@ -4736,7 +4623,7 @@ do
-     for ac_prog in egrep; do
-     for ac_exec_ext in '' $ac_executable_extensions; do
-       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
--      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-+      as_fn_executable_p "$ac_path_EGREP" || continue
- # Check for GNU ac_path_EGREP and select it if it is found.
-   # Check for GNU $ac_path_EGREP
- case `"$ac_path_EGREP" --version 2>&1` in
-@@ -4803,7 +4690,7 @@ do
-     for ac_prog in fgrep; do
-     for ac_exec_ext in '' $ac_executable_extensions; do
-       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
--      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-+      as_fn_executable_p "$ac_path_FGREP" || continue
- # Check for GNU ac_path_FGREP and select it if it is found.
-   # Check for GNU $ac_path_FGREP
- case `"$ac_path_FGREP" --version 2>&1` in
-@@ -5059,7 +4946,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -5103,7 +4990,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -5527,7 +5414,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -5567,7 +5454,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -5873,7 +5760,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -5913,7 +5800,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -6017,7 +5904,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -6061,7 +5948,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_AR="$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -6186,7 +6073,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -6226,7 +6113,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_STRIP="strip"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -6285,7 +6172,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -6325,7 +6212,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_RANLIB="ranlib"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -6974,7 +6861,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7014,7 +6901,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7094,7 +6981,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7134,7 +7021,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7186,7 +7073,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7226,7 +7113,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7278,7 +7165,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7318,7 +7205,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_LIPO="lipo"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7370,7 +7257,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7410,7 +7297,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_OTOOL="otool"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7462,7 +7349,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7502,7 +7389,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ac_ct_OTOOL64="otool64"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -9104,7 +8991,7 @@ $as_echo_n "checking whether the $compil
-   enable_shared_with_static_runtimes=no
-   export_dynamic_flag_spec=
-   export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  hardcode_automatic=no
-+  hardcode_automatic=yes
-   hardcode_direct=no
-   hardcode_direct_absolute=no
-   hardcode_libdir_flag_spec=
-@@ -12136,7 +12023,7 @@ hardcode_libdir_flag_spec_CXX=
- hardcode_libdir_separator_CXX=
- hardcode_minus_L_CXX=no
- hardcode_shlibpath_var_CXX=unsupported
--hardcode_automatic_CXX=no
-+hardcode_automatic_CXX=yes
- inherit_rpath_CXX=no
- module_cmds_CXX=
- module_expsym_cmds_CXX=
-@@ -15665,42 +15552,8 @@ _ACEOF
- esac
- rm -rf conftest*
-   fi
--fi
--
- 
- 
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for execinfo.h" >&5
--$as_echo_n "checking for execinfo.h... " >&6; }
--
--  if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--      #include <execinfo.h>
--      int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
--
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
--      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
--$as_echo "#define USE_EXECINFO 1" >>confdefs.h
--
--
--else
--
--      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
- 
-@@ -16350,7 +16203,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_ax_pthread_config="yes"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -16553,7 +16406,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_PTHREAD_CC="$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -17514,7 +17367,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -17557,7 +17410,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -18204,6 +18057,14 @@ LIBOBJS=$ac_libobjs
- LTLIBOBJS=$ac_ltlibobjs
- 
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
-+$as_echo_n "checking that generated files are newer than configure... " >&6; }
-+   if test -n "$am_sleep_pid"; then
-+     # Hide warnings about reused PIDs.
-+     wait $am_sleep_pid 2>/dev/null
-+   fi
-+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-+$as_echo "done" >&6; }
-  if test -n "$EXEEXT"; then
-   am__EXEEXT_TRUE=
-   am__EXEEXT_FALSE='#'
-@@ -18522,16 +18383,16 @@ if (echo >conf$$.file) 2>/dev/null; then
-     # ... but there are two gotchas:
-     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
--    # In both cases, we have to default to `cp -p'.
-+    # In both cases, we have to default to `cp -pR'.
-     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
--      as_ln_s='cp -p'
-+      as_ln_s='cp -pR'
-   elif ln conf$$.file conf$$ 2>/dev/null; then
-     as_ln_s=ln
-   else
--    as_ln_s='cp -p'
-+    as_ln_s='cp -pR'
-   fi
- else
--  as_ln_s='cp -p'
-+  as_ln_s='cp -pR'
- fi
- rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
- rmdir conf$$.dir 2>/dev/null
-@@ -18591,28 +18452,16 @@ else
-   as_mkdir_p=false
- fi
- 
--if test -x / >/dev/null 2>&1; then
--  as_test_x='test -x'
--else
--  if ls -dL / >/dev/null 2>&1; then
--    as_ls_L_option=L
--  else
--    as_ls_L_option=
--  fi
--  as_test_x='
--    eval sh -c '\''
--      if test -d "$1"; then
--	test -d "$1/.";
--      else
--	case $1 in #(
--	-*)set "./$1";;
--	esac;
--	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
--	???[sx]*):;;*)false;;esac;fi
--    '\'' sh
--  '
--fi
--as_executable_p=$as_test_x
-+
-+# as_fn_executable_p FILE
-+# -----------------------
-+# Test if FILE is an executable regular file.
-+as_fn_executable_p ()
-+{
-+  test -f "$1" && test -x "$1"
-+} # as_fn_executable_p
-+as_test_x='test -x'
-+as_executable_p=as_fn_executable_p
- 
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -18634,7 +18483,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
- # values after options handling.
- ac_log="
- This file was extended by rtorrent $as_me 0.9.2, which was
--generated by GNU Autoconf 2.68.  Invocation command line was
-+generated by GNU Autoconf 2.69.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -18700,10 +18549,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
- ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
- rtorrent config.status 0.9.2
--configured by $0, generated by GNU Autoconf 2.68,
-+configured by $0, generated by GNU Autoconf 2.69,
-   with options \\"\$ac_cs_config\\"
- 
--Copyright (C) 2010 Free Software Foundation, Inc.
-+Copyright (C) 2012 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
- 
-@@ -18794,7 +18643,7 @@ fi
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- if \$ac_cs_recheck; then
--  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-   shift
-   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-   CONFIG_SHELL='$SHELL'
-@@ -19825,7 +19674,7 @@ $as_echo "$as_me: executing $ac_file com
-     # Strip MF so we end up with the name of the file.
-     mf=`echo "$mf" | sed -e 's/:.*$//'`
-     # Check whether this is an Automake generated Makefile or not.
--    # We used to match only the files named `Makefile.in', but
-+    # We used to match only the files named 'Makefile.in', but
-     # some people rename them; so instead we look at the file content.
-     # Grep'ing the first line is not enough: some people post-process
-     # each Makefile.in and add a new line on top of each file to say so.
-@@ -19859,21 +19708,19 @@ $as_echo X"$mf" |
-       continue
-     fi
-     # Extract the definition of DEPDIR, am__include, and am__quote
--    # from the Makefile without running `make'.
-+    # from the Makefile without running 'make'.
-     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-     test -z "$DEPDIR" && continue
-     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-     test -z "am__include" && continue
-     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
--    # When using ansi2knr, U may be empty or an underscore; expand it
--    U=`sed -n 's/^U = //p' < "$mf"`
-     # Find all dependency output files, they are included files with
-     # $(DEPDIR) in their names.  We invoke sed twice because it is the
-     # simplest approach to changing $(DEPDIR) to its actual value in the
-     # expansion.
-     for file in `sed -n "
-       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
--	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-       # Make sure the directory exists.
-       test -f "$dirpart/$file" && continue
-       fdir=`$as_dirname -- "$file" ||
diff --git a/package/systemd/Makefile b/package/systemd/Makefile
index 11ae586ae..5fe43a086 100644
--- a/package/systemd/Makefile
+++ b/package/systemd/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		systemd
 PKG_VERSION:=		208
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		df64550d92afbffb4f67a434193ee165
 PKG_DESCR:=		System and Service Manager
 PKG_SECTION:=		utils
@@ -14,28 +14,13 @@ PKG_BUILDDEP:=		autotool usbutils glib kmod util-linux libcap
 PKG_BUILDDEP+=		libgcrypt gperf-host
 PKG_URL:=		http://freedesktop.org/wiki/Software/systemd/
 PKG_SITES:=		http://www.freedesktop.org/software/systemd/
-PKG_LIBNAME:=		libudev
-PKG_OPTS:=		dev
 
 PKG_LIBC_DEPENDS:=	eglibc glibc
-PKG_SUBPKGS:=		UDEV LIBUDEV LIBGUDEV
-PKGSC_LIBGUDEV:=	libs
-PKGSD_LIBGUDEV:=	GUDEV library
-PKGSC_LIBUDEV:=		libs
-PKGSD_LIBUDEV:=		UDEV library
-PKGSD_UDEV:=		Dynamic device management subsystem
-
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+=		libmix
-endif
-
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,UDEV,udev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBUDEV,libudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBGUDEV,libgudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,SYSTEMD,systemd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 AUTOTOOL_STYLE:=	autoreconf
 TARGET_LDFLAGS+=	-lrt
@@ -45,19 +30,7 @@ CONFIGURE_ARGS+=	--disable-static \
 			--disable-manpages \
 			--disable-polkit
 
-udev-install:
-	${INSTALL_DIR} ${IDIR_UDEV}/usr/bin ${IDIR_UDEV}/etc/udev
-	${INSTALL_DIR} ${IDIR_UDEV}/usr/lib/udev
-	${CP} ${WRKINST}/etc/udev/* ${IDIR_UDEV}/etc/udev
-	${CP} ${WRKINST}/usr/lib/udev/* ${IDIR_UDEV}/usr/lib/udev
-	${CP} ${WRKINST}/usr/bin/udevadm ${IDIR_UDEV}/usr/bin
-
-libudev-install:
-	${INSTALL_DIR} ${IDIR_LIBUDEV}/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libudev.so* $(IDIR_LIBUDEV)/usr/lib
-
-libgudev-install:
-	${INSTALL_DIR} ${IDIR_LIBGUDEV}/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libgudev*.so* $(IDIR_LIBGUDEV)/usr/lib
+# TODO
+systemd-install:
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/upower/Makefile b/package/upower/Makefile
index adf317802..99c721879 100644
--- a/package/upower/Makefile
+++ b/package/upower/Makefile
@@ -5,17 +5,15 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		upower
 PKG_VERSION:=		0.99.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		14f43bc13353e23e7280863f33ac50d2
 PKG_DESCR:=		powermanagement
 PKG_SECTION:=		misc
-PKG_BUILDDEP:=		glib dbus-glib polkit systemd
+PKG_BUILDDEP:=		glib dbus-glib polkit eudev
 PKG_DEPENDS:=		glib dbus-glib polkit libgudev
 PKG_URL:=		http://upower.freedesktop.org/
 PKG_SITES:=		http://upower.freedesktop.org/releases/
 
-PKG_LIBC_DEPENDS:=	eglibc glibc
-
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 include $(TOPDIR)/mk/package.mk
@@ -38,5 +36,8 @@ upower-install:
 	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/upower \
 		$(IDIR_UPOWER)/usr/bin
+	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/share/dbus-1
+	$(CP) $(WRKINST)/usr/share/dbus-1/* \
+		$(IDIR_UPOWER)/usr/share/dbus-1
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index 71ead8b7e..9f45cd633 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -9,27 +9,30 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		7ae385ebf8e5cfcb917393235e6efbdb
 PKG_DESCR:=		software media player
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		boost libffmpeg python2 libstdcxx bcm2835-vc
+PKG_DEPENDS:=		boost libffmpeg python2 libstdcxx
 PKG_DEPENDS+=		libglew mesalib libass libmpeg2 libmad dbus
 PKG_DEPENDS+=		libjpeg-turbo libogg libvorbis libmodplug libcurl
 PKG_DEPENDS+=		libflac libopenssl libbz2 libtiff liblzo
 PKG_DEPENDS+=		yajl tinyxml libsqlite libpcrecpp libpng
 PKG_DEPENDS+=		libpcre libcdio libfreetype libsamplerate
 PKG_DEPENDS+=		taglib libjasper libmp3lame libmicrohttpd
-PKG_DEPENDS+=		omxplayer libbluray libgpg-error libudev
+PKG_DEPENDS+=		libbluray libgpg-error libudev
 PKG_DEPENDS+=		libssh libcec libnfs librtmp samba-lib libncurses
 PKG_BUILDDEP:=		autotool boost ffmpeg python2 MesaLib libglew libass
 PKG_BUILDDEP+=		libmpeg2 libmad libjpeg-turbo libogg libvorbis libmodplug
 PKG_BUILDDEP+=		curl flac openssl bzip2 libtiff liblzo yajl
 PKG_BUILDDEP+=		tinyxml sqlite pcre libpng libcdio freetype 
 PKG_BUILDDEP+=		libsamplerate taglib libjasper lame libmicrohttpd
-PKG_BUILDDEP+=		bcm2835-vc libgpg-error libbluray dbus
-PKG_BUILDDEP+=		libssh libcec libnfs samba rtmpdump systemd
+PKG_BUILDDEP+=		libssh libcec libnfs samba rtmpdump eudev
+PKG_BUILDDEP+=		libgpg-error libbluray dbus
 PKG_BUILDDEP+=		swig-host sdl-host sdl-image-host liblzo-host
 PKG_URL:=		http://xbmc.org/
 PKG_SITES:=		http://mirrors.xbmc.org/releases/source/
 
-PKG_SYSTEM_DEPENDS:=	raspberry-pi
+PKG_DEPENDS_RASPBERRY_PI:=	bcm2835-vc omxplayer
+PKG_BUILDDEP_RASPBERRY_PI:=	bcm2835-vc omxplayer
+PKG_BUILDDEP_IBM_X40:=	nasm-host
+PKG_SYSTEM_DEPENDS:=	raspberry-pi ibm-x40
 PKG_LIBC_DEPENDS:=	eglibc glibc musl
 
 WRKDIST=		$(WRKDIR)/$(PKG_NAME)-$(PKG_VERSION)-Frodo
@@ -41,12 +44,15 @@ $(eval $(call PKG_template,XBMC,xbmc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS
 XAKE_FLAGS+=		V=1 TIXML_USE_STL=1
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 TARGET_CPPFLAGS+=	-I$(STAGING_DIR)/usr/include/boost-1_55 \
-			-DTIXML_USE_STL=1 \
-			-I$(STAGING_DIR)/opt/vc/include \
+			-DTIXML_USE_STL=1 -DHAS_SIMPLEPM=1
+
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+TARGET_CPPFLAGS+=	-I$(STAGING_DIR)/opt/vc/include \
 			-I$(STAGING_DIR)/opt/vc/include/interface/vcos/pthreads \
 			-I$(STAGING_DIR)/opt/vc/include/interface/vmcs_host/linux
-TARGET_LDFLAGS+=	-L$(STAGING_DIR)/opt/vc/lib -lkhrn_static \
-			-L$(STAGING_DIR)/usr/lib/samba
+TARGET_LDFLAGS+=	-L$(STAGING_DIR)/opt/vc/lib -lkhrn_static
+endif
+
 AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ENV+=		DESTDIR='${WRKINST}' \
 			TEXTUREPACKER_NATIVE_ROOT='$(STAGING_HOST_DIR)/usr'
@@ -58,20 +64,25 @@ CONFIGURE_ARGS+=	--disable-optical-drive \
 			--enable-udev \
 			--enable-libbluray \
 			--enable-external-libraries \
-			--enable-player=omxplayer \
-			--enable-gles \
 			--enable-rtmp \
 			--disable-libusb \
 			--disable-libcap \
 			--disable-sdl \
 			--disable-joystick \
 			--disable-dvdcss \
-			--disable-x11 \
-			--disable-debug \
-			--with-platform=raspberry-pi
+			--disable-debug
+
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+CONFIGURE_ARGS+=	--with-platform=raspberry-pi \
+			--enable-player=omxplayer \
+			--enable-gles \
+			--disable-x11
+else
+CONFIGURE_ARGS+=	--enable-x11
+endif
 
 pre-configure:
-	(cd $(WRKBUILD)/lib/cpluff && ./autogen.sh)
+	(cd $(WRKBUILD)/lib/cpluff && env PATH=$(AUTOTOOL_PATH) ./autogen.sh)
 
 xbmc-install:
 	$(INSTALL_DIR) $(IDIR_XBMC)/usr/lib/xbmc
diff --git a/package/xbmc/patches/001-simplepm.patch b/package/xbmc/patches/001-simplepm.patch
new file mode 100644
index 000000000..41ded94fa
--- /dev/null
+++ b/package/xbmc/patches/001-simplepm.patch
@@ -0,0 +1,144 @@
+diff -Nur xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp xbmc-12.3-Frodo/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp
+--- xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp	1970-01-01 01:00:00.000000000 +0100
++++ xbmc-12.3-Frodo/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp	2014-01-10 16:23:32.238217592 +0100
+@@ -0,0 +1,55 @@
++/*
++ *      Copyright (C) 2014 Team XBMC
++ *      http://www.xbmc.org
++ *
++ *  This Program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2, or (at your option)
++ *  any later version.
++ *
++ *  This Program 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 XBMC; see the file COPYING.  If not, see
++ *  <http://www.gnu.org/licenses/>.
++ *
++ */
++ 
++#if defined (_LINUX)
++
++#include <stdlib.h>
++#include "LinuxPowerSyscall.h"
++#include "utils/log.h"
++
++CLinuxPowerSyscall::CLinuxPowerSyscall()
++{ 
++	CLog::Log(LOGINFO, "Selected LinuxPower as PowerSyscall");
++}
++
++CLinuxPowerSyscall::~CLinuxPowerSyscall()
++{ }
++
++bool CLinuxPowerSyscall::Powerdown()
++{
++  system("/sbin/poweroff -F");
++  return 0;
++}
++
++bool CLinuxPowerSyscall::Reboot()
++{
++  system("/sbin/reboot -F");
++  return 0;
++}
++
++int CLinuxPowerSyscall::BatteryLevel(void)
++{ }
++
++bool CLinuxPowerSyscall::PumpPowerEvents(IPowerEventsCallback *callback)
++{    
++  return true;
++}
++
++#endif
+diff -Nur xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/LinuxPowerSyscall.h xbmc-12.3-Frodo/xbmc/powermanagement/linux/LinuxPowerSyscall.h
+--- xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/LinuxPowerSyscall.h	1970-01-01 01:00:00.000000000 +0100
++++ xbmc-12.3-Frodo/xbmc/powermanagement/linux/LinuxPowerSyscall.h	2014-01-10 14:57:23.365205874 +0100
+@@ -0,0 +1,44 @@
++#pragma once
++/*
++ *      Copyright (C) 2014 Team XBMC
++ *      http://www.xbmc.org
++ *
++ *  This Program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2, or (at your option)
++ *  any later version.
++ *
++ *  This Program 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 XBMC; see the file COPYING.  If not, see
++ *  <http://www.gnu.org/licenses/>.
++ *
++ */
++
++#if defined (_LINUX)
++#include "powermanagement/IPowerSyscall.h"
++
++class CLinuxPowerSyscall : public CPowerSyscallWithoutEvents
++{
++public:
++  CLinuxPowerSyscall();
++  ~CLinuxPowerSyscall();
++
++  virtual bool Powerdown();
++  virtual bool Suspend(void) { return false; }
++  virtual bool Hibernate(void) { return false; }
++  virtual bool Reboot();
++
++  virtual bool CanPowerdown(void) { return true; }
++  virtual bool CanSuspend(void) { return false; }
++  virtual bool CanHibernate(void) { return false; }
++  virtual bool CanReboot(void) { return true; }
++  virtual int  BatteryLevel(void);
++
++  virtual bool PumpPowerEvents(IPowerEventsCallback *callback);
++};
++#endif
+diff -Nur xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/Makefile xbmc-12.3-Frodo/xbmc/powermanagement/linux/Makefile
+--- xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/Makefile	2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/xbmc/powermanagement/linux/Makefile	2014-01-10 14:27:13.411383558 +0100
+@@ -2,7 +2,8 @@
+      ConsoleUPowerSyscall.cpp \
+      HALPowerSyscall.cpp \
+      UPowerSyscall.cpp \
+-     SystemdUPowerSyscall.cpp
++     SystemdUPowerSyscall.cpp \
++     LinuxPowerSyscall.cpp
+ 
+ LIB=powermanagement_linux.a
+ 
+diff -Nur xbmc-12.3-Frodo.orig/xbmc/powermanagement/PowerManager.cpp xbmc-12.3-Frodo/xbmc/powermanagement/PowerManager.cpp
+--- xbmc-12.3-Frodo.orig/xbmc/powermanagement/PowerManager.cpp	2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/xbmc/powermanagement/PowerManager.cpp	2014-01-14 11:19:11.558337441 +0100
+@@ -46,6 +46,9 @@
+ #include "linux/ConsoleDeviceKitPowerSyscall.h"
+ #include "linux/SystemdUPowerSyscall.h"
+ #include "linux/UPowerSyscall.h"
++#ifdef HAS_SIMPLEPM
++#include "linux/LinuxPowerSyscall.h"
++#endif
+ #ifdef HAS_HAL
+ #include "linux/HALPowerSyscall.h"
+ #endif
+@@ -83,6 +86,10 @@
+     m_instance = new CSystemdUPowerSyscall();
+   else if (CUPowerSyscall::HasUPower())
+     m_instance = new CUPowerSyscall();
++#ifdef HAS_SIMPLEPM
++  else
++    m_instance = new CLinuxPowerSyscall();
++#endif
+ #ifdef HAS_HAL
+   else
+     m_instance = new CHALPowerSyscall();
diff --git a/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in b/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in
index a08eb0a94..9b670449b 100644
--- a/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in
+++ b/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in
@@ -1,5 +1,26 @@
---- xbmc-12.2.orig/tools/Linux/xbmc.sh.in	2013-05-03 07:57:41.000000000 +0200
-+++ xbmc-12.2/tools/Linux/xbmc.sh.in	2013-08-05 16:24:14.000000000 +0200
+--- xbmc-12.3-Frodo.orig/tools/Linux/xbmc.sh.in	2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/tools/Linux/xbmc.sh.in	2014-01-14 09:55:27.409527526 +0100
+@@ -52,7 +52,7 @@ single_stacktrace()
+ 
+ print_crash_report()
+ {
+-  FILE="$HOME/xbmc_crashlog-`date +%Y%m%d_%H%M%S`.log"
++  FILE="/tmp/xbmc_crashlog-`date +%Y%m%d_%H%M%S`.log"
+   echo "############## XBMC CRASH LOG ###############" >> $FILE
+   echo >> $FILE
+   echo "################ SYSTEM INFO ################" >> $FILE
+@@ -91,9 +91,9 @@ print_crash_report()
+   echo >> $FILE
+   echo "################# LOG FILE ##################" >> $FILE
+   echo >> $FILE
+-  if [ -f ~/.xbmc/temp/xbmc.log ]
++  if [ -f /tmp/xbmc/xbmc.log ]
+   then
+-    cat ~/.xbmc/temp/xbmc.log >> $FILE
++    cat /tmp/xbmc/xbmc.log >> $FILE
+     echo >> $FILE
+   else
+     echo "Logfile not found in the usual place." >> $FILE
 @@ -107,12 +107,6 @@ print_crash_report()
    echo "Crash report available at $FILE"
  }
diff --git a/package/xf86-input-evdev/Makefile b/package/xf86-input-evdev/Makefile
index 5e5e35d53..dac1fbd87 100644
--- a/package/xf86-input-evdev/Makefile
+++ b/package/xf86-input-evdev/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		2d3f7111b8284cec81884023c4bb4a11
 PKG_DESCR:=		X11 driver for Event driver
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server kmod-input-evdev libudev
-PKG_BUILDDEP:=		xorg-server systemd
+PKG_BUILDDEP:=		xorg-server eudev
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 PKG_LIBC_DEPENDS:=	eglibc glibc
diff --git a/package/xf86-video-ati/Makefile b/package/xf86-video-ati/Makefile
index 32c5178f5..fcc6e4256 100644
--- a/package/xf86-video-ati/Makefile
+++ b/package/xf86-video-ati/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		6bb71cff9ad9c5c7b258b2b6c56fdc95
 PKG_DESCR:=		X11 driver for ATI VGA chip
 PKG_SECTION:=		x11/drivers
-PKG_BUILDDEP:=		xorg-server libdrm xf86driproto MesaLib systemd
+PKG_BUILDDEP:=		xorg-server libdrm xf86driproto MesaLib eudev
 PKG_DEPENDS:=		xorg-server libdrm mesalib libudev
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_NEED_CXX:=		1
diff --git a/tools/adk/depmaker.c b/tools/adk/depmaker.c
index a2291e4b0..a80a0b02f 100644
--- a/tools/adk/depmaker.c
+++ b/tools/adk/depmaker.c
@@ -1,7 +1,7 @@
 /*
  * depmaker - create package/Depends.mk for OpenADK buildsystem
  *
- * Copyright (C) 2010,2011 Waldemar Brodkorb <wbx@openadk.org>
+ * Copyright (C) 2010-2014 Waldemar Brodkorb <wbx@openadk.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -64,7 +64,7 @@ static int check_symbol(char *symbol) {
 }
 
 /*@null@*/
-static char *parse_line(char *package, char *pkgvar, char *string, int checksym, int pprefix) {
+static char *parse_line(char *package, char *pkgvar, char *string, int checksym, int pprefix, int system) {
 
 	char *key, *value, *dep, *key_sym, *pkgdeps;
 	char temp[MAXLINE];
@@ -83,15 +83,20 @@ static char *parse_line(char *package, char *pkgvar, char *string, int checksym,
 			perror("Can not allocate memory.");
 			exit(EXIT_FAILURE);
 		}
-		if (pprefix == 0) {
-			if (snprintf(key_sym, MAXLINE, "ADK_PACKAGE_%s_", pkgvar) < 0)
-				perror("Can not create string variable.");
+		if (system == 0) {
+			if (pprefix == 0) {
+				if (snprintf(key_sym, MAXLINE, "ADK_PACKAGE_%s_", pkgvar) < 0)
+					perror("Can not create string variable.");
+			} else {
+				if (snprintf(key_sym, MAXLINE, "ADK_PACKAGE_") < 0)
+					perror("Can not create string variable.");
+			}
+			strncat(key_sym, key+6, strlen(key)-6);
 		} else {
-			if (snprintf(key_sym, MAXLINE, "ADK_PACKAGE_") < 0)
-				perror("Can not create string variable.");
+			if (snprintf(key_sym, MAXLINE, "ADK_TARGET_SYSTEM_%s", pkgvar) < 0)
+					perror("Can not create string variable.");
 		}
 			
-		strncat(key_sym, key+6, strlen(key)-6);
 		if (check_symbol(key_sym) != 0) {
 			free(key_sym);
 			return(NULL);
@@ -130,7 +135,8 @@ int main() {
 	FILE *pkg;
 	char buf[MAXLINE];
 	char path[MAXPATH];
-	char *string, *pkgvar, *pkgdeps, *tmp, *fpkg, *cpkg, *spkg, *key, *check;
+	char *string, *pkgvar, *pkgdeps, *tmp, *fpkg, *cpkg, *spkg, *key, *check, *dpkg;
+	char *stringtmp;
 	int i;
 	
 	/* read Makefile's for all packages */
@@ -160,6 +166,7 @@ int main() {
 				!(strncmp(pkgdirp->d_name, "libpthread", 10) == 0 && strlen(pkgdirp->d_name) == 10) &&
 				!(strncmp(pkgdirp->d_name, "uclibc++", 8) == 0) &&
 				!(strncmp(pkgdirp->d_name, "uclibc", 6) == 0) &&
+				!(strncmp(pkgdirp->d_name, "musl", 4) == 0) &&
 				!(strncmp(pkgdirp->d_name, "glibc", 5) == 0)) {
 				/* print result to stdout */
 				printf("package-$(ADK_COMPILE_%s) += %s\n", pkgvar, pkgdirp->d_name); 
@@ -187,7 +194,7 @@ int main() {
 
 					string = strstr(buf, "PKG_BUILDDEP:=");
 					if (string != NULL) {
-						tmp = parse_line(pkgdirp->d_name, pkgvar, string, 0, 0);
+						tmp = parse_line(pkgdirp->d_name, pkgvar, string, 0, 0, 0);
 						if (tmp != NULL) {
 							strncat(pkgdeps, tmp, strlen(tmp));
 						}
@@ -195,12 +202,27 @@ int main() {
 
 					string = strstr(buf, "PKG_BUILDDEP+=");
 					if (string != NULL) {
-						tmp = parse_line(pkgdirp->d_name, pkgvar, string, 0, 0);
+						tmp = parse_line(pkgdirp->d_name, pkgvar, string, 0, 0, 0);
 						if (tmp != NULL)
 							strncat(pkgdeps, tmp, strlen(tmp));
 					}
 
-					// WE need to find the subpackage name here
+					// We need to find the system name here
+					string = strstr(buf, "PKG_BUILDDEP_");
+					if (string != NULL) {
+						check = strstr(buf, ":=");
+						if (check != NULL) {
+							stringtmp = strdup(string);
+							string[strlen(string)-1] = '\0';
+							key = strtok(string, ":=");
+							dpkg = strdup(key+13);
+							tmp = parse_line(pkgdirp->d_name, dpkg, stringtmp, 1, 0, 1);
+							if (tmp != NULL)
+								strncat(pkgdeps, tmp, strlen(tmp));
+						}
+					}
+
+					// We need to find the subpackage name here
 					string = strstr(buf, "PKG_FLAVOURS_");
 					if (string != NULL) {
 						check = strstr(buf, ":=");
@@ -213,12 +235,12 @@ int main() {
 
 					string = strstr(buf, "PKGFB_");
 					if (string != NULL) {
-						tmp = parse_line(pkgdirp->d_name, fpkg, string, 1, 0);
+						tmp = parse_line(pkgdirp->d_name, fpkg, string, 1, 0, 0);
 						if (tmp != NULL)
 							strncat(pkgdeps, tmp, strlen(tmp));
 					}
 
-					// WE need to find the subpackage name here
+					// We need to find the subpackage name here
 					string = strstr(buf, "PKG_CHOICES_");
 					if (string != NULL) {
 						check = strstr(buf, ":=");
@@ -230,12 +252,12 @@ int main() {
 					}
 					string = strstr(buf, "PKGCB_");
 					if (string != NULL) {
-						tmp = parse_line(pkgdirp->d_name, cpkg, string, 1, 0);
+						tmp = parse_line(pkgdirp->d_name, cpkg, string, 1, 0, 0);
 						if (tmp != NULL)
 							strncat(pkgdeps, tmp, strlen(tmp));
 					}
 
-					// WE need to find the subpackage name here
+					// We need to find the subpackage name here
 					string = strstr(buf, "PKG_SUBPKGS_");
 					if (string != NULL) {
 						check = strstr(buf, ":=");
@@ -248,7 +270,7 @@ int main() {
 
 					string = strstr(buf, "PKGSB_");
 					if (string != NULL) {
-						tmp = parse_line(pkgdirp->d_name, spkg, string, 1, 1);
+						tmp = parse_line(pkgdirp->d_name, spkg, string, 1, 1, 0);
 						if (tmp != NULL) {
 							strncat(pkgdeps, tmp, strlen(tmp));
 						}
diff --git a/tools/adk/pkgmaker.c b/tools/adk/pkgmaker.c
index d00e7302f..3609691b6 100644
--- a/tools/adk/pkgmaker.c
+++ b/tools/adk/pkgmaker.c
@@ -1,7 +1,7 @@
 /*
  * pkgmaker - create package meta-data for OpenADK buildsystem
  *
- * Copyright (C) 2010-2013 Waldemar Brodkorb <wbx@openadk.org>
+ * Copyright (C) 2010-2014 Waldemar Brodkorb <wbx@openadk.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -111,6 +111,53 @@ static int parse_var(char *buf, const char *varname, char *pvalue, char **result
 	return(1);
 }
 
+static int parse_var_with_system(char *buf, const char *varname, char *pvalue, char **result, char **sysname, int varlen) {
+
+	char *pkg_var, *check;
+	char *key, *value, *string;
+
+	if ((pkg_var = malloc(MAXLINE)) != NULL)
+		memset(pkg_var, 0, MAXLINE);
+	else {
+		perror("Can not allocate memory");
+		exit(EXIT_FAILURE);
+	}
+
+	check = strstr(buf, ":=");
+	if (check != NULL) {
+		string = strstr(buf, varname);
+		if (string != NULL) {
+			string[strlen(string)-1] = '\0';
+			key = strtok(string, ":=");
+			*sysname = strdup(key+varlen);
+			value = strtok(NULL, "=\t");
+			if (value != NULL) {
+				strncat(pkg_var, value, strlen(value));
+				*result = strdup(pkg_var);
+			}
+			free(pkg_var);
+			return(0);
+		}
+	} else {
+		string = strstr(buf, varname);
+		if (string != NULL) {
+			string[strlen(string)-1] = '\0';
+			key = strtok(string, "+=");
+			value = strtok(NULL, "=\t");
+			if (pvalue != NULL)
+				strncat(pkg_var, pvalue, strlen(pvalue));
+			strncat(pkg_var, " ", 1);
+			if (value != NULL)
+				strncat(pkg_var, value, strlen(value));
+			*result = strdup(pkg_var);
+			free(pkg_var);
+			return(0);
+		}
+	}
+	free(pkg_var);
+	return(1);
+}
+
 static int parse_var_with_pkg(char *buf, const char *varname, char *pvalue, char **result, char **pkgname, int varlen) {
 
 	char *pkg_var, *check;
@@ -268,9 +315,9 @@ int main() {
 	char dir[MAXPATH];
 	char variable[2*MAXVAR];
 	char *key, *value, *token, *cftoken, *sp, *hkey, *val, *pkg_fd;
-	char *pkg_name, *pkg_depends, *pkg_section, *pkg_descr, *pkg_url;
+	char *pkg_name, *pkg_depends, *pkg_depends_system, *pkg_section, *pkg_descr, *pkg_url;
 	char *pkg_cxx, *pkg_subpkgs, *pkg_cfline, *pkg_dflt, *pkg_multi;
-	char *pkg_need_cxx, *pkg_need_java, *pkgname, *pkg_debug;
+	char *pkg_need_cxx, *pkg_need_java, *pkgname, *sysname, *pkg_debug;
 	char *pkg_libc_depends, *pkg_host_depends, *pkg_system_depends, *pkg_arch_depends, *pkg_flavours, *pkg_flavours_string, *pkg_choices, *pseudo_name;
 	char *packages, *pkg_name_u, *pkgs, *pkg_opts, *pkg_libname;
 	char *saveptr, *p_ptr, *s_ptr, *pkg_helper;
@@ -282,6 +329,7 @@ int main() {
 	pkg_section = NULL;
 	pkg_url = NULL;
 	pkg_depends = NULL;
+	pkg_depends_system = NULL;
 	pkg_opts = NULL;
 	pkg_libname = NULL;
 	pkg_flavours = NULL;
@@ -299,6 +347,7 @@ int main() {
 	pkg_need_cxx = NULL;
 	pkg_need_java = NULL;
 	pkgname = NULL;
+	sysname = NULL;
 	pkg_helper = NULL;
 	pkg_debug = NULL;
 
@@ -463,6 +512,8 @@ int main() {
 						continue;
 					if ((parse_var(buf, "PKG_DEPENDS", pkg_depends, &pkg_depends)) == 0)
 						continue;
+					if ((parse_var_with_system(buf, "PKG_DEPENDS_", pkg_depends_system, &pkg_depends_system, &sysname, 12)) == 0)
+						continue;
 					if ((parse_var(buf, "PKG_LIBNAME", pkg_libname, &pkg_libname)) == 0) 
 						continue;
 					if ((parse_var(buf, "PKG_OPTS", pkg_opts, &pkg_opts)) == 0)
@@ -517,6 +568,8 @@ int main() {
 				fprintf(stderr, "Package description is %s\n", pkg_descr);
 			if (pkg_depends != NULL)
 				fprintf(stderr, "Package dependencies are %s\n", pkg_depends);
+			if (pkg_depends_system != NULL)
+				fprintf(stderr, "Package systemspecific dependencies are %s\n", pkg_depends_system);
 			if (pkg_subpkgs != NULL)
 				fprintf(stderr, "Package subpackages are %s\n", pkg_subpkgs);
 			if (pkg_flavours != NULL && pkgname != NULL)
@@ -782,6 +835,16 @@ int main() {
 					free(pkg_depends);
 					pkg_depends = NULL;
 				}
+				/* create system specific package dependency information */
+				if (pkg_depends_system != NULL) {
+					token = strtok(pkg_depends_system, " ");
+					while (token != NULL) {
+						fprintf(cfg, "\tselect ADK_PACKAGE_%s if ADK_TARGET_SYSTEM_%s\n", toupperstr(token), sysname);
+						token = strtok(NULL, " ");
+					}
+					free(pkg_depends_system);
+					pkg_depends_system = NULL;
+				}
 
 				if (pkg_need_cxx != NULL) {
 					fprintf(cfg, "\tdepends on ADK_TOOLCHAIN_GCC_CXX\n");
author	Waldemar Brodkorb <wbx@openadk.org>	2014-01-14 17:53:20 +0100
committer	Waldemar Brodkorb <wbx@openadk.org>	2014-01-14 17:53:20 +0100
commit	f67b4be3be5d03a688bbbf7a54df25ca16caa475 (patch)
tree	21b9c0f3095f1615121ea986af5e5152c8c564d2
parent	c6d7c45aeb5f365a69d93f01a0365edc24db67ce (diff)
parent	be769dc45c2063408845ccaed62ef34404f42d68 (diff)