activate GCC cflags check, cleanup FLAGS stuff in OpenADK.

* remove TCFLAGS/TLDFLAGS/TCPPFLAGS and only use TARGET_CFLAGS/TARGET_LDFLAGS/TARGET_CPPFLAGS, ... * activate GCC_HONOUR_COPTS and fix all packages to honour CFLAGS * use CC_FOR_BUILD, CFLAGS_FOR_BUILD, ... for all build compilation, remove HOST* variants * introduce KERNEL_MODULE_FLAGS for external kernel modules * mark rpm package as broken, mark syslinux for native builds only, mark libhugetlb for eglibc/glibc only usage
author: Waldemar Brodkorb <wbx@openadk.org> 2011-01-22 22:37:50 +0100
committer: Waldemar Brodkorb <wbx@openadk.org> 2011-01-22 22:37:50 +0100
commit: 9436a026e2e23d207fbdcb9e8bc9b076e3573700 (patch)
tree: adb1937bc90be8869a5f7c9636da84773414eb3b
parent: 52b1b0100c53b1f8699955df618fcb47744e0a7e (diff)
290 files changed, 8917 insertions, 10724 deletions
diff --git a/Makefile b/Makefile
index bcef6d5c2..27f85205c 100644
--- a/Makefile
+++ b/Makefile
@@ -215,7 +215,7 @@ NO_ERROR=0
 	@echo "_PATH:=$$PATH" >>prereq.mk
 	@echo "PATH:=\$${TOPDIR}/scripts:/usr/sbin:$$PATH" >>prereq.mk
 	@echo "SHELL:=$$(which bash)" >>prereq.mk
-	@echo "HOST_LIBIDL_CONFIG:=$$(which libIDL-config-2 2>/dev/null)" >>prereq.mk
+	@echo "BUILD_LIBIDL_CONFIG:=$$(which libIDL-config-2 2>/dev/null)" >>prereq.mk
 	@echo "PKG_HOSTLIB_DIR=$$(eval pkg-config --variable pc_path pkg-config 2>/dev/null)" >/dev/null
 	@echo "PKG_HOSTLIB_DIR:=$${PKG_HOSTLIB_DIR:-/usr/lib/pkgconfig}" >>prereq.mk
 	@env NO_ERROR=${NO_ERROR} BASH="$$(which bash)" \
diff --git a/config/Makefile b/config/Makefile
index cacb2a28c..afe153c8a 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -6,31 +6,31 @@ include ${TOPDIR}/rules.mk
 endif
 
 CP=cp -fpR
-HOSTCFLAGS+=-DKBUILD_NO_NLS
+CFLAGS_FOR_BUILD+=-DKBUILD_NO_NLS
 
 all: ncurses conf mconf
 
 LIBS=		-lncurses
 ifeq (/usr/include/ncurses/ncurses.h, $(wildcard /usr/include/ncurses/ncurses.h))
-HOSTNCURSES+=	-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"
+CFLAGS_FOR_BUILD+=	-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"
 else
 ifeq (/usr/include/ncurses/curses.h, $(wildcard /usr/include/ncurses/curses.h))
-HOSTNCURSES+=	-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"
+CFLAGS_FOR_BUILD+=	-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"
 else
 ifeq (/usr/local/include/ncurses/ncurses.h, $(wildcard /usr/local/include/ncurses/ncurses.h))
-HOSTCFLAGS+=	-I/usr/local/include/ncurses -DCURSES_LOC="<ncurses.h>"
+CFLAGS_FOR_BUILD+=	-I/usr/local/include/ncurses -DCURSES_LOC="<ncurses.h>"
 else
 ifeq (/usr/local/include/ncurses/curses.h, $(wildcard /usr/local/include/ncurses/curses.h))
-HOSTCFLAGS+=	-I/usr/local/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"
+CFLAGS_FOR_BUILD+=	-I/usr/local/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"
 else
 ifeq (/usr/pkg/include/ncurses.h, $(wildcard /usr/pkg/include/ncurses.h))
-HOSTCFLAGS+=	-I/usr/pkg/include -DCURSES_LOC="<ncurses.h>"
+CFLAGS_FOR_BUILD+=	-I/usr/pkg/include -DCURSES_LOC="<ncurses.h>"
 LIBS+=		-L/usr/pkg/lib -Wl,-rpath -Wl,/usr/pkg/lib
 else
 ifeq (/usr/include/ncurses.h, $(wildcard /usr/include/ncurses.h))
-HOSTNCURSES+=	-DCURSES_LOC="<ncurses.h>"
+CFLAGS_FOR_BUILD+=	-DCURSES_LOC="<ncurses.h>"
 else
-HOSTNCURSES+=	-DCURSES_LOC="<curses.h>"
+CFLAGS_FOR_BUILD+=	-DCURSES_LOC="<curses.h>"
 LIBS=		-lcurses
 endif
 endif
@@ -39,8 +39,8 @@ endif
 endif
 endif
 
-HOSTGTKLIBS = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0`
-HOSTGTKCFLAGS = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0`
+GTKLIBS = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0`
+GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0`
 
 CONF_SRC  =conf.c
 MCONF_SRC =mconf.c $(wildcard lxdialog/*.c)
@@ -53,25 +53,25 @@ GCONF_OBJS=$(patsubst %.c,%.o, $(GCONF_SRC))
 SHARED_OBJS=$(patsubst %.c,%.o, $(SHARED_SRC))
 
 conf: $(CONF_OBJS) $(SHARED_OBJS)
-	@$(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $^ -o $@
+	@$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NATIVE_LDFLAGS) $^ -o $@
 
 mconf: $(MCONF_OBJS) $(SHARED_OBJS)
-	@$(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS)
+	@$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS)
 
 gconf: $(GCONF_OBJS) $(SHARED_OBJS)
-	@$(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $^ -o $@ $(HOSTGTKLIBS)
+	@$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NATIVE_LDFLAGS) $^ -o $@ $(GTKLIBS)
 
 $(CONF_OBJS): %.o : %.c $(SHARED_DEPS)
-	@$(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@
+	@$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c $< -o $@
 
 $(MCONF_OBJS): %.o : %.c $(SHARED_DEPS)
-	@$(HOSTCC) $(HOSTCFLAGS) $(HOSTNCURSES) -I. -c $< -o $@
+	@$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(HOSTNCURSES) -I. -c $< -o $@
 
 $(GCONF_OBJS): %.o : %.c $(SHARED_DEPS)
-	@$(HOSTCC) $(HOSTCFLAGS) $(HOSTGTKCFLAGS) -DLKC_DIRECT_LINK -I. -c $< -o $@
+	@$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(GTKCFLAGS) -DLKC_DIRECT_LINK -I. -c $< -o $@
 
 glob.o: glob.c $(SHARED_DEPS)
-	@$(HOSTCC) $(HOSTCFLAGS) -I. -c glob.c -o $@
+	@$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c glob.c -o $@
 
 lkc_defs.h: lkc_proto.h
 	@sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
@@ -94,15 +94,15 @@ lex.%.c: %.l
 	flex -P$(notdir $*) -o$@ $<
 
 lex.zconf.o: lex.zconf.c $(SHARED_DEPS)
-	$(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@
+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c $< -o $@
 
 zconf.tab.o: zconf.tab.c zconf.hash.c lex.zconf.c confdata.c expr.c symbol.c menu.c $(SHARED_DEPS)
-	$(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@
+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c $< -o $@
 
 else
 
 lex.zconf.o: lex.zconf.c $(SHARED_DEPS)
-	$(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@
+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c $< -o $@
 
 lex.zconf.c: lex.zconf.c_shipped
 	@$(CP) lex.zconf.c_shipped lex.zconf.c
@@ -111,7 +111,7 @@ zconf.hash.c: zconf.hash.c_shipped
 	@$(CP) zconf.hash.c_shipped zconf.hash.c
 
 zconf.tab.o: zconf.tab.c zconf.hash.c lex.zconf.c confdata.c expr.c symbol.c menu.c $(SHARED_DEPS)
-	@$(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@
+	@$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c $< -o $@
 
 zconf.tab.c: zconf.tab.c_shipped
 	@$(CP) zconf.tab.c_shipped zconf.tab.c
@@ -124,7 +124,7 @@ endif
 
 ncurses:
 	@echo "int main(void) { return -1; }" > lxtemp.c
-	@if $(HOSTCC) $(HOSTCFLAGS) lxtemp.c $(LIBS) ; then \
+	@if $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) lxtemp.c $(LIBS) ; then \
 		rm -f lxtemp.c a.out; \
 	else \
 		rm -f lxtemp.c; \
diff --git a/mk/build.mk b/mk/build.mk
index 43f209923..8ac41f3a5 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -252,7 +252,7 @@ ifeq ($(filter-out distclean,${MAKECMDGOALS}),)
 include ${TOPDIR}/mk/vars.mk
 else
 include $(TOPDIR)/prereq.mk
-export BASH HOSTCC HOSTCFLAGS HOSTCXX HOSTCXXFLAGS MAKE LANGUAGE LC_ALL OStype PATH
+export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD
 endif
 
 all: menuconfig
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk
index f66b238e0..e730f561d 100644
--- a/mk/kernel-vars.mk
+++ b/mk/kernel-vars.mk
@@ -4,12 +4,6 @@
 KERNEL_MAKE_OPTS:=	-C "${LINUX_DIR}" V=1
 ifneq ($(ADK_NATIVE),y)
 KERNEL_MAKE_OPTS+=	CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
-			CC="$(TARGET_CC)" HOSTCC="${HOSTCC}" \
-			HOSTCFLAGS='${HOSTCFLAGS}'
+			CC="$(TARGET_CC)" HOSTCC="${CC_FOR_BUILD}" \
+			HOSTCFLAGS='${CFLAGS_FOR_BUILD}'
 endif
-
-ifeq (${ADK_TARGET_SYSTEM_LINKSYS_WRT54G},y)
-ADK_KCPPFLAGS+=		-DBCM47XX_OVERRIDE_FLASHSIZE=0x400000
-endif
-
-KERNEL_MAKE_ENV+=	KCPPFLAGS='${ADK_KCPPFLAGS}'
diff --git a/mk/package.mk b/mk/package.mk
index bacee71f4..eded9c226 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -7,32 +7,6 @@ ifeq ($(ADK_HOST_CYGWIN),y)
 EXEEXT:=		.exe
 endif
 
-TCFLAGS:=		${TARGET_CFLAGS}
-TCXXFLAGS:=		${TARGET_CFLAGS}
-TCPPFLAGS:=		${TARGET_CPPFLAGS}
-TLDFLAGS:=		${TARGET_LDFLAGS} -Wl,-rpath -Wl,/usr/lib \
-			-Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \
-			-L${STAGING_TARGET_DIR}/lib -L${STAGING_TARGET_DIR}/usr/lib
-ifeq ($(ADK_STATIC),y)
-TCFLAGS:=		${TARGET_CFLAGS} -static
-TCXXFLAGS:=		${TARGET_CFLAGS} -static
-TCPPFLAGS:=		${TARGET_CPPFLAGS} -static
-TLDFLAGS:=		${TARGET_LDFLAGS} -Wl,-rpath -Wl,/usr/lib \
-			-Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \
-			-L${STAGING_TARGET_DIR}/lib -L${STAGING_TARGET_DIR}/usr/lib \
-			-static
-endif
-ifeq ($(ADK_NATIVE),y)
-TCFLAGS:=		$(TARGET_CFLAGS_ARCH) $(TARGET_DEBUGGING) -fwrapv
-TCXXFLAGS:=		
-TCPPFLAGS:=
-TLDFLAGS:=
-endif
-
-ifeq ($(ADK_DEBUG),)
-TCPPFLAGS+=		-DNDEBUG
-endif
-
 # does not change CONFIGURE_ARGS in minimal mode
 ifeq ($(filter minimal,${CONFIG_STYLE}),)
 ifneq ($(ADK_DEBUG),)
@@ -42,10 +16,10 @@ endif
 
 CONFIGURE_ENV+=		GCC_HONOUR_COPTS=s \
 			CONFIG_SHELL='$(strip ${SHELL})' \
-			CFLAGS='$(strip ${TCFLAGS})' \
-			CXXFLAGS='$(strip ${TCXXFLAGS})' \
-			CPPFLAGS='$(strip ${TCPPFLAGS})' \
-			LDFLAGS='$(strip ${TLDFLAGS})' \
+			CFLAGS='$(strip ${TARGET_CFLAGS})' \
+			CXXFLAGS='$(strip ${TARGET_CXXFLAGS})' \
+			CPPFLAGS='$(strip ${TARGET_CPPFLAGS})' \
+			LDFLAGS='$(strip ${TARGET_LDFLAGS})' \
 			PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig'
 ifeq ($(ADK_NATIVE),)
 CONFIGURE_ENV+=		${TARGET_CONFIGURE_OPTS} \
@@ -67,26 +41,16 @@ FAKE_FLAGS?=
 ALL_TARGET?=		all
 INSTALL_TARGET?=	install
 
-MAKE_ENV+=		WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \
+MAKE_ENV+=		GCC_HONOUR_COPTS=2 \
+			WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \
 			WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' \
-			CFLAGS='$(strip ${TCFLAGS})' \
-			CXXFLAGS='$(strip ${TCXXFLAGS})' \
-			CPPFLAGS='$(strip ${TCPPFLAGS})' \
-			LDFLAGS='$(strip ${TLDFLAGS})'
-MAKE_ENV+=		PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig'
+			CFLAGS='$(strip ${TARGET_CFLAGS})' \
+			CXXFLAGS='$(strip ${TARGET_CXXFLAGS})' \
+			CPPFLAGS='$(strip ${TARGET_CPPFLAGS})' \
+			LDFLAGS='$(strip ${TARGET_LDFLAGS})' \
+			PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig'
 ifeq ($(ADK_NATIVE),)
-MAKE_ENV+=		PATH='${TARGET_PATH}' \
-			${HOST_CONFIGURE_OPTS} \
-			CC='${TARGET_CC}' \
-			CXX='${TARGET_CXX}' \
-			LD='${TARGET_LD}' \
-			AR='${TARGET_CROSS}ar' \
-			RANLIB='${TARGET_CROSS}ranlib' \
-			NM='${TARGET_CROSS}nm' \
-			OBJCOPY='${TARGET_CROSS}objcopy' \
-			RANLIB='${TARGET_CROSS}ranlib' \
-			STRIP='${TARGET_CROSS}strip' \
-			CROSS="$(TARGET_CROSS)"
+MAKE_ENV+=		${TARGET_CONFIGURE_OPTS} ${HOST_CONFIGURE_OPTS}
 endif
 
 MAKE_FLAGS+=		${XAKE_FLAGS} V=1
diff --git a/mk/vars.mk b/mk/vars.mk
index ab247901f..1bc167e52 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -10,24 +10,6 @@ MAKEFLAGS=		$(EXTRA_MAKEFLAGS)
 BUILD_USER=		$(shell id -un)
 BUILD_GROUP=		$(shell id -gn)
 
-# target compiler settings
-TARGET_CPPFLAGS+=	-I${STAGING_TARGET_DIR}/usr/include
-TARGET_LDFLAGS+=	-Wl,-O2
-ifneq ($(ADK_DEBUG),)
-TARGET_DEBUGGING:=	-g3 -fno-omit-frame-pointer
-else
-TARGET_DEBUGGING:=	$(TARGET_OPTIMIZATION) -fomit-frame-pointer
-endif
-TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) $(TARGET_DEBUGGING) -fwrapv
-ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),)
-TARGET_CFLAGS+=		-fstack-protector
-TARGET_CXXFLAGS+=	-fstack-protector
-TARGET_LDFLAGS+=	-fstack-protector
-endif
-ifneq ($(ADK_TOOLCHAIN_GCC_USE_LTO),)
-TARGET_CFLAGS+=		-flto
-TARGET_LDFLAGS+=	-flto
-endif
 
 BASE_DIR:=		$(TOPDIR)
 DISTDIR?=		${BASE_DIR}/dl
@@ -56,35 +38,89 @@ TARGET_PATH=		${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_
 REAL_GNU_TARGET_NAME=	$(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX)
 GNU_TARGET_NAME=	$(CPU_ARCH)-$(ADK_VENDOR)-linux
 ifeq ($(ADK_NATIVE),y) 
-TARGET_CROSS:=		
+TARGET_CROSS:=
 TARGET_COMPILER_PREFIX?=
 else
 TARGET_CROSS:=		$(STAGING_HOST_DIR)/bin/$(REAL_GNU_TARGET_NAME)-
 TARGET_COMPILER_PREFIX?=${TARGET_CROSS}
 endif
+
+# target compiler flags
 TARGET_CC:=		${TARGET_COMPILER_PREFIX}gcc
 TARGET_CXX:=		${TARGET_COMPILER_PREFIX}g++
 TARGET_LD:=		${TARGET_COMPILER_PREFIX}ld
+
+TARGET_CPPFLAGS:=	-I${STAGING_TARGET_DIR}/usr/include
+TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts
+TARGET_CXXFLAGS:=
+TARGET_LDFLAGS:=	-Wl,-O2 -Wl,-rpath -Wl,/usr/lib \
+			-Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \
+			-L${STAGING_TARGET_DIR}/lib -L${STAGING_TARGET_DIR}/usr/lib
+
+ifneq ($(ADK_STATIC),)
+TARGET_CFLAGS+=		-static
+TARGET_CXXFLAGS+=	-static
+TARGET_LDFLAGS+=	-static
+endif
+
+ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),)
+TARGET_CFLAGS+=		-fstack-protector
+TARGET_CXXFLAGS+=	-fstack-protector
+TARGET_LDFLAGS+=	-fstack-protector
+endif
+
+ifneq ($(ADK_TOOLCHAIN_GCC_USE_LTO),)
+TARGET_CFLAGS+=		-flto
+TARGET_LDFLAGS+=	-flto
+endif
+
+ifneq ($(ADK_DEBUG),)
+TARGET_CPPFLAGS+=	-DNDEBUG
+TARGET_CFLAGS+=		-g3 -fno-omit-frame-pointer
+else
+TARGET_CFLAGS+=		-fomit-frame-pointer $(TARGET_OPTIMIZATION)
+endif
+
+ifneq ($(ADK_NATIVE),)
+TARGET_CPPFLAGS:=
+TARGET_CFLAGS:=		$(TARGET_OPTIMIZATION) $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts
+TARGET_LDFLAGS:=
+endif
+
+# host compiler flags
+CPPFLAGS_FOR_BUILD?=
+CFLAGS_FOR_BUILD?=      -O2 -Wall
+CXXFLAGS_FOR_BUILD?=    -O2 -Wall
+LDFLAGS_FOR_BUILD?=
+FLAGS_FOR_BUILD:=       ${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD}
+
 PATCH=			${BASH} $(SCRIPT_DIR)/patch.sh
 SED:=			sed -i -e
 LINUX_DIR:=		$(BUILD_DIR)/linux
 LINUX_HEADER_DIR:=	$(STAGING_TARGET_DIR)/linux-header
+KERNEL_MODULE_FLAGS:=	ARCH=${ARCH} KERNELVERSION="2.6" \
+			KERNEL_PATH=${LINUX_DIR} KERNELDIR=${LINUX_DIR} KERNEL_DIR=${LINUX_DIR} \
+			PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \
+			CFLAGS_MODULE="-fhonour-copts" V=1
+
 
 TARGET_CONFIGURE_OPTS=	PATH='${TARGET_PATH}' \
-			AR=$(TARGET_CROSS)ar \
-			AS=$(TARGET_CROSS)as \
-			LD=$(TARGET_CROSS)ld \
-			NM=$(TARGET_CROSS)nm \
-			RANLIB=$(TARGET_CROSS)ranlib \
+			AR='$(TARGET_CROSS)ar' \
+			AS='$(TARGET_CROSS)as' \
+			LD='$(TARGET_CROSS)ld' \
+			NM='$(TARGET_CROSS)nm' \
+			RANLIB='$(TARGET_CROSS)ranlib' \
+			STRIP='${TARGET_CROSS}strip' \
+			OBJCOPY='${TARGET_CROSS}objcopy' \
 			CC='$(TARGET_CC)' \
 			GCC='$(TARGET_CC)' \
 			CXX='$(TARGET_CXX)' \
 			CROSS='$(TARGET_CROSS)'
-HOST_CONFIGURE_OPTS=	CC_FOR_BUILD='${HOSTCC}' \
-			BUILD_CC='${HOSTCC}' \
-			CFLAGS_FOR_BUILD='${HOSTCFLAGS}' \
-			CPPFLAGS_FOR_BUILD='${HOSTCPPFLAGS}' \
-			LDFLAGS_FOR_BUILD='${HOSTLDFLAGS}'
+
+HOST_CONFIGURE_OPTS=	CC_FOR_BUILD='${CC_FOR_BUILD}' \
+			CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \
+			CFLAGS_FOR_BUILD='${CFLAGS_FOR_BUILD}' \
+			LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}'
 
 PKG_SUFFIX:=		$(strip $(subst ",, $(ADK_PACKAGE_SUFFIX)))
 
diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile
index 5eeeac943..f9f12f0be 100644
--- a/package/aiccu/Makefile
+++ b/package/aiccu/Makefile
@@ -20,13 +20,13 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,AICCU,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIG_STYLE:=	manual
-INSTALL_STYLE:=	manual
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
 
-TCFLAGS+=	-D_REENTRANT -D_GNU_SOURCE -DAICCU_CONSOLE \
-		-D_LINUX -DHAS_IFHEAD -DAICCU_TYPE=\"linux\"
-TLDFLAGS+=	-pthread -lresolv
-MAKE_FLAGS+=	CC='${TARGET_CC}' CFLAGS='${TCFLAGS}' LDFLAGS='${TLDFLAGS}'
+TARGET_CPPFLAGS+=	-D_REENTRANT -D_GNU_SOURCE -DAICCU_CONSOLE \
+		 	-D_LINUX -DHAS_IFHEAD -DAICCU_TYPE=\"linux\"
+TARGET_LDFLAGS+=	-pthread -lresolv
+MAKE_FLAGS+=		CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS}' LDFLAGS='${TARGET_LDFLAGS}'
 
 do-install:
 	$(INSTALL_DIR) $(IDIR_AICCU)/usr/sbin $(IDIR_AICCU)/etc
diff --git a/package/alix-switch/Makefile b/package/alix-switch/Makefile
index 0317fdf7d..873594dea 100644
--- a/package/alix-switch/Makefile
+++ b/package/alix-switch/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		alix-switch
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_DESCR:=		daemon listening on button events
 PKG_SECTION:=		base
 PKG_URL:=		http://openadk.org/
@@ -20,8 +20,10 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
+TARGET_CFLAGS+=		-Wall
+
 do-build:
-	${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} \
+	${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
 		-o ${WRKBUILD}/alix-switchd ${WRKBUILD}/alix-switchd.c
 
 do-install:
diff --git a/package/arpd/Makefile b/package/arpd/Makefile
index 722faae9d..32730f11d 100644
--- a/package/arpd/Makefile
+++ b/package/arpd/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		arpd
 PKG_VERSION:=		0.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		e2911fa9de1b92ef50deda1489ae944d
 PKG_DESCR:=		Generates ARP responses for IP address ranges
 PKG_SECTION:=		route
@@ -23,9 +23,9 @@ $(eval $(call PKG_template,ARPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_
 CONFIGURE_ARGS+=	--with-libdnet=${STAGING_TARGET_DIR}/usr \
 			--with-libevent=${STAGING_TARGET_DIR}/usr \
 			--with-libpcap=${STAGING_TARGET_DIR}/usr
-MAKE_FLAGS+=		CFLAGS="${TCFLAGS}" \
-			INCLS="-I. -I${STAGING_TARGET_DIR}/usr/include" \
-			LIBS="-L${STAGING_TARGET_DIR}/usr/lib -lpcap -ldnet -levent"
+MAKE_FLAGS+=		CFLAGS="${TARGET_CFLAGS}" \
+			INCLS="-I. ${TARGET_CPPFLAGS}" \
+			LIBS="-lpcap -ldnet -levent"
 
 post-install:
 	${INSTALL_DIR} ${IDIR_ARPD}/usr/sbin
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 2b1fc70a5..73ac40acb 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -84,7 +84,7 @@ endif
 ifneq (${ADK_PACKAGE_ASTERISK_FORMAT_VORBIS},)
 CONFIGURE_ARGS+=	--with-ogg=${STAGING_TARGET_DIR}/usr \
 			--with-vorbis=${STAGING_TARGET_DIR}/usr
-TLDFLAGS+=		-logg
+TARGET_LDFLAGS+=	-logg
 endif
 ifneq (${ADK_PACKAGE_ASTERISK_CURL},)
 CONFIGURE_ARGS+=	--with-libcurl=${STAGING_TARGET_DIR}/usr
@@ -99,12 +99,11 @@ endif
 
 INSTALL_STYLE:=		manual
 
-TLDFLAGS+=		-lm
-MAKE_ENV=		ASTCFLAGS="${TCPPFLAGS} -DHAVE_STRTOQ" \
-			ASTLDFLAGS="${TLDFLAGS}"
+TARGET_LDFLAGS+=	-lm
+MAKE_ENV=		ASTCFLAGS="${TARGET_CPPFLAGS} -DHAVE_STRTOQ" \
+			ASTLDFLAGS="${TARGET_LDFLAGS}"
 MAKE_FLAGS+=		DESTDIR="$(WRKINST)" \
 			OPTIMIZE="${TARGET_OPTIMIZATION}" \
-			STRIP="${TARGET_CROSS}strip" \
 			NOISY_BUILD=1
 ALL_TARGET:=		all install samples
 
diff --git a/package/atftp/Makefile b/package/atftp/Makefile
index 601e9aba3..e7d759066 100644
--- a/package/atftp/Makefile
+++ b/package/atftp/Makefile
@@ -16,19 +16,20 @@ PKG_SITES:=		ftp://ftp.mamalinux.com/pub/atftp/
 
 PKG_SUBPKGS:=		ATFTP ATFTPD
 PKGSD_ATFTPD:=		TFTP server
+PKGSS_ATFTPD:=		libreadline libncurses
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,ATFTP,atftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ATFTPD,atftpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ATFTPD},${PKG_SECTION}))
 
-MAKE_FLAGS+=		CFLAGS="${TCFLAGS} -Wall -D_REENTRANT -fno-inline"
+MAKE_FLAGS+=		CFLAGS="${TARGET_CFLAGS} -Wall -D_REENTRANT -fno-inline"
 
-post-install:
-	# atftp client
+atftp-install:
 	$(INSTALL_DIR) $(IDIR_ATFTP)/usr/bin
 	$(INSTALL_BIN) $(WRKBUILD)/atftp $(IDIR_ATFTP)/usr/bin
-	# atftp server
+
+atftpd-install:
 	$(INSTALL_DIR) $(IDIR_ATFTPD)/usr/sbin
 	$(INSTALL_BIN) $(WRKBUILD)/atftpd $(IDIR_ATFTPD)/usr/sbin
 
diff --git a/package/aufs2-util/Makefile b/package/aufs2-util/Makefile
index f42767dbe..83e39c26e 100644
--- a/package/aufs2-util/Makefile
+++ b/package/aufs2-util/Makefile
@@ -29,7 +29,7 @@ $(eval $(call PKG_template,AUFS2_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},
 $(eval $(call PKG_template,LIBAU,libau,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBAU},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
-XAKE_FLAGS+=		Install=install HOSTCPPFLAGS="-I${LINUX_HEADER_DIR}/include"
+XAKE_FLAGS+=		Install=install CPPFLAGS_FOR_BUILD="-I${LINUX_HEADER_DIR}/include"
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_AUFS2_UTIL)/sbin
diff --git a/package/aufs2-util/patches/patch-Makefile b/package/aufs2-util/patches/patch-Makefile
index d77ea81ec..6a8f74806 100644
--- a/package/aufs2-util/patches/patch-Makefile
+++ b/package/aufs2-util/patches/patch-Makefile
@@ -4,10 +4,10 @@
  # along with this program; if not, write to the Free Software
  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301	 USA
  
-+c2sh c2tmac: CC = ${HOSTCC}
-+c2sh c2tmac: CFLAGS= ${HOSTCFLAGS}
-+c2sh c2tmac: LDFLAGS= ${HOSTLDFLAGS}
-+c2sh c2tmac: CPPFLAGS= ${HOSTCPPFLAGS} -I./libau -I${LINUX_HEADER_DIR}/include
++c2sh c2tmac: CC = ${CC_FOR_BUILD}
++c2sh c2tmac: CFLAGS= ${CFLAGS_FOR_BUILD}
++c2sh c2tmac: LDFLAGS= ${LDFLAGS_FOR_BUILD}
++c2sh c2tmac: CPPFLAGS= ${CPPFLAGS_FOR_BUILD} -I./libau -I${LINUX_HEADER_DIR}/include
 +
  CFLAGS += -I./libau
  CFLAGS += -O -Wall
diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index ebd811ca9..05ef2a39c 100644
--- a/package/avahi/Makefile
+++ b/package/avahi/Makefile
@@ -26,7 +26,7 @@ $(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEAS
 $(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_AVAHI_DNSCONFD},${PKGSD_AVAHI_DNSCONFD},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAVAHI},${PKGSC_LIBAVAHI}))
 
-TLDFLAGS+=		-lintl
+TARGET_LDFLAGS+=	-lintl
 CONFIGURE_ARGS+=	--enable-glib \
 			--disable-qt3 \
 			--disable-qt4 \
diff --git a/package/axtls/Makefile b/package/axtls/Makefile
index 62dbb7226..2d02e722e 100644
--- a/package/axtls/Makefile
+++ b/package/axtls/Makefile
@@ -29,9 +29,7 @@ CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 XAKE_FLAGS+=		STRIP='' \
-			CC='${TARGET_CC}' \
-			OPT_CFLAGS='${TARGET_CFLAGS} -fPIC' \
-			OPT_LDFLAGS=""
+			CC='${TARGET_CC}'
 
 do-configure:
 	${CP} ./files/config ${WRKBUILD}/config/.config
diff --git a/package/bind/Makefile b/package/bind/Makefile
index 278982c4b..2e44d787b 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -51,45 +51,46 @@ else
 CONFIGURE_ARGS+=	--disable-ipv6
 endif
 
-pre-build:
-	${MAKE} -C ${WRKBUILD}/lib/dns \
-		BUILD_CC="${HOSTCC}" \
-		CC="${HOSTCC}" \
-		CFLAGS='${HOSTCFLAGS}' \
-		gen
-
-post-install:
-	# bind server
+CONFIGURE_ENV+=		BUILD_CC="${CC_FOR_BUILD}" BUILD_CFLAGS='${CFLAGS_FOR_BUILD}'
+
+bind-server-install:
 	${INSTALL_DIR} ${IDIR_BIND_SERVER}/usr/sbin ${IDIR_BIND_SERVER}/etc
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/named ${IDIR_BIND_SERVER}/usr/sbin/
 	${CP} ./files/bind ${IDIR_BIND_SERVER}/etc
-	# nsupdate
+
+bind-client-install:
 	${INSTALL_DIR} ${IDIR_BIND_CLIENT}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/nsupdate ${IDIR_BIND_CLIENT}/usr/bin/
-	# rndc
+
+bind-rndc-install:
 	${INSTALL_DIR} ${IDIR_BIND_RNDC}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc ${IDIR_BIND_RNDC}/usr/sbin/
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc-confgen \
 		${IDIR_BIND_RNDC}/usr/sbin/
-	# bind check
+
+bind-check-install:
 	${INSTALL_DIR} ${IDIR_BIND_CHECK}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkconf \
 		${IDIR_BIND_CHECK}/usr/sbin/
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkzone \
 		${IDIR_BIND_CHECK}/usr/sbin/
-	# dnsec tools
+
+bind-dnssec-install:
 	${INSTALL_DIR} ${IDIR_BIND_DNSSEC}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-keygen \
 		${IDIR_BIND_DNSSEC}/usr/sbin/
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-signzone \
 		${IDIR_BIND_DNSSEC}/usr/sbin/
-	# host
+
+bind-host-install:
 	${INSTALL_DIR} ${IDIR_BIND_HOST}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/host ${IDIR_BIND_HOST}/usr/bin/
-	# dig
+
+bind-dig-install:
 	${INSTALL_DIR} ${IDIR_BIND_DIG}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dig ${IDIR_BIND_DIG}/usr/bin/
-	# bind lib
+
+libbind-install:
 	${INSTALL_DIR} ${IDIR_LIBBIND}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libbind9.so.* ${IDIR_LIBBIND}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libdns.so.* ${IDIR_LIBBIND}/usr/lib/
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index b076323d5..dd970c6c3 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -19,7 +19,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBBFD,libbfd,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBFD},${PKGSC_LIBBFD}))
 
-TCFLAGS+=		-fPIC
+TARGET_CFLAGS+=		-fPIC
 CONFIGURE_ARGS+=	--disable-werror \
 			--host=$(REAL_GNU_TARGET_NAME) \
 			--target=$(REAL_GNU_TARGET_NAME)
diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile
index 41b56a5ca..77bf2246f 100644
--- a/package/bitlbee/Makefile
+++ b/package/bitlbee/Makefile
@@ -19,7 +19,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,BITLBEE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		minimal
-TCFLAGS+=		-fPIC
+TARGET_CFLAGS+=		-fPIC
 CONFIGURE_ARGS:=	--target=${REAL_GNU_TARGET_NAME} \
 			--prefix=/usr/ \
 			--bindir=/usr/sbin/ \
diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile
index b94a29059..990bf1178 100644
--- a/package/bzip2/Makefile
+++ b/package/bzip2/Makefile
@@ -17,8 +17,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,BZIP2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
-
-TCFLAGS+=		-fPIC
+TARGET_CFLAGS+=		-fPIC
 XAKE_FLAGS+=		PREFIX=${WRKINST}/usr
 
 post-install:
diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile
index 7a42d671f..b63b87751 100644
--- a/package/cryptinit/Makefile
+++ b/package/cryptinit/Makefile
@@ -24,8 +24,8 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 do-build:
-	${TARGET_CC} ${TCPPFLAGS} ${TCFLAGS} -c -o ${WRKBUILD}/cryptinit.o \
-		${WRKBUILD}/cryptinit.c
+	${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} -c \
+		-o ${WRKBUILD}/cryptinit.o ${WRKBUILD}/cryptinit.c
 	( cd ${WRKBUILD}; \
 	${TARGET_CC} -static -o cryptinit cryptinit.o \
 		 ${STAGING_TARGET_DIR}/usr/lib/libcryptsetup.a \
diff --git a/package/cups/Makefile b/package/cups/Makefile
index aa3bea6fd..8f764ba1b 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -21,7 +21,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		ac_cv_func_sigset=no \
-			OPTIM='-fPIC $(TARGET_CFLAGS)'
+			OPTIM='-fPIC'
 
 CONFIGURE_ARGS+=	--with-cups-user=cups \
 			--with-cups-group=cups \
@@ -42,7 +42,7 @@ CONFIGURE_ARGS+=	--with-cups-user=cups \
 			--disable-ssl
 
 FAKE_FLAGS+=		DSTROOT="${WRKINST}" STRIP="/bin/true"
-XAKE_FLAGS+=		OPTIM='-fPIC $(TARGET_CFLAGS)'
+XAKE_FLAGS+=		OPTIM='-fPIC'
 
 post-install:
 	${INSTALL_DIR} ${IDIR_CUPS}/usr/bin
diff --git a/package/cutter/Makefile b/package/cutter/Makefile
index 0cf8a1c74..69af2e4ce 100755
--- a/package/cutter/Makefile
+++ b/package/cutter/Makefile
@@ -22,9 +22,11 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
+TARGET_CFLAGS+=		-Wall
+
 do-build:
-	${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} ${WRKBUILD}/cutter.c \
-		-o ${WRKBUILD}/cutter
+	${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
+		${WRKBUILD}/cutter.c -o ${WRKBUILD}/cutter
 
 do-install:
 	${INSTALL_DIR} ${IDIR_CUTTER}/usr/sbin
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index c67b73579..fb1c36bd1 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -19,15 +19,15 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
-TCXXFLAGS+=		-fno-builtin -nostdinc++ \
+TARGET_CXXFLAGS+=	-fno-builtin -nostdinc++ \
 			-I${STAGING_TARGET_DIR}/usr/include/uClibc++ -Wl,-E
-TLDFLAGS+=		-luClibc++ -liconv -lm -nodefaultlibs -shared
+TARGET_LDFLAGS+=	-luClibc++ -liconv -lm -nodefaultlibs -shared
 else
-TLDFLAGS+=		-liconv -shared
+TARGET_LDFLAGS+=	-liconv -shared
 endif
 
-TCFLAGS+=		-fPIC
-TCXXFLAGS+=		-fPIC
+TARGET_CFLAGS+=		-fPIC
+TARGET_CXXFLAGS+=	-fPIC
 CONFIGURE_ARGS+=	--with-libiconv-prefix='${STAGING_TARGET_DIR}/usr'
 
 post-install:
diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile
index 390ac22a0..9e090989a 100644
--- a/package/digitemp/Makefile
+++ b/package/digitemp/Makefile
@@ -21,7 +21,7 @@ $(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
-TCFLAGS+=		-I./src -I./userial
+TARGET_CPPFLAGS+=	-I./src -I./userial
 ALL_TARGET=		ds2490
 
 do-install:
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index 1c2bcf500..56884def3 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -24,11 +24,10 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DILLO,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TLDFLAGS+=		-liconv
+TARGET_LDLFAGS+=	-liconv
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_DILLO)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/dillo \
-		$(IDIR_DILLO)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/dillo $(IDIR_DILLO)/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 7b22a922d..3ce19d494 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -38,14 +38,14 @@ $(eval $(call PKG_template,E2FSCK_STATIC,e2fsck-static,${PKG_VERSION}-${PKG_RELE
 
 CONFIGURE_ARGS+=	--enable-elf-shlibs --disable-rpath
 INSTALL_TARGET+=	install-libs
-TLDFLAGS+=		-lpthread
+TARGET_LDFLAGS+=	-lpthread
 
 pre-build:
 	${MAKE} -C ${WRKBUILD}/util \
-		BUILDCC="${HOSTCC}" \
-		CFLAGS="" \
-		LDFLAGS="" \
-		CPPFLAGS="" \
+		BUILDCC="${CC_FOR_BUILD}" \
+		CFLAGS="${CFLAGS_FOR_BUILD}" \
+		LDFLAGS="${LDFLAGS_FOR_BUILD}" \
+		CPPFLAGS="${CPPFLAGS_FOR_BUILD}" \
 		subst
 
 post-build:
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index e3603353f..60d35f1ee 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -34,7 +34,8 @@ EGLIBC_CONFOPTS:=	--build=$(GNU_HOST_NAME) \
 			--enable-add-ons
 
 EGLIBC_ENV:=		PATH='${TARGET_PATH}' \
-			BUILD_CC=${HOSTCC} \
+			GCC_HONOUR_COPTS=s \
+			BUILD_CC=${CC_FOR_BUILD} \
 			CFLAGS="$(TARGET_CFLAGS)" \
 			CC=${REAL_GNU_TARGET_NAME}-gcc \
 			CXX=${REAL_GNU_TARGET_NAME}-g++ \
@@ -100,8 +101,7 @@ eglibc-dev-install:
 			--with-headers=$(IDIR_EGLIBC_DEV)/usr/include \
 			${EGLIBC_CONFOPTS} \
 	);
-	PATH='${TARGET_PATH}' \
-	$(MAKE) -C $(WRKBUILD) \
+	PATH='${TARGET_PATH}' $(MAKE) -C $(WRKBUILD) \
 		install-headers install-bootstrap-headers=yes
 	@touch $(IDIR_EGLIBC_DEV)/usr/include/gnu/stubs.h
 	@find $(IDIR_EGLIBC_DEV) -name .install -exec rm {} \;
diff --git a/package/elinks/Makefile b/package/elinks/Makefile
index fe863ec55..ee0e2798a 100644
--- a/package/elinks/Makefile
+++ b/package/elinks/Makefile
@@ -23,7 +23,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,ELINKS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 INSTALL_STYLE:=		manual
-TCFLAGS+=		-fPIC
+TARGET_CFLAGS+=		-fPIC
 CONFIGURE_ENV+=		$(shell echo ac_cv_file_./features.conf | tr [:blank:]-/. _)=yes
 CONFIGURE_ENV+=		$(shell echo ac_cv_file_${WRKBUILD}/features.conf | tr [:blank:]-/. _)=yes
 CONFIGURE_ARGS+=	--enable-small \
diff --git a/package/ether-wake/Makefile b/package/ether-wake/Makefile
index 39985ea08..335b6f441 100644
--- a/package/ether-wake/Makefile
+++ b/package/ether-wake/Makefile
@@ -19,9 +19,11 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
+TARGET_CFLAGS+=		-Wall
+
 do-build:
-	${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} -o \
-		${WRKBUILD}/ether-wake ${WRKBUILD}/ether-wake.c
+	${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
+		-o ${WRKBUILD}/ether-wake ${WRKBUILD}/ether-wake.c
 
 do-install:
 	${INSTALL_DIR} ${IDIR_ETHER_WAKE}/usr/sbin
diff --git a/package/exmap/Makefile b/package/exmap/Makefile
index 9b3c57740..ab6897d48 100644
--- a/package/exmap/Makefile
+++ b/package/exmap/Makefile
@@ -33,12 +33,7 @@ CONFIGURE_ARGS+=	--disable-doc
 CONFIGURE_ENV+=		LIBS="-lncurses"
 
 pre-build:
-	GCC_HONOUR_COPTS=s \
-	KERNEL_PATH=${LINUX_DIR} \
-	CROSS_COMPILE="${TARGET_CROSS}" \
-	V=1 ARCH="${ARCH}" KERNELVERSION="2.6" \
-	LDFLAGS="" \
-	$(MAKE) -C ${WRKBUILD}/kernel
+	$(MAKE) -C ${WRKBUILD}/kernel $(KERNEL_MODULE_FLAGS)
 
 post-install:
 	${INSTALL_DIR} ${IDIR_EXMAP_KMOD}/etc/modules.d/
diff --git a/package/faad2/Makefile b/package/faad2/Makefile
index 87a5f8e81..dab8ab734 100644
--- a/package/faad2/Makefile
+++ b/package/faad2/Makefile
@@ -22,7 +22,7 @@ $(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE},${PKG
 CONFIGURE_ENV+=		ac_cv_c99_lrintf=yes
 CONFIGURE_ARGS+=	--without-mpeg4ip \
 			--without-xmms
-TLDFLAGS+=		-lm
+TARGET_LDFLAGS+=	-lm
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBFAAD2}/usr/lib
diff --git a/package/fakeidentd/Makefile b/package/fakeidentd/Makefile
index d7180e6b0..876a1c551 100644
--- a/package/fakeidentd/Makefile
+++ b/package/fakeidentd/Makefile
@@ -22,9 +22,11 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
+TARGET_CFLAGS+=		-Wall
+
 do-build:
-	${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} -o \
-		${WRKBUILD}/fakeidentd ${WRKBUILD}/identd.c
+	${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
+		-o ${WRKBUILD}/fakeidentd ${WRKBUILD}/identd.c
 
 do-install:
 	${INSTALL_DIR} ${IDIR_FAKEIDENTD}/usr/sbin
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index 082bfe171..989393c2a 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -43,11 +43,7 @@ else
 CONFIGURE_CPU_OPTS:=    --disable-sse 
 endif
 
-# gcc 4.5 produces internal compiler error with -Os
-#TCFLAGS:=$(subst Os,O2,$(TCFLAGS))
-
 CONFIG_STYLE:=		minimal
-
 CONFIGURE_ARGS:=	--prefix=/usr \
 			--target-os=linux \
 			--arch=${CPU_ARCH} \
@@ -56,7 +52,7 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--source-path=${WRKSRC} \
 			--cross-prefix=${TARGET_CROSS} \
 			--cc=$(TARGET_CC) \
-			--host-cc=$(HOSTCC) \
+			--host-cc=$(CC_FOR_BUILD) \
 			--disable-doc \
 			--disable-debug \
 			--disable-optimizations \
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index b5d034065..895a2c76a 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -35,9 +35,12 @@ else
 CONFIGURE_ARGS+=	--enable-ipc
 endif
 
-CONFIGURE_ENV+=		CROSS_COMPILE=1 HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" \
-			HOST_CXX="${HOSTCXX}" HOST_CXXFLAGS="${HOSTCXXFLAGS}" \
-			HOST_LIBIDL_CONFIG="${HOST_LIBIDL_CONFIG}" \
+CONFIGURE_ENV+=		CROSS_COMPILE=1 \
+			HOST_CC="${CC_FOR_BUILD}" \
+			HOST_CFLAGS="${CFLAGS_FOR_BUILD}" \
+			HOST_CXX="${CXX_FOR_BUILD}" \
+			HOST_CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \
+			BUILD_LIBIDL_CONFIG="${BUILD_LIBIDL_CONFIG}" \
 			PKG_HOSTLIB_DIR="${PKG_HOSTLIB_DIR}" \
 			HOST_RANLIB="ranlib" HOST_AR="ar" \
 			CPPFLAGS="-I${STAGING_TARGET_DIR}/usr/include/freetype2" \
@@ -67,6 +70,7 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--disable-crashreporter
 
 XAKE_FLAGS+=		OS_RELEASE="2.6"
+XAKE_FLAGS+=            ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}"
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin
diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure
index 4a3499a7b..6ab49e7f0 100644
--- a/package/firefox/patches/patch-configure
+++ b/package/firefox/patches/patch-configure
@@ -42,8 +42,8 @@
 -        HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
 -    fi
 -fi
-+HOST_LIBIDL_CFLAGS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${HOST_LIBIDL_CONFIG} --cflags`
-+HOST_LIBIDL_LIBS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${HOST_LIBIDL_CONFIG} --libs`
++HOST_LIBIDL_CFLAGS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${BUILD_LIBIDL_CONFIG} --cflags`
++HOST_LIBIDL_LIBS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${BUILD_LIBIDL_CONFIG} --libs`
 +
 +echo "host libidl cflags: ${HOST_LIBIDL_CFLAGS}"
 +echo "host libidl libs: ${HOST_LIBIDL_LIBS}"
diff --git a/package/firefox/patches/patch-security_coreconf_Linux_mk b/package/firefox/patches/patch-security_coreconf_Linux_mk
new file mode 100644
index 000000000..26a3dc8f3
--- /dev/null
+++ b/package/firefox/patches/patch-security_coreconf_Linux_mk
@@ -0,0 +1,15 @@
+--- mozilla-1.9.2.orig/security/coreconf/Linux.mk	2010-12-03 16:48:49.000000000 +0100
++++ mozilla-1.9.2/security/coreconf/Linux.mk	2011-01-20 20:18:26.904905227 +0100
+@@ -46,9 +46,9 @@ ifeq ($(USE_PTHREADS),1)
+ 	IMPL_STRATEGY = _PTH
+ endif
+ 
+-CC			= gcc
+-CCC			= g++
+-RANLIB			= ranlib
++CC			?= gcc
++CCC			?= g++
++RANLIB			?= ranlib
+ 
+ DEFAULT_COMPILER = gcc
+ 
diff --git a/package/firefox/patches/patch-security_coreconf_command_mk b/package/firefox/patches/patch-security_coreconf_command_mk
new file mode 100644
index 000000000..fcf73b8a8
--- /dev/null
+++ b/package/firefox/patches/patch-security_coreconf_command_mk
@@ -0,0 +1,11 @@
+--- mozilla-1.9.2.orig/security/coreconf/command.mk	2010-12-03 16:48:49.000000000 +0100
++++ mozilla-1.9.2/security/coreconf/command.mk	2011-01-20 20:18:56.214904993 +0100
+@@ -48,7 +48,7 @@ LINK_EXE      = $(LINK) $(OS_LFLAGS) $(L
+ CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
+ 		$(XCFLAGS)
+ PERL          = perl
+-RANLIB        = echo
++RANLIB        = ranlib
+ TAR           = /bin/tar
+ #
+ # For purify
diff --git a/package/gatling/Makefile b/package/gatling/Makefile
index 034f86f7c..e6813c29e 100644
--- a/package/gatling/Makefile
+++ b/package/gatling/Makefile
@@ -25,9 +25,9 @@ INSTALL_STYLE:=		manual
 
 MAKE_FILE:=		GNUmakefile
 ALL_TARGET:=		gatling
-TCPPFLAGS+=		-I${STAGING_TARGET_DIR}/usr/include/owfat
+TARGET_CPPFLAGS+=	-I${STAGING_TARGET_DIR}/usr/include/owfat
 XAKE_FLAGS+=		CC='${TARGET_CC}' \
-			CFLAGS='${TCPPFLAGS} ${TCFLAGS}' \
+			CFLAGS='${TARGET_CPPFLAGS} ${TARGET_CFLAGS}' \
 			ZLIB=0 DIET= prefix='${WRKINST}/usr'
 
 do-install:
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index faf1f9e31..fec6661e3 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -16,8 +16,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GCC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-TCFLAGS:=		''
-TCPPFLAGS:=		''
+TARGET_CFLAGS:=		''
+TARGET_CPPFLAGS:=	''
 
 ifeq ($(ADK_LINUX_64),y)
 CONFIGURE_ARGS+=       --with-abi=64
@@ -39,6 +39,9 @@ CONFIGURE_ARGS+=	--enable-languages=c,c++ \
 			--disable-libstdcxx-pch \
 			--enable-cxx-flags="${TARGET_LDFLAGS}"
 
+# disable honour cflags stuff
+XAKE_FLAGS+=		GCC_HONOUR_COPTS:=s
+
 post-install:
 	${INSTALL_DIR} ${IDIR_GCC}/usr/lib/gcc ${IDIR_GCC}/usr/bin
 	${INSTALL_DIR} ${IDIR_GCC}/lib ${IDIR_GCC}/usr/include/c++
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index 5d3d60806..5e9f706d1 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -16,13 +16,15 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		${TCPPFLAGS} -fPIC
+TARGET_CFLAGS+=		${TARGET_CPPFLAGS} -fPIC
 CONFIGURE_ARGS+=	--without-uiout --enable-gdbmi \
 			--disable-tui --disable-gdbtk --without-x \
 			--without-included-gettext --disable-sim \
 			--enable-threads --with-curses --disable-werror \
 			--enable-static --without-python
-XAKE_FLAGS+=		LDFLAGS='${TLDFLAGS}'
+XAKE_FLAGS+=		LDFLAGS='${TARGET_LDFLAGS}'
+# disable honour cflags stuff
+XAKE_FLAGS+=		GCC_HONOUR_COPTS:=s
 
 post-install:
 	${INSTALL_DIR} ${IDIR_GDB}/usr/bin
diff --git a/package/gpm/Makefile b/package/gpm/Makefile
index 9d7df66f0..b20ec8889 100644
--- a/package/gpm/Makefile
+++ b/package/gpm/Makefile
@@ -16,7 +16,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GPM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-I${WRKSRC}/src/headers
+TARGET_CPPFLAGS+=	-I${WRKSRC}/src/headers
 
 post-install:
 	${INSTALL_DIR} ${IDIR_GPM}/usr/sbin ${IDIR_GPM}/usr/lib
diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile
index 24536e5c1..025e525b2 100644
--- a/package/gpsd/Makefile
+++ b/package/gpsd/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ENV+=		EGREP="grep -E" \
 			ac_cv_func_strlcat=no \
 			ac_cv_lib_nsl_gethostbyname=no
 CONFIGURE_ARGS+=	--disable-dbus
-TCFLAGS+=		-fPIC
+TARGET_CFLAGS+=		-fPIC
 
 LIBRARIES:=-nodefaultlibs -luClibc++
 ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
@@ -38,11 +38,11 @@ LIBRARIES+=-lssp -lssp_nonshared
 endif
 
 ifeq ($(ADK_COMPILE_GPSD_WITH_UCLIBCXX),y)
-TCXXFLAGS+=		-fno-rtti -nostdinc++ \
+TARGET_CXXFLAGS+=	-fno-rtti -nostdinc++ \
 			-I${STAGING_TARGET_DIR}/usr/include/uClibc++
-TLDFLAGS+=		$(LIBRARIES)
+TARGET_LDFLAGS+=	$(LIBRARIES)
 else
-TLDFLAGS+=		-shared -pthread
+TARGET_LDFLAGS+=	-shared -pthread
 endif
 
 ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y)
diff --git a/package/haserl/Makefile b/package/haserl/Makefile
index 7dbfd208a..33cc8adde 100644
--- a/package/haserl/Makefile
+++ b/package/haserl/Makefile
@@ -16,7 +16,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,HASERL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-DMAX_UPLOAD_KB=8192
+TARGET_CPPFLAGS+=	-DMAX_UPLOAD_KB=8192
 
 post-install:
 	${INSTALL_DIR} ${IDIR_HASERL}/usr/bin
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index 9568237e0..0e027feae 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -69,7 +69,7 @@ CONFIGURE_OPTS+=	--disable-pk-init \
 			--disable-kx509
 endif
 
-TCFLAGS+=		-I${STAGING_TARGET_DIR}/usr/include/et -pthread
+TARGET_CFLAGS+=		-I${STAGING_TARGET_DIR}/usr/include/et -pthread
 
 CONFIGURE_ARGS+=	${CONFIGURE_OPTS} --with-cross-tools=${STAGING_HOST_DIR}/bin
 CONFIGURE_ENV+=		cross_compiling=yes \
@@ -87,12 +87,12 @@ post-extract:
 	${MAKE} -C ${WRKBUILD}/lib/roken
 	${MAKE} -C ${WRKBUILD}/lib/vers
 	${MAKE} -C ${WRKBUILD}/lib/editline
-	env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/lib/com_err compile_et$(EXEEXT)
-	env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile$(EXEEXT)
-	env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/lib/sl slc$(EXEEXT)
-	${MAKE} -C ${WRKBUILD}/lib/roken install
-	${MAKE} -C ${WRKBUILD}/lib/asn1 install
-	${MAKE} -C ${WRKBUILD}/lib/sl install
+	${MAKE} -C ${WRKBUILD}/lib/com_err compile_et$(EXEEXT) LDFLAGS="-all-static"
+	${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile$(EXEEXT) LDFLAGS="-all-static"
+	${MAKE} -C ${WRKBUILD}/lib/sl slc$(EXEEXT) LDFLAGS="-all-static"
+	${MAKE} -C ${WRKBUILD}/lib/roken install LDFLAGS="-all-static"
+	${MAKE} -C ${WRKBUILD}/lib/asn1 install LDFLAGS="-all-static"
+	${MAKE} -C ${WRKBUILD}/lib/sl install LDFLAGS="-all-static"
 	$(CP) $(STAGING_HOST_DIR)/libexec/heimdal/{slc,asn1_compile} \
 		$(STAGING_HOST_DIR)/bin
 	${MAKE} -C ${WRKBUILD}/lib/sl clean
diff --git a/package/heimdal/patches/patch-lib_roken_Makefile_in b/package/heimdal/patches/patch-lib_roken_Makefile_in
index a702be6b7..a5b84a201 100644
--- a/package/heimdal/patches/patch-lib_roken_Makefile_in
+++ b/package/heimdal/patches/patch-lib_roken_Makefile_in
@@ -29,7 +29,7 @@
 +	$(AWK) -f $(srcdir)/roken.awk $(srcdir)/roken.h.in > make-roken.c
 +
 +make-roken$(EXEEXT): make-roken.c
-+	$(HOSTCC) $(HOSTCFLAGS) -I$(top_builddir)/include -DHAVE_CONFIG_H \
++	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I$(top_builddir)/include -DHAVE_CONFIG_H \
 +		-o $@ $<
  
 -@CROSS_COMPILE_TRUE@roken.h: $(top_srcdir)/cf/roken-h-process.pl roken.h.in
diff --git a/package/httping/Makefile b/package/httping/Makefile
index 2abf4d187..c7b8e8b3f 100644
--- a/package/httping/Makefile
+++ b/package/httping/Makefile
@@ -19,9 +19,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,HTTPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-D_GNU_SOURCE
-
 CONFIG_STYLE:=		manual
+TARGET_CFLAGS+=		-D_GNU_SOURCE
 
 post-install:
 	${INSTALL_DIR} ${IDIR_HTTPING}/usr/bin
diff --git a/package/huawei/Makefile b/package/huawei/Makefile
index 3b555a66e..9d780f37e 100644
--- a/package/huawei/Makefile
+++ b/package/huawei/Makefile
@@ -21,8 +21,10 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
+TARGET_CFLAGS+=		-Wall
+
 do-build:
-	${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} \
+	${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
 		-o ${WRKBUILD}/huawei ${WRKBUILD}/huawei.c -lusb
 
 do-install:
diff --git a/package/icecast/Makefile b/package/icecast/Makefile
index f37bc9080..7c8a248ea 100644
--- a/package/icecast/Makefile
+++ b/package/icecast/Makefile
@@ -18,7 +18,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ICECAST,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCPPFLAGS+=		-I${STAGING_TARGET_DIR}/usr/include/libxml2
+TARGET_CPPFLAGS+=	-I${STAGING_TARGET_DIR}/usr/include/libxml2
 CONFIGURE_ARGS+=	--disable-yp \
 			--with-curl="yes" \
 			--with-curl-config="${STAGING_TARGET_DIR}/usr/bin/curl-config" \
diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile
index 3a20f34d6..370b40755 100644
--- a/package/id3lib/Makefile
+++ b/package/id3lib/Makefile
@@ -20,7 +20,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ID3LIB,id3lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-fPIC
+TARGET_CFLAGS+=		-fPIC
 CONFIGURE_ARGS+=	--enable-cxx-warnings=no
 
 LIBRARIES:=-nodefaultlibs -luClibc++ -lz -lm -lc
@@ -29,11 +29,11 @@ LIBRARIES+=-lssp -fstack-protector
 endif
 
 ifeq ($(ADK_COMPILE_ID3LIB_WITH_UCLIBCXX),y)
-TCXXFLAGS+=		-fno-builtin -fno-rtti -nostdinc++ \
+TARGET_CXXFLAGS+=	-fno-builtin -fno-rtti -nostdinc++ \
 			-I${STAGING_TARGET_DIR}/usr/include/uClibc++
 CONFIGURE_ENV+=		LIBS="${LIBRARIES}"
 else
-TLDFLAGS+=		-shared
+TARGET_LDFLAGS+=	-shared
 endif
 
 post-install:
diff --git a/package/igmpproxy/Makefile b/package/igmpproxy/Makefile
index d255fd1f2..d59cffefa 100644
--- a/package/igmpproxy/Makefile
+++ b/package/igmpproxy/Makefile
@@ -19,12 +19,11 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IGMPPROXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-std=gnu99
+TARGET_CFLAGS+=		-std=gnu99
 
 post-install:
 	${INSTALL_DIR} ${IDIR_IGMPPROXY}/usr/sbin ${IDIR_IGMPPROXY}/etc
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/igmpproxy \
-		 ${IDIR_IGMPPROXY}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/igmpproxy ${IDIR_IGMPPROXY}/usr/sbin
 	${INSTALL_DATA} ${WRKINST}/etc/igmpproxy.conf ${IDIR_IGMPPROXY}/etc
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/iperf/Makefile b/package/iperf/Makefile
index a8db48d59..b2d01f86d 100644
--- a/package/iperf/Makefile
+++ b/package/iperf/Makefile
@@ -20,12 +20,12 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,IPERF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
-TLDFLAGS+=		-lssp
+TARGET_LDFLAGS+=	-lssp
 endif
 
 ifeq ($(ADK_COMPILE_IPERF_WITH_UCLIBCXX),y)
-TCXXFLAGS+=		-fno-builtin -fno-rtti -nostdinc++
-TLDFLAGS+=		-nodefaultlibs
+TARGET_CXXFLAGS+=	-fno-builtin -fno-rtti -nostdinc++
+TARGET_LDFLAGS+=	-nodefaultlibs
 CONFIGURE_ENV+=		LIBS="-luClibc++ -lc -lm -lgcc_s -lpthread"
 else
 CONFIGURE_ENV+=		LIBS="-lc -lm -lgcc_s -lpthread"
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 8ce92d5e2..f2c4a847a 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -42,8 +42,8 @@ $(eval $(call PKG_template,ROUTEL,routel,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_
 $(eval $(call PKG_template,RTMON,rtmon,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_RTMON},${PKG_SECTION}))
 $(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_SS},${PKG_SECTION}))
 
-TCFLAGS+=		-D_GNU_SOURCE
-XAKE_FLAGS+=		CCOPTS="${TCFLAGS}" MFLAGS="CC=${TARGET_CC}" \
+TARGET_CFLAGS+=		-D_GNU_SOURCE
+XAKE_FLAGS+=		CCOPTS="${TARGET_CFLAGS}" MFLAGS="CC=${TARGET_CC}" \
 			HOSTCFLAGS="-I${LINUX_HEADER_DIR}/include"
 CONFIGURE_ENV+=		IPTC="${TARGET_CFLAGS}" IPTL="${TARGET_LDFLAGS}"
 
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 01ba6a8ee..571020304 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -29,10 +29,7 @@ ALL_TARGET:=		binaries
 INSTALL_TARGET:=	binaries_install
 
 pre-build:
-	V=1 ARCH=${ARCH} KERNEL_DIR=${LINUX_DIR} \
-	PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \
-	LD=$(TARGET_CROSS)gcc LDFLAGS="" \
-	$(MAKE) -C ${WRKBUILD} modules
+	$(MAKE) -C ${WRKBUILD} $(KERNEL_MODULE_FLAGS) modules
 
 post-install:
 	${INSTALL_DIR} ${IDIR_IPSET}/usr/sbin ${IDIR_IPSET}/usr/lib/ipset
diff --git a/package/ipset/patches/patch-Makefile b/package/ipset/patches/patch-Makefile
new file mode 100644
index 000000000..e97a5b6a0
--- /dev/null
+++ b/package/ipset/patches/patch-Makefile
@@ -0,0 +1,36 @@
+--- ipset-4.1.orig/Makefile	2009-11-11 20:22:42.000000000 +0100
++++ ipset-4.1/Makefile	2011-01-21 13:30:47.148658311 +0100
+@@ -64,9 +64,13 @@ ifndef NO_EXTRA_WARN_FLAGS
+ endif
+ 
+ ABI_FLAGS:=
+-CFLAGS:=$(ABI_FLAGS) $(COPT_FLAGS) $(WARN_FLAGS) -Ikernel/include -I. # -g -DIPSET_DEBUG
++CPPFLAGS?=
++CPPFLAGS+=-Ikernel/include -I.
++CFLAGS?=$(ABI_FLAGS) $(COPT_FLAGS) $(WARN_FLAGS)
+ SH_CFLAGS:=$(CFLAGS) -fPIC
+-LDFLAGS:=$(ABI_FLAGS)
++LDFLAGS?=$(ABI_FLAGS)
++LIBS?=
++LIBS+=-ldl
+ SETTYPES:=ipmap portmap macipmap
+ SETTYPES+=iptree iptreemap
+ SETTYPES+=iphash nethash ipporthash ipportiphash ipportnethash
+@@ -114,14 +118,14 @@ release: clean
+ 
+ #The ipset(8) self
+ ipset.o: ipset.c ipset.h
+-	$(CC) $(CFLAGS) -DIPSET_VERSION=\"$(IPSET_VERSION)\" -DIPSET_LIB_DIR=\"$(IPSET_LIB_DIR)\" -c -o $@ $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) -DIPSET_VERSION=\"$(IPSET_VERSION)\" -DIPSET_LIB_DIR=\"$(IPSET_LIB_DIR)\" -c -o $@ $<
+ 
+ ipset: ipset.o
+-	$(CC) $(CFLAGS) $(LDFLAGS) -rdynamic -o $@ $^ -ldl
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ #Pooltypes
+ ipset_%.o: ipset_%.c ipset.h
+-	$(CC) $(SH_CFLAGS) -o $@ -c $<
++	$(CC) $(CPPFLAGS) $(SH_CFLAGS) -o $@ -c $<
+ 
+ libipset_%.so: ipset_%.o
+ 	$(CC) -shared $(LDFLAGS) -o $@ $<
diff --git a/package/iptraf/patches/patch-src_Makefile b/package/iptraf/patches/patch-src_Makefile
index c65ad0743..c73f68411 100644
--- a/package/iptraf/patches/patch-src_Makefile
+++ b/package/iptraf/patches/patch-src_Makefile
@@ -1,23 +1,70 @@
 $Id$
 --- iptraf-3.0.0.orig/src/Makefile	2005-09-13 11:11:17.000000000 +0200
-+++ iptraf-3.0.0/src/Makefile	2010-10-05 10:07:10.000000000 +0200
-@@ -107,13 +107,13 @@ BINS = iptraf rvnamed rawtime
++++ iptraf-3.0.0/src/Makefile	2011-01-21 13:46:03.628658655 +0100
+@@ -18,7 +18,8 @@ VERSION 	= -DVERSION=\"$(VERNUMBER)\"
+ BINDIR		= ../../iptraf-$(VERNUMBER).bin.$(ARCH)
+ 
+ CC		= gcc
+-LIBS		= -L../support -ltextbox -lpanel -lncurses   # in this order!
++LIBS		?=
++LIBS		+= -ltextbox -lpanel -lncurses   # in this order!
+ 
+ # comment this one out to omit debug code when done.
+ 
+@@ -31,15 +32,17 @@ PROF		= #-pg
+ # options to be passed to the compiler.  I don't believe they need to be
+ # modified (except for -m486 on non-Intel x86 platforms).
+ 
+-CFLAGS		= -Wall #-O2 #-m486
++CFLAGS		?= -Wall #-O2 #-m486
+ DIRS		= -DWORKDIR=\"$(WORKDIR)\" \
+ 		  -DLOGDIR=\"$(LOGDIR)\" -DEXECDIR=\"$(TARGET)\"
+-LDOPTS		= #-static
++LDFLAGS ?=
++LDFLAGS += 	-L../support
+ 
+ # you may want to change this to point to your ncurses include directory
+ # if the ncurses include files are not in the default location.
+ 
+-INCLUDEDIR	= -I/usr/include/ncurses -I../support
++CPPFLAGS ?=
++CPPFLAGS +=	-I../support
+ 
+ # You can uncomment this one to disable the backspace key in input fields.
+ # This means you must use the Del key or Ctrl+H combination to erase the
+@@ -106,33 +109,31 @@ error.o log.o mode.o getpath.o bar.o par
+ BINS = iptraf rvnamed rawtime
  
  all: $(BINS)
- 	@echo
+-	@echo
 -	@size $(BINS)
-+	#@size $(BINS)
  
  iptraf: $(OBJS) textlib
- 	$(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) $(LIBS)
+-	$(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) $(LIBS)
++	$(CC) $(LDFLAGS) -o iptraf $(OBJS) $(LIBS)
  
  textlib:
 -	make -C ../support
 +	$(MAKE) -C ../support
  
  %.o: %.c *.h version
- 	$(CC) $(CFLAGS) $(DIRS) $(INCLUDEDIR) $(VERSION) $(PLATFORM) $(PROF) $(DEBUG) $(EXECPERM) $(BSSETTING) -c -o $*.o $<
-@@ -132,7 +132,7 @@ rawtime: rawtime.c
+-	$(CC) $(CFLAGS) $(DIRS) $(INCLUDEDIR) $(VERSION) $(PLATFORM) $(PROF) $(DEBUG) $(EXECPERM) $(BSSETTING) -c -o $*.o $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(DIRS) $(VERSION) $(PLATFORM) $(EXECPERM) $(BSSETTING) -c -o $*.o $<
+ 
+ rvnamed: rvnamed.o getpath.o
+-	$(CC) $(LDOPTS) $(PROF) -o rvnamed rvnamed.o getpath.o
++	$(CC) $(LDFLAGS) -o $@ $^
+ 
+ rvnamed.o: rvnamed.c rvnamed.h
+-	$(CC) $(CFLAGS) $(PROF) $(DEBUG) -c -o rvnamed.o rvnamed.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ rvnamed.c
+ 
+ rawtime: rawtime.c
+-	$(CC) $(CFLAGS) $(LDOPTS) $(PROF) $(DEBUG) -o rawtime rawtime.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o rawtime rawtime.c
+ 
+ 
+ # rule to clear out all object files and the executables (pow!)
  
  clean:
  	rm -f *.o *~ core $(BINS)
@@ -26,3 +73,12 @@ $Id$
  
  # I just included this rule to clear out the .o files, leaving the
  # executables, stripped and ready for packing.
+@@ -162,7 +163,7 @@ install:
+ # and the compiled programs for release as a ready-to-run distribution.
+ 
+ dist-bin: all
+-	$(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) -L../support -ltextbox /usr/lib/libpanel.a /usr/lib/libncurses.a
++	$(CC) $(LDFLAGS) -o iptraf $(OBJS) -L../support -ltextbox -lpanel -lncurses
+ 	rm -rf $(BINDIR)
+ 	mkdir $(BINDIR)
+ 	/bin/cp -p ../CHANGES ../LICENSE ../FAQ ../INSTALL ../README* \
diff --git a/package/iptraf/patches/patch-support_Makefile b/package/iptraf/patches/patch-support_Makefile
index c72b89ef6..fae8e3938 100644
--- a/package/iptraf/patches/patch-support_Makefile
+++ b/package/iptraf/patches/patch-support_Makefile
@@ -1,7 +1,9 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- iptraf-3.0.0.orig/support/Makefile	2002-07-19 18:31:48.000000000 +0200
-+++ iptraf-3.0.0/support/Makefile	2008-10-09 17:34:11.000000000 +0200
-@@ -3,16 +3,14 @@ INCLUDEDIR		= -I/usr/include/ncurses
++++ iptraf-3.0.0/support/Makefile	2011-01-21 13:47:38.508658394 +0100
+@@ -1,18 +1,13 @@
+-INCLUDEDIR		= -I/usr/include/ncurses
+-
  OBJS			= input.o menurt.o listbox.o winops.o labels.o \
  				msgboxes.o txbox.o
  
@@ -14,11 +16,10 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -#	gcc -shared -o libtextbox.so $(OBJS)
 +	$(AR) cq libtextbox.a $(OBJS)
 +	$(RANLIB) libtextbox.a
-+#	$(CC) -shared -o libtextbox.so $(OBJS)
  
  %.o: %.c *.h
 -	gcc -O2 -g -Wall -fPIC $(INCLUDEDIR) -c -o $*.o $<
-+	$(CC) -O2 -g -Wall -fPIC $(INCLUDEDIR) -c -o $*.o $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -c -o $*.o $<
  
  clean:
  	rm -rf *.o *~ libtextbox.a libtextbox.so
diff --git a/package/iw/Makefile b/package/iw/Makefile
index 679377b89..5515def8a 100644
--- a/package/iw/Makefile
+++ b/package/iw/Makefile
@@ -22,7 +22,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,IW,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
-TCFLAGS+=		$(TCPPFLAGS)
+TARGET_CFLAGS+=		$(TARGET_CPPFLAGS)
 
 post-install:
 	${INSTALL_DIR} ${IDIR_IW}/usr/sbin
diff --git a/package/knock/Makefile b/package/knock/Makefile
index c7978ece1..7567fd85c 100644
--- a/package/knock/Makefile
+++ b/package/knock/Makefile
@@ -22,7 +22,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,KNOCK,knock,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,KNOCKD,knockd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_KNOCKD},${PKGSD_KNOCKD},${PKG_SECTION}))
 
-TCXXFLAGS+=		${TCPPFLAGS} ${TCFLAGS}
 CONFIGURE_ENV+=		ac_cv_lib_pcap_pcap_open_live=yes
 
 post-install:
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index c7ec9955d..fc4e8d8e0 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -27,7 +27,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBKRB5,libkrb5,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBKRB5},${PKGSC_LIBKRB5}))
 
-TCFLAGS+=		-I${STAGING_TARGET_DIR}/usr/include/et
+TARGET_CPPFLAGS+=	-I${STAGING_TARGET_DIR}/usr/include/et
 CONFIGURE_ARGS+=	--disable-static \
 			--disable-profiled \
 			--with-system-ss \
diff --git a/package/libart/Makefile b/package/libart/Makefile
index b41a9377a..92b0da08f 100644
--- a/package/libart/Makefile
+++ b/package/libart/Makefile
@@ -18,6 +18,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBART,libart,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+MAKE_ENV+=		HOSTCC=$(CC_FOR_BUILD)
+
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBART}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libart_lgpl_2.so* ${IDIR_LIBART}/usr/lib/
diff --git a/package/libevent/Makefile b/package/libevent/Makefile
index a11099ab0..25897ad61 100644
--- a/package/libevent/Makefile
+++ b/package/libevent/Makefile
@@ -23,8 +23,7 @@ $(eval $(call PKG_template,LIBEVENT_DEV,libevent-dev,$(PKG_VERSION)-${PKG_RELEAS
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_LIBEVENT)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libevent*.so* \
-		$(IDIR_LIBEVENT)/usr/lib/
+	$(CP) $(WRKINST)/usr/lib/libevent*.so* $(IDIR_LIBEVENT)/usr/lib
 
 libevent-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBEVENT_DEV}/usr/include
diff --git a/package/libhugetlbfs/Makefile b/package/libhugetlbfs/Makefile
index 600d154e9..b41283736 100644
--- a/package/libhugetlbfs/Makefile
+++ b/package/libhugetlbfs/Makefile
@@ -4,14 +4,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libhugetlbfs
-PKG_VERSION:=		2.6
+PKG_VERSION:=		2.11
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		cda489010e5bb89eb59994f689f8693e
+PKG_MD5SUM:=		35e68f16b704f2e339622a8ca07fdee0
 PKG_DESCR:=		easy hugepage access
 PKG_SECTION:=		libs
 PKG_URL:=		http://libhugetlbfs.ozlabs.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libhugetlbfs/}
 
+PKG_CFLINE_LIBHUGETLBFS:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBHUGETLBFS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/libhugetlbfs/patches/patch-Makefile b/package/libhugetlbfs/patches/patch-Makefile
index 44deaba1d..b0b919940 100644
--- a/package/libhugetlbfs/patches/patch-Makefile
+++ b/package/libhugetlbfs/patches/patch-Makefile
@@ -1,8 +1,8 @@
 	- do not call uname -m, use passed ${ADK_ARCH} variable
 	- use ${CC} instead of hard-coded gcc
---- libhugetlbfs-2.6.orig/Makefile	2009-08-24 14:56:07.000000000 +0200
-+++ libhugetlbfs-2.6/Makefile	2011-01-17 15:17:03.942093253 +0100
-@@ -30,51 +30,51 @@ CFLAGS ?= -O2 -g
+--- libhugetlbfs-2.11.orig/Makefile	2010-12-16 18:38:22.000000000 +0100
++++ libhugetlbfs-2.11/Makefile	2011-01-22 21:09:48.008659615 +0100
+@@ -31,51 +31,51 @@ CFLAGS ?= -O2 -g
  CFLAGS += -Wall -fPIC
  CPPFLAGS += -D__LIBHUGETLBFS__
  
diff --git a/package/libhugetlbfs/patches/patch-morecore_c b/package/libhugetlbfs/patches/patch-morecore_c
new file mode 100644
index 000000000..61651fbe0
--- /dev/null
+++ b/package/libhugetlbfs/patches/patch-morecore_c
@@ -0,0 +1,11 @@
+--- libhugetlbfs-2.11.orig/morecore.c	2010-12-16 18:38:22.000000000 +0100
++++ libhugetlbfs-2.11/morecore.c	2011-01-22 21:18:44.018658436 +0100
+@@ -268,7 +268,7 @@ void hugetlbfs_setup_morecore(void)
+ 	INFO("setup_morecore(): heapaddr = 0x%lx\n", heapaddr);
+ 
+ 	heaptop = heapbase = (void *)heapaddr;
+-	__morecore = &hugetlbfs_morecore;
++	morecore = &hugetlbfs_morecore;
+ 
+ 	/* Set some allocator options more appropriate for hugepages */
+ 
diff --git a/package/libhugetlbfs/patches/patch-version b/package/libhugetlbfs/patches/patch-version
new file mode 100644
index 000000000..08c11d193
--- /dev/null
+++ b/package/libhugetlbfs/patches/patch-version
@@ -0,0 +1,5 @@
+--- libhugetlbfs-2.11.orig/version	2010-12-16 19:14:12.000000000 +0100
++++ libhugetlbfs-2.11/version	2011-01-22 21:09:48.624905626 +0100
+@@ -1 +1 @@
+-2.11
++commit<f475340970f58d3643bdd7e3cec809dc1fa3e908>
diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile
index c180fed62..2da817c1e 100644
--- a/package/libiconv/Makefile
+++ b/package/libiconv/Makefile
@@ -20,7 +20,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBICONV,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-TCFLAGS+=		-fPIC
+TARGET_CFLAGS+=		-fPIC
 FAKE_FLAGS+=		libdir="${WRKINST}/usr/lib" \
 			includedir="${WRKINST}/usr/include" \
 INSTALL_TARGET=		install-lib
diff --git a/package/libid3tag/Makefile b/package/libid3tag/Makefile
index 1b1d376ea..972daf556 100644
--- a/package/libid3tag/Makefile
+++ b/package/libid3tag/Makefile
@@ -26,6 +26,6 @@ pre-install:
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBID3TAG}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libid3tag.so.* ${IDIR_LIBID3TAG}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libid3tag.so* ${IDIR_LIBID3TAG}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libid3tag/patches/patch-configure b/package/libid3tag/patches/patch-configure
new file mode 100644
index 000000000..d243b3634
--- /dev/null
+++ b/package/libid3tag/patches/patch-configure
@@ -0,0 +1,14 @@
+--- libid3tag-0.15.1b.orig/configure	2004-02-05 10:35:25.000000000 +0100
++++ libid3tag-0.15.1b/configure	2011-01-21 14:17:04.434906188 +0100
+@@ -19038,10 +19038,7 @@ do
+ 	    arch="$arch $1"
+ 	    shift
+ 	    ;;
+-	-fomit-frame-pointer)
+-	    shift
+-	    ;;
+-	-O*|-f*)
++	-O*)
+ 	    optimize="$1"
+ 	    shift
+ 	    ;;
diff --git a/package/libnet/Makefile b/package/libnet/Makefile
index 5309c68ec..1e65aa7af 100644
--- a/package/libnet/Makefile
+++ b/package/libnet/Makefile
@@ -31,7 +31,6 @@ $(eval $(call PKG_template,LIBNET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PK
 
 CONFIGURE_ENV+=		ac_cv_libnet_endianess=${ENDIAN} \
 			ac_cv_lbl_unaligned_fail=no
-#CONFIGURE_ARGS+=	--with-pf_packet=yes
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBNET}/usr/lib
diff --git a/package/libosip2/patches/patch-configure b/package/libosip2/patches/patch-configure
new file mode 100644
index 000000000..49b5fd977
--- /dev/null
+++ b/package/libosip2/patches/patch-configure
@@ -0,0 +1,11 @@
+--- libosip2-3.3.0.orig/configure	2009-03-04 12:18:53.000000000 +0100
++++ libosip2-3.3.0/configure	2011-01-21 14:27:29.384906610 +0100
+@@ -22308,7 +22308,7 @@ if test "x$Wpointer_arith_flag" = xyes; 
+   CPPFLAGS="$CPPFLAGS -Wpointer-arith"
+ fi
+ 
+-SIP_CFLAGS="$SIP_CFLAGS $CFLAGS"
++SIP_CFLAGS="$SIP_CFLAGS"
+ 
+ 
+ 
diff --git a/package/libowfat/Makefile b/package/libowfat/Makefile
index d1b6150b5..3dd95eaad 100644
--- a/package/libowfat/Makefile
+++ b/package/libowfat/Makefile
@@ -17,7 +17,7 @@ include ${TOPDIR}/mk/package.mk
 
 CONFIG_STYLE:=		manual
 
-TCFLAGS+=		${TCPPFLAGS}
+TARGET_CFLAGS+=		${TARGET_CPPFLAGS}
 MAKE_FILE=		GNUmakefile
 MAKE_FLAGS+=		DIET= CC='${TARGET_CC}' CROSS=${TARGET_CROSS} \
 			LDFLAGS='${TARGET_LDFLAGS}'
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index 209a337df..eee796502 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -21,9 +21,9 @@ $(eval $(call PKG_template,LIBPCAP,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${P
 
 CONFIGURE_ENV+=		ac_cv_linux_vers=26
 CONFIGURE_ARGS+=	--disable-yydebug \
-			--with-build-cc=$(HOSTCC) \
+			--with-build-cc=$(CC_FOR_BUILD) \
 			--with-pcap=linux
-TCFLAGS+=		${TCPPFLAGS}
+TARGET_CFLAGS+=		${TARGET_CPPFLAGS}
 INSTALL_TARGET=		install install-shared
 MAKE_FLAGS+=		STAGING_TARGET_DIR=$(STAGING_TARGET_DIR)
 
diff --git a/package/libpri/Makefile b/package/libpri/Makefile
index 101f82c98..5c93c4cc0 100644
--- a/package/libpri/Makefile
+++ b/package/libpri/Makefile
@@ -18,7 +18,7 @@ $(eval $(call PKG_template,LIBPRI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PK
 
 CONFIG_STYLE:=		manual
 
-MAKE_FLAGS+=		CC='${TARGET_CC}' LDCONFIG=''
+MAKE_FLAGS+=		CC='${TARGET_CC}' LDCONFIG='' ARCH=$(ARCH)
 FAKE_FLAGS+=		INSTALL_BASE=/usr
 
 post-install:
diff --git a/package/libpri/patches/patch-Makefile b/package/libpri/patches/patch-Makefile
index e7e553e4a..743924088 100644
--- a/package/libpri/patches/patch-Makefile
+++ b/package/libpri/patches/patch-Makefile
@@ -1,6 +1,36 @@
 --- libpri-1.4.10.2.orig/Makefile	2008-08-06 20:20:51.000000000 +0200
-+++ libpri-1.4.10.2/Makefile	2010-05-29 09:55:08.750000000 +0200
-@@ -146,7 +146,6 @@ $(STATIC_LIBRARY): $(STATIC_OBJS)
++++ libpri-1.4.10.2/Makefile	2011-01-21 14:32:08.278658337 +0100
+@@ -31,8 +31,8 @@ CC=gcc
+ GREP=grep
+ AWK=awk
+ 
+-OSARCH=$(shell uname -s)
+-PROC?=$(shell uname -m)
++OSARCH=Linux
++PROC?=$(ARCH)
+ 
+ # SONAME version; should be changed on every ABI change
+ # please don't change it needlessly; it's perfectly fine to have a SONAME
+@@ -43,7 +43,8 @@ STATIC_LIBRARY=libpri.a
+ DYNAMIC_LIBRARY:=libpri.so.$(SONAME)
+ STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o version.o
+ DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo version.lo
+-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
++CFLAGS?=
++CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
+ libdir?=$(INSTALL_BASE)/lib
+@@ -135,7 +136,7 @@ pridump: pridump.o
+ MAKE_DEPS= -MD -MT $@ -MF .$(subst /,_,$@).d -MP
+ 
+ %.o: %.c
+-	$(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $<
+ 
+ %.lo: %.c
+ 	$(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $<
+@@ -146,7 +147,6 @@ $(STATIC_LIBRARY): $(STATIC_OBJS)
  
  $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
  	$(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile
index 25cbd8566..7e4c59366 100644
--- a/package/libupnp/Makefile
+++ b/package/libupnp/Makefile
@@ -19,7 +19,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBUPNP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-fPIC
+TARGET_CFLAGS+=		-fPIC
 CONFIGURE_ARGS+=	--disable-samples
 
 post-build:
diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile
index 03ff483f2..df516c250 100644
--- a/package/libvirt/Makefile
+++ b/package/libvirt/Makefile
@@ -21,7 +21,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBVIRT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-std=c99
+TARGET_CFLAGS+=		-std=c99
 CONFIGURE_ARGS+=	--without-xen \
 			--without-uml \
 			--without-esx \
diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile
index 69bbdab24..922297112 100644
--- a/package/lighttpd/Makefile
+++ b/package/lighttpd/Makefile
@@ -68,7 +68,7 @@ $(eval $(call PKG_mod_template,LIGHTTPD_MOD_STATUS,status))
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_USERTRACK,usertrack))
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_WEBDAV,webdav))
 
-TCPPFLAGS+=		-I$(STAGING_TARGET_DIR)/usr/include/libxml2
+TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/usr/include/libxml2
 CONFIGURE_ENV+=		PCRE_LIB="-lpcre"
 CONFIGURE_ARGS+=	\
 			--libdir=/usr/lib/lighttpd \
diff --git a/package/logrotate/Makefile b/package/logrotate/Makefile
index 884b2d0fb..1d0a69ae6 100644
--- a/package/logrotate/Makefile
+++ b/package/logrotate/Makefile
@@ -18,7 +18,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LOGROTATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
-TCFLAGS+=              -D_GNU_SOURCE -DVERSION=\"$(PKG_VERSION)\"
+TARGET_CFLAGS+=		-D_GNU_SOURCE -DVERSION=\"$(PKG_VERSION)\"
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LOGROTATE}/usr/sbin
diff --git a/package/lua/Makefile b/package/lua/Makefile
index 59cb96791..e7647728a 100644
--- a/package/lua/Makefile
+++ b/package/lua/Makefile
@@ -26,8 +26,8 @@ $(eval $(call PKG_template,LUAC,luac,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS
 $(eval $(call PKG_template,LUA_EXAMPLES,lua-examples,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LUAEXAMPLES},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
-MAKE_FLAGS+=		CFLAGS="${TCFLAGS} ${TCPPFLAGS} -DLUA_USE_LINUX -fPIC" \
-			MYLDFLAGS="${TLDFLAGS}" \
+MAKE_FLAGS+=		CFLAGS="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} -DLUA_USE_LINUX -fPIC" \
+			MYLDFLAGS="${TARGET_LDFLAGS}" \
 			CC="${TARGET_CC}" LD="${TARGET_CROSS}ld" \
 			AR="${TARGET_CROSS}ar rcu" \
 			RANLIB="${TARGET_CROSS}ranlib"
diff --git a/package/lynx/Makefile b/package/lynx/Makefile
index b71dcb292..0310b9531 100644
--- a/package/lynx/Makefile
+++ b/package/lynx/Makefile
@@ -21,10 +21,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LYNX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCPPFLAGS+=		-I${STAGING_TARGET_DIR}/include/openssl
-TCPPFLAGS+=		-DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT
-TLDFLAGS+=		-lz
-
+TARGET_CPPFLAGS+=	-I${STAGING_TARGET_DIR}/include/openssl
+TARGET_CPPFLAGS+=	-DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT
 CONFIGURE_ENV+=		ac_cv_path_TELNET=telnet \
 			ac_cv_path_TN3270=tn3270 \
 			ac_cv_path_RLOGIN=rlogin \
@@ -78,7 +76,6 @@ CONFIGURE_ARGS+=	\
 			--disable-widec \
 			--disable-locale-charset \
 			--with-build-cppflags="-I/usr/include/ncurses"
-
 MAKE_FILE:=		makefile
 
 post-install:
diff --git a/package/madplay/Makefile b/package/madplay/Makefile
index 01372dce8..50187a26a 100644
--- a/package/madplay/Makefile
+++ b/package/madplay/Makefile
@@ -19,7 +19,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MADPLAY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ENV+=		BUILD_CC="${TARGET_CC}" HOSTCC=${HOST_CC} \
+CONFIGURE_ENV+=		BUILD_CC="${TARGET_CC}" HOSTCC=${CC_FOR_BUILD} \
 			LIBS="-lz" \
 			ac_cv_linux_vers=2 \
 			td_cv_buggygetaddrinfo="no"
diff --git a/package/madplay/patches/patch-configure b/package/madplay/patches/patch-configure
new file mode 100644
index 000000000..b3d1b6c7c
--- /dev/null
+++ b/package/madplay/patches/patch-configure
@@ -0,0 +1,14 @@
+--- madplay-0.15.2b.orig/configure	2004-02-23 22:36:21.000000000 +0100
++++ madplay-0.15.2b/configure	2011-01-21 16:04:04.644909723 +0100
+@@ -19057,10 +19057,7 @@ do
+ 	    arch="$arch $1"
+ 	    shift
+ 	    ;;
+-	-fomit-frame-pointer)
+-	    shift
+-	    ;;
+-	-O*|-f*)
++	-O*)
+ 	    optimize="$1"
+ 	    shift
+ 	    ;;
diff --git a/package/maradns/Makefile b/package/maradns/Makefile
index f940c458f..097435650 100644
--- a/package/maradns/Makefile
+++ b/package/maradns/Makefile
@@ -4,22 +4,21 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		maradns
-PKG_VERSION:=		1.4.03
+PKG_VERSION:=		1.4.05
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9e715104234cc9bf01e2afaad27eb787
+PKG_MD5SUM:=		aff277f6ba0e1ff46d32a60ab84f16cb
 PKG_DESCR:=		small and secure DNS server
 PKG_SECTION:=		dns
-PKG_NOPARALLEL:=	1
 PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://www.maradns.org
 PKG_SITES:=		http://www.maradns.org/download/1.4/${PKG_VERSION}/
+PKG_NOPARALLEL:=	1
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MARADNS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
-
 FAKE_FLAGS+=		PREFIX="${WRKINST}/usr" \
 			RPM_BUILD_ROOT="${WRKINST}"
 
diff --git a/package/maradns/patches/cross-compile-fix.patch b/package/maradns/patches/cross-compile-fix.patch
index 8277956c5..384cd6936 100644
--- a/package/maradns/patches/cross-compile-fix.patch
+++ b/package/maradns/patches/cross-compile-fix.patch
@@ -1,12 +1,20 @@
 diff -urN maradns-1.0.26.old/rng/Makefile maradns-1.0.26.dev/rng/Makefile
---- maradns-1.4.03.orig/rng/Makefile	2006-01-02 17:59:33.000000000 +0100
-+++ maradns-1.4.03/rng/Makefile	2010-02-06 00:19:48.241836878 +0100
-@@ -25,7 +25,7 @@ rng-api-fst.o: rng-alg-fst.o rng-api-fst
- 	$(CC) -c $(FLAGS) -o rng-api-fst.o rng-api-fst.c
+--- maradns-1.4.05.orig/rng/Makefile	2006-01-02 17:59:33.000000000 +0100
++++ maradns-1.4.05/rng/Makefile	2011-01-21 16:47:29.318658272 +0100
+@@ -19,13 +19,13 @@ superclean:
+ 	rm -f $(ROBJECTS) core make_32bit_tables $(TABLES)
+ 
+ rng-alg-fst.o: rng-alg-fst.c rng-alg-fst.h $(TABLES)
+-	$(CC) -c $(FLAGS) -o rng-alg-fst.o rng-alg-fst.c
++	$(CC) -c $(CFLAGS) -o rng-alg-fst.o rng-alg-fst.c
+ 
+ rng-api-fst.o: rng-alg-fst.o rng-api-fst.h 
+-	$(CC) -c $(FLAGS) -o rng-api-fst.o rng-api-fst.c
++	$(CC) -c $(CFLAGS) -o rng-api-fst.o rng-api-fst.c
  
  make_32bit_tables: make_32bit_tables.c
 -	$(CC) -o make_32bit_tables make_32bit_tables.c
-+	$(HOSTCC) -o make_32bit_tables make_32bit_tables.c
++	$(CC_FOR_BUILD) -o make_32bit_tables make_32bit_tables.c
  
  rng-32bit-tables.h: make_32bit_tables
  	./make_32bit_tables > rng-32bit-tables.h
diff --git a/package/maradns/patches/patch-Makefile b/package/maradns/patches/patch-Makefile
index d1fc651c4..c06bf9a64 100644
--- a/package/maradns/patches/patch-Makefile
+++ b/package/maradns/patches/patch-Makefile
@@ -1,12 +1,12 @@
---- maradns-1.4.03.orig/Makefile	2006-01-02 17:59:33.000000000 +0100
-+++ maradns-1.4.03/Makefile	2010-02-06 00:19:48.471836901 +0100
+--- maradns-1.4.05.orig/Makefile	2006-01-02 17:59:33.000000000 +0100
++++ maradns-1.4.05/Makefile	2011-01-21 16:48:06.124913980 +0100
 @@ -1,15 +1,82 @@
 -# This is a wrapper that runs "./configure ; make"
 -all:
 -	./compile.sh
-+VERSION=1.4.03
-+COMPILED="Linux system at Sat Feb 6 00:19:48 CET 2010"
-+COMPILED_DEBUG="Linux system at Sat Feb 6 00:19:48 CET 2010 (Debug)"
++VERSION=1.4.05
++COMPILED="Linux system at Fri Jan 21 16:48:06 CET 2011"
++COMPILED_DEBUG="Linux system at Fri Jan 21 16:48:06 CET 2011 (Debug)"
 +# Server objects
 +SOBJECTS=server/MaraBigHash.o
 +# js_string library (buffer overflow resistant string library) objects
@@ -34,23 +34,23 @@
 +# LDFLAGS=-L/usr/ucblib -lucb -lxnet
 +# end the Solaris section
 +# Non-Solaris version of "M"
-+V="VERSION=$(VERSION)"
++VER="VERSION=$(VERSION)"
 +Q="DEFINES=-DSELECT_PROBLEM"
 +
 +# Debug
 +
-+FLAGS = -O2 -Wall -DSELECT_PROBLEM
-+M="CC=$(CC) $(FLAGS)"
-+D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS"
++CFLAGS ?= -O2 -Wall -DSELECT_PROBLEM
++M="CC=$(CC)"
++D="CC=$(CC) -DDEBUG -DTHREADS"
 +#FLAGS = -g
 +
 +all: 
 +	cd libs ; make $(M) ; cd ../dns ; make $(M) ; \
 +	cd ../rng ; make $(M) ; cd ../parse ; make $(M) ; \
 +	cd ../qual ; make $(M) ; cd ../server ; \
-+	make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \
++	make $(M) $(VER) COMPILED=\"$(COMPILED)\" ; \
 +	cd ../tools ; make $(M) ; \
-+	cd ../tcp ; make $(M) $(V) ; cat ../00README.FIRST
++	cd ../tcp ; make $(M) $(VER)
 +
 +debug: 
 +	cd libs ; make $(D) DEBUG="-DDEBUG -DTHREADS" ; \
diff --git a/package/maradns/patches/patch-build_Makefile_linux b/package/maradns/patches/patch-build_Makefile_linux
index 2e7dec5be..44b68b5a4 100644
--- a/package/maradns/patches/patch-build_Makefile_linux
+++ b/package/maradns/patches/patch-build_Makefile_linux
@@ -1,5 +1,5 @@
---- maradns-1.4.03.orig/build/Makefile.linux	2006-11-24 12:44:29.000000000 +0100
-+++ maradns-1.4.03/build/Makefile.linux	2010-02-06 00:23:58.393084387 +0100
+--- maradns-1.4.05.orig/build/Makefile.linux	2006-11-24 12:44:29.000000000 +0100
++++ maradns-1.4.05/build/Makefile.linux	2011-01-21 16:36:23.968658279 +0100
 @@ -23,23 +23,23 @@ EXECS=server/maradns
  # LDFLAGS=-L/usr/ucblib -lucb -lxnet
  # end the Solaris section
@@ -14,8 +14,8 @@
 -M="CC=$(CC) $(FLAGS)"
 -D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS"
 +CFLAGS ?= -O2 -Wall -DSELECT_PROBLEM
-+M="CC=$(CC) $(CFLAGS)"
-+D="CC=$(CC) $(CFLAGS) -DDEBUG -DTHREADS"
++M="CC=$(CC)"
++D="CC=$(CC) -DDEBUG -DTHREADS"
  #FLAGS = -g
  
  all: 
diff --git a/package/maradns/patches/patch-dns_Makefile b/package/maradns/patches/patch-dns_Makefile
index 70713032f..81855b3dc 100644
--- a/package/maradns/patches/patch-dns_Makefile
+++ b/package/maradns/patches/patch-dns_Makefile
@@ -1,5 +1,5 @@
---- maradns-1.4.03.orig/dns/Makefile	2005-12-20 11:10:40.000000000 +0100
-+++ maradns-1.4.03/dns/Makefile	2010-02-06 00:19:48.481829524 +0100
+--- maradns-1.4.05.orig/dns/Makefile	2005-12-20 11:10:40.000000000 +0100
++++ maradns-1.4.05/dns/Makefile	2011-01-21 16:48:06.144914132 +0100
 @@ -3,7 +3,7 @@ JOBJS=../libs/JsStr.o ../libs/JsStrOS.o 
  MHOBJS=../libs/MaraHash.o
  OBJECTS=$(DOBJECTS) $(JOBJS) $(MHOBJS)
@@ -9,3 +9,22 @@
  #FLAGS = -g $(DEBUG)
  
  all: Queries.o Compress.o bobbit.o Decompress.o
+@@ -12,14 +12,14 @@ clean:
+ 	rm -f Queries.o Compress.o bobbit.o Decompress.o
+ 
+ Queries.o: Queries.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o Queries.o Queries.c 
++	$(CC) -c $(CFLAGS) -o Queries.o Queries.c 
+ 
+ Compress.o: Compress.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o Compress.o Compress.c 
++	$(CC) -c $(CFLAGS) -o Compress.o Compress.c 
+ 
+ Decompress.o: Decompress.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o Decompress.o Decompress.c 
++	$(CC) -c $(CFLAGS) -o Decompress.o Decompress.c 
+ 
+ bobbit.o: bobbit.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o bobbit.o bobbit.c 
++	$(CC) -c $(CFLAGS) -o bobbit.o bobbit.c 
+ 
diff --git a/package/maradns/patches/patch-dns_Makefile_recursive b/package/maradns/patches/patch-dns_Makefile_recursive
new file mode 100644
index 000000000..3e8339140
--- /dev/null
+++ b/package/maradns/patches/patch-dns_Makefile_recursive
@@ -0,0 +1,21 @@
+--- maradns-1.4.05.orig/dns/Makefile.recursive	2006-01-02 17:59:33.000000000 +0100
++++ maradns-1.4.05/dns/Makefile.recursive	2011-01-21 16:47:09.678658422 +0100
+@@ -12,14 +12,14 @@ clean:
+ 	rm -f Queries.o Compress.o bobbit.o Decompress.o
+ 
+ Queries.o: Queries.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o Queries.o Queries.c 
++	$(CC) -c $(CFLAGS) -o Queries.o Queries.c 
+ 
+ Compress.o: Compress.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o Compress.o Compress.c 
++	$(CC) -c $(CFLAGS) -o Compress.o Compress.c 
+ 
+ Decompress.o: Decompress.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o Decompress.o Decompress.c 
++	$(CC) -c $(CFLAGS) -o Decompress.o Decompress.c 
+ 
+ bobbit.o: bobbit.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o bobbit.o bobbit.c 
++	$(CC) -c $(CFLAGS) -o bobbit.o bobbit.c 
+ 
diff --git a/package/maradns/patches/patch-libs_Makefile b/package/maradns/patches/patch-libs_Makefile
new file mode 100644
index 000000000..4c8ec3255
--- /dev/null
+++ b/package/maradns/patches/patch-libs_Makefile
@@ -0,0 +1,31 @@
+--- maradns-1.4.05.orig/libs/Makefile	2006-01-02 17:59:33.000000000 +0100
++++ maradns-1.4.05/libs/Makefile	2011-01-21 16:46:50.568579851 +0100
+@@ -9,22 +9,22 @@ clean:
+ 	rm -f core $(OBJECTS) tests mtest *.exe
+ 
+ MaraHash.o: JsStr.h MaraHash.c
+-	$(CC) -c $(FLAGS) -o MaraHash.o MaraHash.c 
++	$(CC) -c $(CFLAGS) -o MaraHash.o MaraHash.c 
+ 
+ JsStr.o: JsStr.h JsStr.c
+-	$(CC) -c $(FLAGS) -o JsStr.o JsStr.c 
++	$(CC) -c $(CFLAGS) -o JsStr.o JsStr.c 
+ 
+ JsStrOS.o: JsStr.h JsStrOS.c
+-	$(CC) -c $(FLAGS) -o JsStrOS.o JsStrOS.c 
++	$(CC) -c $(CFLAGS) -o JsStrOS.o JsStrOS.c 
+ 
+ JsStrCP.o: JsStr.h JsStrCP.c
+-	$(CC) -c $(FLAGS) -o JsStrCP.o JsStrCP.c 
++	$(CC) -c $(CFLAGS) -o JsStrCP.o JsStrCP.c 
+ 
+ mtest: mtest.c $(OBJECTS)
+-	$(CC) $(FLAGS) -o mtest mtest.c $(OBJECTS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o mtest mtest.c $(OBJECTS)
+ 
+ tests: tests.c $(OBJECTS)
+-	$(CC) $(FLAGS) -o tests tests.c $(OBJECTS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o tests tests.c $(OBJECTS)
+ 
+ #onetime: $(OBJECTS) kiwi.h config.h onetime.c do_scramble.o cryptdate.o
+ #	$(CC) $(FLAGS) -o onetime onetime.c do_scramble.o cryptdate.o
diff --git a/package/maradns/patches/patch-parse_Makefile b/package/maradns/patches/patch-parse_Makefile
new file mode 100644
index 000000000..b7098c969
--- /dev/null
+++ b/package/maradns/patches/patch-parse_Makefile
@@ -0,0 +1,80 @@
+--- maradns-1.4.05.orig/parse/Makefile	2006-07-18 05:50:44.000000000 +0200
++++ maradns-1.4.05/parse/Makefile	2011-01-21 16:47:47.994913518 +0100
+@@ -8,8 +8,8 @@ DOBJECTS=../dns/Queries.o ../dns/Compres
+ OBJECTS=$(JOBJS) $(MHOBJS) $(POBJECTS) $(DOBJECTS) $(OUTOBJ)
+ EXECS=parsetest parsetest2
+ 
+-#FLAGS = -g -Wall $(DEBUG)
+-#FLAGS = -g $(DEBUG)
++#CFLAGS = -g -Wall $(DEBUG)
++#CFLAGS = -g $(DEBUG)
+ 
+ all: $(POBJECTS) $(OUTOBJ)
+ 
+@@ -20,50 +20,50 @@ clean:
+ 	cd libs ; make
+ 
+ ParseMaraRc.o: ParseMaraRc.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h ParseMaraRc_en.h
+-	$(CC) -c $(FLAGS) -o ParseMaraRc.o ParseMaraRc.c 
++	$(CC) -c $(CFLAGS) -o ParseMaraRc.o ParseMaraRc.c 
+ 
+ ParseCsv1.o: ParseCsv1.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o ParseCsv1.o ParseCsv1.c 
++	$(CC) -c $(CFLAGS) -o ParseCsv1.o ParseCsv1.c 
+ 
+ ParseIpAcl.o: ParseIpAcl.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o ParseIpAcl.o ParseIpAcl.c
++	$(CC) -c $(CFLAGS) -o ParseIpAcl.o ParseIpAcl.c
+ 
+ Parse_ipv6.o: Parse_ipv6.c ../libs/MaraHash.h
+-	$(CC) -c $(FLAGS) -o Parse_ipv6.o Parse_ipv6.c
++	$(CC) -c $(CFLAGS) -o Parse_ipv6.o Parse_ipv6.c
+ 
+ Csv2_esc_txt.o: Csv2_esc_txt.c ../libs/JsStr.h
+-	$(CC) -c $(FLAGS) -o Csv2_esc_txt.o Csv2_esc_txt.c
++	$(CC) -c $(CFLAGS) -o Csv2_esc_txt.o Csv2_esc_txt.c
+ 
+ Csv2_main.o: Csv2_main.c ../libs/JsStr.h Csv2_read.h
+-	$(CC) -c $(FLAGS) -o Csv2_main.o Csv2_main.c
++	$(CC) -c $(CFLAGS) -o Csv2_main.o Csv2_main.c
+ 
+ Csv2_read.o: Csv2_read.c ../libs/JsStr.h Csv2_read.h
+-	$(CC) -c $(FLAGS) -o Csv2_read.o Csv2_read.c
++	$(CC) -c $(CFLAGS) -o Csv2_read.o Csv2_read.c
+ 
+ Csv2_parse.o: Csv2_parse.c ../libs/JsStr.h Csv2_read.h
+-	$(CC) -c $(FLAGS) -o Csv2_parse.o Csv2_parse.c
++	$(CC) -c $(CFLAGS) -o Csv2_parse.o Csv2_parse.c
+ 
+ Csv2_rr_aaaa.o: Csv2_rr_aaaa.c ../libs/JsStr.h Csv2_read.h
+-	$(CC) -c $(FLAGS) -o Csv2_rr_aaaa.o Csv2_rr_aaaa.c
++	$(CC) -c $(CFLAGS) -o Csv2_rr_aaaa.o Csv2_rr_aaaa.c
+ 
+ Csv2_rr_wks.o: Csv2_rr_wks.c ../libs/JsStr.h Csv2_read.h
+-	$(CC) -c $(FLAGS) -o Csv2_rr_wks.o Csv2_rr_wks.c
++	$(CC) -c $(CFLAGS) -o Csv2_rr_wks.o Csv2_rr_wks.c
+ 
+ Csv2_rr_a.o: Csv2_rr_a.c ../libs/JsStr.h Csv2_read.h
+-	$(CC) -c $(FLAGS) -o Csv2_rr_a.o Csv2_rr_a.c
++	$(CC) -c $(CFLAGS) -o Csv2_rr_a.o Csv2_rr_a.c
+ 
+ Csv2_rr_soa.o: Csv2_rr_soa.c ../libs/JsStr.h Csv2_read.h
+-	$(CC) -c $(FLAGS) -o Csv2_rr_soa.o Csv2_rr_soa.c
++	$(CC) -c $(CFLAGS) -o Csv2_rr_soa.o Csv2_rr_soa.c
+ 
+ Csv2_rr_txt.o: Csv2_rr_txt.c ../libs/JsStr.h Csv2_read.h
+-	$(CC) -c $(FLAGS) -o Csv2_rr_txt.o Csv2_rr_txt.c
++	$(CC) -c $(CFLAGS) -o Csv2_rr_txt.o Csv2_rr_txt.c
+ 
+ Csv2_database.o: Csv2_database.c ../libs/JsStr.h Csv2_read.h
+-	$(CC) -c $(FLAGS) -o Csv2_database.o Csv2_database.c
++	$(CC) -c $(CFLAGS) -o Csv2_database.o Csv2_database.c
+ 
+ parsetest: parsetest.c $(OBJECTS) 
+-	$(CC) $(FLAGS) -o parsetest parsetest.c $(OBJECTS) 
++	$(CC) $(CFLAGS) -o parsetest parsetest.c $(OBJECTS) 
+ 
+ parsetest2: parsetest2.c $(OBJECTS) 
+-	$(CC) $(FLAGS) -o parsetest2 parsetest2.c $(OBJECTS) 
++	$(CC) $(CFLAGS) -o parsetest2 parsetest2.c $(OBJECTS) 
+ 
diff --git a/package/maradns/patches/patch-qual_Makefile_threadsafe b/package/maradns/patches/patch-qual_Makefile_threadsafe
new file mode 100644
index 000000000..81ef93c77
--- /dev/null
+++ b/package/maradns/patches/patch-qual_Makefile_threadsafe
@@ -0,0 +1,9 @@
+--- maradns-1.4.05.orig/qual/Makefile.threadsafe	2006-01-22 06:22:01.000000000 +0100
++++ maradns-1.4.05/qual/Makefile.threadsafe	2011-01-21 16:48:40.348658539 +0100
+@@ -8,5 +8,5 @@ clean:
+ 	rm -f qual_timestamp.o
+ 
+ qual_timestamp.o: qual_timestamp.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o qual_timestamp.o qual_timestamp.c 
++	$(CC) -c $(CFLAGS) -o qual_timestamp.o qual_timestamp.c 
+ 
diff --git a/package/maradns/patches/patch-rng_rng-32bit-tables_h b/package/maradns/patches/patch-rng_rng-32bit-tables_h
index 61ebbff70..2f4647940 100644
--- a/package/maradns/patches/patch-rng_rng-32bit-tables_h
+++ b/package/maradns/patches/patch-rng_rng-32bit-tables_h
@@ -1,5 +1,5 @@
---- maradns-1.4.03.orig/rng/rng-32bit-tables.h	2010-02-02 18:12:47.000000000 +0100
-+++ maradns-1.4.03/rng/rng-32bit-tables.h	2010-02-06 00:19:49.965584207 +0100
+--- maradns-1.4.05.orig/rng/rng-32bit-tables.h	2010-09-25 16:14:04.000000000 +0200
++++ maradns-1.4.05/rng/rng-32bit-tables.h	2011-01-21 16:25:33.324914221 +0100
 @@ -1,332 +1,332 @@
  /* This file is automatically generated by the program make_32bit_tables.c */
  
diff --git a/package/maradns/patches/patch-server_Makefile b/package/maradns/patches/patch-server_Makefile
index 96595433b..571fba3eb 100644
--- a/package/maradns/patches/patch-server_Makefile
+++ b/package/maradns/patches/patch-server_Makefile
@@ -1,5 +1,5 @@
---- maradns-1.4.03.orig/server/Makefile	2006-01-02 17:59:33.000000000 +0100
-+++ maradns-1.4.03/server/Makefile	2010-02-06 00:19:48.471836901 +0100
+--- maradns-1.4.05.orig/server/Makefile	2006-01-02 17:59:33.000000000 +0100
++++ maradns-1.4.05/server/Makefile	2011-01-21 16:45:45.307408698 +0100
 @@ -1,11 +1,13 @@
 -SOBJECTS=MaraBigHash.o recursive.o timestamp.o read_kvars.o MaraAnyChain.o
 +SOBJECTS=MaraBigHash.o recursive.o timestamp.o read_kvars.o MaraAnyChain.o \
@@ -16,13 +16,37 @@
  POBJECTS=../parse/ParseMaraRc.o ../parse/ParseCsv1.o $(POBJ4) $(POBJ5)
  DOBJECTS=../dns/Queries.o ../dns/Compress.o ../dns/bobbit.o ../dns/Decompress.o
  ROBJECTS=../rng/rng-api-fst.o ../rng/rng-alg-fst.o
-@@ -46,6 +48,9 @@ timestamp.o: timestamp.c MaraDNS_locale.
- MaraAnyChain.o: MaraAnyChain.c
- 	$(CC) -c $(FLAGS) -o MaraAnyChain.o MaraAnyChain.c
+@@ -32,23 +34,26 @@ libs/tests:
+ 	cd libs ; make
  
-+udpsuccess.o: udpsuccess.c
-+	$(CC) -c $(FLAGS) -o udpsuccess.o udpsuccess.c
+ read_kvars.o: read_kvars.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o read_kvars.o read_kvars.c
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o read_kvars.o read_kvars.c
+ 
+ MaraBigHash.o: MaraBigHash.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h MaraBigHash_locale.h
+-	$(CC) -c $(FLAGS) -o MaraBigHash.o MaraBigHash.c 
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o MaraBigHash.o MaraBigHash.c 
+ 
+ recursive.o: recursive.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o recursive.o recursive.c 
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o recursive.o recursive.c 
+ 
+ timestamp.o: timestamp.c MaraDNS_locale.h
+-	$(CC) -c $(FLAGS) -o timestamp.o timestamp.c
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o timestamp.o timestamp.c
+ 
+ MaraAnyChain.o: MaraAnyChain.c
+-	$(CC) -c $(FLAGS) -o MaraAnyChain.o MaraAnyChain.c
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o MaraAnyChain.o MaraAnyChain.c
 +
++udpsuccess.o: udpsuccess.c
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o udpsuccess.o udpsuccess.c
+ 
  maradns: MaraDNS.c $(OBJECTS) MaraDNS_locale.h
- 	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
+-	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
++	$(CC) $(CFLAGS) $(LDFLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
+ 
+ simple: simple.c $(XOBJECTS) MaraDNS_locale.h
+-	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c 
++	$(CC) $(CFLAGS) $(LDFLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c 
  
diff --git a/package/maradns/patches/patch-server_Makefile_recursive b/package/maradns/patches/patch-server_Makefile_recursive
new file mode 100644
index 000000000..cb0d5268c
--- /dev/null
+++ b/package/maradns/patches/patch-server_Makefile_recursive
@@ -0,0 +1,37 @@
+--- maradns-1.4.05.orig/server/Makefile.recursive	2007-08-16 15:35:43.000000000 +0200
++++ maradns-1.4.05/server/Makefile.recursive	2011-01-21 16:45:30.748658697 +0100
+@@ -34,26 +34,26 @@ libs/tests:
+ 	cd libs ; make
+ 
+ read_kvars.o: read_kvars.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o read_kvars.o read_kvars.c
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o read_kvars.o read_kvars.c
+ 
+ MaraBigHash.o: MaraBigHash.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h MaraBigHash_locale.h
+-	$(CC) -c $(FLAGS) -o MaraBigHash.o MaraBigHash.c 
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o MaraBigHash.o MaraBigHash.c 
+ 
+ recursive.o: recursive.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o recursive.o recursive.c 
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o recursive.o recursive.c 
+ 
+ timestamp.o: timestamp.c MaraDNS_locale.h
+-	$(CC) -c $(FLAGS) -o timestamp.o timestamp.c
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o timestamp.o timestamp.c
+ 
+ MaraAnyChain.o: MaraAnyChain.c
+-	$(CC) -c $(FLAGS) -o MaraAnyChain.o MaraAnyChain.c
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o MaraAnyChain.o MaraAnyChain.c
+ 
+ udpsuccess.o: udpsuccess.c
+-	$(CC) -c $(FLAGS) -o udpsuccess.o udpsuccess.c
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o udpsuccess.o udpsuccess.c
+ 
+ maradns: MaraDNS.c $(OBJECTS) MaraDNS_locale.h
+-	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
++	$(CC) $(CFLAGS) $(LDFLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
+ 
+ simple: simple.c $(XOBJECTS) MaraDNS_locale.h
+-	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c 
++	$(CC) $(CFLAGS) $(LDFLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c 
+ 
diff --git a/package/maradns/patches/patch-tcp_Makefile b/package/maradns/patches/patch-tcp_Makefile
index cbb673b59..4b5d12cd4 100644
--- a/package/maradns/patches/patch-tcp_Makefile
+++ b/package/maradns/patches/patch-tcp_Makefile
@@ -1,5 +1,5 @@
---- maradns-1.4.03.orig/tcp/Makefile	2005-12-20 11:10:40.000000000 +0100
-+++ maradns-1.4.03/tcp/Makefile	2010-02-06 00:19:48.481829524 +0100
+--- maradns-1.4.05.orig/tcp/Makefile	2005-12-20 11:10:40.000000000 +0100
++++ maradns-1.4.05/tcp/Makefile	2011-01-21 16:41:10.254914344 +0100
 @@ -2,10 +2,11 @@ JOBJS=../libs/JsStr.o ../libs/JsStrOS.o 
  MJOBJS=../qual/qual_timestamp.o
  MHOBJS=../libs/MaraHash.o
@@ -22,3 +22,18 @@
  #FLAGS = -g $(DEBUG)
  
  all: $(EXECS)
+@@ -25,11 +26,11 @@ clean:
+ 	rm -f core $(EXECS) $(TCPOBJS) *.exe
+ 
+ getzone: getzone.c $(OBJECTS) 
+-	$(CC) $(FLAGS) -o getzone getzone.c $(OBJECTS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o getzone getzone.c $(OBJECTS)
+ 
+ fetchzone: fetchzone.c $(OBJECTS) 
+-	$(CC) $(FLAGS) -o fetchzone fetchzone.c $(OBJECTS) 
++	$(CC) $(CFLAGS) $(LDFLAGS) -o fetchzone fetchzone.c $(OBJECTS) 
+ 
+ zoneserver: zoneserver.c zoneserver_en.h $(OBJECTS)
+-	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -o zoneserver zoneserver.c $(OBJECTS) $(RNGOBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -DVERSION=\"$(VERSION)\" -o zoneserver zoneserver.c $(OBJECTS) $(RNGOBJS)
+ 
diff --git a/package/maradns/patches/patch-tcp_Makefile_recursive b/package/maradns/patches/patch-tcp_Makefile_recursive
new file mode 100644
index 000000000..38a7a7047
--- /dev/null
+++ b/package/maradns/patches/patch-tcp_Makefile_recursive
@@ -0,0 +1,17 @@
+--- maradns-1.4.05.orig/tcp/Makefile.recursive	2006-07-18 05:50:44.000000000 +0200
++++ maradns-1.4.05/tcp/Makefile.recursive	2011-01-21 16:40:56.008658167 +0100
+@@ -26,11 +26,11 @@ clean:
+ 	rm -f core $(EXECS) $(TCPOBJS) *.exe
+ 
+ getzone: getzone.c $(OBJECTS) 
+-	$(CC) $(FLAGS) -o getzone getzone.c $(OBJECTS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o getzone getzone.c $(OBJECTS)
+ 
+ fetchzone: fetchzone.c $(OBJECTS) 
+-	$(CC) $(FLAGS) -o fetchzone fetchzone.c $(OBJECTS) 
++	$(CC) $(CFLAGS) $(LDFLAGS) -o fetchzone fetchzone.c $(OBJECTS) 
+ 
+ zoneserver: zoneserver.c zoneserver_en.h $(OBJECTS)
+-	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -o zoneserver zoneserver.c $(OBJECTS) $(RNGOBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -DVERSION=\"$(VERSION)\" -o zoneserver zoneserver.c $(OBJECTS) $(RNGOBJS)
+ 
diff --git a/package/maradns/patches/patch-tools_Makefile_recursive b/package/maradns/patches/patch-tools_Makefile_recursive
new file mode 100644
index 000000000..bf0f20d6f
--- /dev/null
+++ b/package/maradns/patches/patch-tools_Makefile_recursive
@@ -0,0 +1,25 @@
+--- maradns-1.4.05.orig/tools/Makefile.recursive	2006-01-02 17:59:33.000000000 +0100
++++ maradns-1.4.05/tools/Makefile.recursive	2011-01-21 16:42:58.874910569 +0100
+@@ -18,17 +18,17 @@ clean:
+ 	rm -f core $(EXECS) *.exe
+ 
+ askmara: askmara.c askmara_labels_en.h $(OBJECTS) $(Q) $(OUTOBJ)
+-	$(CC) $(FLAGS) -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ)
+ 
+ askmara-tcp: askmara-tcp.c askmara_labels_en.h $(OBJECTS) $(ROBJECTS) $(POBJECTS)
+-	$(CC) $(FLAGS) -o askmara-tcp askmara-tcp.c $(OBJECTS) $(ROBJECTS) $(POBJECTS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o askmara-tcp askmara-tcp.c $(OBJECTS) $(ROBJECTS) $(POBJECTS)
+ 
+ benchmark: benchmark.c askmara_labels_en.h $(OBJECTS) $(POBJECTS)
+-	$(CC) $(FLAGS) -o benchmark benchmark.c $(OBJECTS) $(POBJECTS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o benchmark benchmark.c $(OBJECTS) $(POBJECTS)
+ 
+ duende: duende.c 
+-	$(CC) $(FLAGS) -o duende duende.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o duende duende.c
+ 
+ strip.control: strip.control.c
+-	$(CC) $(FLAGS) -o strip.control strip.control.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o strip.control strip.control.c
+ 
diff --git a/package/mgetty/patches/patch-Makefile b/package/mgetty/patches/patch-Makefile
index 3fd5dfb66..9741f0f29 100644
--- a/package/mgetty/patches/patch-Makefile
+++ b/package/mgetty/patches/patch-Makefile
@@ -1,5 +1,23 @@
 --- mgetty-1.1.36.orig/Makefile	2007-06-15 13:15:56.000000000 +0200
-+++ mgetty-1.1.36/Makefile	2009-08-28 15:17:14.235450692 +0200
++++ mgetty-1.1.36/Makefile	2011-01-21 17:07:06.158658312 +0100
+@@ -4,7 +4,7 @@
+ #
+ # this is the C compiler to use (on SunOS, the standard "cc" does not
+ # grok my code, so please use gcc there. On ISC 4.0, use "icc".).
+-CC=gcc
++CC?=gcc
+ #CC=cc
+ #
+ #### C Compiler Flags ####
+@@ -102,7 +102,7 @@ CC=gcc
+ #	    USTAT	  - ustat(), no statfs etc.
+ #
+ #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL
+-CFLAGS=-O2 -Wall -pipe
++CFLAGS?=-O2 -Wall -pipe
+ #CFLAGS=-O -DSVR4
+ #CFLAGS=-O -DSVR4 -DSVR42
+ #CFLAGS=-O -DUSE_POLL
 @@ -164,7 +164,9 @@ LIBS=
  #
  # if your systems doesn't have one, use the shell script that I provide
@@ -27,7 +45,7 @@
 -mksed: mksed.c policy.h Makefile 
 +REALGCC:=/usr/bin/gcc
 +mksed: mksed.c policy.h Makefile
-+	( echo $(REALGCC); $(MAKE) "CC=$(REALGCC)" "CFLAGS=$(CFLAGS)" mksed-wrong;\
++	( echo $(CC_FOR_BUILD); $(MAKE) "CC=$(CC_FOR_BUILD)" "CFLAGS=$(CFLAGS_FOR_BUILD)" mksed-wrong;\
 +	);
 +
 +mksed-wrong: mksed.c policy.h Makefile 
diff --git a/package/miax/Makefile b/package/miax/Makefile
index 276b202b3..40f08ae89 100644
--- a/package/miax/Makefile
+++ b/package/miax/Makefile
@@ -25,9 +25,9 @@ CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 MAKE_FLAGS+=		CC="${TARGET_CC}" \
-			OFLAGS="${TCFLAGS}" \
-			CPPFLAGS="${TCPPFLAGS}" \
-			LDFLAGS="${TLDFLAGS}" \
+			OFLAGS="${TARGET_CFLAGS}" \
+			CPPFLAGS="${TARGET_CPPFLAGS}" \
+			LDFLAGS="${TARGET_LDFLAGS}"
 
 do-install:
 	${INSTALL_DIR} ${IDIR_MIAX}/usr/bin
diff --git a/package/microperl/Makefile b/package/microperl/Makefile
index 7e02b75df..040daa12d 100644
--- a/package/microperl/Makefile
+++ b/package/microperl/Makefile
@@ -22,7 +22,7 @@ $(eval $(call PKG_template,MICROPERL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},$
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
-MAKE_FLAGS+=		CC="${TARGET_CC}" OPTIMIZE="${TCFLAGS}"
+MAKE_FLAGS+=		CC="${TARGET_CC}" OPTIMIZE="${TARGET_CFLAGS}"
 MAKE_FILE:=		Makefile.micro
 
 pre-configure:
diff --git a/package/microperl/patches/patch-Makefile_micro b/package/microperl/patches/patch-Makefile_micro
index 01bca8bdc..021e44a74 100644
--- a/package/microperl/patches/patch-Makefile_micro
+++ b/package/microperl/patches/patch-Makefile_micro
@@ -24,10 +24,10 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
  generate_uudmap$(_O): generate_uudmap.c
 -	$(CC) $(CCFLAGS) -o $@ $(CFLAGS) generate_uudmap.c
-+	$(HOSTCC) $(CCFLAGS) -o $@ $(HOSTCFLAGS) generate_uudmap.c
++	$(CC_FOR_BUILD) $(CCFLAGS) -o $@ $(CFLAGS_FOR_BUILD) generate_uudmap.c
  
  generate_uudmap$(_X): generate_uudmap$(_O)
 -	$(LD) -o generate_uudmap $(LDFLAGS) generate_uudmap$(_O) $(LIBS)
-+	$(HOSTCC) -o generate_uudmap $(HOSTLDFLAGS) generate_uudmap$(_O) $(LIBS)
++	$(CC_FOR_BUILD) -o generate_uudmap $(LDFLAGS_FOR_BUILD) generate_uudmap$(_O) $(LIBS)
  
  # That's it, folks!
diff --git a/package/miredo/Makefile b/package/miredo/Makefile
index 9df35111d..9a70d0f88 100644
--- a/package/miredo/Makefile
+++ b/package/miredo/Makefile
@@ -21,7 +21,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,MIREDO,miredo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,MIREDO_SERVER,miredo-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-std=gnu99
+TARGET_CFLAGS+=		-std=gnu99
 CONFIGURE_ENV+=		ac_cv_file__proc_self_maps=yes
 CONFIGURE_ARGS+=	--without-Judy \
 			--enable-teredo-client \
diff --git a/package/mksh/Makefile b/package/mksh/Makefile
index 84dee864e..3b0a3c072 100644
--- a/package/mksh/Makefile
+++ b/package/mksh/Makefile
@@ -23,7 +23,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,MKSH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq ($(strip ${ADK_PACKAGE_MKSH_FULL}),)
-TCPPFLAGS+=		-DMKSH_SMALL=1
+TARGET_CPPFLAGS+=	-DMKSH_SMALL=1
 endif
 
 CONFIG_STYLE:=		manual
@@ -31,8 +31,8 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 do-build:
-	cd ${WRKBUILD} && CC='${TARGET_CC}' CFLAGS='${TCFLAGS}' \
-	    CPPFLAGS='${TCPPFLAGS}' LDFLAGS='${TLDFLAGS}' \
+	cd ${WRKBUILD} && CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS}' \
+	    CPPFLAGS='${TARGET_CPPFLAGS}' LDFLAGS='${TARGET_LDFLAGS}' \
 	    TARGET_OS=Linux ${BASH} ${WRKSRC}/Build.sh -Q -r -combine
 
 do-install:
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index b211386b0..ecfeb77ad 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -59,7 +59,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-std=gnu99
+TARGET_CFLAGS+=		-std=gnu99
 XAKE_FLAGS+=		MPD_CFLAGS='-D_GNU_SOURCE'
 CONFIGURE_ARGS+=	--disable-httpd-output \
 			--disable-jack \
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 21ad00432..8fa592770 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -44,7 +44,7 @@ endif
 # related patch to allow configure to find out the DirectFB
 # version number.
 ifeq (${ADK_PACKAGE_MPLAYER_WITH_DIRECTFB},y)
-TCFLAGS+=		-I${STAGING_TARGET_DIR}/usr/include/directfb
+TARGET_CPPFLAGS+=	-I${STAGING_TARGET_DIR}/usr/include/directfb
 endif
 
 ifeq (${ADK_TARGET_CPU_WITH_MMX},y)
@@ -84,7 +84,7 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--enable-cross-compile \
 			--target=${ARCH}-linux \
 			--cc=$(TARGET_CC) \
-			--host-cc=$(HOSTCC) \
+			--host-cc=$(CC_FOR_BUILD) \
 			--yasm='' \
 			--disable-mencoder \
 			--enable-fbdev \
diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile
index 1638eaf9e..49a39ad96 100644
--- a/package/mrd6/Makefile
+++ b/package/mrd6/Makefile
@@ -28,11 +28,11 @@ LIBRARIES+=-lssp -lssp_nonshared
 endif
 
 ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y)
-TCXXFLAGS+=		-fno-builtin -nostdinc++ \
+TARGET_CXXFLAGS+=	-fno-builtin -nostdinc++ \
 			-I${STAGING_TARGET_DIR}/usr/include/uClibc++
-TLDFLAGS+=		-shared ${LIBRARIES}
+TARGET_LDFLAGS+=	-shared ${LIBRARIES}
 endif
-XAKE_FLAGS+=		EXTRA_FLAGS="${TCFLAGS}"
+XAKE_FLAGS+=		EXTRA_FLAGS="${TARGET_CFLAGS}"
 
 post-install:
 	${INSTALL_DIR} ${IDIR_MRD6}/usr/sbin ${IDIR_MRD6}/etc
diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile
index 5493cb759..f1cfa627e 100644
--- a/package/mt-daapd/Makefile
+++ b/package/mt-daapd/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--enable-mdns \
 			--with-gdbm-includes="${STAGING_TARGET_DIR}/usr/include" \
 			--with-gdbm-libs="${STAGING_TARGET_DIR}/usr/lib" \
 			--without-static-libs
-TLDFLAGS+=		-pthread
+TARGET_LDFLAGS+=	-pthread
 
 post-install:
 	${INSTALL_DIR} ${IDIR_MT_DAAPD}/etc ${IDIR_MT_DAAPD}/usr/{share,sbin}
diff --git a/package/mtd/Makefile b/package/mtd/Makefile
index c2875b1fa..ab3cbea98 100644
--- a/package/mtd/Makefile
+++ b/package/mtd/Makefile
@@ -21,8 +21,10 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
+TARGET_CFLAGS+=		-Wall
+
 do-build:
-	${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} \
+	${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
 		-o ${WRKBUILD}/mtd ${WRKBUILD}/mtd.c
 
 do-install:
diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index fb3d1404c..09aa971b0 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -25,7 +25,7 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 CONFIGURE_ENV+=		OPTIMIZE_CFLAGS="${TARGET_CFLAGS}" \
-			OPTIMIZE_CXXFLAGS="${TARGET_CFLAGS}" \
+			OPTIMIZE_CXXFLAGS="${TARGET_CXXFLAGS}" \
 			ac_cv_lib_nsl_gethostbyname_r=no \
 			ac_cv_lib_nsl_yp_get_default_domain=no \
 			ac_cv_sys_restartable_syscalls=yes \
@@ -50,16 +50,16 @@ CONFIGURE_ARGS+=	--disable-assembler \
 			--without-docs \
 			--without-readline \
 			--with-machine-type=${CPU_ARCH}
-HOSTTOOLFLAGS=		CC="${HOSTCC}" \
-			CXX='c++' \
-			CFLAGS='${HOSTCFLAGS} -DHOSTCOMPILE=1' \
-			CXXFLAGS='${HOSTCFLAGS}' \
-			LDFLAGS='${HOSTLDFLAGS}' \
-			CPPFLAGS='${HOSTCPPFLAGS}' \
-			CXXLINK='c++ ${HOSTCFLAGS} ${HOSTLDFLAGS} -o $$@' \
-			LINK='${HOSTCC} ${HOSTCFLAGS} ${HOSTLDFLAGS} -o $$@'
+BUILD_LFLAGS=		CC="${CC_FOR_BUILD}" \
+			CXX='${CXX_FOR_BUILD}' \
+			CFLAGS='${CFLAGS_FOR_BUILD} -DHOSTCOMPILE=1' \
+			CXXFLAGS='${CXXFLAGS_FOR_BUILD}' \
+			LDFLAGS='${LDFLAGS_FOR_BUILD}' \
+			CPPFLAGS='${CPPFLAGS_FOR_BUILD}' \
+			CXXLINK='${CXX_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD} -o $$@' \
+			LINK='${CC_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD} -o $$@'
 ifneq (${OStype},Linux)
-HOSTTOOLFLAGS+=		LIBS='-lm -lz'
+BUILD_FLAGS+=		LIBS='-lm -lz'
 endif
 
 do-build:
@@ -68,8 +68,8 @@ do-build:
 		DESTDIR="${WRKINST}" \
 		all install
 	${MAKE} -C "${WRKBUILD}/libmysql" \
-		LINK="${HOSTCC} -o conf_to_src -lc" \
-		${HOSTTOOLFLAGS} \
+		LINK="${CC_FOR_BUILD} -o conf_to_src -lc" \
+		${BUILD_FLAGS} \
 		conf_to_src
 	${MAKE} -C "${WRKBUILD}" \
 		CFLAGS="${TARGET_CFLAGS}" \
@@ -87,5 +87,7 @@ do-install:
 	${INSTALL_DIR} ${IDIR_LIBMYSQLCLIENT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/mysql/libmysqlclient.so* \
 	    ${IDIR_LIBMYSQLCLIENT}/usr/lib
+	$(SED) "s,\(^pkgincludedir='\)\(.*\),\1${STAGING_TARGET_DIR}\2," \
+		${WRKINST}/usr/bin/mysql_config
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mysql/patches/patch-include_config_h_in b/package/mysql/patches/patch-include_config_h_in
index 361a8b651..d9b28c419 100644
--- a/package/mysql/patches/patch-include_config_h_in
+++ b/package/mysql/patches/patch-include_config_h_in
@@ -1,11 +1,11 @@
 --- mysql-5.1.48.orig/include/config.h.in	2010-06-03 17:54:04.000000000 +0200
-+++ mysql-5.1.48/include/config.h.in	2011-01-15 13:01:30.000000000 +0100
++++ mysql-5.1.48/include/config.h.in	2011-01-21 00:08:19.737408555 +0100
 @@ -856,7 +856,7 @@
  /* Define to 1 if you have the `strtoull' function. */
  #undef HAVE_STRTOULL
  
 -/* Define to 1 if `st_rdev' is member of `struct stat'. */
-+/* Define to 1 if `st_rdev' is a member of `struct stat'. */
++/* Define to 1 if `struct stat' is a member of `st_rdev'. */
  #undef HAVE_STRUCT_STAT_ST_RDEV
  
  /* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use
diff --git a/package/mysql/patches/patch-scripts_mysql_config_sh b/package/mysql/patches/patch-scripts_mysql_config_sh
new file mode 100644
index 000000000..3e1833199
--- /dev/null
+++ b/package/mysql/patches/patch-scripts_mysql_config_sh
@@ -0,0 +1,11 @@
+--- mysql-5.1.48.orig/scripts/mysql_config.sh	2010-06-03 17:50:21.000000000 +0200
++++ mysql-5.1.48/scripts/mysql_config.sh	2011-01-21 00:32:53.596454498 +0100
+@@ -119,7 +119,7 @@ if [ -r "$pkglibdir/libmygcc.a" ]; then
+   embedded_libs="$embedded_libs -lmygcc "
+ fi
+ 
+-cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
++cflags="-I$pkgincludedir" #note: end space!
+ include="-I$pkgincludedir"
+ 
+ # Remove some options that a client doesn't have to care about
diff --git a/package/nand/Makefile b/package/nand/Makefile
index cb62784cc..451e4c226 100644
--- a/package/nand/Makefile
+++ b/package/nand/Makefile
@@ -21,9 +21,11 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
+TARGET_CFLAGS+=		-Wall
+
 do-build:
-	${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} -o ${WRKBUILD}/nand \
-		${WRKBUILD}/nand.c
+	${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
+		-o ${WRKBUILD}/nand ${WRKBUILD}/nand.c
 
 do-install:
 	${INSTALL_DIR} ${IDIR_NAND}/sbin
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 975cfa1b7..12259ddba 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -53,7 +53,7 @@ pre-configure:
 	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
 		./configure \
 		--with-shared \
-		--with-build-cc=${HOSTCC} \
+		--with-build-cc=${CC_FOR_BUILD} \
 		--with-progs \
 		--without-debug \
 		--without-profile \
diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile
index d32401d33..0e21b9c3d 100644
--- a/package/net-snmp/Makefile
+++ b/package/net-snmp/Makefile
@@ -39,7 +39,7 @@ else
 SNMP_TRANSPORTS_EXCLUDED:=	TCPIPv6 UDPIPv6
 endif
 
-TLDFLAGS+=		-pthread
+TARGET_LDFLAGS+=	-pthread
 CONFIGURE_ARGS+=	--with-defaults \
 			--with-persistent-directory=/etc/snmp \
 			--with-default-snmp-version=3 \
diff --git a/package/net-snmp/patches/patch-net-snmp-config_in b/package/net-snmp/patches/patch-net-snmp-config_in
new file mode 100644
index 000000000..2465be023
--- /dev/null
+++ b/package/net-snmp/patches/patch-net-snmp-config_in
@@ -0,0 +1,15 @@
+--- net-snmp-5.6.1.orig/net-snmp-config.in	2010-10-13 11:58:34.000000000 +0200
++++ net-snmp-5.6.1/net-snmp-config.in	2011-01-21 18:05:18.494919068 +0100
+@@ -127,10 +127,10 @@ else
+       ;;
+     #################################################### compile
+     --base-cflags)
+-      echo @CFLAGS@ @CPPFLAGS@ -I${NSC_INCLUDEDIR}
++      echo -I${NSC_INCLUDEDIR}
+       ;;
+     --cflags|--cf*)
+-      echo @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@ -I. -I${NSC_INCLUDEDIR}
++      echo @DEVFLAGS@ -I. -I${NSC_INCLUDEDIR}
+       ;;
+     --srcdir)
+       echo $NSC_SRCDIR
diff --git a/package/nfs-utils/patches/patch-config_log b/package/nfs-utils/patches/patch-config_log
new file mode 100644
index 000000000..f781209a4
--- /dev/null
+++ b/package/nfs-utils/patches/patch-config_log
@@ -0,0 +1,5831 @@
+--- nfs-utils-1.2.3.orig/config.log	2010-09-28 14:25:03.000000000 +0200
++++ nfs-utils-1.2.3/config.log	2011-01-21 17:33:44.714914032 +0100
+@@ -4,22 +4,22 @@ running configure, to aid debugging if c
+ It was created by linux nfs-utils configure 1.2.3, which was
+ generated by GNU Autoconf 2.65.  Invocation command line was
+ 
+-  $ ./configure --disable-gss
++  $ /home/wbx/adk/openadk/build_ibm-x40_i686_uclibc/w-nfs-utils-1.2.3-3/nfs-utils-1.2.3/configure --build=x86_64-linux-gnu --host=i686-openadk-linux --target=i686-openadk-linux --program-prefix= --program-suffix= --prefix=/usr --bindir=/usr/bin --datadir=/usr/share --mandir=/usr/share/man --libexecdir=/usr/libexec --localstatedir=/var --sysconfdir=/etc --disable-nls --enable-shared --enable-static --disable-dependency-tracking --disable-libtool-lock --enable-nfsv4 --with-krb5=/home/wbx/adk/openadk/target_i686_uclibc/usr/ --enable-gss --enable-tirpc --with-tirpcinclude=/home/wbx/adk/openadk/target_i686_uclibc/usr/include/tirpc --without-tcp-wrappers --with-rpcgen=internal --disable-uuid
+ 
+ ## --------- ##
+ ## Platform. ##
+ ## --------- ##
+ 
+-hostname = TopHat.home.4dicksons.org
++hostname = chrom
+ uname -m = x86_64
+-uname -r = 2.6.34.6-54.fc13.x86_64
++uname -r = 2.6.31-22-server
+ uname -s = Linux
+-uname -v = #1 SMP Sun Sep 5 17:16:27 UTC 2010
++uname -v = #70-Ubuntu SMP Thu Dec 2 00:00:57 UTC 2010
+ 
+ /usr/bin/uname -p = unknown
+ /bin/uname -X     = unknown
+ 
+-/bin/arch              = x86_64
++/bin/arch              = unknown
+ /usr/bin/arch -k       = unknown
+ /usr/convex/getsysinfo = unknown
+ /usr/bin/hostinfo      = unknown
+@@ -27,23 +27,18 @@ uname -v = #1 SMP Sun Sep 5 17:16:27 UTC
+ /usr/bin/oslevel       = unknown
+ /bin/universe          = unknown
+ 
+-PATH: /usr/lib64/qt-3.3/bin
+-PATH: /usr/kerberos/sbin
+-PATH: /usr/kerberos/bin
+-PATH: /usr/lib64/ccache
+-PATH: /usr/local/bin
+-PATH: /bin
+-PATH: /usr/bin
++PATH: /home/wbx/adk/openadk/scripts
++PATH: /home/wbx/adk/openadk/bin/tools
++PATH: /home/wbx/adk/openadk/host_i686_uclibc/bin
++PATH: /home/wbx/adk/openadk/host_i686_uclibc/usr/bin
++PATH: /home/wbx/adk/openadk/target_i686_uclibc/scripts
+ PATH: /usr/local/sbin
++PATH: /usr/local/bin
+ PATH: /usr/sbin
+-PATH: /sbin
+-PATH: /sbin
+ PATH: /usr/bin
+-PATH: /usr/sbin
+-PATH: /usr/local/bin
+-PATH: /usr/local/kde/bin
+-PATH: /home/steved/bin
+-PATH: /home/steved/bin
++PATH: /sbin
++PATH: /bin
++PATH: /usr/games
+ 
+ 
+ ## ----------- ##
+@@ -51,17 +46,19 @@ PATH: /home/steved/bin
+ ## ----------- ##
+ 
+ configure:2864: checking build system type
+-configure:2878: result: x86_64-unknown-linux-gnu
++configure:2878: result: x86_64-pc-linux-gnu
+ configure:2898: checking host system type
+-configure:2911: result: x86_64-unknown-linux-gnu
++configure:2911: result: i686-openadk-linux-gnu
+ configure:2948: checking for a BSD-compatible install
+-configure:3016: result: /usr/bin/install -c
++configure:3016: result: /home/wbx/adk/openadk/scripts/install -c
+ configure:3027: checking whether build environment is sane
+ configure:3077: result: yes
++configure:3126: checking for i686-openadk-linux-strip
++configure:3153: result: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-strip
+ configure:3218: checking for a thread-safe mkdir -p
+ configure:3257: result: /bin/mkdir -p
+ configure:3270: checking for gawk
+-configure:3286: found /bin/gawk
++configure:3286: found /usr/bin/gawk
+ configure:3297: result: gawk
+ configure:3308: checking whether make sets $(MAKE)
+ configure:3330: result: yes
+@@ -69,70 +66,70 @@ configure:3413: checking whether to enab
+ configure:3422: result: no
+ configure:3727: checking for style of include used by make
+ configure:3755: result: GNU
+-configure:3825: checking for gcc
+-configure:3841: found /usr/lib64/ccache/gcc
+-configure:3852: result: gcc
++configure:3785: checking for i686-openadk-linux-gcc
++configure:3812: result: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc
+ configure:4081: checking for C compiler version
+-configure:4090: gcc --version >&5
+-gcc (GCC) 4.4.4 20100630 (Red Hat 4.4.4-10)
++configure:4090: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc --version >&5
++i686-openadk-linux-uclibc-gcc (GCC) 4.5.2
+ Copyright (C) 2010 Free Software Foundation, Inc.
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ 
+ configure:4101: $? = 0
+-configure:4090: gcc -v >&5
++configure:4090: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -v >&5
+ Using built-in specs.
+-Target: x86_64-redhat-linux
+-Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-languages=c,c++,objc,obj-c++,java,fortran,ada --enable-java-awt=gtk --disable-dssi --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre --enable-libgcj-multifile --enable-java-maintainer-mode --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --disable-libjava-multilib --with-ppl --with-cloog --with-tune=generic --with-arch_32=i686 --build=x86_64-redhat-linux
++COLLECT_GCC=/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc
++COLLECT_LTO_WRAPPER=/home/wbx/adk/openadk/host_i686_uclibc/libexec/gcc/i686-openadk-linux-uclibc/4.5.2/lto-wrapper
++Target: i686-openadk-linux-uclibc
++Configured with: /home/wbx/adk/openadk/toolchain_build_i686_uclibc/w-gcc-4.5.2-1/gcc-4.5.2/configure --prefix=/home/wbx/adk/openadk/host_i686_uclibc --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=i686-openadk-linux-uclibc --with-gmp=/home/wbx/adk/openadk/host_i686_uclibc --with-mpfr=/home/wbx/adk/openadk/host_i686_uclibc --with-libelf=/home/wbx/adk/openadk/host_i686_uclibc --disable-__cxa_atexit --with-gnu-ld --disable-libmudflap --disable-libgomp --disable-biarch --disable-decimal-float --disable-multilib --disable-sjlj-exceptions --disable-libstdcxx-pch --disable-ppl-version-check --disable-cloog-version-check --without-ppl --without-cloog --disable-nls --enable-libssp --enable-lto --enable-tls --enable-target-optspace --enable-languages=c,c++ --with-sysroot='/home/wbx/adk/openadk/host_i686_uclibc/../target_i686_uclibc' --with-slibdir=/home/wbx/adk/openadk/target_i686_uclibc/lib --enable-shared
+ Thread model: posix
+-gcc version 4.4.4 20100630 (Red Hat 4.4.4-10) (GCC) 
++gcc version 4.5.2 (GCC) 
+ configure:4101: $? = 0
+-configure:4090: gcc -V >&5
+-gcc: '-V' option must have argument
++configure:4090: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -V >&5
++i686-openadk-linux-uclibc-gcc: '-V' option must have argument
+ configure:4101: $? = 1
+-configure:4090: gcc -qversion >&5
+-gcc: unrecognized option '-qversion'
+-gcc: no input files
++configure:4090: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -qversion >&5
++i686-openadk-linux-uclibc-gcc: unrecognized option '-qversion'
++i686-openadk-linux-uclibc-gcc: no input files
+ configure:4101: $? = 1
+ configure:4121: checking whether the C compiler works
+-configure:4143: gcc    conftest.c  >&5
++configure:4143: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/librpcsecgss.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
+ configure:4147: $? = 0
+ configure:4196: result: yes
+ configure:4199: checking for C compiler default output file name
+ configure:4201: result: a.out
+ configure:4207: checking for suffix of executables
+-configure:4214: gcc -o conftest    conftest.c  >&5
++configure:4214: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/librpcsecgss.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
+ configure:4218: $? = 0
+ configure:4240: result: 
+ configure:4262: checking whether we are cross compiling
+-configure:4270: gcc -o conftest    conftest.c  >&5
+-configure:4274: $? = 0
+-configure:4281: ./conftest
+-configure:4285: $? = 0
+-configure:4300: result: no
++configure:4300: result: yes
+ configure:4305: checking for suffix of object files
+-configure:4327: gcc -c   conftest.c >&5
++configure:4327: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
+ configure:4331: $? = 0
+ configure:4352: result: o
+ configure:4356: checking whether we are using the GNU C compiler
+-configure:4375: gcc -c   conftest.c >&5
++configure:4375: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
+ configure:4375: $? = 0
+ configure:4384: result: yes
+-configure:4393: checking whether gcc accepts -g
+-configure:4413: gcc -c -g  conftest.c >&5
++configure:4393: checking whether /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc accepts -g
++configure:4413: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -g -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
+ configure:4413: $? = 0
+ configure:4454: result: yes
+-configure:4471: checking for gcc option to accept ISO C89
+-configure:4535: gcc  -c -g -O2  conftest.c >&5
++configure:4471: checking for /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc option to accept ISO C89
++configure:4535: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc  -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
+ configure:4535: $? = 0
+ configure:4548: result: none needed
+-configure:4570: checking dependency style of gcc
+-configure:4680: result: gcc3
++configure:4570: checking dependency style of /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc
++configure:4680: result: none
+ configure:4701: checking how to run the C preprocessor
+-configure:4732: gcc -E  conftest.c
++configure:4732: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c
+ configure:4732: $? = 0
+-configure:4746: gcc -E  conftest.c
+-conftest.c:14:28: error: ac_nonexistent.h: No such file or directory
++configure:4746: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c
++conftest.c:15:28: fatal error: ac_nonexistent.h: No such file or directory
++compilation terminated.
+ configure:4746: $? = 1
+ configure: failed program was:
+ | /* confdefs.h */
+@@ -147,13 +144,15 @@ configure: failed program was:
+ | #define START_STATD "/usr/sbin/start-statd"
+ | #define NFS3_SUPPORTED 1
+ | #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
+ | /* end confdefs.h.  */
+ | #include <ac_nonexistent.h>
+-configure:4771: result: gcc -E
+-configure:4791: gcc -E  conftest.c
++configure:4771: result: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E
++configure:4791: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c
+ configure:4791: $? = 0
+-configure:4805: gcc -E  conftest.c
+-conftest.c:14:28: error: ac_nonexistent.h: No such file or directory
++configure:4805: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c
++conftest.c:15:28: fatal error: ac_nonexistent.h: No such file or directory
++compilation terminated.
+ configure:4805: $? = 1
+ configure: failed program was:
+ | /* confdefs.h */
+@@ -168,6 +167,7 @@ configure: failed program was:
+ | #define START_STATD "/usr/sbin/start-statd"
+ | #define NFS3_SUPPORTED 1
+ | #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
+ | /* end confdefs.h.  */
+ | #include <ac_nonexistent.h>
+ configure:4834: checking for grep that handles long lines and -e
+@@ -175,152 +175,5230 @@ configure:4892: result: /bin/grep
+ configure:4897: checking for egrep
+ configure:4959: result: /bin/grep -E
+ configure:4964: checking for ANSI C header files
+-configure:4984: gcc -c -g -O2  conftest.c >&5
++configure:4984: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
+ configure:4984: $? = 0
+-configure:5057: gcc -o conftest -g -O2   conftest.c  >&5
+-configure:5057: $? = 0
+-configure:5057: ./conftest
+-configure:5057: $? = 0
+ configure:5068: result: yes
+ configure:5081: checking for sys/types.h
+-configure:5081: gcc -c -g -O2  conftest.c >&5
++configure:5081: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
+ configure:5081: $? = 0
+ configure:5081: result: yes
+ configure:5081: checking for sys/stat.h
+-configure:5081: gcc -c -g -O2  conftest.c >&5
++configure:5081: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
+ configure:5081: $? = 0
+ configure:5081: result: yes
+ configure:5081: checking for stdlib.h
+-configure:5081: gcc -c -g -O2  conftest.c >&5
++configure:5081: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
+ configure:5081: $? = 0
+ configure:5081: result: yes
+ configure:5081: checking for string.h
+-configure:5081: gcc -c -g -O2  conftest.c >&5
++configure:5081: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
+ configure:5081: $? = 0
+ configure:5081: result: yes
+ configure:5081: checking for memory.h
+-configure:5081: gcc -c -g -O2  conftest.c >&5
++configure:5081: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
+ configure:5081: $? = 0
+ configure:5081: result: yes
+ configure:5081: checking for strings.h
+-configure:5081: gcc -c -g -O2  conftest.c >&5
++configure:5081: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
+ configure:5081: $? = 0
+ configure:5081: result: yes
+ configure:5081: checking for inttypes.h
+-configure:5081: gcc -c -g -O2  conftest.c >&5
++configure:5081: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
+ configure:5081: $? = 0
+ configure:5081: result: yes
+ configure:5081: checking for stdint.h
+-configure:5081: gcc -c -g -O2  conftest.c >&5
++configure:5081: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
+ configure:5081: $? = 0
+ configure:5081: result: yes
+ configure:5081: checking for unistd.h
+-configure:5081: gcc -c -g -O2  conftest.c >&5
++configure:5081: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
+ configure:5081: $? = 0
+ configure:5081: result: yes
+ configure:5108: checking for clnt_tli_create in -ltirpc
+-configure:5133: gcc -o conftest -g -O2   conftest.c -ltirpc   >&5
++configure:5133: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc  -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
+ configure:5133: $? = 0
+ configure:5142: result: yes
+-configure:5167: checking /usr/include/tirpc/netconfig.h usability
+-configure:5167: gcc -c -g -O2  conftest.c >&5
++configure:5167: checking /home/wbx/adk/openadk/target_i686_uclibc/usr/include/tirpc/netconfig.h usability
++configure:5167: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
+ configure:5167: $? = 0
+ configure:5167: result: yes
+-configure:5167: checking /usr/include/tirpc/netconfig.h presence
+-configure:5167: gcc -E  conftest.c
++configure:5167: checking /home/wbx/adk/openadk/target_i686_uclibc/usr/include/tirpc/netconfig.h presence
++configure:5167: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c
++configure:5167: $? = 0
++configure:5167: result: yes
++configure:5167: checking for /home/wbx/adk/openadk/target_i686_uclibc/usr/include/tirpc/netconfig.h
++configure:5167: result: yes
++configure:5194: checking for prctl
++configure:5194: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:5194: $? = 0
++configure:5194: result: yes
++configure:5209: checking for cap_get_proc in -lcap
++configure:5234: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -lcap  -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/host_i686_uclibc/lib/gcc/i686-openadk-linux-uclibc/4.5.2/../../../../i686-openadk-linux-uclibc/bin/ld: cannot find -lcap
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++collect2: ld returned 1 exit status
++configure:5234: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| /* end confdefs.h.  */
++| 
++| /* Override any GCC internal prototype to avoid an error.
++|    Use char because int might match the return type of a GCC
++|    builtin and then its argument prototype would still apply.  */
++| #ifdef __cplusplus
++| extern "C"
++| #endif
++| char cap_get_proc ();
++| int
++| main ()
++| {
++| return cap_get_proc ();
++|   ;
++|   return 0;
++| }
++configure:5243: result: no
++configure:5252: checking sys/capability.h usability
++configure:5252: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
++conftest.c:60:28: fatal error: sys/capability.h: No such file or directory
++compilation terminated.
++configure:5252: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| /* end confdefs.h.  */
++| #include <stdio.h>
++| #ifdef HAVE_SYS_TYPES_H
++| # include <sys/types.h>
++| #endif
++| #ifdef HAVE_SYS_STAT_H
++| # include <sys/stat.h>
++| #endif
++| #ifdef STDC_HEADERS
++| # include <stdlib.h>
++| # include <stddef.h>
++| #else
++| # ifdef HAVE_STDLIB_H
++| #  include <stdlib.h>
++| # endif
++| #endif
++| #ifdef HAVE_STRING_H
++| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++| #  include <memory.h>
++| # endif
++| # include <string.h>
++| #endif
++| #ifdef HAVE_STRINGS_H
++| # include <strings.h>
++| #endif
++| #ifdef HAVE_INTTYPES_H
++| # include <inttypes.h>
++| #endif
++| #ifdef HAVE_STDINT_H
++| # include <stdint.h>
++| #endif
++| #ifdef HAVE_UNISTD_H
++| # include <unistd.h>
++| #endif
++| #include <sys/capability.h>
++configure:5252: result: no
++configure:5252: checking sys/capability.h presence
++configure:5252: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c
++conftest.c:27:28: fatal error: sys/capability.h: No such file or directory
++compilation terminated.
++configure:5252: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| /* end confdefs.h.  */
++| #include <sys/capability.h>
++configure:5252: result: no
++configure:5252: checking for sys/capability.h
++configure:5252: result: no
++configure:5362: checking for special C compiler options needed for large files
++configure:5407: result: no
++configure:5413: checking for _FILE_OFFSET_BITS value needed for large files
++configure:5438: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
++conftest.c:33:3: warning: left shift count >= width of type
++conftest.c:33:3: warning: left shift count >= width of type
++conftest.c:34:10: warning: left shift count >= width of type
++conftest.c:34:10: warning: left shift count >= width of type
++conftest.c:33:7: error: size of array 'off_t_is_large' is negative
++conftest.c:35:9: warning: variably modified 'off_t_is_large' at file scope
++configure:5438: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| /* end confdefs.h.  */
++| #include <sys/types.h>
++|  /* Check that off_t can represent 2**63 - 1 correctly.
++|     We can't simply define LARGE_OFF_T to be 9223372036854775807,
++|     since some C++ compilers masquerading as C compilers
++|     incorrectly reject 9223372036854775807.  */
++| #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++|   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++| 		       && LARGE_OFF_T % 2147483647 == 1)
++| 		      ? 1 : -1];
++| int
++| main ()
++| {
++| 
++|   ;
++|   return 0;
++| }
++configure:5462: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
++configure:5462: $? = 0
++configure:5470: result: 64
++configure:5671: checking for C++ compiler version
++configure:5680: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ --version >&5
++i686-openadk-linux-uclibc-g++ (GCC) 4.5.2
++Copyright (C) 2010 Free Software Foundation, Inc.
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++
++configure:5691: $? = 0
++configure:5680: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ -v >&5
++Using built-in specs.
++COLLECT_GCC=/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++
++COLLECT_LTO_WRAPPER=/home/wbx/adk/openadk/host_i686_uclibc/libexec/gcc/i686-openadk-linux-uclibc/4.5.2/lto-wrapper
++Target: i686-openadk-linux-uclibc
++Configured with: /home/wbx/adk/openadk/toolchain_build_i686_uclibc/w-gcc-4.5.2-1/gcc-4.5.2/configure --prefix=/home/wbx/adk/openadk/host_i686_uclibc --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=i686-openadk-linux-uclibc --with-gmp=/home/wbx/adk/openadk/host_i686_uclibc --with-mpfr=/home/wbx/adk/openadk/host_i686_uclibc --with-libelf=/home/wbx/adk/openadk/host_i686_uclibc --disable-__cxa_atexit --with-gnu-ld --disable-libmudflap --disable-libgomp --disable-biarch --disable-decimal-float --disable-multilib --disable-sjlj-exceptions --disable-libstdcxx-pch --disable-ppl-version-check --disable-cloog-version-check --without-ppl --without-cloog --disable-nls --enable-libssp --enable-lto --enable-tls --enable-target-optspace --enable-languages=c,c++ --with-sysroot='/home/wbx/adk/openadk/host_i686_uclibc/../target_i686_uclibc' --with-slibdir=/home/wbx/adk/openadk/target_i686_uclibc/lib --enable-shared
++Thread model: posix
++gcc version 4.5.2 (GCC) 
++configure:5691: $? = 0
++configure:5680: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ -V >&5
++i686-openadk-linux-uclibc-g++: '-V' option must have argument
++configure:5691: $? = 1
++configure:5680: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ -qversion >&5
++i686-openadk-linux-uclibc-g++: unrecognized option '-qversion'
++i686-openadk-linux-uclibc-g++: no input files
++configure:5691: $? = 1
++configure:5695: checking whether we are using the GNU C++ compiler
++configure:5714: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ -c  -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.cpp >&5
++configure:5714: $? = 0
++configure:5723: result: yes
++configure:5732: checking whether /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ accepts -g
++configure:5752: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ -c -g -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.cpp >&5
++configure:5752: $? = 0
++configure:5793: result: yes
++configure:5818: checking dependency style of /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++
++configure:5928: result: none
++configure:5951: checking for i686-openadk-linux-gcc
++configure:5978: result: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc
++configure:6247: checking for C compiler version
++configure:6256: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc --version >&5
++i686-openadk-linux-uclibc-gcc (GCC) 4.5.2
++Copyright (C) 2010 Free Software Foundation, Inc.
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++
++configure:6267: $? = 0
++configure:6256: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -v >&5
++Using built-in specs.
++COLLECT_GCC=/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc
++COLLECT_LTO_WRAPPER=/home/wbx/adk/openadk/host_i686_uclibc/libexec/gcc/i686-openadk-linux-uclibc/4.5.2/lto-wrapper
++Target: i686-openadk-linux-uclibc
++Configured with: /home/wbx/adk/openadk/toolchain_build_i686_uclibc/w-gcc-4.5.2-1/gcc-4.5.2/configure --prefix=/home/wbx/adk/openadk/host_i686_uclibc --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=i686-openadk-linux-uclibc --with-gmp=/home/wbx/adk/openadk/host_i686_uclibc --with-mpfr=/home/wbx/adk/openadk/host_i686_uclibc --with-libelf=/home/wbx/adk/openadk/host_i686_uclibc --disable-__cxa_atexit --with-gnu-ld --disable-libmudflap --disable-libgomp --disable-biarch --disable-decimal-float --disable-multilib --disable-sjlj-exceptions --disable-libstdcxx-pch --disable-ppl-version-check --disable-cloog-version-check --without-ppl --without-cloog --disable-nls --enable-libssp --enable-lto --enable-tls --enable-target-optspace --enable-languages=c,c++ --with-sysroot='/home/wbx/adk/openadk/host_i686_uclibc/../target_i686_uclibc' --with-slibdir=/home/wbx/adk/openadk/target_i686_uclibc/lib --enable-shared
++Thread model: posix
++gcc version 4.5.2 (GCC) 
++configure:6267: $? = 0
++configure:6256: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -V >&5
++i686-openadk-linux-uclibc-gcc: '-V' option must have argument
++configure:6267: $? = 1
++configure:6256: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -qversion >&5
++i686-openadk-linux-uclibc-gcc: unrecognized option '-qversion'
++i686-openadk-linux-uclibc-gcc: no input files
++configure:6267: $? = 1
++configure:6271: checking whether we are using the GNU C compiler
++configure:6299: result: yes
++configure:6308: checking whether /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc accepts -g
++configure:6369: result: yes
++configure:6386: checking for /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc option to accept ISO C89
++configure:6463: result: none needed
++configure:6485: checking dependency style of /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc
++configure:6595: result: none
++configure:6615: checking how to run the C preprocessor
++configure:6685: result: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E
++configure:6705: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c
++configure:6705: $? = 0
++configure:6719: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c
++conftest.c:28:28: fatal error: ac_nonexistent.h: No such file or directory
++compilation terminated.
++configure:6719: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| /* end confdefs.h.  */
++| #include <ac_nonexistent.h>
++configure:6748: checking whether ln -s works
++configure:6752: result: yes
++configure:6759: checking whether make sets $(MAKE)
++configure:6781: result: yes
++configure:6815: checking for a sed that does not truncate output
++configure:6879: result: /home/wbx/adk/openadk/scripts/sed
++configure:6897: checking for fgrep
++configure:6959: result: /bin/grep -F
++configure:6994: checking for ld used by /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc
++configure:7061: result: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ld
++configure:7068: checking if the linker (/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ld) is GNU ld
++configure:7083: result: yes
++configure:7095: checking for BSD- or MS-compatible name lister (nm)
++configure:7144: result: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-nm
++configure:7262: checking the name lister (/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-nm) interface
++configure:7269: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
++configure:7272: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-nm "conftest.o"
++configure:7275: output
++00000000 B some_variable
++configure:7282: result: BSD nm
++configure:7286: checking the maximum length of command line arguments
++configure:7406: result: 3458764513820540925
++configure:7423: checking whether the shell understands some XSI constructs
++configure:7433: result: yes
++configure:7437: checking whether the shell understands "+="
++configure:7443: result: yes
++configure:7478: checking for /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ld option to reload object files
++configure:7485: result: -r
++configure:7514: checking for i686-openadk-linux-objdump
++configure:7530: found /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-objdump
++configure:7541: result: i686-openadk-linux-objdump
++configure:7613: checking how to recognize dependent libraries
++configure:7809: result: pass_all
++configure:7829: checking for i686-openadk-linux-ar
++configure:7856: result: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ar
++configure:7934: checking for i686-openadk-linux-strip
++configure:7961: result: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-strip
++configure:8033: checking for i686-openadk-linux-ranlib
++configure:8060: result: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ranlib
++configure:8190: checking command to parse /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-nm output from /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc object
++configure:8308: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
++configure:8311: $? = 0
++configure:8315: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-nm conftest.o \| sed -n -e 's/^.*[	 ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[	 ][	 ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' \> conftest.nm
++configure:8318: $? = 0
++configure:8372: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c conftstm.o >&5
++configure:8375: $? = 0
++configure:8413: result: ok
++configure:9218: checking for dlfcn.h
++configure:9218: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
++configure:9218: $? = 0
++configure:9218: result: yes
++configure:9343: checking for C++ compiler version
++configure:9352: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ --version >&5
++i686-openadk-linux-uclibc-g++ (GCC) 4.5.2
++Copyright (C) 2010 Free Software Foundation, Inc.
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++
++configure:9363: $? = 0
++configure:9352: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ -v >&5
++Using built-in specs.
++COLLECT_GCC=/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++
++COLLECT_LTO_WRAPPER=/home/wbx/adk/openadk/host_i686_uclibc/libexec/gcc/i686-openadk-linux-uclibc/4.5.2/lto-wrapper
++Target: i686-openadk-linux-uclibc
++Configured with: /home/wbx/adk/openadk/toolchain_build_i686_uclibc/w-gcc-4.5.2-1/gcc-4.5.2/configure --prefix=/home/wbx/adk/openadk/host_i686_uclibc --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=i686-openadk-linux-uclibc --with-gmp=/home/wbx/adk/openadk/host_i686_uclibc --with-mpfr=/home/wbx/adk/openadk/host_i686_uclibc --with-libelf=/home/wbx/adk/openadk/host_i686_uclibc --disable-__cxa_atexit --with-gnu-ld --disable-libmudflap --disable-libgomp --disable-biarch --disable-decimal-float --disable-multilib --disable-sjlj-exceptions --disable-libstdcxx-pch --disable-ppl-version-check --disable-cloog-version-check --without-ppl --without-cloog --disable-nls --enable-libssp --enable-lto --enable-tls --enable-target-optspace --enable-languages=c,c++ --with-sysroot='/home/wbx/adk/openadk/host_i686_uclibc/../target_i686_uclibc' --with-slibdir=/home/wbx/adk/openadk/target_i686_uclibc/lib --enable-shared
++Thread model: posix
++gcc version 4.5.2 (GCC) 
++configure:9363: $? = 0
++configure:9352: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ -V >&5
++i686-openadk-linux-uclibc-g++: '-V' option must have argument
++configure:9363: $? = 1
++configure:9352: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ -qversion >&5
++i686-openadk-linux-uclibc-g++: unrecognized option '-qversion'
++i686-openadk-linux-uclibc-g++: no input files
++configure:9363: $? = 1
++configure:9367: checking whether we are using the GNU C++ compiler
++configure:9395: result: yes
++configure:9404: checking whether /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ accepts -g
++configure:9465: result: yes
++configure:9490: checking dependency style of /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++
++configure:9600: result: none
++configure:9623: checking how to run the C++ preprocessor
++configure:9650: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.cpp
++configure:9650: $? = 0
++configure:9664: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.cpp
++conftest.cpp:29:28: fatal error: ac_nonexistent.h: No such file or directory
++compilation terminated.
++configure:9664: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| /* end confdefs.h.  */
++| #include <ac_nonexistent.h>
++configure:9689: result: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ -E
++configure:9709: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.cpp
++configure:9709: $? = 0
++configure:9723: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.cpp
++conftest.cpp:29:28: fatal error: ac_nonexistent.h: No such file or directory
++compilation terminated.
++configure:9723: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| /* end confdefs.h.  */
++| #include <ac_nonexistent.h>
++configure:9929: checking for objdir
++configure:9944: result: .libs
++configure:10240: checking if /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc supports -fno-rtti -fno-exceptions
++configure:10258: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -fno-rtti -fno-exceptions conftest.c >&5
++cc1: warning: command line option "-fno-rtti" is valid for C++/ObjC++ but not for C
++configure:10262: $? = 0
++configure:10275: result: no
++configure:10295: checking for /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc option to produce PIC
++configure:10567: result: -fPIC -DPIC
++configure:10579: checking if /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc PIC flag -fPIC -DPIC works
++configure:10597: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -fPIC -DPIC -DPIC conftest.c >&5
++configure:10601: $? = 0
++configure:10614: result: yes
++configure:10638: checking if /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc static flag -static works
++configure:10666: result: yes
++configure:10681: checking if /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc supports -c -o file.o
++configure:10702: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -o out/conftest2.o conftest.c >&5
++configure:10706: $? = 0
++configure:10728: result: yes
++configure:10736: checking if /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc supports -c -o file.o
++configure:10783: result: yes
++configure:10816: checking whether the /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc linker (/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ld) supports shared libraries
++configure:11802: result: yes
++configure:11839: checking whether -lc should be explicitly linked in
++configure:11844: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c >&5
++configure:11847: $? = 0
++configure:11862: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -shared conftest.o  -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /bin/grep  -lc  \>/dev/null 2\>\&1
++configure:11865: $? = 0
++configure:11877: result: no
++configure:12041: checking dynamic linker characteristics
++configure:12474: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -Wl,-rpath -Wl,/foo conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:12474: $? = 0
++configure:12695: result: GNU/Linux ld.so
++configure:12797: checking how to hardcode library paths into programs
++configure:12822: result: immediate
++configure:13342: checking whether stripping libraries is possible
++configure:13347: result: yes
++configure:13382: checking if libtool supports shared libraries
++configure:13384: result: yes
++configure:13387: checking whether to build shared libraries
++configure:13408: result: yes
++configure:13411: checking whether to build static libraries
++configure:13415: result: yes
++configure:13565: checking for ld used by /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++
++configure:13632: result: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ld
++configure:13639: checking if the linker (/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ld) is GNU ld
++configure:13654: result: yes
++configure:13709: checking whether the /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ linker (/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ld) supports shared libraries
++configure:14622: result: yes
++configure:14650: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ -c  -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.cpp >&5
++configure:14653: $? = 0
++configure:14835: checking for /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ option to produce PIC
++configure:15152: result: -fPIC -DPIC
++configure:15161: checking if /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ PIC flag -fPIC -DPIC works
++configure:15179: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ -c  -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -fPIC -DPIC -DPIC conftest.cpp >&5
++configure:15183: $? = 0
++configure:15196: result: yes
++configure:15217: checking if /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ static flag -static works
++configure:15245: result: yes
++configure:15257: checking if /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ supports -c -o file.o
++configure:15278: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ -c  -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -o out/conftest2.o conftest.cpp >&5
++configure:15282: $? = 0
++configure:15304: result: yes
++configure:15309: checking if /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ supports -c -o file.o
++configure:15356: result: yes
++configure:15386: checking whether the /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ linker (/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ld) supports shared libraries
++configure:15412: result: yes
++configure:15549: checking dynamic linker characteristics
++configure:15930: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ -o conftest  -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -Wl,-rpath -Wl,/foo conftest.cpp -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:15930: $? = 0
++configure:16151: result: GNU/Linux ld.so
++configure:16202: checking how to hardcode library paths into programs
++configure:16227: result: immediate
++configure:16286: checking whether /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc and cc understand -c and -o together
++configure:16317: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c conftest.c -o conftest2.o >&5
++configure:16321: $? = 0
++configure:16327: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c conftest.c -o conftest2.o >&5
++configure:16331: $? = 0
++configure:16342: cc -c conftest.c >&5
++configure:16346: $? = 0
++configure:16354: cc -c conftest.c -o conftest2.o >&5
++configure:16358: $? = 0
++configure:16364: cc -c conftest.c -o conftest2.o >&5
++configure:16368: $? = 0
++configure:16386: result: yes
++configure:16423: checking for i686-openadk-linux-ar
++configure:16450: result: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ar
++configure:16515: checking for i686-openadk-linux-ld
++configure:16542: result: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ld
++configure:16605: checking for ANSI C header files
++configure:16709: result: yes
++configure:16718: checking for GNU libc2
++configure:16732: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include conftest.c
++configure:16732: $? = 0
++configure:16740: result: yes
++configure:16748: checking for BSD signal semantics
++configure:16797: result: no
++configure:16805: checking for gethostbyname
++configure:16805: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/tmp/ccoPHc9A.o: In function `main':
++conftest.c:(.text+0x12): warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:16805: $? = 0
++configure:16805: result: yes
++configure:16853: checking for connect
++configure:16853: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:16853: $? = 0
++configure:16853: result: yes
++configure:16902: checking for getaddrinfo
++configure:16902: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:16902: $? = 0
++configure:16902: result: yes
++configure:16910: checking for getrpcbynumber
++configure:16910: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:16910: $? = 0
++configure:16910: result: yes
++configure:16918: checking for getservbyname
++configure:16918: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:16918: $? = 0
++configure:16918: result: yes
++configure:16926: checking for crypt in -lcrypt
++configure:16951: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -lcrypt  -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:16951: $? = 0
++configure:16960: result: yes
++configure:16970: checking for event_dispatch in -levent
++configure:16995: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -levent  -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:16995: $? = 0
++configure:17004: result: yes
++configure:17015: checking event.h usability
++configure:17015: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:17015: $? = 0
++configure:17015: result: yes
++configure:17015: checking event.h presence
++configure:17015: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++configure:17015: $? = 0
++configure:17015: result: yes
++configure:17015: checking for event.h
++configure:17015: result: yes
++configure:17032: checking for nfs4_init_name_mapping in -lnfsidmap
++configure:17057: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -lnfsidmap  -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libnfsidmap.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:17057: $? = 0
++configure:17066: result: yes
++configure:17077: checking nfsidmap.h usability
++configure:17077: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:17077: $? = 0
++configure:17077: result: yes
++configure:17077: checking nfsidmap.h presence
++configure:17077: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++configure:17077: $? = 0
++configure:17077: result: yes
++configure:17077: checking for nfsidmap.h
++configure:17077: result: yes
++configure:17090: checking for nfs4_set_debug in -lnfsidmap
++configure:17115: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -lnfsidmap  -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libnfsidmap.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:17115: $? = 0
++configure:17124: result: yes
++configure:17142: checking for i686-openadk-linux-pkg-config
++configure:17175: result: no
++configure:17185: checking for pkg-config
++configure:17203: found /usr/bin/pkg-config
++configure:17215: result: /usr/bin/pkg-config
++configure:17227: WARNING: using cross tools not prefixed with host triplet
++configure:17240: checking pkg-config is at least version 0.9.0
++configure:17243: result: yes
++configure:17256: checking for GSSGLUE
++configure:17263: $PKG_CONFIG --exists --print-errors "libgssglue >= 0.1"
++configure:17266: $? = 0
++configure:17279: $PKG_CONFIG --exists --print-errors "libgssglue >= 0.1"
++configure:17282: $? = 0
++configure:17336: result: yes
++configure:17590: checking for getnameinfo
++configure:17590: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:17590: $? = 0
++configure:17590: result: yes
++configure:17600: checking for nfs4_init_name_mapping in -lnfsidmap
++configure:17634: result: yes
++configure:17645: checking for nfsidmap.h
++configure:17645: result: yes
++configure:17658: checking for nfs4_set_debug in -lnfsidmap
++configure:17692: result: yes
++configure:17705: checking spkm3.h usability
++configure:17705: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++conftest.c:69:19: fatal error: spkm3.h: No such file or directory
++compilation terminated.
++configure:17705: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| /* end confdefs.h.  */
++| #include <stdio.h>
++| #ifdef HAVE_SYS_TYPES_H
++| # include <sys/types.h>
++| #endif
++| #ifdef HAVE_SYS_STAT_H
++| # include <sys/stat.h>
++| #endif
++| #ifdef STDC_HEADERS
++| # include <stdlib.h>
++| # include <stddef.h>
++| #else
++| # ifdef HAVE_STDLIB_H
++| #  include <stdlib.h>
++| # endif
++| #endif
++| #ifdef HAVE_STRING_H
++| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++| #  include <memory.h>
++| # endif
++| # include <string.h>
++| #endif
++| #ifdef HAVE_STRINGS_H
++| # include <strings.h>
++| #endif
++| #ifdef HAVE_INTTYPES_H
++| # include <inttypes.h>
++| #endif
++| #ifdef HAVE_STDINT_H
++| # include <stdint.h>
++| #endif
++| #ifdef HAVE_UNISTD_H
++| # include <unistd.h>
++| #endif
++| #include <spkm3.h>
++configure:17705: result: no
++configure:17705: checking spkm3.h presence
++configure:17705: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++conftest.c:36:19: fatal error: spkm3.h: No such file or directory
++compilation terminated.
++configure:17705: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| /* end confdefs.h.  */
++| #include <spkm3.h>
++configure:17705: result: no
++configure:17705: checking for spkm3.h
++configure:17705: result: no
++configure:17712: WARNING: Could not locate SPKM3 header; will not have SPKM3 support
++configure:17720: checking for Kerberos v5
++configure:17791: result: /home/wbx/adk/openadk/target_i686_uclibc/usr/
++configure:17805: checking for gss_krb5_export_lucid_sec_context in -lgssapi_krb5
++configure:17830: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -lgssapi_krb5 -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib $(PROG_RPATH_FLAGS) -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv -ldl -ltirpc -lrpcsecgss >&5
++i686-openadk-linux-uclibc-gcc: $(PROG_RPATH_FLAGS): No such file or directory
++configure:17830: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| /* end confdefs.h.  */
++| 
++| /* Override any GCC internal prototype to avoid an error.
++|    Use char because int might match the return type of a GCC
++|    builtin and then its argument prototype would still apply.  */
++| #ifdef __cplusplus
++| extern "C"
++| #endif
++| char gss_krb5_export_lucid_sec_context ();
++| int
++| main ()
++| {
++| return gss_krb5_export_lucid_sec_context ();
++|   ;
++|   return 0;
++| }
++configure:17840: result: no
++configure:17850: checking for gss_krb5_set_allowable_enctypes in -lgssapi_krb5
++configure:17875: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -lgssapi_krb5 -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib $(PROG_RPATH_FLAGS) -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv -ldl -ltirpc -lrpcsecgss >&5
++i686-openadk-linux-uclibc-gcc: $(PROG_RPATH_FLAGS): No such file or directory
++configure:17875: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| /* end confdefs.h.  */
++| 
++| /* Override any GCC internal prototype to avoid an error.
++|    Use char because int might match the return type of a GCC
++|    builtin and then its argument prototype would still apply.  */
++| #ifdef __cplusplus
++| extern "C"
++| #endif
++| char gss_krb5_set_allowable_enctypes ();
++| int
++| main ()
++| {
++| return gss_krb5_set_allowable_enctypes ();
++|   ;
++|   return 0;
++| }
++configure:17885: result: no
++configure:17895: checking for gss_krb5_ccache_name in -lgssapi_krb5
++configure:17920: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -lgssapi_krb5 -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib $(PROG_RPATH_FLAGS) -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv -ldl -ltirpc -lrpcsecgss >&5
++i686-openadk-linux-uclibc-gcc: $(PROG_RPATH_FLAGS): No such file or directory
++configure:17920: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| /* end confdefs.h.  */
++| 
++| /* Override any GCC internal prototype to avoid an error.
++|    Use char because int might match the return type of a GCC
++|    builtin and then its argument prototype would still apply.  */
++| #ifdef __cplusplus
++| extern "C"
++| #endif
++| char gss_krb5_ccache_name ();
++| int
++| main ()
++| {
++| return gss_krb5_ccache_name ();
++|   ;
++|   return 0;
++| }
++configure:17930: result: no
++configure:17941: checking for krb5_get_error_message in -lgssapi_krb5
++configure:17966: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -lgssapi_krb5 -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib $(PROG_RPATH_FLAGS) -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv -ldl -ltirpc -lrpcsecgss >&5
++i686-openadk-linux-uclibc-gcc: $(PROG_RPATH_FLAGS): No such file or directory
++configure:17966: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| /* end confdefs.h.  */
++| 
++| /* Override any GCC internal prototype to avoid an error.
++|    Use char because int might match the return type of a GCC
++|    builtin and then its argument prototype would still apply.  */
++| #ifdef __cplusplus
++| extern "C"
++| #endif
++| char krb5_get_error_message ();
++| int
++| main ()
++| {
++| return krb5_get_error_message ();
++|   ;
++|   return 0;
++| }
++configure:17976: result: no
++configure:17987: checking for krb5_get_init_creds_opt_set_addressless in -lgssapi_krb5
++configure:18012: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -lgssapi_krb5 -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib $(PROG_RPATH_FLAGS) -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv -ldl -ltirpc -lrpcsecgss >&5
++i686-openadk-linux-uclibc-gcc: $(PROG_RPATH_FLAGS): No such file or directory
++configure:18012: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| /* end confdefs.h.  */
++| 
++| /* Override any GCC internal prototype to avoid an error.
++|    Use char because int might match the return type of a GCC
++|    builtin and then its argument prototype would still apply.  */
++| #ifdef __cplusplus
++| extern "C"
++| #endif
++| char krb5_get_init_creds_opt_set_addressless ();
++| int
++| main ()
++| {
++| return krb5_get_init_creds_opt_set_addressless ();
++|   ;
++|   return 0;
++| }
++configure:18022: result: no
++configure:18143: checking whether AI_ADDRCONFIG is declared
++configure:18143: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18143: $? = 0
++configure:18143: result: yes
++configure:18195: checking arpa/inet.h usability
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking arpa/inet.h presence
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking for arpa/inet.h
++configure:18195: result: yes
++configure:18195: checking fcntl.h usability
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking fcntl.h presence
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking for fcntl.h
++configure:18195: result: yes
++configure:18195: checking libintl.h usability
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking libintl.h presence
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking for libintl.h
++configure:18195: result: yes
++configure:18195: checking limits.h usability
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking limits.h presence
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking for limits.h
++configure:18195: result: yes
++configure:18195: checking malloc.h usability
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking malloc.h presence
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking for malloc.h
++configure:18195: result: yes
++configure:18195: checking for memory.h
++configure:18195: result: yes
++configure:18195: checking netdb.h usability
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking netdb.h presence
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking for netdb.h
++configure:18195: result: yes
++configure:18195: checking netinet/in.h usability
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking netinet/in.h presence
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking for netinet/in.h
++configure:18195: result: yes
++configure:18195: checking paths.h usability
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking paths.h presence
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking for paths.h
++configure:18195: result: yes
++configure:18195: checking for stdlib.h
++configure:18195: result: yes
++configure:18195: checking for string.h
++configure:18195: result: yes
++configure:18195: checking sys/file.h usability
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking sys/file.h presence
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking for sys/file.h
++configure:18195: result: yes
++configure:18195: checking sys/ioctl.h usability
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking sys/ioctl.h presence
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking for sys/ioctl.h
++configure:18195: result: yes
++configure:18195: checking sys/mount.h usability
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking sys/mount.h presence
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking for sys/mount.h
++configure:18195: result: yes
++configure:18195: checking sys/param.h usability
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking sys/param.h presence
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking for sys/param.h
++configure:18195: result: yes
++configure:18195: checking sys/socket.h usability
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking sys/socket.h presence
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking for sys/socket.h
++configure:18195: result: yes
++configure:18195: checking sys/time.h usability
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking sys/time.h presence
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking for sys/time.h
++configure:18195: result: yes
++configure:18195: checking sys/vfs.h usability
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking sys/vfs.h presence
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking for sys/vfs.h
++configure:18195: result: yes
++configure:18195: checking syslog.h usability
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking syslog.h presence
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking for syslog.h
++configure:18195: result: yes
++configure:18195: checking for unistd.h
++configure:18195: result: yes
++configure:18195: checking com_err.h usability
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++conftest.c:92:21: fatal error: com_err.h: No such file or directory
++compilation terminated.
++configure:18195: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| /* end confdefs.h.  */
++| #include <stdio.h>
++| #ifdef HAVE_SYS_TYPES_H
++| # include <sys/types.h>
++| #endif
++| #ifdef HAVE_SYS_STAT_H
++| # include <sys/stat.h>
++| #endif
++| #ifdef STDC_HEADERS
++| # include <stdlib.h>
++| # include <stddef.h>
++| #else
++| # ifdef HAVE_STDLIB_H
++| #  include <stdlib.h>
++| # endif
++| #endif
++| #ifdef HAVE_STRING_H
++| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++| #  include <memory.h>
++| # endif
++| # include <string.h>
++| #endif
++| #ifdef HAVE_STRINGS_H
++| # include <strings.h>
++| #endif
++| #ifdef HAVE_INTTYPES_H
++| # include <inttypes.h>
++| #endif
++| #ifdef HAVE_STDINT_H
++| # include <stdint.h>
++| #endif
++| #ifdef HAVE_UNISTD_H
++| # include <unistd.h>
++| #endif
++| #include <com_err.h>
++configure:18195: result: no
++configure:18195: checking com_err.h presence
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++conftest.c:59:21: fatal error: com_err.h: No such file or directory
++compilation terminated.
++configure:18195: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| /* end confdefs.h.  */
++| #include <com_err.h>
++configure:18195: result: no
++configure:18195: checking for com_err.h
++configure:18195: result: no
++configure:18195: checking et/com_err.h usability
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking et/com_err.h presence
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking for et/com_err.h
++configure:18195: result: yes
++configure:18195: checking ifaddrs.h usability
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking ifaddrs.h presence
++configure:18195: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++configure:18195: $? = 0
++configure:18195: result: yes
++configure:18195: checking for ifaddrs.h
++configure:18195: result: yes
++configure:18207: checking for an ANSI C-conforming const
++configure:18272: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18272: $? = 0
++configure:18279: result: yes
++configure:18287: checking for uid_t in sys/types.h
++configure:18306: result: yes
++configure:18317: checking for inline
++configure:18333: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18333: $? = 0
++configure:18341: result: inline
++configure:18359: checking for off_t
++configure:18359: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18359: $? = 0
++configure:18359: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++conftest.c: In function 'main':
++conftest.c:97:20: error: expected expression before ')' token
++configure:18359: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| /* end confdefs.h.  */
++| #include <stdio.h>
++| #ifdef HAVE_SYS_TYPES_H
++| # include <sys/types.h>
++| #endif
++| #ifdef HAVE_SYS_STAT_H
++| # include <sys/stat.h>
++| #endif
++| #ifdef STDC_HEADERS
++| # include <stdlib.h>
++| # include <stddef.h>
++| #else
++| # ifdef HAVE_STDLIB_H
++| #  include <stdlib.h>
++| # endif
++| #endif
++| #ifdef HAVE_STRING_H
++| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++| #  include <memory.h>
++| # endif
++| # include <string.h>
++| #endif
++| #ifdef HAVE_STRINGS_H
++| # include <strings.h>
++| #endif
++| #ifdef HAVE_INTTYPES_H
++| # include <inttypes.h>
++| #endif
++| #ifdef HAVE_STDINT_H
++| # include <stdint.h>
++| #endif
++| #ifdef HAVE_UNISTD_H
++| # include <unistd.h>
++| #endif
++| int
++| main ()
++| {
++| if (sizeof ((off_t)))
++| 	    return 0;
++|   ;
++|   return 0;
++| }
++configure:18359: result: yes
++configure:18370: checking for pid_t
++configure:18370: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18370: $? = 0
++configure:18370: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++conftest.c: In function 'main':
++conftest.c:97:20: error: expected expression before ')' token
++configure:18370: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| /* end confdefs.h.  */
++| #include <stdio.h>
++| #ifdef HAVE_SYS_TYPES_H
++| # include <sys/types.h>
++| #endif
++| #ifdef HAVE_SYS_STAT_H
++| # include <sys/stat.h>
++| #endif
++| #ifdef STDC_HEADERS
++| # include <stdlib.h>
++| # include <stddef.h>
++| #else
++| # ifdef HAVE_STDLIB_H
++| #  include <stdlib.h>
++| # endif
++| #endif
++| #ifdef HAVE_STRING_H
++| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++| #  include <memory.h>
++| # endif
++| # include <string.h>
++| #endif
++| #ifdef HAVE_STRINGS_H
++| # include <strings.h>
++| #endif
++| #ifdef HAVE_INTTYPES_H
++| # include <inttypes.h>
++| #endif
++| #ifdef HAVE_STDINT_H
++| # include <stdint.h>
++| #endif
++| #ifdef HAVE_UNISTD_H
++| # include <unistd.h>
++| #endif
++| int
++| main ()
++| {
++| if (sizeof ((pid_t)))
++| 	    return 0;
++|   ;
++|   return 0;
++| }
++configure:18370: result: yes
++configure:18381: checking for size_t
++configure:18381: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18381: $? = 0
++configure:18381: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++conftest.c: In function 'main':
++conftest.c:97:21: error: expected expression before ')' token
++configure:18381: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| /* end confdefs.h.  */
++| #include <stdio.h>
++| #ifdef HAVE_SYS_TYPES_H
++| # include <sys/types.h>
++| #endif
++| #ifdef HAVE_SYS_STAT_H
++| # include <sys/stat.h>
++| #endif
++| #ifdef STDC_HEADERS
++| # include <stdlib.h>
++| # include <stddef.h>
++| #else
++| # ifdef HAVE_STDLIB_H
++| #  include <stdlib.h>
++| # endif
++| #endif
++| #ifdef HAVE_STRING_H
++| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++| #  include <memory.h>
++| # endif
++| # include <string.h>
++| #endif
++| #ifdef HAVE_STRINGS_H
++| # include <strings.h>
++| #endif
++| #ifdef HAVE_INTTYPES_H
++| # include <inttypes.h>
++| #endif
++| #ifdef HAVE_STDINT_H
++| # include <stdint.h>
++| #endif
++| #ifdef HAVE_UNISTD_H
++| # include <unistd.h>
++| #endif
++| int
++| main ()
++| {
++| if (sizeof ((size_t)))
++| 	    return 0;
++|   ;
++|   return 0;
++| }
++configure:18381: result: yes
++configure:18392: checking whether time.h and sys/time.h may both be included
++configure:18412: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18412: $? = 0
++configure:18419: result: yes
++configure:18427: checking whether struct tm is in sys/time.h or time.h
++configure:18447: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18447: $? = 0
++configure:18454: result: time.h
++configure:18465: checking for working alloca.h
++configure:18482: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:18482: $? = 0
++configure:18490: result: yes
++configure:18498: checking for alloca
++configure:18535: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:18535: $? = 0
++configure:18543: result: yes
++configure:18656: checking for dirent.h that defines DIR
++configure:18675: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:18675: $? = 0
++configure:18683: result: yes
++configure:18697: checking for library containing opendir
++configure:18728: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:18728: $? = 0
++configure:18745: result: none required
++configure:18812: checking whether closedir returns void
++configure:18846: result: yes
++configure:18854: checking for error_at_line
++configure:18870: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:18870: $? = 0
++configure:18878: result: yes
++configure:18891: checking vfork.h usability
++configure:18891: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++conftest.c:99:19: fatal error: vfork.h: No such file or directory
++compilation terminated.
++configure:18891: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| #define TIME_WITH_SYS_TIME 1
++| #define HAVE_ALLOCA_H 1
++| #define HAVE_ALLOCA 1
++| #define HAVE_DIRENT_H 1
++| #define CLOSEDIR_VOID 1
++| /* end confdefs.h.  */
++| #include <stdio.h>
++| #ifdef HAVE_SYS_TYPES_H
++| # include <sys/types.h>
++| #endif
++| #ifdef HAVE_SYS_STAT_H
++| # include <sys/stat.h>
++| #endif
++| #ifdef STDC_HEADERS
++| # include <stdlib.h>
++| # include <stddef.h>
++| #else
++| # ifdef HAVE_STDLIB_H
++| #  include <stdlib.h>
++| # endif
++| #endif
++| #ifdef HAVE_STRING_H
++| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++| #  include <memory.h>
++| # endif
++| # include <string.h>
++| #endif
++| #ifdef HAVE_STRINGS_H
++| # include <strings.h>
++| #endif
++| #ifdef HAVE_INTTYPES_H
++| # include <inttypes.h>
++| #endif
++| #ifdef HAVE_STDINT_H
++| # include <stdint.h>
++| #endif
++| #ifdef HAVE_UNISTD_H
++| # include <unistd.h>
++| #endif
++| #include <vfork.h>
++configure:18891: result: no
++configure:18891: checking vfork.h presence
++configure:18891: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++conftest.c:66:19: fatal error: vfork.h: No such file or directory
++compilation terminated.
++configure:18891: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| #define TIME_WITH_SYS_TIME 1
++| #define HAVE_ALLOCA_H 1
++| #define HAVE_ALLOCA 1
++| #define HAVE_DIRENT_H 1
++| #define CLOSEDIR_VOID 1
++| /* end confdefs.h.  */
++| #include <vfork.h>
++configure:18891: result: no
++configure:18891: checking for vfork.h
++configure:18891: result: no
++configure:18904: checking for fork
++configure:18904: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++conftest.c:89:6: warning: conflicting types for built-in function 'fork'
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:18904: $? = 0
++configure:18904: result: yes
++configure:18904: checking for vfork
++configure:18904: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:18904: $? = 0
++configure:18904: result: yes
++configure:18915: checking for working fork
++configure:18947: result: cross
++configure:18963: WARNING: result yes guessed because of cross compilation
++configure:18968: checking for working vfork
++configure:19078: result: yes
++configure:19103: checking type of array argument to getgroups
++configure:19162: result: gid_t
++configure:19170: checking for getgroups
++configure:19170: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19170: $? = 0
++configure:19170: result: yes
++configure:19225: checking for working getgroups
++configure:19256: result: no
++configure:19270: checking for library containing getmntent
++configure:19301: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19301: $? = 0
++configure:19318: result: none required
++configure:19333: checking whether /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc needs -traditional
++configure:19367: result: no
++configure:19374: checking whether lstat correctly handles trailing slash
++configure:19417: result: no
++configure:19436: checking whether lstat accepts an empty string
++configure:19466: result: yes
++configure:19482: checking whether lstat correctly handles trailing slash
++configure:19525: result: no
++configure:19544: checking whether sys/types.h defines makedev
++configure:19560: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19560: $? = 0
++configure:19569: result: yes
++configure:19595: checking for working memcmp
++configure:19648: result: no
++configure:19661: checking sys/select.h usability
++configure:19661: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:19661: $? = 0
++configure:19661: result: yes
++configure:19661: checking sys/select.h presence
++configure:19661: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c
++configure:19661: $? = 0
++configure:19661: result: yes
++configure:19661: checking for sys/select.h
++configure:19661: result: yes
++configure:19661: checking for sys/socket.h
++configure:19661: result: yes
++configure:19672: checking types of arguments for select
++configure:19700: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:19700: $? = 0
++configure:19711: result: int,fd_set *,struct timeval *
++configure:19734: checking return type of signal handlers
++configure:19752: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++conftest.c: In function 'main':
++conftest.c:84:1: error: void value not ignored as it ought to be
++configure:19752: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| #define TIME_WITH_SYS_TIME 1
++| #define HAVE_ALLOCA_H 1
++| #define HAVE_ALLOCA 1
++| #define HAVE_DIRENT_H 1
++| #define CLOSEDIR_VOID 1
++| #define HAVE_FORK 1
++| #define HAVE_VFORK 1
++| #define HAVE_WORKING_VFORK 1
++| #define HAVE_WORKING_FORK 1
++| #define GETGROUPS_T gid_t
++| #define HAVE_GETMNTENT 1
++| #define HAVE_LSTAT_EMPTY_STRING_BUG 1
++| #define HAVE_SYS_SELECT_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define SELECT_TYPE_ARG1 int
++| #define SELECT_TYPE_ARG234 (fd_set *)
++| #define SELECT_TYPE_ARG5 (struct timeval *)
++| /* end confdefs.h.  */
++| #include <sys/types.h>
++| #include <signal.h>
++| 
++| int
++| main ()
++| {
++| return *(signal (0, 0)) (0) == 1;
++|   ;
++|   return 0;
++| }
++configure:19759: result: void
++configure:19767: checking whether stat accepts an empty string
++configure:19797: result: yes
++configure:19815: checking for vprintf
++configure:19815: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++conftest.c:103:6: warning: conflicting types for built-in function 'vprintf'
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19815: $? = 0
++configure:19815: result: yes
++configure:19821: checking for _doprnt
++configure:19821: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++/tmp/ccFobr1P.o: In function `main':
++conftest.c:(.text+0x12): undefined reference to `_doprnt'
++collect2: ld returned 1 exit status
++configure:19821: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| #define TIME_WITH_SYS_TIME 1
++| #define HAVE_ALLOCA_H 1
++| #define HAVE_ALLOCA 1
++| #define HAVE_DIRENT_H 1
++| #define CLOSEDIR_VOID 1
++| #define HAVE_FORK 1
++| #define HAVE_VFORK 1
++| #define HAVE_WORKING_VFORK 1
++| #define HAVE_WORKING_FORK 1
++| #define GETGROUPS_T gid_t
++| #define HAVE_GETMNTENT 1
++| #define HAVE_LSTAT_EMPTY_STRING_BUG 1
++| #define HAVE_SYS_SELECT_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define SELECT_TYPE_ARG1 int
++| #define SELECT_TYPE_ARG234 (fd_set *)
++| #define SELECT_TYPE_ARG5 (struct timeval *)
++| #define RETSIGTYPE void
++| #define HAVE_STAT_EMPTY_STRING_BUG 1
++| #define HAVE_VPRINTF 1
++| /* end confdefs.h.  */
++| /* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
++|    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++| #define _doprnt innocuous__doprnt
++| 
++| /* System header to define __stub macros and hopefully few prototypes,
++|     which can conflict with char _doprnt (); below.
++|     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++|     <limits.h> exists even on freestanding compilers.  */
++| 
++| #ifdef __STDC__
++| # include <limits.h>
++| #else
++| # include <assert.h>
++| #endif
++| 
++| #undef _doprnt
++| 
++| /* Override any GCC internal prototype to avoid an error.
++|    Use char because int might match the return type of a GCC
++|    builtin and then its argument prototype would still apply.  */
++| #ifdef __cplusplus
++| extern "C"
++| #endif
++| char _doprnt ();
++| /* The GNU C library defines this for functions which it implements
++|     to always fail with ENOSYS.  Some functions are actually named
++|     something starting with __ and the normal name is an alias.  */
++| #if defined __stub__doprnt || defined __stub____doprnt
++| choke me
++| #endif
++| 
++| int
++| main ()
++| {
++| return _doprnt ();
++|   ;
++|   return 0;
++| }
++configure:19821: result: no
++configure:19840: checking for alarm
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for atexit
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for dup2
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for fdatasync
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for ftruncate
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for getcwd
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for gethostbyaddr
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/tmp/ccMsHpoy.o: In function `main':
++conftest.c:(.text+0x12): warning: gethostbyaddr is obsolescent, use getaddrinfo() instead.
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for gethostbyname
++configure:19840: result: yes
++configure:19840: checking for gethostname
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for getmntent
++configure:19840: result: yes
++configure:19840: checking for getnameinfo
++configure:19840: result: yes
++configure:19840: checking for getrpcbyname
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for getifaddrs
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for gettimeofday
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for hasmntopt
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for inet_ntoa
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for innetgr
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++/tmp/cc8RLUnr.o: In function `main':
++conftest.c:(.text+0x12): undefined reference to `innetgr'
++collect2: ld returned 1 exit status
++configure:19840: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| #define TIME_WITH_SYS_TIME 1
++| #define HAVE_ALLOCA_H 1
++| #define HAVE_ALLOCA 1
++| #define HAVE_DIRENT_H 1
++| #define CLOSEDIR_VOID 1
++| #define HAVE_FORK 1
++| #define HAVE_VFORK 1
++| #define HAVE_WORKING_VFORK 1
++| #define HAVE_WORKING_FORK 1
++| #define GETGROUPS_T gid_t
++| #define HAVE_GETMNTENT 1
++| #define HAVE_LSTAT_EMPTY_STRING_BUG 1
++| #define HAVE_SYS_SELECT_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define SELECT_TYPE_ARG1 int
++| #define SELECT_TYPE_ARG234 (fd_set *)
++| #define SELECT_TYPE_ARG5 (struct timeval *)
++| #define RETSIGTYPE void
++| #define HAVE_STAT_EMPTY_STRING_BUG 1
++| #define HAVE_VPRINTF 1
++| #define HAVE_ALARM 1
++| #define HAVE_ATEXIT 1
++| #define HAVE_DUP2 1
++| #define HAVE_FDATASYNC 1
++| #define HAVE_FTRUNCATE 1
++| #define HAVE_GETCWD 1
++| #define HAVE_GETHOSTBYADDR 1
++| #define HAVE_GETHOSTBYNAME 1
++| #define HAVE_GETHOSTNAME 1
++| #define HAVE_GETMNTENT 1
++| #define HAVE_GETNAMEINFO 1
++| #define HAVE_GETRPCBYNAME 1
++| #define HAVE_GETIFADDRS 1
++| #define HAVE_GETTIMEOFDAY 1
++| #define HAVE_HASMNTOPT 1
++| #define HAVE_INET_NTOA 1
++| /* end confdefs.h.  */
++| /* Define innetgr to an innocuous variant, in case <limits.h> declares innetgr.
++|    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++| #define innetgr innocuous_innetgr
++| 
++| /* System header to define __stub macros and hopefully few prototypes,
++|     which can conflict with char innetgr (); below.
++|     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++|     <limits.h> exists even on freestanding compilers.  */
++| 
++| #ifdef __STDC__
++| # include <limits.h>
++| #else
++| # include <assert.h>
++| #endif
++| 
++| #undef innetgr
++| 
++| /* Override any GCC internal prototype to avoid an error.
++|    Use char because int might match the return type of a GCC
++|    builtin and then its argument prototype would still apply.  */
++| #ifdef __cplusplus
++| extern "C"
++| #endif
++| char innetgr ();
++| /* The GNU C library defines this for functions which it implements
++|     to always fail with ENOSYS.  Some functions are actually named
++|     something starting with __ and the normal name is an alias.  */
++| #if defined __stub_innetgr || defined __stub___innetgr
++| choke me
++| #endif
++| 
++| int
++| main ()
++| {
++| return innetgr ();
++|   ;
++|   return 0;
++| }
++configure:19840: result: no
++configure:19840: checking for memset
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++conftest.c:120:6: warning: conflicting types for built-in function 'memset'
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for mkdir
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for pathconf
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for realpath
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for rmdir
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for select
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for socket
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for strcasecmp
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++conftest.c:127:6: warning: conflicting types for built-in function 'strcasecmp'
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for strchr
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++conftest.c:128:6: warning: conflicting types for built-in function 'strchr'
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for strdup
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++conftest.c:129:6: warning: conflicting types for built-in function 'strdup'
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for strerror
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for strrchr
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++conftest.c:131:6: warning: conflicting types for built-in function 'strrchr'
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for strtol
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for strtoul
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19840: checking for sigprocmask
++configure:19840: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib conftest.c -ltirpc -lrpcsecgss >&5
++/home/wbx/adk/openadk/target_i686_uclibc/usr/lib/libtirpc.so: warning: gethostbyname is obsolescent, use getnameinfo() instead.
++configure:19840: $? = 0
++configure:19840: result: yes
++configure:19856: checking size of short
++configure:19861: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:19861: $? = 0
++configure:19861: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++conftest.c: In function 'main':
++conftest.c:148:12: error: size of array 'test_array' is negative
++configure:19861: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| #define TIME_WITH_SYS_TIME 1
++| #define HAVE_ALLOCA_H 1
++| #define HAVE_ALLOCA 1
++| #define HAVE_DIRENT_H 1
++| #define CLOSEDIR_VOID 1
++| #define HAVE_FORK 1
++| #define HAVE_VFORK 1
++| #define HAVE_WORKING_VFORK 1
++| #define HAVE_WORKING_FORK 1
++| #define GETGROUPS_T gid_t
++| #define HAVE_GETMNTENT 1
++| #define HAVE_LSTAT_EMPTY_STRING_BUG 1
++| #define HAVE_SYS_SELECT_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define SELECT_TYPE_ARG1 int
++| #define SELECT_TYPE_ARG234 (fd_set *)
++| #define SELECT_TYPE_ARG5 (struct timeval *)
++| #define RETSIGTYPE void
++| #define HAVE_STAT_EMPTY_STRING_BUG 1
++| #define HAVE_VPRINTF 1
++| #define HAVE_ALARM 1
++| #define HAVE_ATEXIT 1
++| #define HAVE_DUP2 1
++| #define HAVE_FDATASYNC 1
++| #define HAVE_FTRUNCATE 1
++| #define HAVE_GETCWD 1
++| #define HAVE_GETHOSTBYADDR 1
++| #define HAVE_GETHOSTBYNAME 1
++| #define HAVE_GETHOSTNAME 1
++| #define HAVE_GETMNTENT 1
++| #define HAVE_GETNAMEINFO 1
++| #define HAVE_GETRPCBYNAME 1
++| #define HAVE_GETIFADDRS 1
++| #define HAVE_GETTIMEOFDAY 1
++| #define HAVE_HASMNTOPT 1
++| #define HAVE_INET_NTOA 1
++| #define HAVE_MEMSET 1
++| #define HAVE_MKDIR 1
++| #define HAVE_PATHCONF 1
++| #define HAVE_REALPATH 1
++| #define HAVE_RMDIR 1
++| #define HAVE_SELECT 1
++| #define HAVE_SOCKET 1
++| #define HAVE_STRCASECMP 1
++| #define HAVE_STRCHR 1
++| #define HAVE_STRDUP 1
++| #define HAVE_STRERROR 1
++| #define HAVE_STRRCHR 1
++| #define HAVE_STRTOL 1
++| #define HAVE_STRTOUL 1
++| #define HAVE_SIGPROCMASK 1
++| /* end confdefs.h.  */
++| #include <stdio.h>
++| #ifdef HAVE_SYS_TYPES_H
++| # include <sys/types.h>
++| #endif
++| #ifdef HAVE_SYS_STAT_H
++| # include <sys/stat.h>
++| #endif
++| #ifdef STDC_HEADERS
++| # include <stdlib.h>
++| # include <stddef.h>
++| #else
++| # ifdef HAVE_STDLIB_H
++| #  include <stdlib.h>
++| # endif
++| #endif
++| #ifdef HAVE_STRING_H
++| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++| #  include <memory.h>
++| # endif
++| # include <string.h>
++| #endif
++| #ifdef HAVE_STRINGS_H
++| # include <strings.h>
++| #endif
++| #ifdef HAVE_INTTYPES_H
++| # include <inttypes.h>
++| #endif
++| #ifdef HAVE_STDINT_H
++| # include <stdint.h>
++| #endif
++| #ifdef HAVE_UNISTD_H
++| # include <unistd.h>
++| #endif
++| int
++| main ()
++| {
++| static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= 0)];
++| test_array [0] = 0
++| 
++|   ;
++|   return 0;
++| }
++configure:19861: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++conftest.c: In function 'main':
++conftest.c:148:12: error: size of array 'test_array' is negative
++configure:19861: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| #define TIME_WITH_SYS_TIME 1
++| #define HAVE_ALLOCA_H 1
++| #define HAVE_ALLOCA 1
++| #define HAVE_DIRENT_H 1
++| #define CLOSEDIR_VOID 1
++| #define HAVE_FORK 1
++| #define HAVE_VFORK 1
++| #define HAVE_WORKING_VFORK 1
++| #define HAVE_WORKING_FORK 1
++| #define GETGROUPS_T gid_t
++| #define HAVE_GETMNTENT 1
++| #define HAVE_LSTAT_EMPTY_STRING_BUG 1
++| #define HAVE_SYS_SELECT_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define SELECT_TYPE_ARG1 int
++| #define SELECT_TYPE_ARG234 (fd_set *)
++| #define SELECT_TYPE_ARG5 (struct timeval *)
++| #define RETSIGTYPE void
++| #define HAVE_STAT_EMPTY_STRING_BUG 1
++| #define HAVE_VPRINTF 1
++| #define HAVE_ALARM 1
++| #define HAVE_ATEXIT 1
++| #define HAVE_DUP2 1
++| #define HAVE_FDATASYNC 1
++| #define HAVE_FTRUNCATE 1
++| #define HAVE_GETCWD 1
++| #define HAVE_GETHOSTBYADDR 1
++| #define HAVE_GETHOSTBYNAME 1
++| #define HAVE_GETHOSTNAME 1
++| #define HAVE_GETMNTENT 1
++| #define HAVE_GETNAMEINFO 1
++| #define HAVE_GETRPCBYNAME 1
++| #define HAVE_GETIFADDRS 1
++| #define HAVE_GETTIMEOFDAY 1
++| #define HAVE_HASMNTOPT 1
++| #define HAVE_INET_NTOA 1
++| #define HAVE_MEMSET 1
++| #define HAVE_MKDIR 1
++| #define HAVE_PATHCONF 1
++| #define HAVE_REALPATH 1
++| #define HAVE_RMDIR 1
++| #define HAVE_SELECT 1
++| #define HAVE_SOCKET 1
++| #define HAVE_STRCASECMP 1
++| #define HAVE_STRCHR 1
++| #define HAVE_STRDUP 1
++| #define HAVE_STRERROR 1
++| #define HAVE_STRRCHR 1
++| #define HAVE_STRTOL 1
++| #define HAVE_STRTOUL 1
++| #define HAVE_SIGPROCMASK 1
++| /* end confdefs.h.  */
++| #include <stdio.h>
++| #ifdef HAVE_SYS_TYPES_H
++| # include <sys/types.h>
++| #endif
++| #ifdef HAVE_SYS_STAT_H
++| # include <sys/stat.h>
++| #endif
++| #ifdef STDC_HEADERS
++| # include <stdlib.h>
++| # include <stddef.h>
++| #else
++| # ifdef HAVE_STDLIB_H
++| #  include <stdlib.h>
++| # endif
++| #endif
++| #ifdef HAVE_STRING_H
++| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++| #  include <memory.h>
++| # endif
++| # include <string.h>
++| #endif
++| #ifdef HAVE_STRINGS_H
++| # include <strings.h>
++| #endif
++| #ifdef HAVE_INTTYPES_H
++| # include <inttypes.h>
++| #endif
++| #ifdef HAVE_STDINT_H
++| # include <stdint.h>
++| #endif
++| #ifdef HAVE_UNISTD_H
++| # include <unistd.h>
++| #endif
++| int
++| main ()
++| {
++| static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= 1)];
++| test_array [0] = 0
++| 
++|   ;
++|   return 0;
++| }
++configure:19861: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:19861: $? = 0
++configure:19861: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:19861: $? = 0
++configure:19876: result: 2
++configure:19890: checking size of int
++configure:19895: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:19895: $? = 0
++configure:19895: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++conftest.c: In function 'main':
++conftest.c:149:12: error: size of array 'test_array' is negative
++configure:19895: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| #define TIME_WITH_SYS_TIME 1
++| #define HAVE_ALLOCA_H 1
++| #define HAVE_ALLOCA 1
++| #define HAVE_DIRENT_H 1
++| #define CLOSEDIR_VOID 1
++| #define HAVE_FORK 1
++| #define HAVE_VFORK 1
++| #define HAVE_WORKING_VFORK 1
++| #define HAVE_WORKING_FORK 1
++| #define GETGROUPS_T gid_t
++| #define HAVE_GETMNTENT 1
++| #define HAVE_LSTAT_EMPTY_STRING_BUG 1
++| #define HAVE_SYS_SELECT_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define SELECT_TYPE_ARG1 int
++| #define SELECT_TYPE_ARG234 (fd_set *)
++| #define SELECT_TYPE_ARG5 (struct timeval *)
++| #define RETSIGTYPE void
++| #define HAVE_STAT_EMPTY_STRING_BUG 1
++| #define HAVE_VPRINTF 1
++| #define HAVE_ALARM 1
++| #define HAVE_ATEXIT 1
++| #define HAVE_DUP2 1
++| #define HAVE_FDATASYNC 1
++| #define HAVE_FTRUNCATE 1
++| #define HAVE_GETCWD 1
++| #define HAVE_GETHOSTBYADDR 1
++| #define HAVE_GETHOSTBYNAME 1
++| #define HAVE_GETHOSTNAME 1
++| #define HAVE_GETMNTENT 1
++| #define HAVE_GETNAMEINFO 1
++| #define HAVE_GETRPCBYNAME 1
++| #define HAVE_GETIFADDRS 1
++| #define HAVE_GETTIMEOFDAY 1
++| #define HAVE_HASMNTOPT 1
++| #define HAVE_INET_NTOA 1
++| #define HAVE_MEMSET 1
++| #define HAVE_MKDIR 1
++| #define HAVE_PATHCONF 1
++| #define HAVE_REALPATH 1
++| #define HAVE_RMDIR 1
++| #define HAVE_SELECT 1
++| #define HAVE_SOCKET 1
++| #define HAVE_STRCASECMP 1
++| #define HAVE_STRCHR 1
++| #define HAVE_STRDUP 1
++| #define HAVE_STRERROR 1
++| #define HAVE_STRRCHR 1
++| #define HAVE_STRTOL 1
++| #define HAVE_STRTOUL 1
++| #define HAVE_SIGPROCMASK 1
++| #define SIZEOF_SHORT 2
++| /* end confdefs.h.  */
++| #include <stdio.h>
++| #ifdef HAVE_SYS_TYPES_H
++| # include <sys/types.h>
++| #endif
++| #ifdef HAVE_SYS_STAT_H
++| # include <sys/stat.h>
++| #endif
++| #ifdef STDC_HEADERS
++| # include <stdlib.h>
++| # include <stddef.h>
++| #else
++| # ifdef HAVE_STDLIB_H
++| #  include <stdlib.h>
++| # endif
++| #endif
++| #ifdef HAVE_STRING_H
++| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++| #  include <memory.h>
++| # endif
++| # include <string.h>
++| #endif
++| #ifdef HAVE_STRINGS_H
++| # include <strings.h>
++| #endif
++| #ifdef HAVE_INTTYPES_H
++| # include <inttypes.h>
++| #endif
++| #ifdef HAVE_STDINT_H
++| # include <stdint.h>
++| #endif
++| #ifdef HAVE_UNISTD_H
++| # include <unistd.h>
++| #endif
++| int
++| main ()
++| {
++| static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= 0)];
++| test_array [0] = 0
++| 
++|   ;
++|   return 0;
++| }
++configure:19895: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++conftest.c: In function 'main':
++conftest.c:149:12: error: size of array 'test_array' is negative
++configure:19895: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| #define TIME_WITH_SYS_TIME 1
++| #define HAVE_ALLOCA_H 1
++| #define HAVE_ALLOCA 1
++| #define HAVE_DIRENT_H 1
++| #define CLOSEDIR_VOID 1
++| #define HAVE_FORK 1
++| #define HAVE_VFORK 1
++| #define HAVE_WORKING_VFORK 1
++| #define HAVE_WORKING_FORK 1
++| #define GETGROUPS_T gid_t
++| #define HAVE_GETMNTENT 1
++| #define HAVE_LSTAT_EMPTY_STRING_BUG 1
++| #define HAVE_SYS_SELECT_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define SELECT_TYPE_ARG1 int
++| #define SELECT_TYPE_ARG234 (fd_set *)
++| #define SELECT_TYPE_ARG5 (struct timeval *)
++| #define RETSIGTYPE void
++| #define HAVE_STAT_EMPTY_STRING_BUG 1
++| #define HAVE_VPRINTF 1
++| #define HAVE_ALARM 1
++| #define HAVE_ATEXIT 1
++| #define HAVE_DUP2 1
++| #define HAVE_FDATASYNC 1
++| #define HAVE_FTRUNCATE 1
++| #define HAVE_GETCWD 1
++| #define HAVE_GETHOSTBYADDR 1
++| #define HAVE_GETHOSTBYNAME 1
++| #define HAVE_GETHOSTNAME 1
++| #define HAVE_GETMNTENT 1
++| #define HAVE_GETNAMEINFO 1
++| #define HAVE_GETRPCBYNAME 1
++| #define HAVE_GETIFADDRS 1
++| #define HAVE_GETTIMEOFDAY 1
++| #define HAVE_HASMNTOPT 1
++| #define HAVE_INET_NTOA 1
++| #define HAVE_MEMSET 1
++| #define HAVE_MKDIR 1
++| #define HAVE_PATHCONF 1
++| #define HAVE_REALPATH 1
++| #define HAVE_RMDIR 1
++| #define HAVE_SELECT 1
++| #define HAVE_SOCKET 1
++| #define HAVE_STRCASECMP 1
++| #define HAVE_STRCHR 1
++| #define HAVE_STRDUP 1
++| #define HAVE_STRERROR 1
++| #define HAVE_STRRCHR 1
++| #define HAVE_STRTOL 1
++| #define HAVE_STRTOUL 1
++| #define HAVE_SIGPROCMASK 1
++| #define SIZEOF_SHORT 2
++| /* end confdefs.h.  */
++| #include <stdio.h>
++| #ifdef HAVE_SYS_TYPES_H
++| # include <sys/types.h>
++| #endif
++| #ifdef HAVE_SYS_STAT_H
++| # include <sys/stat.h>
++| #endif
++| #ifdef STDC_HEADERS
++| # include <stdlib.h>
++| # include <stddef.h>
++| #else
++| # ifdef HAVE_STDLIB_H
++| #  include <stdlib.h>
++| # endif
++| #endif
++| #ifdef HAVE_STRING_H
++| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++| #  include <memory.h>
++| # endif
++| # include <string.h>
++| #endif
++| #ifdef HAVE_STRINGS_H
++| # include <strings.h>
++| #endif
++| #ifdef HAVE_INTTYPES_H
++| # include <inttypes.h>
++| #endif
++| #ifdef HAVE_STDINT_H
++| # include <stdint.h>
++| #endif
++| #ifdef HAVE_UNISTD_H
++| # include <unistd.h>
++| #endif
++| int
++| main ()
++| {
++| static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= 1)];
++| test_array [0] = 0
++| 
++|   ;
++|   return 0;
++| }
++configure:19895: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++conftest.c: In function 'main':
++conftest.c:149:12: error: size of array 'test_array' is negative
++configure:19895: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| #define TIME_WITH_SYS_TIME 1
++| #define HAVE_ALLOCA_H 1
++| #define HAVE_ALLOCA 1
++| #define HAVE_DIRENT_H 1
++| #define CLOSEDIR_VOID 1
++| #define HAVE_FORK 1
++| #define HAVE_VFORK 1
++| #define HAVE_WORKING_VFORK 1
++| #define HAVE_WORKING_FORK 1
++| #define GETGROUPS_T gid_t
++| #define HAVE_GETMNTENT 1
++| #define HAVE_LSTAT_EMPTY_STRING_BUG 1
++| #define HAVE_SYS_SELECT_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define SELECT_TYPE_ARG1 int
++| #define SELECT_TYPE_ARG234 (fd_set *)
++| #define SELECT_TYPE_ARG5 (struct timeval *)
++| #define RETSIGTYPE void
++| #define HAVE_STAT_EMPTY_STRING_BUG 1
++| #define HAVE_VPRINTF 1
++| #define HAVE_ALARM 1
++| #define HAVE_ATEXIT 1
++| #define HAVE_DUP2 1
++| #define HAVE_FDATASYNC 1
++| #define HAVE_FTRUNCATE 1
++| #define HAVE_GETCWD 1
++| #define HAVE_GETHOSTBYADDR 1
++| #define HAVE_GETHOSTBYNAME 1
++| #define HAVE_GETHOSTNAME 1
++| #define HAVE_GETMNTENT 1
++| #define HAVE_GETNAMEINFO 1
++| #define HAVE_GETRPCBYNAME 1
++| #define HAVE_GETIFADDRS 1
++| #define HAVE_GETTIMEOFDAY 1
++| #define HAVE_HASMNTOPT 1
++| #define HAVE_INET_NTOA 1
++| #define HAVE_MEMSET 1
++| #define HAVE_MKDIR 1
++| #define HAVE_PATHCONF 1
++| #define HAVE_REALPATH 1
++| #define HAVE_RMDIR 1
++| #define HAVE_SELECT 1
++| #define HAVE_SOCKET 1
++| #define HAVE_STRCASECMP 1
++| #define HAVE_STRCHR 1
++| #define HAVE_STRDUP 1
++| #define HAVE_STRERROR 1
++| #define HAVE_STRRCHR 1
++| #define HAVE_STRTOL 1
++| #define HAVE_STRTOUL 1
++| #define HAVE_SIGPROCMASK 1
++| #define SIZEOF_SHORT 2
++| /* end confdefs.h.  */
++| #include <stdio.h>
++| #ifdef HAVE_SYS_TYPES_H
++| # include <sys/types.h>
++| #endif
++| #ifdef HAVE_SYS_STAT_H
++| # include <sys/stat.h>
++| #endif
++| #ifdef STDC_HEADERS
++| # include <stdlib.h>
++| # include <stddef.h>
++| #else
++| # ifdef HAVE_STDLIB_H
++| #  include <stdlib.h>
++| # endif
++| #endif
++| #ifdef HAVE_STRING_H
++| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++| #  include <memory.h>
++| # endif
++| # include <string.h>
++| #endif
++| #ifdef HAVE_STRINGS_H
++| # include <strings.h>
++| #endif
++| #ifdef HAVE_INTTYPES_H
++| # include <inttypes.h>
++| #endif
++| #ifdef HAVE_STDINT_H
++| # include <stdint.h>
++| #endif
++| #ifdef HAVE_UNISTD_H
++| # include <unistd.h>
++| #endif
++| int
++| main ()
++| {
++| static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= 3)];
++| test_array [0] = 0
++| 
++|   ;
++|   return 0;
++| }
++configure:19895: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:19895: $? = 0
++configure:19895: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:19895: $? = 0
++configure:19895: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:19895: $? = 0
++configure:19910: result: 4
++configure:19924: checking size of long
++configure:19929: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:19929: $? = 0
++configure:19929: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++conftest.c: In function 'main':
++conftest.c:150:12: error: size of array 'test_array' is negative
++configure:19929: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| #define TIME_WITH_SYS_TIME 1
++| #define HAVE_ALLOCA_H 1
++| #define HAVE_ALLOCA 1
++| #define HAVE_DIRENT_H 1
++| #define CLOSEDIR_VOID 1
++| #define HAVE_FORK 1
++| #define HAVE_VFORK 1
++| #define HAVE_WORKING_VFORK 1
++| #define HAVE_WORKING_FORK 1
++| #define GETGROUPS_T gid_t
++| #define HAVE_GETMNTENT 1
++| #define HAVE_LSTAT_EMPTY_STRING_BUG 1
++| #define HAVE_SYS_SELECT_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define SELECT_TYPE_ARG1 int
++| #define SELECT_TYPE_ARG234 (fd_set *)
++| #define SELECT_TYPE_ARG5 (struct timeval *)
++| #define RETSIGTYPE void
++| #define HAVE_STAT_EMPTY_STRING_BUG 1
++| #define HAVE_VPRINTF 1
++| #define HAVE_ALARM 1
++| #define HAVE_ATEXIT 1
++| #define HAVE_DUP2 1
++| #define HAVE_FDATASYNC 1
++| #define HAVE_FTRUNCATE 1
++| #define HAVE_GETCWD 1
++| #define HAVE_GETHOSTBYADDR 1
++| #define HAVE_GETHOSTBYNAME 1
++| #define HAVE_GETHOSTNAME 1
++| #define HAVE_GETMNTENT 1
++| #define HAVE_GETNAMEINFO 1
++| #define HAVE_GETRPCBYNAME 1
++| #define HAVE_GETIFADDRS 1
++| #define HAVE_GETTIMEOFDAY 1
++| #define HAVE_HASMNTOPT 1
++| #define HAVE_INET_NTOA 1
++| #define HAVE_MEMSET 1
++| #define HAVE_MKDIR 1
++| #define HAVE_PATHCONF 1
++| #define HAVE_REALPATH 1
++| #define HAVE_RMDIR 1
++| #define HAVE_SELECT 1
++| #define HAVE_SOCKET 1
++| #define HAVE_STRCASECMP 1
++| #define HAVE_STRCHR 1
++| #define HAVE_STRDUP 1
++| #define HAVE_STRERROR 1
++| #define HAVE_STRRCHR 1
++| #define HAVE_STRTOL 1
++| #define HAVE_STRTOUL 1
++| #define HAVE_SIGPROCMASK 1
++| #define SIZEOF_SHORT 2
++| #define SIZEOF_INT 4
++| /* end confdefs.h.  */
++| #include <stdio.h>
++| #ifdef HAVE_SYS_TYPES_H
++| # include <sys/types.h>
++| #endif
++| #ifdef HAVE_SYS_STAT_H
++| # include <sys/stat.h>
++| #endif
++| #ifdef STDC_HEADERS
++| # include <stdlib.h>
++| # include <stddef.h>
++| #else
++| # ifdef HAVE_STDLIB_H
++| #  include <stdlib.h>
++| # endif
++| #endif
++| #ifdef HAVE_STRING_H
++| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++| #  include <memory.h>
++| # endif
++| # include <string.h>
++| #endif
++| #ifdef HAVE_STRINGS_H
++| # include <strings.h>
++| #endif
++| #ifdef HAVE_INTTYPES_H
++| # include <inttypes.h>
++| #endif
++| #ifdef HAVE_STDINT_H
++| # include <stdint.h>
++| #endif
++| #ifdef HAVE_UNISTD_H
++| # include <unistd.h>
++| #endif
++| int
++| main ()
++| {
++| static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= 0)];
++| test_array [0] = 0
++| 
++|   ;
++|   return 0;
++| }
++configure:19929: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++conftest.c: In function 'main':
++conftest.c:150:12: error: size of array 'test_array' is negative
++configure:19929: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| #define TIME_WITH_SYS_TIME 1
++| #define HAVE_ALLOCA_H 1
++| #define HAVE_ALLOCA 1
++| #define HAVE_DIRENT_H 1
++| #define CLOSEDIR_VOID 1
++| #define HAVE_FORK 1
++| #define HAVE_VFORK 1
++| #define HAVE_WORKING_VFORK 1
++| #define HAVE_WORKING_FORK 1
++| #define GETGROUPS_T gid_t
++| #define HAVE_GETMNTENT 1
++| #define HAVE_LSTAT_EMPTY_STRING_BUG 1
++| #define HAVE_SYS_SELECT_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define SELECT_TYPE_ARG1 int
++| #define SELECT_TYPE_ARG234 (fd_set *)
++| #define SELECT_TYPE_ARG5 (struct timeval *)
++| #define RETSIGTYPE void
++| #define HAVE_STAT_EMPTY_STRING_BUG 1
++| #define HAVE_VPRINTF 1
++| #define HAVE_ALARM 1
++| #define HAVE_ATEXIT 1
++| #define HAVE_DUP2 1
++| #define HAVE_FDATASYNC 1
++| #define HAVE_FTRUNCATE 1
++| #define HAVE_GETCWD 1
++| #define HAVE_GETHOSTBYADDR 1
++| #define HAVE_GETHOSTBYNAME 1
++| #define HAVE_GETHOSTNAME 1
++| #define HAVE_GETMNTENT 1
++| #define HAVE_GETNAMEINFO 1
++| #define HAVE_GETRPCBYNAME 1
++| #define HAVE_GETIFADDRS 1
++| #define HAVE_GETTIMEOFDAY 1
++| #define HAVE_HASMNTOPT 1
++| #define HAVE_INET_NTOA 1
++| #define HAVE_MEMSET 1
++| #define HAVE_MKDIR 1
++| #define HAVE_PATHCONF 1
++| #define HAVE_REALPATH 1
++| #define HAVE_RMDIR 1
++| #define HAVE_SELECT 1
++| #define HAVE_SOCKET 1
++| #define HAVE_STRCASECMP 1
++| #define HAVE_STRCHR 1
++| #define HAVE_STRDUP 1
++| #define HAVE_STRERROR 1
++| #define HAVE_STRRCHR 1
++| #define HAVE_STRTOL 1
++| #define HAVE_STRTOUL 1
++| #define HAVE_SIGPROCMASK 1
++| #define SIZEOF_SHORT 2
++| #define SIZEOF_INT 4
++| /* end confdefs.h.  */
++| #include <stdio.h>
++| #ifdef HAVE_SYS_TYPES_H
++| # include <sys/types.h>
++| #endif
++| #ifdef HAVE_SYS_STAT_H
++| # include <sys/stat.h>
++| #endif
++| #ifdef STDC_HEADERS
++| # include <stdlib.h>
++| # include <stddef.h>
++| #else
++| # ifdef HAVE_STDLIB_H
++| #  include <stdlib.h>
++| # endif
++| #endif
++| #ifdef HAVE_STRING_H
++| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++| #  include <memory.h>
++| # endif
++| # include <string.h>
++| #endif
++| #ifdef HAVE_STRINGS_H
++| # include <strings.h>
++| #endif
++| #ifdef HAVE_INTTYPES_H
++| # include <inttypes.h>
++| #endif
++| #ifdef HAVE_STDINT_H
++| # include <stdint.h>
++| #endif
++| #ifdef HAVE_UNISTD_H
++| # include <unistd.h>
++| #endif
++| int
++| main ()
++| {
++| static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= 1)];
++| test_array [0] = 0
++| 
++|   ;
++|   return 0;
++| }
++configure:19929: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++conftest.c: In function 'main':
++conftest.c:150:12: error: size of array 'test_array' is negative
++configure:19929: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| #define TIME_WITH_SYS_TIME 1
++| #define HAVE_ALLOCA_H 1
++| #define HAVE_ALLOCA 1
++| #define HAVE_DIRENT_H 1
++| #define CLOSEDIR_VOID 1
++| #define HAVE_FORK 1
++| #define HAVE_VFORK 1
++| #define HAVE_WORKING_VFORK 1
++| #define HAVE_WORKING_FORK 1
++| #define GETGROUPS_T gid_t
++| #define HAVE_GETMNTENT 1
++| #define HAVE_LSTAT_EMPTY_STRING_BUG 1
++| #define HAVE_SYS_SELECT_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define SELECT_TYPE_ARG1 int
++| #define SELECT_TYPE_ARG234 (fd_set *)
++| #define SELECT_TYPE_ARG5 (struct timeval *)
++| #define RETSIGTYPE void
++| #define HAVE_STAT_EMPTY_STRING_BUG 1
++| #define HAVE_VPRINTF 1
++| #define HAVE_ALARM 1
++| #define HAVE_ATEXIT 1
++| #define HAVE_DUP2 1
++| #define HAVE_FDATASYNC 1
++| #define HAVE_FTRUNCATE 1
++| #define HAVE_GETCWD 1
++| #define HAVE_GETHOSTBYADDR 1
++| #define HAVE_GETHOSTBYNAME 1
++| #define HAVE_GETHOSTNAME 1
++| #define HAVE_GETMNTENT 1
++| #define HAVE_GETNAMEINFO 1
++| #define HAVE_GETRPCBYNAME 1
++| #define HAVE_GETIFADDRS 1
++| #define HAVE_GETTIMEOFDAY 1
++| #define HAVE_HASMNTOPT 1
++| #define HAVE_INET_NTOA 1
++| #define HAVE_MEMSET 1
++| #define HAVE_MKDIR 1
++| #define HAVE_PATHCONF 1
++| #define HAVE_REALPATH 1
++| #define HAVE_RMDIR 1
++| #define HAVE_SELECT 1
++| #define HAVE_SOCKET 1
++| #define HAVE_STRCASECMP 1
++| #define HAVE_STRCHR 1
++| #define HAVE_STRDUP 1
++| #define HAVE_STRERROR 1
++| #define HAVE_STRRCHR 1
++| #define HAVE_STRTOL 1
++| #define HAVE_STRTOUL 1
++| #define HAVE_SIGPROCMASK 1
++| #define SIZEOF_SHORT 2
++| #define SIZEOF_INT 4
++| /* end confdefs.h.  */
++| #include <stdio.h>
++| #ifdef HAVE_SYS_TYPES_H
++| # include <sys/types.h>
++| #endif
++| #ifdef HAVE_SYS_STAT_H
++| # include <sys/stat.h>
++| #endif
++| #ifdef STDC_HEADERS
++| # include <stdlib.h>
++| # include <stddef.h>
++| #else
++| # ifdef HAVE_STDLIB_H
++| #  include <stdlib.h>
++| # endif
++| #endif
++| #ifdef HAVE_STRING_H
++| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++| #  include <memory.h>
++| # endif
++| # include <string.h>
++| #endif
++| #ifdef HAVE_STRINGS_H
++| # include <strings.h>
++| #endif
++| #ifdef HAVE_INTTYPES_H
++| # include <inttypes.h>
++| #endif
++| #ifdef HAVE_STDINT_H
++| # include <stdint.h>
++| #endif
++| #ifdef HAVE_UNISTD_H
++| # include <unistd.h>
++| #endif
++| int
++| main ()
++| {
++| static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= 3)];
++| test_array [0] = 0
++| 
++|   ;
++|   return 0;
++| }
++configure:19929: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:19929: $? = 0
++configure:19929: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:19929: $? = 0
++configure:19929: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:19929: $? = 0
++configure:19944: result: 4
++configure:19958: checking size of size_t
++configure:19963: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:19963: $? = 0
++configure:19963: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++conftest.c: In function 'main':
++conftest.c:151:12: error: size of array 'test_array' is negative
++configure:19963: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| #define TIME_WITH_SYS_TIME 1
++| #define HAVE_ALLOCA_H 1
++| #define HAVE_ALLOCA 1
++| #define HAVE_DIRENT_H 1
++| #define CLOSEDIR_VOID 1
++| #define HAVE_FORK 1
++| #define HAVE_VFORK 1
++| #define HAVE_WORKING_VFORK 1
++| #define HAVE_WORKING_FORK 1
++| #define GETGROUPS_T gid_t
++| #define HAVE_GETMNTENT 1
++| #define HAVE_LSTAT_EMPTY_STRING_BUG 1
++| #define HAVE_SYS_SELECT_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define SELECT_TYPE_ARG1 int
++| #define SELECT_TYPE_ARG234 (fd_set *)
++| #define SELECT_TYPE_ARG5 (struct timeval *)
++| #define RETSIGTYPE void
++| #define HAVE_STAT_EMPTY_STRING_BUG 1
++| #define HAVE_VPRINTF 1
++| #define HAVE_ALARM 1
++| #define HAVE_ATEXIT 1
++| #define HAVE_DUP2 1
++| #define HAVE_FDATASYNC 1
++| #define HAVE_FTRUNCATE 1
++| #define HAVE_GETCWD 1
++| #define HAVE_GETHOSTBYADDR 1
++| #define HAVE_GETHOSTBYNAME 1
++| #define HAVE_GETHOSTNAME 1
++| #define HAVE_GETMNTENT 1
++| #define HAVE_GETNAMEINFO 1
++| #define HAVE_GETRPCBYNAME 1
++| #define HAVE_GETIFADDRS 1
++| #define HAVE_GETTIMEOFDAY 1
++| #define HAVE_HASMNTOPT 1
++| #define HAVE_INET_NTOA 1
++| #define HAVE_MEMSET 1
++| #define HAVE_MKDIR 1
++| #define HAVE_PATHCONF 1
++| #define HAVE_REALPATH 1
++| #define HAVE_RMDIR 1
++| #define HAVE_SELECT 1
++| #define HAVE_SOCKET 1
++| #define HAVE_STRCASECMP 1
++| #define HAVE_STRCHR 1
++| #define HAVE_STRDUP 1
++| #define HAVE_STRERROR 1
++| #define HAVE_STRRCHR 1
++| #define HAVE_STRTOL 1
++| #define HAVE_STRTOUL 1
++| #define HAVE_SIGPROCMASK 1
++| #define SIZEOF_SHORT 2
++| #define SIZEOF_INT 4
++| #define SIZEOF_LONG 4
++| /* end confdefs.h.  */
++| #include <stdio.h>
++| #ifdef HAVE_SYS_TYPES_H
++| # include <sys/types.h>
++| #endif
++| #ifdef HAVE_SYS_STAT_H
++| # include <sys/stat.h>
++| #endif
++| #ifdef STDC_HEADERS
++| # include <stdlib.h>
++| # include <stddef.h>
++| #else
++| # ifdef HAVE_STDLIB_H
++| #  include <stdlib.h>
++| # endif
++| #endif
++| #ifdef HAVE_STRING_H
++| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++| #  include <memory.h>
++| # endif
++| # include <string.h>
++| #endif
++| #ifdef HAVE_STRINGS_H
++| # include <strings.h>
++| #endif
++| #ifdef HAVE_INTTYPES_H
++| # include <inttypes.h>
++| #endif
++| #ifdef HAVE_STDINT_H
++| # include <stdint.h>
++| #endif
++| #ifdef HAVE_UNISTD_H
++| # include <unistd.h>
++| #endif
++| int
++| main ()
++| {
++| static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= 0)];
++| test_array [0] = 0
++| 
++|   ;
++|   return 0;
++| }
++configure:19963: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++conftest.c: In function 'main':
++conftest.c:151:12: error: size of array 'test_array' is negative
++configure:19963: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| #define TIME_WITH_SYS_TIME 1
++| #define HAVE_ALLOCA_H 1
++| #define HAVE_ALLOCA 1
++| #define HAVE_DIRENT_H 1
++| #define CLOSEDIR_VOID 1
++| #define HAVE_FORK 1
++| #define HAVE_VFORK 1
++| #define HAVE_WORKING_VFORK 1
++| #define HAVE_WORKING_FORK 1
++| #define GETGROUPS_T gid_t
++| #define HAVE_GETMNTENT 1
++| #define HAVE_LSTAT_EMPTY_STRING_BUG 1
++| #define HAVE_SYS_SELECT_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define SELECT_TYPE_ARG1 int
++| #define SELECT_TYPE_ARG234 (fd_set *)
++| #define SELECT_TYPE_ARG5 (struct timeval *)
++| #define RETSIGTYPE void
++| #define HAVE_STAT_EMPTY_STRING_BUG 1
++| #define HAVE_VPRINTF 1
++| #define HAVE_ALARM 1
++| #define HAVE_ATEXIT 1
++| #define HAVE_DUP2 1
++| #define HAVE_FDATASYNC 1
++| #define HAVE_FTRUNCATE 1
++| #define HAVE_GETCWD 1
++| #define HAVE_GETHOSTBYADDR 1
++| #define HAVE_GETHOSTBYNAME 1
++| #define HAVE_GETHOSTNAME 1
++| #define HAVE_GETMNTENT 1
++| #define HAVE_GETNAMEINFO 1
++| #define HAVE_GETRPCBYNAME 1
++| #define HAVE_GETIFADDRS 1
++| #define HAVE_GETTIMEOFDAY 1
++| #define HAVE_HASMNTOPT 1
++| #define HAVE_INET_NTOA 1
++| #define HAVE_MEMSET 1
++| #define HAVE_MKDIR 1
++| #define HAVE_PATHCONF 1
++| #define HAVE_REALPATH 1
++| #define HAVE_RMDIR 1
++| #define HAVE_SELECT 1
++| #define HAVE_SOCKET 1
++| #define HAVE_STRCASECMP 1
++| #define HAVE_STRCHR 1
++| #define HAVE_STRDUP 1
++| #define HAVE_STRERROR 1
++| #define HAVE_STRRCHR 1
++| #define HAVE_STRTOL 1
++| #define HAVE_STRTOUL 1
++| #define HAVE_SIGPROCMASK 1
++| #define SIZEOF_SHORT 2
++| #define SIZEOF_INT 4
++| #define SIZEOF_LONG 4
++| /* end confdefs.h.  */
++| #include <stdio.h>
++| #ifdef HAVE_SYS_TYPES_H
++| # include <sys/types.h>
++| #endif
++| #ifdef HAVE_SYS_STAT_H
++| # include <sys/stat.h>
++| #endif
++| #ifdef STDC_HEADERS
++| # include <stdlib.h>
++| # include <stddef.h>
++| #else
++| # ifdef HAVE_STDLIB_H
++| #  include <stdlib.h>
++| # endif
++| #endif
++| #ifdef HAVE_STRING_H
++| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++| #  include <memory.h>
++| # endif
++| # include <string.h>
++| #endif
++| #ifdef HAVE_STRINGS_H
++| # include <strings.h>
++| #endif
++| #ifdef HAVE_INTTYPES_H
++| # include <inttypes.h>
++| #endif
++| #ifdef HAVE_STDINT_H
++| # include <stdint.h>
++| #endif
++| #ifdef HAVE_UNISTD_H
++| # include <unistd.h>
++| #endif
++| int
++| main ()
++| {
++| static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= 1)];
++| test_array [0] = 0
++| 
++|   ;
++|   return 0;
++| }
++configure:19963: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++conftest.c: In function 'main':
++conftest.c:151:12: error: size of array 'test_array' is negative
++configure:19963: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| #define TIME_WITH_SYS_TIME 1
++| #define HAVE_ALLOCA_H 1
++| #define HAVE_ALLOCA 1
++| #define HAVE_DIRENT_H 1
++| #define CLOSEDIR_VOID 1
++| #define HAVE_FORK 1
++| #define HAVE_VFORK 1
++| #define HAVE_WORKING_VFORK 1
++| #define HAVE_WORKING_FORK 1
++| #define GETGROUPS_T gid_t
++| #define HAVE_GETMNTENT 1
++| #define HAVE_LSTAT_EMPTY_STRING_BUG 1
++| #define HAVE_SYS_SELECT_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define SELECT_TYPE_ARG1 int
++| #define SELECT_TYPE_ARG234 (fd_set *)
++| #define SELECT_TYPE_ARG5 (struct timeval *)
++| #define RETSIGTYPE void
++| #define HAVE_STAT_EMPTY_STRING_BUG 1
++| #define HAVE_VPRINTF 1
++| #define HAVE_ALARM 1
++| #define HAVE_ATEXIT 1
++| #define HAVE_DUP2 1
++| #define HAVE_FDATASYNC 1
++| #define HAVE_FTRUNCATE 1
++| #define HAVE_GETCWD 1
++| #define HAVE_GETHOSTBYADDR 1
++| #define HAVE_GETHOSTBYNAME 1
++| #define HAVE_GETHOSTNAME 1
++| #define HAVE_GETMNTENT 1
++| #define HAVE_GETNAMEINFO 1
++| #define HAVE_GETRPCBYNAME 1
++| #define HAVE_GETIFADDRS 1
++| #define HAVE_GETTIMEOFDAY 1
++| #define HAVE_HASMNTOPT 1
++| #define HAVE_INET_NTOA 1
++| #define HAVE_MEMSET 1
++| #define HAVE_MKDIR 1
++| #define HAVE_PATHCONF 1
++| #define HAVE_REALPATH 1
++| #define HAVE_RMDIR 1
++| #define HAVE_SELECT 1
++| #define HAVE_SOCKET 1
++| #define HAVE_STRCASECMP 1
++| #define HAVE_STRCHR 1
++| #define HAVE_STRDUP 1
++| #define HAVE_STRERROR 1
++| #define HAVE_STRRCHR 1
++| #define HAVE_STRTOL 1
++| #define HAVE_STRTOUL 1
++| #define HAVE_SIGPROCMASK 1
++| #define SIZEOF_SHORT 2
++| #define SIZEOF_INT 4
++| #define SIZEOF_LONG 4
++| /* end confdefs.h.  */
++| #include <stdio.h>
++| #ifdef HAVE_SYS_TYPES_H
++| # include <sys/types.h>
++| #endif
++| #ifdef HAVE_SYS_STAT_H
++| # include <sys/stat.h>
++| #endif
++| #ifdef STDC_HEADERS
++| # include <stdlib.h>
++| # include <stddef.h>
++| #else
++| # ifdef HAVE_STDLIB_H
++| #  include <stdlib.h>
++| # endif
++| #endif
++| #ifdef HAVE_STRING_H
++| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++| #  include <memory.h>
++| # endif
++| # include <string.h>
++| #endif
++| #ifdef HAVE_STRINGS_H
++| # include <strings.h>
++| #endif
++| #ifdef HAVE_INTTYPES_H
++| # include <inttypes.h>
++| #endif
++| #ifdef HAVE_STDINT_H
++| # include <stdint.h>
++| #endif
++| #ifdef HAVE_UNISTD_H
++| # include <unistd.h>
++| #endif
++| int
++| main ()
++| {
++| static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= 3)];
++| test_array [0] = 0
++| 
++|   ;
++|   return 0;
++| }
++configure:19963: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:19963: $? = 0
++configure:19963: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:19963: $? = 0
++configure:19963: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:19963: $? = 0
++configure:19978: result: 4
++configure:19992: checking size of socklen_t
++configure:19997: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:19997: $? = 0
++configure:19997: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++conftest.c: In function 'main':
++conftest.c:152:12: error: size of array 'test_array' is negative
++configure:19997: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| #define TIME_WITH_SYS_TIME 1
++| #define HAVE_ALLOCA_H 1
++| #define HAVE_ALLOCA 1
++| #define HAVE_DIRENT_H 1
++| #define CLOSEDIR_VOID 1
++| #define HAVE_FORK 1
++| #define HAVE_VFORK 1
++| #define HAVE_WORKING_VFORK 1
++| #define HAVE_WORKING_FORK 1
++| #define GETGROUPS_T gid_t
++| #define HAVE_GETMNTENT 1
++| #define HAVE_LSTAT_EMPTY_STRING_BUG 1
++| #define HAVE_SYS_SELECT_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define SELECT_TYPE_ARG1 int
++| #define SELECT_TYPE_ARG234 (fd_set *)
++| #define SELECT_TYPE_ARG5 (struct timeval *)
++| #define RETSIGTYPE void
++| #define HAVE_STAT_EMPTY_STRING_BUG 1
++| #define HAVE_VPRINTF 1
++| #define HAVE_ALARM 1
++| #define HAVE_ATEXIT 1
++| #define HAVE_DUP2 1
++| #define HAVE_FDATASYNC 1
++| #define HAVE_FTRUNCATE 1
++| #define HAVE_GETCWD 1
++| #define HAVE_GETHOSTBYADDR 1
++| #define HAVE_GETHOSTBYNAME 1
++| #define HAVE_GETHOSTNAME 1
++| #define HAVE_GETMNTENT 1
++| #define HAVE_GETNAMEINFO 1
++| #define HAVE_GETRPCBYNAME 1
++| #define HAVE_GETIFADDRS 1
++| #define HAVE_GETTIMEOFDAY 1
++| #define HAVE_HASMNTOPT 1
++| #define HAVE_INET_NTOA 1
++| #define HAVE_MEMSET 1
++| #define HAVE_MKDIR 1
++| #define HAVE_PATHCONF 1
++| #define HAVE_REALPATH 1
++| #define HAVE_RMDIR 1
++| #define HAVE_SELECT 1
++| #define HAVE_SOCKET 1
++| #define HAVE_STRCASECMP 1
++| #define HAVE_STRCHR 1
++| #define HAVE_STRDUP 1
++| #define HAVE_STRERROR 1
++| #define HAVE_STRRCHR 1
++| #define HAVE_STRTOL 1
++| #define HAVE_STRTOUL 1
++| #define HAVE_SIGPROCMASK 1
++| #define SIZEOF_SHORT 2
++| #define SIZEOF_INT 4
++| #define SIZEOF_LONG 4
++| #define SIZEOF_SIZE_T 4
++| /* end confdefs.h.  */
++| #include <stdio.h>
++| #ifdef HAVE_SYS_TYPES_H
++| # include <sys/types.h>
++| #endif
++| #ifdef HAVE_SYS_STAT_H
++| # include <sys/stat.h>
++| #endif
++| #ifdef STDC_HEADERS
++| # include <stdlib.h>
++| # include <stddef.h>
++| #else
++| # ifdef HAVE_STDLIB_H
++| #  include <stdlib.h>
++| # endif
++| #endif
++| #ifdef HAVE_STRING_H
++| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++| #  include <memory.h>
++| # endif
++| # include <string.h>
++| #endif
++| #ifdef HAVE_STRINGS_H
++| # include <strings.h>
++| #endif
++| #ifdef HAVE_INTTYPES_H
++| # include <inttypes.h>
++| #endif
++| #ifdef HAVE_STDINT_H
++| # include <stdint.h>
++| #endif
++| #ifdef HAVE_UNISTD_H
++| # include <unistd.h>
++| #endif
++| int
++| main ()
++| {
++| static int test_array [1 - 2 * !(((long int) (sizeof (socklen_t))) <= 0)];
++| test_array [0] = 0
++| 
++|   ;
++|   return 0;
++| }
++configure:19997: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++conftest.c: In function 'main':
++conftest.c:152:12: error: size of array 'test_array' is negative
++configure:19997: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| #define TIME_WITH_SYS_TIME 1
++| #define HAVE_ALLOCA_H 1
++| #define HAVE_ALLOCA 1
++| #define HAVE_DIRENT_H 1
++| #define CLOSEDIR_VOID 1
++| #define HAVE_FORK 1
++| #define HAVE_VFORK 1
++| #define HAVE_WORKING_VFORK 1
++| #define HAVE_WORKING_FORK 1
++| #define GETGROUPS_T gid_t
++| #define HAVE_GETMNTENT 1
++| #define HAVE_LSTAT_EMPTY_STRING_BUG 1
++| #define HAVE_SYS_SELECT_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define SELECT_TYPE_ARG1 int
++| #define SELECT_TYPE_ARG234 (fd_set *)
++| #define SELECT_TYPE_ARG5 (struct timeval *)
++| #define RETSIGTYPE void
++| #define HAVE_STAT_EMPTY_STRING_BUG 1
++| #define HAVE_VPRINTF 1
++| #define HAVE_ALARM 1
++| #define HAVE_ATEXIT 1
++| #define HAVE_DUP2 1
++| #define HAVE_FDATASYNC 1
++| #define HAVE_FTRUNCATE 1
++| #define HAVE_GETCWD 1
++| #define HAVE_GETHOSTBYADDR 1
++| #define HAVE_GETHOSTBYNAME 1
++| #define HAVE_GETHOSTNAME 1
++| #define HAVE_GETMNTENT 1
++| #define HAVE_GETNAMEINFO 1
++| #define HAVE_GETRPCBYNAME 1
++| #define HAVE_GETIFADDRS 1
++| #define HAVE_GETTIMEOFDAY 1
++| #define HAVE_HASMNTOPT 1
++| #define HAVE_INET_NTOA 1
++| #define HAVE_MEMSET 1
++| #define HAVE_MKDIR 1
++| #define HAVE_PATHCONF 1
++| #define HAVE_REALPATH 1
++| #define HAVE_RMDIR 1
++| #define HAVE_SELECT 1
++| #define HAVE_SOCKET 1
++| #define HAVE_STRCASECMP 1
++| #define HAVE_STRCHR 1
++| #define HAVE_STRDUP 1
++| #define HAVE_STRERROR 1
++| #define HAVE_STRRCHR 1
++| #define HAVE_STRTOL 1
++| #define HAVE_STRTOUL 1
++| #define HAVE_SIGPROCMASK 1
++| #define SIZEOF_SHORT 2
++| #define SIZEOF_INT 4
++| #define SIZEOF_LONG 4
++| #define SIZEOF_SIZE_T 4
++| /* end confdefs.h.  */
++| #include <stdio.h>
++| #ifdef HAVE_SYS_TYPES_H
++| # include <sys/types.h>
++| #endif
++| #ifdef HAVE_SYS_STAT_H
++| # include <sys/stat.h>
++| #endif
++| #ifdef STDC_HEADERS
++| # include <stdlib.h>
++| # include <stddef.h>
++| #else
++| # ifdef HAVE_STDLIB_H
++| #  include <stdlib.h>
++| # endif
++| #endif
++| #ifdef HAVE_STRING_H
++| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++| #  include <memory.h>
++| # endif
++| # include <string.h>
++| #endif
++| #ifdef HAVE_STRINGS_H
++| # include <strings.h>
++| #endif
++| #ifdef HAVE_INTTYPES_H
++| # include <inttypes.h>
++| #endif
++| #ifdef HAVE_STDINT_H
++| # include <stdint.h>
++| #endif
++| #ifdef HAVE_UNISTD_H
++| # include <unistd.h>
++| #endif
++| int
++| main ()
++| {
++| static int test_array [1 - 2 * !(((long int) (sizeof (socklen_t))) <= 1)];
++| test_array [0] = 0
++| 
++|   ;
++|   return 0;
++| }
++configure:19997: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++conftest.c: In function 'main':
++conftest.c:152:12: error: size of array 'test_array' is negative
++configure:19997: $? = 1
++configure: failed program was:
++| /* confdefs.h */
++| #define PACKAGE_NAME "linux nfs-utils"
++| #define PACKAGE_TARNAME "nfs-utils"
++| #define PACKAGE_VERSION "1.2.3"
++| #define PACKAGE_STRING "linux nfs-utils 1.2.3"
++| #define PACKAGE_BUGREPORT "linux-nfs@vger.kernel.org"
++| #define PACKAGE_URL ""
++| #define PACKAGE "nfs-utils"
++| #define VERSION "1.2.3"
++| #define START_STATD "/usr/sbin/start-statd"
++| #define NFS3_SUPPORTED 1
++| #define NFS4_SUPPORTED 1
++| #define GSS_SUPPORTED 1
++| #define STDC_HEADERS 1
++| #define HAVE_SYS_TYPES_H 1
++| #define HAVE_SYS_STAT_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_STRINGS_H 1
++| #define HAVE_INTTYPES_H 1
++| #define HAVE_STDINT_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_LIBTIRPC 1
++| #define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++| #define _FILE_OFFSET_BITS 64
++| #define HAVE_DLFCN_H 1
++| #define LT_OBJDIR ".libs/"
++| #define STDC_HEADERS 1
++| #define HAVE_EVENT_H 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define HAVE_NFSIDMAP_H 1
++| #define HAVE_NFS4_SET_DEBUG 1
++| #define KRB5_VERSION 181
++| #define HAVE_KRB5 1
++| #define HAVE_DECL_AI_ADDRCONFIG 1
++| #define HAVE_ARPA_INET_H 1
++| #define HAVE_FCNTL_H 1
++| #define HAVE_LIBINTL_H 1
++| #define HAVE_LIMITS_H 1
++| #define HAVE_MALLOC_H 1
++| #define HAVE_MEMORY_H 1
++| #define HAVE_NETDB_H 1
++| #define HAVE_NETINET_IN_H 1
++| #define HAVE_PATHS_H 1
++| #define HAVE_STDLIB_H 1
++| #define HAVE_STRING_H 1
++| #define HAVE_SYS_FILE_H 1
++| #define HAVE_SYS_IOCTL_H 1
++| #define HAVE_SYS_MOUNT_H 1
++| #define HAVE_SYS_PARAM_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define HAVE_SYS_TIME_H 1
++| #define HAVE_SYS_VFS_H 1
++| #define HAVE_SYSLOG_H 1
++| #define HAVE_UNISTD_H 1
++| #define HAVE_ET_COM_ERR_H 1
++| #define HAVE_IFADDRS_H 1
++| #define TIME_WITH_SYS_TIME 1
++| #define HAVE_ALLOCA_H 1
++| #define HAVE_ALLOCA 1
++| #define HAVE_DIRENT_H 1
++| #define CLOSEDIR_VOID 1
++| #define HAVE_FORK 1
++| #define HAVE_VFORK 1
++| #define HAVE_WORKING_VFORK 1
++| #define HAVE_WORKING_FORK 1
++| #define GETGROUPS_T gid_t
++| #define HAVE_GETMNTENT 1
++| #define HAVE_LSTAT_EMPTY_STRING_BUG 1
++| #define HAVE_SYS_SELECT_H 1
++| #define HAVE_SYS_SOCKET_H 1
++| #define SELECT_TYPE_ARG1 int
++| #define SELECT_TYPE_ARG234 (fd_set *)
++| #define SELECT_TYPE_ARG5 (struct timeval *)
++| #define RETSIGTYPE void
++| #define HAVE_STAT_EMPTY_STRING_BUG 1
++| #define HAVE_VPRINTF 1
++| #define HAVE_ALARM 1
++| #define HAVE_ATEXIT 1
++| #define HAVE_DUP2 1
++| #define HAVE_FDATASYNC 1
++| #define HAVE_FTRUNCATE 1
++| #define HAVE_GETCWD 1
++| #define HAVE_GETHOSTBYADDR 1
++| #define HAVE_GETHOSTBYNAME 1
++| #define HAVE_GETHOSTNAME 1
++| #define HAVE_GETMNTENT 1
++| #define HAVE_GETNAMEINFO 1
++| #define HAVE_GETRPCBYNAME 1
++| #define HAVE_GETIFADDRS 1
++| #define HAVE_GETTIMEOFDAY 1
++| #define HAVE_HASMNTOPT 1
++| #define HAVE_INET_NTOA 1
++| #define HAVE_MEMSET 1
++| #define HAVE_MKDIR 1
++| #define HAVE_PATHCONF 1
++| #define HAVE_REALPATH 1
++| #define HAVE_RMDIR 1
++| #define HAVE_SELECT 1
++| #define HAVE_SOCKET 1
++| #define HAVE_STRCASECMP 1
++| #define HAVE_STRCHR 1
++| #define HAVE_STRDUP 1
++| #define HAVE_STRERROR 1
++| #define HAVE_STRRCHR 1
++| #define HAVE_STRTOL 1
++| #define HAVE_STRTOUL 1
++| #define HAVE_SIGPROCMASK 1
++| #define SIZEOF_SHORT 2
++| #define SIZEOF_INT 4
++| #define SIZEOF_LONG 4
++| #define SIZEOF_SIZE_T 4
++| /* end confdefs.h.  */
++| #include <stdio.h>
++| #ifdef HAVE_SYS_TYPES_H
++| # include <sys/types.h>
++| #endif
++| #ifdef HAVE_SYS_STAT_H
++| # include <sys/stat.h>
++| #endif
++| #ifdef STDC_HEADERS
++| # include <stdlib.h>
++| # include <stddef.h>
++| #else
++| # ifdef HAVE_STDLIB_H
++| #  include <stdlib.h>
++| # endif
++| #endif
++| #ifdef HAVE_STRING_H
++| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
++| #  include <memory.h>
++| # endif
++| # include <string.h>
++| #endif
++| #ifdef HAVE_STRINGS_H
++| # include <strings.h>
++| #endif
++| #ifdef HAVE_INTTYPES_H
++| # include <inttypes.h>
++| #endif
++| #ifdef HAVE_STDINT_H
++| # include <stdint.h>
++| #endif
++| #ifdef HAVE_UNISTD_H
++| # include <unistd.h>
++| #endif
++| int
++| main ()
++| {
++| static int test_array [1 - 2 * !(((long int) (sizeof (socklen_t))) <= 3)];
++| test_array [0] = 0
++| 
++|   ;
++|   return 0;
++| }
++configure:19997: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:19997: $? = 0
++configure:19997: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:19997: $? = 0
++configure:19997: /home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE conftest.c >&5
++configure:19997: $? = 0
++configure:20012: result: 4
++configure:20234: creating ./config.status
++
++## ---------------------- ##
++## Running config.status. ##
++## ---------------------- ##
++
++This file was extended by linux nfs-utils config.status 1.2.3, which was
++generated by GNU Autoconf 2.65.  Invocation command line was
++
++  CONFIG_FILES    = 
++  CONFIG_HEADERS  = 
++  CONFIG_LINKS    = 
++  CONFIG_COMMANDS = 
++  $ ./config.status 
++
++on chrom
++
++config.status:1313: creating Makefile
++config.status:1313: creating linux-nfs/Makefile
++config.status:1313: creating support/Makefile
++config.status:1313: creating support/export/Makefile
++config.status:1313: creating support/include/nfs/Makefile
++config.status:1313: creating support/include/rpcsvc/Makefile
++config.status:1313: creating support/include/sys/fs/Makefile
++config.status:1313: creating support/include/sys/Makefile
++config.status:1313: creating support/include/Makefile
++config.status:1313: creating support/misc/Makefile
++config.status:1313: creating support/nfs/Makefile
++config.status:1313: creating support/nsm/Makefile
++config.status:1313: creating tools/Makefile
++config.status:1313: creating tools/locktest/Makefile
++config.status:1313: creating tools/nlmtest/Makefile
++config.status:1313: creating tools/rpcdebug/Makefile
++config.status:1313: creating tools/rpcgen/Makefile
++config.status:1313: creating tools/mountstats/Makefile
++config.status:1313: creating tools/nfs-iostat/Makefile
++config.status:1313: creating utils/Makefile
++config.status:1313: creating utils/exportfs/Makefile
++config.status:1313: creating utils/gssd/Makefile
++config.status:1313: creating utils/idmapd/Makefile
++config.status:1313: creating utils/mount/Makefile
++config.status:1313: creating utils/mountd/Makefile
++config.status:1313: creating utils/nfsd/Makefile
++config.status:1313: creating utils/nfsstat/Makefile
++config.status:1313: creating utils/showmount/Makefile
++config.status:1313: creating utils/statd/Makefile
++config.status:1313: creating tests/Makefile
++config.status:1313: creating tests/nsm_client/Makefile
++config.status:1313: creating support/include/config.h
++config.status:1533: executing depfiles commands
++config.status:1533: executing libtool commands
++configure:22726: WARNING: unrecognized options: --disable-nls
+ 
+ ## ---------------- ##
+ ## Cache variables. ##
+ ## ---------------- ##
+ 
+-ac_cv_build=x86_64-unknown-linux-gnu
++ac_cv_build=x86_64-pc-linux-gnu
+ ac_cv_c_compiler_gnu=yes
++ac_cv_c_const=yes
++ac_cv_c_inline=inline
++ac_cv_cxx_compiler_gnu=yes
+ ac_cv_env_CCC_set=
+ ac_cv_env_CCC_value=
+-ac_cv_env_CC_set=
+-ac_cv_env_CC_value=
+-ac_cv_env_CFLAGS_set=
+-ac_cv_env_CFLAGS_value=
+-ac_cv_env_CPPFLAGS_set=
+-ac_cv_env_CPPFLAGS_value=
++ac_cv_env_CC_set=set
++ac_cv_env_CC_value=/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc
++ac_cv_env_CFLAGS_set=set
++ac_cv_env_CFLAGS_value='-march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe'
++ac_cv_env_CPPFLAGS_set=set
++ac_cv_env_CPPFLAGS_value=-I/home/wbx/adk/openadk/target_i686_uclibc/usr/include
+ ac_cv_env_CPP_set=
+ ac_cv_env_CPP_value=
+ ac_cv_env_CXXCPP_set=
+ ac_cv_env_CXXCPP_value=
+-ac_cv_env_CXXFLAGS_set=
++ac_cv_env_CXXFLAGS_set=set
+ ac_cv_env_CXXFLAGS_value=
+-ac_cv_env_CXX_set=
+-ac_cv_env_CXX_value=
++ac_cv_env_CXX_set=set
++ac_cv_env_CXX_value=/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++
+ ac_cv_env_GSSGLUE_CFLAGS_set=
+ ac_cv_env_GSSGLUE_CFLAGS_value=
+ ac_cv_env_GSSGLUE_LIBS_set=
+ ac_cv_env_GSSGLUE_LIBS_value=
+-ac_cv_env_LDFLAGS_set=
+-ac_cv_env_LDFLAGS_value=
+-ac_cv_env_LIBS_set=
+-ac_cv_env_LIBS_value=
++ac_cv_env_LDFLAGS_set=set
++ac_cv_env_LDFLAGS_value='-Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib'
++ac_cv_env_LIBS_set=set
++ac_cv_env_LIBS_value=-lrpcsecgss
+ ac_cv_env_PKG_CONFIG_set=
+ ac_cv_env_PKG_CONFIG_value=
+ ac_cv_env_RPCSECGSS_CFLAGS_set=
+ ac_cv_env_RPCSECGSS_CFLAGS_value=
+ ac_cv_env_RPCSECGSS_LIBS_set=
+ ac_cv_env_RPCSECGSS_LIBS_value=
+-ac_cv_env_build_alias_set=
+-ac_cv_env_build_alias_value=
+-ac_cv_env_host_alias_set=
+-ac_cv_env_host_alias_value=
+-ac_cv_env_target_alias_set=
+-ac_cv_env_target_alias_value=
++ac_cv_env_build_alias_set=set
++ac_cv_env_build_alias_value=x86_64-linux-gnu
++ac_cv_env_host_alias_set=set
++ac_cv_env_host_alias_value=i686-openadk-linux
++ac_cv_env_target_alias_set=set
++ac_cv_env_target_alias_value=i686-openadk-linux
++ac_cv_func__doprnt=no
++ac_cv_func_alarm=yes
++ac_cv_func_alloca_works=yes
++ac_cv_func_atexit=yes
++ac_cv_func_closedir_void=yes
++ac_cv_func_connect=yes
++ac_cv_func_dup2=yes
++ac_cv_func_fdatasync=yes
++ac_cv_func_fork=yes
++ac_cv_func_fork_works=yes
++ac_cv_func_ftruncate=yes
++ac_cv_func_getaddrinfo=yes
++ac_cv_func_getcwd=yes
++ac_cv_func_getgroups=yes
++ac_cv_func_getgroups_works=no
++ac_cv_func_gethostbyaddr=yes
++ac_cv_func_gethostbyname=yes
++ac_cv_func_gethostname=yes
++ac_cv_func_getifaddrs=yes
++ac_cv_func_getmntent=yes
++ac_cv_func_getnameinfo=yes
++ac_cv_func_getrpcbyname=yes
++ac_cv_func_getrpcbynumber=yes
++ac_cv_func_getservbyname=yes
++ac_cv_func_gettimeofday=yes
++ac_cv_func_hasmntopt=yes
++ac_cv_func_inet_ntoa=yes
++ac_cv_func_innetgr=no
++ac_cv_func_lstat_dereferences_slashed_symlink=no
++ac_cv_func_lstat_empty_string_bug=yes
++ac_cv_func_malloc_0_nonnull=yes
++ac_cv_func_memcmp_working=no
++ac_cv_func_memset=yes
++ac_cv_func_mkdir=yes
++ac_cv_func_pathconf=yes
++ac_cv_func_prctl=yes
++ac_cv_func_realloc_0_nonnull=yes
++ac_cv_func_realpath=yes
++ac_cv_func_rmdir=yes
++ac_cv_func_select=yes
++ac_cv_func_select_args='int,fd_set *,struct timeval *'
++ac_cv_func_sigprocmask=yes
++ac_cv_func_socket=yes
++ac_cv_func_stat_empty_string_bug=yes
++ac_cv_func_strcasecmp=yes
++ac_cv_func_strchr=yes
++ac_cv_func_strdup=yes
++ac_cv_func_strerror=yes
++ac_cv_func_strrchr=yes
++ac_cv_func_strtol=yes
++ac_cv_func_strtoul=yes
++ac_cv_func_vfork=yes
++ac_cv_func_vfork_works=yes
++ac_cv_func_vprintf=yes
++ac_cv_have_decl_AI_ADDRCONFIG=yes
++ac_cv_header__home_wbx_adk_openadk_target_i686_uclibc_usr_include_tirpc_netconfig_h=yes
++ac_cv_header_arpa_inet_h=yes
++ac_cv_header_com_err_h=no
++ac_cv_header_dirent_dirent_h=yes
++ac_cv_header_dlfcn_h=yes
++ac_cv_header_et_com_err_h=yes
++ac_cv_header_event_h=yes
++ac_cv_header_fcntl_h=yes
++ac_cv_header_ifaddrs_h=yes
+ ac_cv_header_inttypes_h=yes
++ac_cv_header_libintl_h=yes
++ac_cv_header_limits_h=yes
++ac_cv_header_malloc_h=yes
+ ac_cv_header_memory_h=yes
++ac_cv_header_netdb_h=yes
++ac_cv_header_netinet_in_h=yes
++ac_cv_header_nfsidmap_h=yes
++ac_cv_header_paths_h=yes
++ac_cv_header_spkm3_h=no
+ ac_cv_header_stdc=yes
+ ac_cv_header_stdint_h=yes
+ ac_cv_header_stdlib_h=yes
+ ac_cv_header_string_h=yes
+ ac_cv_header_strings_h=yes
++ac_cv_header_sys_capability_h=no
++ac_cv_header_sys_file_h=yes
++ac_cv_header_sys_ioctl_h=yes
++ac_cv_header_sys_mount_h=yes
++ac_cv_header_sys_param_h=yes
++ac_cv_header_sys_select_h=yes
++ac_cv_header_sys_socket_h=yes
+ ac_cv_header_sys_stat_h=yes
++ac_cv_header_sys_time_h=yes
+ ac_cv_header_sys_types_h=yes
++ac_cv_header_sys_types_h_makedev=yes
++ac_cv_header_sys_vfs_h=yes
++ac_cv_header_syslog_h=yes
++ac_cv_header_time=yes
+ ac_cv_header_unistd_h=yes
+-ac_cv_host=x86_64-unknown-linux-gnu
++ac_cv_header_vfork_h=no
++ac_cv_host=i686-openadk-linux-gnu
++ac_cv_lib_cap_cap_get_proc=no
++ac_cv_lib_crypt_crypt=yes
++ac_cv_lib_error_at_line=yes
++ac_cv_lib_event_event_dispatch=yes
++ac_cv_lib_gssapi_krb5___gss_krb5_ccache_name=no
++ac_cv_lib_gssapi_krb5___gss_krb5_export_lucid_sec_context=no
++ac_cv_lib_gssapi_krb5___gss_krb5_set_allowable_enctypes=no
++ac_cv_lib_gssapi_krb5___krb5_get_error_message=no
++ac_cv_lib_gssapi_krb5___krb5_get_init_creds_opt_set_addressless=no
++ac_cv_lib_nfsidmap_nfs4_init_name_mapping=yes
++ac_cv_lib_nfsidmap_nfs4_set_debug=yes
++ac_cv_lib_nsl_gethostbyname=no
+ ac_cv_lib_tirpc_clnt_tli_create=yes
+ ac_cv_objext=o
+ ac_cv_path_EGREP='/bin/grep -E'
++ac_cv_path_FGREP='/bin/grep -F'
+ ac_cv_path_GREP=/bin/grep
+-ac_cv_path_install='/usr/bin/install -c'
++ac_cv_path_SED=/home/wbx/adk/openadk/scripts/sed
++ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config
++ac_cv_path_install='/home/wbx/adk/openadk/scripts/install -c'
+ ac_cv_path_mkdir=/bin/mkdir
++ac_cv_prog_AR=/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ar
+ ac_cv_prog_AWK=gawk
+-ac_cv_prog_CPP='gcc -E'
+-ac_cv_prog_ac_ct_CC=gcc
++ac_cv_prog_CC=/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc
++ac_cv_prog_CPP='/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E'
++ac_cv_prog_CXXCPP='/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ -E'
++ac_cv_prog_LD=/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ld
++ac_cv_prog_OBJDUMP=i686-openadk-linux-objdump
++ac_cv_prog_RANLIB=/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ranlib
++ac_cv_prog_STRIP=/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-strip
++ac_cv_prog_cc__home_wbx_adk_openadk_host_i686_uclibc_bin_i686_openadk_linux_uclibc_gcc_c_o=yes
+ ac_cv_prog_cc_c89=
+ ac_cv_prog_cc_g=yes
++ac_cv_prog_cxx_g=yes
++ac_cv_prog_gcc_traditional=no
+ ac_cv_prog_make_make_set=yes
+-am_cv_CC_dependencies_compiler_type=gcc3
++ac_cv_search_getmntent='none required'
++ac_cv_search_opendir='none required'
++ac_cv_sizeof_int=4
++ac_cv_sizeof_long=4
++ac_cv_sizeof_short=2
++ac_cv_sizeof_size_t=4
++ac_cv_sizeof_socklen_t=4
++ac_cv_struct_tm=time.h
++ac_cv_sys_file_offset_bits=64
++ac_cv_sys_largefile_CC=no
++ac_cv_type_getgroups=gid_t
++ac_cv_type_off_t=yes
++ac_cv_type_pid_t=yes
++ac_cv_type_signal=void
++ac_cv_type_size_t=yes
++ac_cv_type_uid_t=yes
++ac_cv_working_alloca_h=yes
++am_cv_CC_dependencies_compiler_type=none
++am_cv_CXX_dependencies_compiler_type=none
++knfsd_cv_bsd_signals=no
++knfsd_cv_glibc2=yes
++lt_cv_deplibs_check_method=pass_all
++lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_ld_reload_flag=-r
++lt_cv_nm_interface='BSD nm'
++lt_cv_objdir=.libs
++lt_cv_path_LD=/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ld
++lt_cv_path_LDCXX=/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ld
++lt_cv_path_NM=/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-nm
++lt_cv_prog_compiler_c_o=yes
++lt_cv_prog_compiler_c_o_CXX=yes
++lt_cv_prog_compiler_pic_works=yes
++lt_cv_prog_compiler_pic_works_CXX=yes
++lt_cv_prog_compiler_rtti_exceptions=no
++lt_cv_prog_compiler_static_works=yes
++lt_cv_prog_compiler_static_works_CXX=yes
++lt_cv_prog_gnu_ld=yes
++lt_cv_prog_gnu_ldcxx=yes
++lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[	 ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[	 ][	 ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\'''
++lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \([^ ]*\) $/  {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/  {"\2", (void *) \&\2},/p'\'''
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='sed -n -e '\''s/^: \([^ ]*\) $/  {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \(lib[^ ]*\)$/  {"\2", (void *) \&\2},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/  {"lib\2", (void *) \&\2},/p'\'''
++lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T .* \(.*\)$/extern int \1();/p'\'' -e '\''s/^[ABCDGIRSTW]* .* \(.*\)$/extern char \1;/p'\'''
++lt_cv_sys_max_cmd_len=3458764513820540925
++pkg_cv_GSSGLUE_CFLAGS='-I/home/wbx/adk/openadk/target_i686_uclibc/usr/include/gssglue  '
++pkg_cv_GSSGLUE_LIBS='-L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -lgssglue -ldl  '
+ 
+ ## ----------------- ##
+ ## Output variables. ##
+ ## ----------------- ##
+ 
+-ACLOCAL='${SHELL} /tmp/nfs-utils-1.2.3/missing --run aclocal-1.11'
+-ACLOCAL_AMFLAGS=''
++ACLOCAL='${SHELL} /home/wbx/adk/openadk/build_ibm-x40_i686_uclibc/w-nfs-utils-1.2.3-3/nfs-utils-1.2.3/missing --run aclocal-1.11'
++ACLOCAL_AMFLAGS='-I  $(ACLOCAL_FLAGS)'
+ ALLOCA=''
+-AMDEPBACKSLASH='\'
+-AMDEP_FALSE='#'
+-AMDEP_TRUE=''
+-AMTAR='${SHELL} /tmp/nfs-utils-1.2.3/missing --run tar'
+-AM_CFLAGS=''
+-AM_CPPFLAGS=''
+-AR=''
+-AUTOCONF='${SHELL} /tmp/nfs-utils-1.2.3/missing --run autoconf'
+-AUTOHEADER='${SHELL} /tmp/nfs-utils-1.2.3/missing --run autoheader'
+-AUTOMAKE='${SHELL} /tmp/nfs-utils-1.2.3/missing --run automake-1.11'
++AMDEPBACKSLASH=''
++AMDEP_FALSE=''
++AMDEP_TRUE='#'
++AMTAR='${SHELL} /home/wbx/adk/openadk/build_ibm-x40_i686_uclibc/w-nfs-utils-1.2.3-3/nfs-utils-1.2.3/missing --run tar'
++AM_CFLAGS='-Wall -Wextra -Wstrict-prototypes  -pipe'
++AM_CPPFLAGS='-I/home/wbx/adk/openadk/target_i686_uclibc/usr/include/tirpc'
++AR='/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ar'
++AUTOCONF='${SHELL} /home/wbx/adk/openadk/build_ibm-x40_i686_uclibc/w-nfs-utils-1.2.3-3/nfs-utils-1.2.3/missing --run autoconf'
++AUTOHEADER='${SHELL} /home/wbx/adk/openadk/build_ibm-x40_i686_uclibc/w-nfs-utils-1.2.3-3/nfs-utils-1.2.3/missing --run autoheader'
++AUTOMAKE='${SHELL} /home/wbx/adk/openadk/build_ibm-x40_i686_uclibc/w-nfs-utils-1.2.3-3/nfs-utils-1.2.3/missing --run automake-1.11'
+ AWK='gawk'
+-CC='gcc'
+-CCDEPMODE='depmode=gcc3'
+-CC_FOR_BUILD=''
+-CFLAGS='-g -O2'
+-CFLAGS_FOR_BUILD=''
+-CONFIG_GSS_FALSE=''
+-CONFIG_GSS_TRUE='#'
++CC='/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc'
++CCDEPMODE='depmode=none'
++CC_FOR_BUILD='cc'
++CFLAGS='-march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe'
++CFLAGS_FOR_BUILD='-O2 -Wall'
++CONFIG_GSS_FALSE='#'
++CONFIG_GSS_TRUE=''
+ CONFIG_IPV6_FALSE=''
+ CONFIG_IPV6_TRUE='#'
+ CONFIG_MOUNT_FALSE='#'
+@@ -329,18 +5407,18 @@ CONFIG_NFSV41_FALSE=''
+ CONFIG_NFSV41_TRUE='#'
+ CONFIG_NFSV4_FALSE='#'
+ CONFIG_NFSV4_TRUE=''
+-CONFIG_RPCGEN_FALSE=''
+-CONFIG_RPCGEN_TRUE='#'
+-CPP='gcc -E'
+-CPPFLAGS=''
+-CPPFLAGS_FOR_BUILD=''
+-CXX=''
+-CXXCPP=''
+-CXXDEPMODE=''
++CONFIG_RPCGEN_FALSE='#'
++CONFIG_RPCGEN_TRUE=''
++CPP='/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc -E'
++CPPFLAGS='-I/home/wbx/adk/openadk/target_i686_uclibc/usr/include -D_GNU_SOURCE'
++CPPFLAGS_FOR_BUILD=' -D_GNU_SOURCE'
++CXX='/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++'
++CXXCPP='/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++ -E'
++CXXDEPMODE='depmode=none'
+ CXXFLAGS=''
+ CXXFLAGS_FOR_BUILD=''
+ CYGPATH_W='echo'
+-DEFS=''
++DEFS='-DHAVE_CONFIG_H'
+ DEPDIR='.deps'
+ DSYMUTIL=''
+ DUMPBIN=''
+@@ -349,11 +5427,11 @@ ECHO_N='-n'
+ ECHO_T=''
+ EGREP='/bin/grep -E'
+ EXEEXT=''
+-FGREP=''
++FGREP='/bin/grep -F'
+ GREP='/bin/grep'
+-GSSD=''
+-GSSGLUE_CFLAGS=''
+-GSSGLUE_LIBS=''
++GSSD='gssd'
++GSSGLUE_CFLAGS='-I/home/wbx/adk/openadk/target_i686_uclibc/usr/include/gssglue  '
++GSSGLUE_LIBS='-L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -lgssglue -ldl  '
+ HAVE_LIBWRAP=''
+ HAVE_TCP_WRAPPER=''
+ IDMAPD='idmapd'
+@@ -361,37 +5439,37 @@ INSTALL_DATA='${INSTALL} -m 644'
+ INSTALL_PROGRAM='${INSTALL}'
+ INSTALL_SCRIPT='${INSTALL}'
+ INSTALL_STRIP_PROGRAM='$(install_sh) -c -s'
+-K5VERS=''
+-KRBCFLAGS=''
+-KRBDIR=''
+-KRBLDFLAGS=''
+-KRBLIBS=''
+-LD=''
+-LDFLAGS=''
++K5VERS='181'
++KRBCFLAGS='-I/home/wbx/adk/openadk/target_i686_uclibc/usr/include'
++KRBDIR='/home/wbx/adk/openadk/target_i686_uclibc/usr/'
++KRBLDFLAGS='-Wl,-rpath=/home/wbx/adk/openadk/target_i686_uclibc/usr//lib'
++KRBLIBS='-L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib $(PROG_RPATH_FLAGS) -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv -ldl'
++LD='/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ld'
++LDFLAGS='-Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib'
+ LDFLAGS_FOR_BUILD=''
+ LIBBLKID=''
+ LIBBSD=''
+ LIBCAP=''
+-LIBCRYPT=''
++LIBCRYPT='-lcrypt'
+ LIBNSL=''
+-LIBOBJS=''
+-LIBS='-ltirpc '
++LIBOBJS=' ${LIBOBJDIR}lstat$U.o ${LIBOBJDIR}memcmp$U.o ${LIBOBJDIR}stat$U.o'
++LIBS='-ltirpc -lrpcsecgss'
+ LIBSOCKET=''
+-LIBTOOL=''
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ LIBWRAP=''
+ LIPO=''
+-LN_S=''
+-LTLIBOBJS=''
++LN_S='ln -s'
++LTLIBOBJS=' ${LIBOBJDIR}lstat$U.lo ${LIBOBJDIR}memcmp$U.lo ${LIBOBJDIR}stat$U.lo'
+ MAINT='#'
+ MAINTAINER_MODE_FALSE=''
+ MAINTAINER_MODE_TRUE='#'
+-MAKEINFO='${SHELL} /tmp/nfs-utils-1.2.3/missing --run makeinfo'
++MAKEINFO='${SHELL} /home/wbx/adk/openadk/build_ibm-x40_i686_uclibc/w-nfs-utils-1.2.3-3/nfs-utils-1.2.3/missing --run makeinfo'
+ MKDIR_P='/bin/mkdir -p'
+ MOUNT_CONFIG_FALSE=''
+ MOUNT_CONFIG_TRUE='#'
+-NM=''
++NM='/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-nm'
+ NMEDIT=''
+-OBJDUMP=''
++OBJDUMP='i686-openadk-linux-objdump'
+ OBJEXT='o'
+ OTOOL64=''
+ OTOOL=''
+@@ -403,80 +5481,80 @@ PACKAGE_TARNAME='nfs-utils'
+ PACKAGE_URL=''
+ PACKAGE_VERSION='1.2.3'
+ PATH_SEPARATOR=':'
+-PKG_CONFIG=''
+-RANLIB=''
++PKG_CONFIG='/usr/bin/pkg-config'
++RANLIB='/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ranlib'
+ RELEASE='1'
+-RPCGEN_PATH='/usr/bin/rpcgen'
++RPCGEN_PATH=''
+ RPCSECGSS_CFLAGS=''
+ RPCSECGSS_LIBS=''
+-SED=''
++SED='/home/wbx/adk/openadk/scripts/sed'
+ SET_MAKE=''
+-SHELL='/bin/sh'
+-STRIP=''
+-SVCGSSD=''
++SHELL='/bin/bash'
++STRIP='/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-strip'
++SVCGSSD='svcgssd'
+ VERSION='1.2.3'
+-ac_ct_CC='gcc'
++ac_ct_CC=''
+ ac_ct_CXX=''
+ ac_ct_DUMPBIN=''
+ am__EXEEXT_FALSE=''
+-am__EXEEXT_TRUE=''
+-am__fastdepCC_FALSE='#'
+-am__fastdepCC_TRUE=''
++am__EXEEXT_TRUE='#'
++am__fastdepCC_FALSE=''
++am__fastdepCC_TRUE='#'
+ am__fastdepCXX_FALSE=''
+-am__fastdepCXX_TRUE=''
++am__fastdepCXX_TRUE='#'
+ am__include='include'
+ am__isrc=''
+ am__leading_dot='.'
+ am__quote=''
+ am__tar='${AMTAR} chof - "$$tardir"'
+ am__untar='${AMTAR} xf -'
+-bindir='${exec_prefix}/bin'
+-build='x86_64-unknown-linux-gnu'
+-build_alias=''
++bindir='/usr/bin'
++build='x86_64-pc-linux-gnu'
++build_alias='x86_64-linux-gnu'
+ build_cpu='x86_64'
+ build_os='linux-gnu'
+-build_vendor='unknown'
+-datadir='${datarootdir}'
++build_vendor='pc'
++datadir='/usr/share'
+ datarootdir='${prefix}/share'
+ docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+ dvidir='${docdir}'
+-enable_gss=''
++enable_gss='yes'
+ enable_ipv6=''
+ enable_mountconfig=''
+ enable_nfsv3='yes'
+ enable_nfsv41=''
+ enable_nfsv4='yes'
+-exec_prefix='NONE'
+-host='x86_64-unknown-linux-gnu'
+-host_alias=''
+-host_cpu='x86_64'
++exec_prefix='${prefix}'
++host='i686-openadk-linux-gnu'
++host_alias='i686-openadk-linux'
++host_cpu='i686'
+ host_os='linux-gnu'
+-host_vendor='unknown'
++host_vendor='openadk'
+ htmldir='${docdir}'
+ includedir='${prefix}/include'
+ infodir='${datarootdir}/info'
+-install_sh='${SHELL} /tmp/nfs-utils-1.2.3/install-sh'
++install_sh='${SHELL} /home/wbx/adk/openadk/build_ibm-x40_i686_uclibc/w-nfs-utils-1.2.3-3/nfs-utils-1.2.3/install-sh'
+ kprefix=''
+ libdir='${exec_prefix}/lib'
+-libexecdir='${exec_prefix}/libexec'
++libexecdir='/usr/libexec'
+ localedir='${datarootdir}/locale'
+-localstatedir='${prefix}/var'
++localstatedir='/var'
+ lt_ECHO='echo'
+-mandir='${datarootdir}/man'
++mandir='/usr/share/man'
+ mkdir_p='/bin/mkdir -p'
+ mountfile=''
+ oldincludedir='/usr/include'
+ pdfdir='${docdir}'
+-prefix='NONE'
+-program_transform_name='s,x,x,'
++prefix='/usr'
++program_transform_name='s&$$&&;s&^&&'
+ psdir='${docdir}'
+ sbindir='${exec_prefix}/sbin'
+ sharedstatedir='${prefix}/com'
+ startstatd='/usr/sbin/start-statd'
+-statduser='rpcuser'
++statduser='nobody'
+ statedir='/var/lib/nfs'
+-sysconfdir='${prefix}/etc'
+-target_alias=''
++sysconfdir='/etc'
++target_alias='i686-openadk-linux'
+ 
+ ## ----------- ##
+ ## confdefs.h. ##
+@@ -494,6 +5572,7 @@ target_alias=''
+ #define START_STATD "/usr/sbin/start-statd"
+ #define NFS3_SUPPORTED 1
+ #define NFS4_SUPPORTED 1
++#define GSS_SUPPORTED 1
+ #define STDC_HEADERS 1
+ #define HAVE_SYS_TYPES_H 1
+ #define HAVE_SYS_STAT_H 1
+@@ -505,6 +5584,97 @@ target_alias=''
+ #define HAVE_STDINT_H 1
+ #define HAVE_UNISTD_H 1
+ #define HAVE_LIBTIRPC 1
++#define HAVE__HOME_WBX_ADK_OPENADK_TARGET_I686_UCLIBC_USR_INCLUDE_TIRPC_NETCONFIG_H 1
++#define _FILE_OFFSET_BITS 64
++#define HAVE_DLFCN_H 1
++#define LT_OBJDIR ".libs/"
++#define STDC_HEADERS 1
++#define HAVE_EVENT_H 1
++#define HAVE_NFSIDMAP_H 1
++#define HAVE_NFS4_SET_DEBUG 1
++#define HAVE_NFSIDMAP_H 1
++#define HAVE_NFS4_SET_DEBUG 1
++#define KRB5_VERSION 181
++#define HAVE_KRB5 1
++#define HAVE_DECL_AI_ADDRCONFIG 1
++#define HAVE_ARPA_INET_H 1
++#define HAVE_FCNTL_H 1
++#define HAVE_LIBINTL_H 1
++#define HAVE_LIMITS_H 1
++#define HAVE_MALLOC_H 1
++#define HAVE_MEMORY_H 1
++#define HAVE_NETDB_H 1
++#define HAVE_NETINET_IN_H 1
++#define HAVE_PATHS_H 1
++#define HAVE_STDLIB_H 1
++#define HAVE_STRING_H 1
++#define HAVE_SYS_FILE_H 1
++#define HAVE_SYS_IOCTL_H 1
++#define HAVE_SYS_MOUNT_H 1
++#define HAVE_SYS_PARAM_H 1
++#define HAVE_SYS_SOCKET_H 1
++#define HAVE_SYS_TIME_H 1
++#define HAVE_SYS_VFS_H 1
++#define HAVE_SYSLOG_H 1
++#define HAVE_UNISTD_H 1
++#define HAVE_ET_COM_ERR_H 1
++#define HAVE_IFADDRS_H 1
++#define TIME_WITH_SYS_TIME 1
++#define HAVE_ALLOCA_H 1
++#define HAVE_ALLOCA 1
++#define HAVE_DIRENT_H 1
++#define CLOSEDIR_VOID 1
++#define HAVE_FORK 1
++#define HAVE_VFORK 1
++#define HAVE_WORKING_VFORK 1
++#define HAVE_WORKING_FORK 1
++#define GETGROUPS_T gid_t
++#define HAVE_GETMNTENT 1
++#define HAVE_LSTAT_EMPTY_STRING_BUG 1
++#define HAVE_SYS_SELECT_H 1
++#define HAVE_SYS_SOCKET_H 1
++#define SELECT_TYPE_ARG1 int
++#define SELECT_TYPE_ARG234 (fd_set *)
++#define SELECT_TYPE_ARG5 (struct timeval *)
++#define RETSIGTYPE void
++#define HAVE_STAT_EMPTY_STRING_BUG 1
++#define HAVE_VPRINTF 1
++#define HAVE_ALARM 1
++#define HAVE_ATEXIT 1
++#define HAVE_DUP2 1
++#define HAVE_FDATASYNC 1
++#define HAVE_FTRUNCATE 1
++#define HAVE_GETCWD 1
++#define HAVE_GETHOSTBYADDR 1
++#define HAVE_GETHOSTBYNAME 1
++#define HAVE_GETHOSTNAME 1
++#define HAVE_GETMNTENT 1
++#define HAVE_GETNAMEINFO 1
++#define HAVE_GETRPCBYNAME 1
++#define HAVE_GETIFADDRS 1
++#define HAVE_GETTIMEOFDAY 1
++#define HAVE_HASMNTOPT 1
++#define HAVE_INET_NTOA 1
++#define HAVE_MEMSET 1
++#define HAVE_MKDIR 1
++#define HAVE_PATHCONF 1
++#define HAVE_REALPATH 1
++#define HAVE_RMDIR 1
++#define HAVE_SELECT 1
++#define HAVE_SOCKET 1
++#define HAVE_STRCASECMP 1
++#define HAVE_STRCHR 1
++#define HAVE_STRDUP 1
++#define HAVE_STRERROR 1
++#define HAVE_STRRCHR 1
++#define HAVE_STRTOL 1
++#define HAVE_STRTOUL 1
++#define HAVE_SIGPROCMASK 1
++#define SIZEOF_SHORT 2
++#define SIZEOF_INT 4
++#define SIZEOF_LONG 4
++#define SIZEOF_SIZE_T 4
++#define SIZEOF_SOCKLEN_T 4
++#define NFS_STATEDIR "/var/lib/nfs"
+ 
+-configure: caught signal 2
+-configure: exit 1
++configure: exit 0
diff --git a/package/nfs-utils/patches/patch-utils_gssd_Makefile_in b/package/nfs-utils/patches/patch-utils_gssd_Makefile_in
new file mode 100644
index 000000000..7c9f3039e
--- /dev/null
+++ b/package/nfs-utils/patches/patch-utils_gssd_Makefile_in
@@ -0,0 +1,25 @@
+--- nfs-utils-1.2.3.orig/utils/gssd/Makefile.in	2010-09-28 14:32:33.000000000 +0200
++++ nfs-utils-1.2.3/utils/gssd/Makefile.in	2011-01-21 17:35:20.288658843 +0100
+@@ -351,7 +351,7 @@ gssd_LDADD = ../../support/nfs/libnfs.a 
+ 		$(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) $(KRBLIBS)
+ 
+ gssd_LDFLAGS = $(KRBLDFLAGS)
+-gssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
++gssd_CFLAGS = $(AM_CFLAGS) \
+ 	      $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS)
+ 
+ svcgssd_SOURCES = \
+@@ -369,11 +369,11 @@ svcgssd_LDADD = \
+ 	$(KRBLIBS)
+ 
+ svcgssd_LDFLAGS = $(KRBLDFLAGS)
+-svcgssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
++svcgssd_CFLAGS = $(AM_CFLAGS) \
+ 		 $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS)
+ 
+ gss_clnt_send_err_SOURCES = gss_clnt_send_err.c
+-gss_clnt_send_err_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
++gss_clnt_send_err_CFLAGS = $(AM_CFLAGS) \
+ 		 $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS)
+ 
+ MAINTAINERCLEANFILES = Makefile.in
diff --git a/package/nmap/Makefile b/package/nmap/Makefile
index 14d7110a4..c26a53c4f 100644
--- a/package/nmap/Makefile
+++ b/package/nmap/Makefile
@@ -27,7 +27,7 @@ ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
 LIBRARIES+=-lssp -lssp_nonshared
 endif
 
-TCPPFLAGS+=		-DNOLUA
+TARGET_CPPFLAGS+=	-DNOLUA
 ifeq ($(ADK_COMPILE_NMAP_WITH_UCLIBCXX),y)
 CONFIGURE_ENV+=		CXXFLAGS="-fno-threadsafe-statics -fno-builtin -fno-rtti -nostdinc++ \
 			-I${STAGING_TARGET_DIR}/usr/include/uClibc++" \
diff --git a/package/nspr/Makefile b/package/nspr/Makefile
index 2564077c9..d25ea2d31 100644
--- a/package/nspr/Makefile
+++ b/package/nspr/Makefile
@@ -20,7 +20,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,NSPR,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ENV+=		OS_TARGET="Linux" HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" \
+CONFIGURE_ENV+=		OS_TARGET="Linux" HOST_CC="${CC_FOR_BUILD}" HOST_CFLAGS="${CFLAGS_FOR_BUILD}" \
 			cross_compiling=yes
 
 ifeq (${ADK_LINUX_64},y)
diff --git a/package/nss/Makefile b/package/nss/Makefile
index 6c4bf7c00..5b3dce6f9 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -26,17 +26,17 @@ $(eval $(call PKG_template,NSS,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
 CONFIG_STYLE:=		manual
 
 ifeq ($(ADK_LINUX_64),y)
-TCFLAGS+=		-DUSE_64
+TARGET_CFLAGS+=		-DUSE_64
 XAKE_FLAGS+=		USE_64=1
 endif
 
-MAKE_FLAGS+=		NATIVE_CC="${HOSTCC}" NATIVE_FLAGS="${HOSTCFLAGS}"
-TCPPFLAGS+=		-I${STAGING_TARGET_DIR}/usr/include/nspr
-TCFLAGS+=		-I${STAGING_TARGET_DIR}/usr/include/nspr
-TLDFLAGS+=		-ldl
+MAKE_FLAGS+=		NATIVE_CC="${CC_FOR_BUILD}" NATIVE_FLAGS="${CFLAGS_FOR_BUILD}"
+TARGET_CPPFLAGS+=	-I${STAGING_TARGET_DIR}/usr/include/nspr
+TARGET_CFLAGS+=		-I${STAGING_TARGET_DIR}/usr/include/nspr
+TARGET_LDFLAGS+=	-ldl
 
 XAKE_FLAGS+=		SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist
-XAKE_FLAGS+=		ARCHFLAG="${TCFLAGS} ${TCPPFLAGS} -ldl"
+XAKE_FLAGS+=		ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}"
 XAKE_FLAGS+=		OS_TEST=${CPU_ARCH} NSS_DISABLE_DBM=1 OS_TARGET=Linux OS_RELEASE=2.6 OS_ARCH=Linux
 XAKE_FLAGS+=		ARTOOL="${TARGET_CROSS}ar" RANLIB="${TARGET_CROSS}ranlib"
 ALL_TARGET:=		build_coreconf all
diff --git a/package/ntpclient/Makefile b/package/ntpclient/Makefile
index 1a7f5e69c..baa7d48f9 100644
--- a/package/ntpclient/Makefile
+++ b/package/ntpclient/Makefile
@@ -23,7 +23,7 @@ $(eval $(call PKG_template,NTPCLIENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},$
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
-MAKE_FLAGS+=		CC='${TARGET_CC}' CFLAGS='${TCFLAGS}'
+MAKE_FLAGS+=		CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS}'
 ALL_TARGET:=
 
 do-install:
diff --git a/package/nut/Makefile b/package/nut/Makefile
index 6af495cb6..5cf4406f6 100644
--- a/package/nut/Makefile
+++ b/package/nut/Makefile
@@ -81,20 +81,14 @@ CONFIGURE_ARGS+=	--with-linux-hiddev=${LINUX_DIR}/include/linux/hiddev.h \
 
 ifneq (${ADK_PACKAGE_NUT_WITH_SSL},)
 CONFIGURE_ARGS+=	--with-ssl
-CONFIGURE_ENV+=		CPPFLAGS="${TCPPFLAGS} ${TLDFLAGS}"
-MAKE_FLAGS+=		SSL_CFLAGS="${TCPPFLAGS}" SSL_LDFLAGS="${TLDFLAGS} -lssl -lcrypto"
+CONFIGURE_ENV+=		CPPFLAGS="${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}"
+MAKE_FLAGS+=		SSL_CFLAGS="${TARGET_CPPFLAGS}" SSL_LDFLAGS="${TARGET_LDFLAGS} -lssl -lcrypto"
 endif
-
-ALL_TARGET:=		all
-INSTALL_TARGET:=	install
-
 ifneq (${ADK_PACKAGE_NUT_WITH_USB},)
-ALL_TARGET+=		usb
-INSTALL_TARGET+=	install-usb
+CONFIGURE_ARGS+=	--with-usb
 endif
 ifneq (${ADK_PACKAGE_NUT_WITH_SNMP},)
-ALL_TARGET+=		snmp
-INSTALL_TARGET+=	install-snmp
+CONFIGURE_ARGS+=	--with-snmp
 endif
 
 post-install:
diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile
index 256cf925d..b16497b36 100644
--- a/package/olsrd/Makefile
+++ b/package/olsrd/Makefile
@@ -41,7 +41,7 @@ $(eval $(call PKG_mod_template,OLSRD_MOD_TAS,tas))
 
 CONFIG_STYLE:=          manual
 
-TCFLAGS+=		-fPIC
+TARGET_CFLAGS+=		-fPIC
 ALL_TARGET+=		libs
 INSTALL_TARGET+=	install_libs
 MAKE_ENV+=		OS="linux" NODEBUG=1 STRIP="true" OFLAGS="${TARGET_CFLAGS}"
diff --git a/package/openswan/patches/patch-Makefile_top b/package/openswan/patches/patch-Makefile_top
new file mode 100644
index 000000000..e3edd3bd6
--- /dev/null
+++ b/package/openswan/patches/patch-Makefile_top
@@ -0,0 +1,11 @@
+--- openswan-2.6.28.orig/Makefile.top	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/Makefile.top	2011-01-21 19:00:28.518658360 +0100
+@@ -29,7 +29,7 @@ ERRCHECK=${MAKEUTILS}/errcheck
+ KVUTIL=${MAKEUTILS}/kernelversion
+ KVSHORTUTIL=${MAKEUTILS}/kernelversion-short
+ 
+-SUBDIRS?=doc lib programs testing
++SUBDIRS?=lib programs
+ 
+ clean::
+ 	-(cd ${OPENSWANSRCDIR} && $(MAKE) modclean && $(MAKE) mod26clean)
diff --git a/package/openswan/patches/patch-lib_libdns_Makefile b/package/openswan/patches/patch-lib_libdns_Makefile
index bfb17431c..ec4c4ef8b 100644
--- a/package/openswan/patches/patch-lib_libdns_Makefile
+++ b/package/openswan/patches/patch-lib_libdns_Makefile
@@ -1,10 +1,20 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- openswan-2.6.18.orig/lib/libdns/Makefile	2008-10-06 18:52:49.000000000 +0200
-+++ openswan-2.6.18/lib/libdns/Makefile	2008-10-14 13:08:03.000000000 +0200
-@@ -102,5 +102,5 @@ code.h:	gen
+--- openswan-2.6.28.orig/lib/libdns/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libdns/Makefile	2011-01-21 19:15:22.484901748 +0100
+@@ -53,7 +53,7 @@ SRCS +=         time.c key.c lib.c
+ programs all: ${LIB}.a
+ 
+ version.o: version.c
+-	${LIBTOOL} --mode=compile ${CC} ${ALL_CFLAGS} \
++	${CC} ${CFLAGS} ${ALL_CFLAGS} \
+ 		-DVERSION=\"${VERSION}\" \
+ 		-DLIBINTERFACE=${LIBINTERFACE} \
+ 		-DLIBREVISION=${LIBREVISION} \
+@@ -100,7 +100,6 @@ code.h:	gen
+ 
+ # this program is to be built on the host, and should not be
  # cross-compiled!
- HOSTCC?=cc
+-HOSTCC?=cc
  gen: gen.c
 -	${HOSTCC} ${HOSTCINCLUDES} ${LDFLAGS} -o $@ ${srcdir}gen.c ${LIBS}
-+	${HOSTCC} ${HOSTCINCLUDES} -o $@ ${srcdir}gen.c ${LIBS}
++	${CC_FOR_BUILD} ${HOSTCINCLUDES} -o $@ ${srcdir}gen.c ${LIBS}
  
diff --git a/package/openswan/patches/patch-lib_libdns_Makefile_in b/package/openswan/patches/patch-lib_libdns_Makefile_in
new file mode 100644
index 000000000..dcef159ea
--- /dev/null
+++ b/package/openswan/patches/patch-lib_libdns_Makefile_in
@@ -0,0 +1,20 @@
+--- openswan-2.6.28.orig/lib/libdns/Makefile.in	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libdns/Makefile.in	2011-01-21 19:01:49.208658272 +0100
+@@ -103,7 +103,7 @@ DEPENDEXTRA =	./gen -F include/dns/rdata
+ @BIND9_MAKE_RULES@
+ 
+ version.@O@: version.c
+-	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
++	${CC} ${CFLAGS} ${ALL_CFLAGS} \
+ 		-DVERSION=\"${VERSION}\" \
+ 		-DLIBINTERFACE=${LIBINTERFACE} \
+ 		-DLIBREVISION=${LIBREVISION} \
+@@ -160,7 +160,7 @@ code.h:	gen
+ 	./gen -s ${srcdir} > code.h
+ 
+ gen: gen.c
+-	${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
++	${CC_FOR_BUILD} ${ALL_CFLAGS} ${CFLAGS_FOR_BUILD} -o $@ ${srcdir}/gen.c ${LIBS}
+ 
+ rbtdb64.@O@: rbtdb.c
+ 
diff --git a/package/openswan/patches/patch-lib_libisc_Makefile b/package/openswan/patches/patch-lib_libisc_Makefile
new file mode 100644
index 000000000..77844c089
--- /dev/null
+++ b/package/openswan/patches/patch-lib_libisc_Makefile
@@ -0,0 +1,11 @@
+--- openswan-2.6.28.orig/lib/libisc/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libisc/Makefile	2011-01-21 19:10:30.838658764 +0100
+@@ -50,7 +50,7 @@ SRCS +=		rwlock.c random.c inet_aton.c i
+ programs all: ${LIB}.a
+ 
+ version.o: version.c
+-	${LIBTOOL} --mode=compile ${CC} ${ALL_CFLAGS} \
++	${CC} ${CFLAGS} ${ALL_CFLAGS} \
+ 		-DVERSION=\"${VERSION}\" \
+ 		-DLIBINTERFACE=${LIBINTERFACE} \
+ 		-DLIBREVISION=${LIBREVISION} \
diff --git a/package/openswan/patches/patch-lib_libisc_Makefile_in b/package/openswan/patches/patch-lib_libisc_Makefile_in
new file mode 100644
index 000000000..4cde48e35
--- /dev/null
+++ b/package/openswan/patches/patch-lib_libisc_Makefile_in
@@ -0,0 +1,23 @@
+--- openswan-2.6.28.orig/lib/libisc/Makefile.in	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libisc/Makefile.in	2011-01-21 19:04:37.798658397 +0100
+@@ -82,7 +82,7 @@ TARGETS =	timestamp
+ @BIND9_MAKE_RULES@
+ 
+ version.@O@: version.c
+-	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
++	${CC} ${CFLAGS} ${ALL_CFLAGS} \
+ 		-DVERSION=\"${VERSION}\" \
+ 		-DLIBINTERFACE=${LIBINTERFACE} \
+ 		-DLIBREVISION=${LIBREVISION} \
+@@ -94,10 +94,7 @@ libisc.@SA@: ${OBJS}
+ 	${RANLIB} $@
+ 
+ libisc.la: ${OBJS}
+-	${LIBTOOL_MODE_LINK} \
+-		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la -rpath ${libdir} \
+-		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
+-		${OBJS} ${LIBS}
++	${CC} ${CFLAGS} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la ${OBJS} ${LIBS}
+ 
+ timestamp: libisc.@A@
+ 	touch timestamp
diff --git a/package/osiris/Makefile b/package/osiris/Makefile
index 01049acf5..6722f4e0e 100644
--- a/package/osiris/Makefile
+++ b/package/osiris/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--with-osiris-user=root \
 			--with-readline=no
 XAKE_FLAGS+=		ar=${TARGET_CROSS}ar \
 			INTERACTIVE=0
-TCFLAGS+=		-DOPENSSL_NO_RIPEMD
+TARGET_CFLAGS+=		-DOPENSSL_NO_RIPEMD
 
 post-configure:
 	(cd ${WRKDIST}/src/osirisd/modules && ./genmods.sh);
diff --git a/package/osiris/patches/patch-configure b/package/osiris/patches/patch-configure
index b9ae74fe0..6dce9a8fb 100644
--- a/package/osiris/patches/patch-configure
+++ b/package/osiris/patches/patch-configure
@@ -1,13 +1,6 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- osiris-4.2.3.orig/configure	2006-07-28 01:57:51.000000000 +0200
-+++ osiris-4.2.3/configure	2011-01-16 15:16:06.000000000 +0100
-@@ -1,4 +1,5 @@
- #! /bin/sh
-+set -x
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.59.
- #
-@@ -3403,7 +3404,7 @@ else
++++ osiris-4.2.3/configure	2011-01-21 20:40:11.234913757 +0100
+@@ -3403,7 +3403,7 @@ else
  fi
  
  
@@ -16,7 +9,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  AUTOHEADER=echo
  
  if test "x$prefix" = "xNONE" ; then
-@@ -3573,7 +3574,6 @@ else
+@@ -3573,7 +3573,6 @@ else
  
  	for ssldir in $tryssldir "" /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do
                  CPPFLAGS="$saved_CPPFLAGS"
@@ -24,7 +17,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
  # GOD DAMN FUCKING STATIC BINARIES ON SOLARIS CAN EAT MY ASS.
  
-@@ -3596,29 +3596,6 @@ else
+@@ -3596,29 +3595,6 @@ else
                  if test ! -z "$ssldir" -a ! -d "$ssldir" ; then
                          continue;
                  fi
@@ -54,7 +47,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
                  # Basic test to check for compatible version and correct linking
  
-@@ -3694,34 +3671,6 @@ fi
+@@ -3694,34 +3670,6 @@ fi
  echo "$as_me:$LINENO: result: $ac_cv_openssldir" >&5
  echo "${ECHO_T}$ac_cv_openssldir" >&6
  
@@ -89,7 +82,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  case "$OS_NAME" in
  SunOS*)
      LIBS="$saved_LIBS $ssldir/lib/libssl.a $ssldir/lib/libcrypto.a"
-@@ -3738,7 +3687,7 @@ CYGWIN*)
+@@ -3738,7 +3686,7 @@ CYGWIN*)
  esac
  
  
@@ -98,7 +91,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
  case "${OS_NAME}" in
      MINGW32*)
-@@ -4448,11 +4397,6 @@ cat >>confdefs.h <<_ACEOF
+@@ -4448,11 +4396,6 @@ cat >>confdefs.h <<_ACEOF
  #define SYSTEM_LINUX 1
  _ACEOF
  
@@ -110,7 +103,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
      ;;
  BSD*)
  
-@@ -11394,7 +11338,6 @@ chmod ug+x src/install/install.sh
+@@ -11394,7 +11337,6 @@ chmod ug+x src/install/install.sh
      echo "   Osiris MD Directory: ${with_md_root_dir}"
      echo "        Osiris MD user: ${with_osiris_md_user}"
      echo "  Osiris MD config dir: ${with_md_conf_dir}"
diff --git a/package/osiris/patches/patch-src_osirisd_modules_Makefile_am b/package/osiris/patches/patch-src_osirisd_modules_Makefile_am
new file mode 100644
index 000000000..332a866d5
--- /dev/null
+++ b/package/osiris/patches/patch-src_osirisd_modules_Makefile_am
@@ -0,0 +1,11 @@
+--- osiris-4.2.3.orig/src/osirisd/modules/Makefile.am	2006-07-28 01:57:51.000000000 +0200
++++ osiris-4.2.3/src/osirisd/modules/Makefile.am	2011-01-21 20:47:14.568658281 +0100
+@@ -11,7 +11,7 @@ INCLUDES 	= -I$(top_srcdir)/src \
+ noinst_SCRIPTS = modules
+ 
+ unused.o:
+-	$(CC) -c unused.c
++	$(CC) $(CFLAGS) -c unused.c
+ 
+ libmodules_a_DEPENDENCIES    = unused.o
+ 
diff --git a/package/osiris/patches/patch-src_osirisd_modules_Makefile_in b/package/osiris/patches/patch-src_osirisd_modules_Makefile_in
new file mode 100644
index 000000000..459702dec
--- /dev/null
+++ b/package/osiris/patches/patch-src_osirisd_modules_Makefile_in
@@ -0,0 +1,11 @@
+--- osiris-4.2.3.orig/src/osirisd/modules/Makefile.in	2006-07-28 01:57:51.000000000 +0200
++++ osiris-4.2.3/src/osirisd/modules/Makefile.in	2011-01-21 20:47:02.618658788 +0100
+@@ -254,7 +254,7 @@ uninstall-am: uninstall-info-am
+ 
+ 
+ unused.o:
+-	$(CC) -c unused.c
++	$(CC) $(CFLAGS) -c unused.c
+ 
+ modules:
+ 	./genmods.sh
diff --git a/package/owfs/Makefile b/package/owfs/Makefile
index 24d359479..567d355a8 100644
--- a/package/owfs/Makefile
+++ b/package/owfs/Makefile
@@ -17,7 +17,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,OWFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-ldl -lrt
+TARGET_CFLAGS+=		-ldl -lrt
 CONFIGURE_ARGS+=	--enable-owfs \
 			--enable-usb \
 			--disable-swig \
diff --git a/package/palantir/Makefile b/package/palantir/Makefile
index 18143c0a1..5deb3c83f 100644
--- a/package/palantir/Makefile
+++ b/package/palantir/Makefile
@@ -24,15 +24,17 @@ CONFIG_STYLE:=          manual
 BUILD_STYLE:=           manual
 INSTALL_STYLE:=         manual
 
+TARGET_CFLAGS+=		-Wall
+TARGET_CPPFLAGS+=	-D_REENTRANT
+
 do-build:
 	mkdir -p ${WRKINST}/usr
 	${MAKE} -C ${WRKBUILD}/server/libgsm \
 		${TARGET_CONFIGURE_OPTS} \
-		CCINC="${TCPPFLAGS}" \
+		CCINC="${TARGET_CPPFLAGS}" \
 		lib/libgsm.a
 	${MAKE} -C ${WRKBUILD}/server \
 		${TARGET_CONFIGURE_OPTS} \
-		CFLAGS="-Wall -D_REENTRANT ${TCFLAGS} ${TCPPFLAGS} ${TLDFLAGS}" \
 		palantir
 
 do-install:
diff --git a/package/palantir/patches/patch-server_Makefile b/package/palantir/patches/patch-server_Makefile
new file mode 100644
index 000000000..a9bc81951
--- /dev/null
+++ b/package/palantir/patches/patch-server_Makefile
@@ -0,0 +1,26 @@
+--- palantir-2.7.orig/server/Makefile	2007-05-19 01:31:36.000000000 +0200
++++ palantir-2.7/server/Makefile	2011-01-20 15:24:19.478658283 +0100
+@@ -47,10 +47,11 @@ ENABLE_X11MON=	0
+ .PHONY : tools man
+ 
+ 
+-CFLAGS= -Wall -D_REENTRANT -O2 -g
++CFLAGS?= -Wall -D_REENTRANT -O2 -g
+ # -O3
+-CC= gcc
+-libjpeg= -ljpeg
++CC?= gcc
++LIBS?=
++LIBS+= -ljpeg -lpthread
+ 
+ ifeq ($(TARGET),mips)
+ 	BROADCOM_SRC= /usr/local/broadcom/src
+@@ -86,7 +87,7 @@ SRCS= *.c
+ libgsm= libgsm/lib/libgsm.a
+ 
+ palantir: $(libgsm) $(OBJ) tools man
+-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(libgsm) $(libjpeg) -lpthread -o palantir
++	$(CC) $(LDFLAGS) $(OBJ) $(libgsm) $(LIBS) -o palantir
+ 
+ mips:
+ 	make TARGET=mips palantir
diff --git a/package/palantir/patches/patch-server_libgsm_Makefile b/package/palantir/patches/patch-server_libgsm_Makefile
new file mode 100644
index 000000000..079e9a825
--- /dev/null
+++ b/package/palantir/patches/patch-server_libgsm_Makefile
@@ -0,0 +1,53 @@
+--- palantir-2.7.orig/server/libgsm/Makefile	2007-03-31 11:50:49.000000000 +0200
++++ palantir-2.7/server/libgsm/Makefile	2011-01-20 15:22:46.318658281 +0100
+@@ -49,11 +49,11 @@ WAV49	= -DWAV49
+ # CCFLAGS 	= -c -O
+ 
+ ifndef CC
+-CC		= gcc
++CC		?= gcc
+ endif
+ 
+-CC		+= -ansi -pedantic
+-CCFLAGS 	= -c -O2 -DNeedFunctionPrototypes=1
++CFLAGS		+= -ansi -pedantic
++CPPFLAGS 	?= -DNeedFunctionPrototypes=1
+ 
+ LD 		= $(CC)
+ 
+@@ -80,7 +80,7 @@ SHELL		= /bin/sh
+ LN		= ln
+ BASENAME 	= basename
+ ifndef AR
+-AR		= ar
++AR		?= ar
+ endif
+ ARFLAGS		= cr
+ RMFLAGS		=
+@@ -89,7 +89,7 @@ COMPRESS 	= compress
+ COMPRESSFLAGS 	= 
+ # RANLIB 	= true
+ ifndef RANLIB
+-RANLIB	 	= ranlib
++RANLIB	 	?= ranlib
+ endif
+ 
+ #
+@@ -109,7 +109,7 @@ INC	= $(ROOT)/inc
+ # DEBUG	= -DNDEBUG
+ ######### Remove -DNDEBUG to enable assertions.
+ 
+-CFLAGS	= $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
++CFLAGS	+= $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
+ 	$(WAV49) $(CCINC) -I$(INC)
+ ######### It's $(CC) $(CFLAGS)
+ 
+@@ -177,7 +177,7 @@ GSM_OBJECTS =	$(SRC)/add.o		\
+ # Default rules
+ 
+ .c.o:
+-		$(CC) $(CFLAGS) $?
++		$(CC) $(CPPFLAGS) $(CFLAGS) -c $?
+ 		@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
+ 
+ # Target rules
diff --git a/package/parprouted/Makefile b/package/parprouted/Makefile
index 118f1ee15..62046d28a 100644
--- a/package/parprouted/Makefile
+++ b/package/parprouted/Makefile
@@ -21,8 +21,8 @@ CONFIG_STYLE:=          manual
 INSTALL_STYLE:=         manual
 
 MAKE_FLAGS+=		CC="${TARGET_CC}" \
-			CFLAGS="${TCFLAGS}" \
-			LDFLAGS=""
+			CFLAGS="${TARGET_CFLAGS}" \
+			LDFLAGS="${TARGET_LDFLAGS}"
 
 do-install:
 	${INSTALL_DIR} ${IDIR_PARPROUTED}/usr/sbin
diff --git a/package/pcre/Makefile b/package/pcre/Makefile
index 9f6d88fad..af078446e 100644
--- a/package/pcre/Makefile
+++ b/package/pcre/Makefile
@@ -19,7 +19,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBPCRE,libpcre,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--disable-cpp
-XAKE_FLAGS+=		${TARGET_CONFIGURE_OPTS} CFLAGS='${TCFLAGS}'
+XAKE_FLAGS+=		${TARGET_CONFIGURE_OPTS}
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBPCRE}/usr/lib
diff --git a/package/php/Makefile b/package/php/Makefile
index 2cfb67674..900ab42d6 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -172,7 +172,7 @@ $(eval $(call PKG_mod_template,PHP_MOD_XML,xml))
 
 INSTALL_STYLE:=		manual
 
-TLDFLAGS+=		-L$(STAGING_TARGET_DIR)/usr/lib/mysql
+TARGET_LDFLAGS+=	-L$(STAGING_TARGET_DIR)/usr/lib/mysql
 CONFIGURE_ENV+=		LIBS="-ldl"
 CONFIGURE_ARGS+=	$(PKG_CONFIGURE_OPTS)
 
diff --git a/package/picocom/Makefile b/package/picocom/Makefile
index 592a6beba..34277e69e 100644
--- a/package/picocom/Makefile
+++ b/package/picocom/Makefile
@@ -18,7 +18,6 @@ $(eval $(call PKG_template,PICOCOM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P
 
 CONFIG_STYLE:=          manual
 INSTALL_STYLE:=         manual
-
 ALL_TARGET:=		picocom
 
 do-install:
diff --git a/package/picocom/patches/patch-Makefile b/package/picocom/patches/patch-Makefile
new file mode 100644
index 000000000..621e7c211
--- /dev/null
+++ b/package/picocom/patches/patch-Makefile
@@ -0,0 +1,18 @@
+--- picocom-1.4.orig/Makefile	2004-08-13 13:18:38.000000000 +0200
++++ picocom-1.4/Makefile	2011-01-21 21:02:02.096749132 +0100
+@@ -2,11 +2,12 @@
+ VERSION=1.4
+ 
+ # CC = gcc
+-CPPFLAGS=-DVERSION_STR=\"$(VERSION)\" -DUUCP_LOCK_DIR=\"/var/lock\"
+-CFLAGS = -Wall -g
++CPPFLAGS ?=
++CPPFLAGS += -DVERSION_STR=\"$(VERSION)\" -DUUCP_LOCK_DIR=\"/var/lock\"
++CFLAGS ?= -Wall -g
+ 
+ # LD = gcc
+-LDFLAGS = -g
++LDFLAGS ?= -g
+ LDLIBS =
+ 
+ picocom : picocom.o term.o
diff --git a/package/pmacct/Makefile b/package/pmacct/Makefile
index 1b2221709..523218a10 100644
--- a/package/pmacct/Makefile
+++ b/package/pmacct/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		pmacct
-PKG_VERSION:=		0.12.3
+PKG_VERSION:=		0.12.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		7e4196c0f87f1382a8eed4eb1bdecdc1
+PKG_MD5SUM:=		3d10f9301a17f034a0f221490a99a5d0
 PKG_DESCR:=		IP accounting daemons
 PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		libpcap
diff --git a/package/pmacct/patches/patch-configure b/package/pmacct/patches/patch-configure
new file mode 100644
index 000000000..0c7310ba6
--- /dev/null
+++ b/package/pmacct/patches/patch-configure
@@ -0,0 +1,41 @@
+--- pmacct-0.12.5.orig/configure	2010-12-28 17:26:21.000000000 +0100
++++ pmacct-0.12.5/configure	2011-01-21 21:15:15.478658080 +0100
+@@ -1006,7 +1006,6 @@ fi
+ 
+ ac_test_CFLAGS="${CFLAGS+set}"
+ ac_save_CFLAGS="$CFLAGS"
+-CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+ echo "configure:1012: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+@@ -1022,22 +1021,6 @@ rm -f conftest*
+ 
+ fi
+ 
+-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+-if test "$ac_test_CFLAGS" = set; then
+-  CFLAGS="$ac_save_CFLAGS"
+-elif test $ac_cv_prog_cc_g = yes; then
+-  if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
+-  else
+-    CFLAGS="-g"
+-  fi
+-else
+-  if test "$GCC" = yes; then
+-    CFLAGS="-O2"
+-  else
+-    CFLAGS=
+-  fi
+-fi
+ 
+ host_os=`uname`
+ host_cpu=`uname -m`
+@@ -1083,7 +1066,6 @@ fi
+ 
+ 
+ if test "x$ac_cv_prog_gcc" = xyes ; then
+-  CFLAGS="-O2"
+   case "$host_os" in
+     IRIX*)
+       CFLAGS="-mabi=n32 -fno-builtins ${CFLAGS}"
diff --git a/package/pmacct/patches/patch-src_nfprobe_plugin_netflow9_c b/package/pmacct/patches/patch-src_nfprobe_plugin_netflow9_c
deleted file mode 100644
index a0f757c8f..000000000
--- a/package/pmacct/patches/patch-src_nfprobe_plugin_netflow9_c
+++ /dev/null
@@ -1,64 +0,0 @@
---- pmacct-0.12.2.orig/src/nfprobe_plugin/netflow9.c	2010-04-21 16:53:36.000000000 +0200
-+++ pmacct-0.12.2/src/nfprobe_plugin/netflow9.c	2010-07-15 15:11:23.575859230 +0200
-@@ -396,8 +396,8 @@ nf9_init_template(void)
- */
- 	
- 	rcount = 0;
--	bzero(&v4_template, sizeof(v4_template));
--	bzero(&v4_int_template, sizeof(v4_int_template));
-+	memset(&v4_template, 0, sizeof(v4_template));
-+	memset(&v4_int_template, 0, sizeof(v4_int_template));
- 
- 	v4_template.r[rcount].type = htons(NF9_LAST_SWITCHED);
- 	v4_template.r[rcount].length = htons(4);
-@@ -588,8 +588,8 @@ nf9_init_template(void)
- 	  v4_int_template.tot_rec_len += v4_int_template.r[idx].length;
- 
- 	rcount = 0;
--	bzero(&v6_template, sizeof(v6_template));
--	bzero(&v6_int_template, sizeof(v6_int_template));
-+	memset(&v6_template, 0, sizeof(v6_template));
-+	memset(&v6_int_template, 0, sizeof(v6_int_template));
- 
- 	v6_template.r[rcount].type = htons(NF9_LAST_SWITCHED);
- 	v6_template.r[rcount].length = htons(4);
-@@ -786,8 +786,8 @@ nf9_init_options_template(void)
- 	int rcount, idx;
- 
-         rcount = 0;
--        bzero(&options_template, sizeof(options_template));
--        bzero(&options_int_template, sizeof(options_int_template));
-+        memset(&options_template, 0, sizeof(options_template));
-+        memset(&options_int_template, 0, sizeof(options_int_template));
- 
-         options_template.r[rcount].type = htons(NF9_OPT_SCOPE_SYSTEM);
-         options_template.r[rcount].length = htons(0);
-@@ -826,8 +826,8 @@ nf_flow_to_flowset(const struct FLOW *fl
- 	char *ftoft_ptr_0 = ftoft_buf_0;
- 	char *ftoft_ptr_1 = ftoft_buf_1;
- 
--	bzero(ftoft_buf_0, sizeof(ftoft_buf_0));
--	bzero(ftoft_buf_1, sizeof(ftoft_buf_1));
-+	memset(ftoft_buf_0, 0, sizeof(ftoft_buf_0));
-+	memset(ftoft_buf_1, 0, sizeof(ftoft_buf_1));
- 	*len_used = nflows = ret_len = 0;
- 
- 	rec32 = htonl(timeval_sub_ms(&flow->flow_last, system_boot_time));
-@@ -916,7 +916,7 @@ nf_options_to_flowset(u_char *packet, u_
-         u_int8_t rec8;
-         char *ftoft_ptr_0 = ftoft_buf_0;
- 
--        bzero(ftoft_buf_0, sizeof(ftoft_buf_0));
-+        memset(ftoft_buf_0, 0, sizeof(ftoft_buf_0));
-         *len_used = nflows = ret_len = 0;
- 
-         rec8 = 1; /* NF9_FLOW_SAMPLER_ID */ 
-@@ -975,7 +975,7 @@ send_netflow_v9(struct FLOW **flows, int
- 
- 	last_valid = num_packets = 0;
- 	for (j = 0; j < num_flows;) {
--		bzero(packet, sizeof(packet));
-+		memset(packet, 0, sizeof(packet));
- 		nf9 = (struct NF9_HEADER *)packet;
- 
- 		nf9->version = htons(9);
diff --git a/package/portmap/Makefile b/package/portmap/Makefile
index 67eb793aa..0e3eddb2c 100644
--- a/package/portmap/Makefile
+++ b/package/portmap/Makefile
@@ -27,10 +27,10 @@ MAKE_FLAGS+=		WRAP_LIB='-L${STAGING_TARGET_DIR}/usr/lib -lwrap'
 else
 MAKE_FLAGS+=		NO_TCP_WRAPPER=1
 endif
-TCPPFLAGS+=		-DDAEMON_UID=20 -DDAEMON_GID=20
-TCFLAGS+=		-fPIC
+TARGET_CPPFLAGS+=	-DDAEMON_UID=20 -DDAEMON_GID=20
+TARGET_CFLAGS+=		-fPIC
 MAKE_FLAGS+=		${TARGET_CONFIGURE_OPTS} \
-			CFLAGS='${TCFLAGS}'
+			CFLAGS='${TARGET_CFLAGS}'
 
 do-install:
 	${INSTALL_DIR} ${IDIR_PORTMAP}/usr/sbin
diff --git a/package/portsentry/Makefile b/package/portsentry/Makefile
index ef2d0d797..43898e416 100644
--- a/package/portsentry/Makefile
+++ b/package/portsentry/Makefile
@@ -22,7 +22,7 @@ CONFIG_STYLE:=          manual
 INSTALL_STYLE:=         manual
 
 ALL_TARGET:=		linux
-MAKE_FLAGS+=		CC="${TARGET_CC}" CFLAGS="${TCFLAGS}"
+MAKE_FLAGS+=		CC="${TARGET_CC}" CFLAGS="${TARGET_CFLAGS}"
 
 do-install:
 	${INSTALL_DIR} ${IDIR_PORTSENTRY}/usr/bin ${IDIR_PORTSENTRY}/etc
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 85386cb08..d6e6043c1 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -30,9 +30,11 @@ $(eval $(call PKG_template,PPP_MOD_PPPDUMP,ppp-mod-pppdump,${PKG_VERSION}-${PKG_
 $(eval $(call PKG_template,PPP_MOD_PPPSTATS,ppp-mod-pppstats,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_UMTS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		minimal
+CONFIGURE_ARGS+=	--system=Linux
 CONFIGURE_ENV+=		UNAME_S="Linux"
 XAKE_FLAGS+=		STAGING_TARGET_DIR=${STAGING_TARGET_DIR} \
-			DESTDIR="${WRKINST}/usr" \
+			DESTDIR="${WRKINST}/usr" STRIP='' \
 			TARGET_AR='${TARGET_CROSS}ar'
 
 post-install:
diff --git a/package/ppp/patches/patch-chat_Makefile_linux b/package/ppp/patches/patch-chat_Makefile_linux
index 3d0c3fdff..07f1a31cb 100644
--- a/package/ppp/patches/patch-chat_Makefile_linux
+++ b/package/ppp/patches/patch-chat_Makefile_linux
@@ -1,31 +1,51 @@
 --- ppp-2.4.5.orig/chat/Makefile.linux	2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/chat/Makefile.linux	2011-01-16 15:56:59.000000000 +0100
-@@ -10,22 +10,23 @@ CDEF3=	-UNO_SLEEP			# Use the usleep fun
- CDEF4=	-DFNDELAY=O_NDELAY		# Old name value
- CDEFS=	$(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
++++ ppp-2.4.5/chat/Makefile.linux	2011-01-21 21:29:57.958658254 +0100
+@@ -1,32 +1,27 @@
+ #	$Id: Makefile.linux,v 1.15 2006/06/04 05:07:46 paulus Exp $
+ 
+-DESTDIR = $(INSTROOT)@DESTDIR@
+-BINDIR = $(DESTDIR)/sbin
+-MANDIR = $(DESTDIR)/share/man/man8
+-
+-CDEF1=	-DTERMIOS			# Use the termios structure
+-CDEF2=	-DSIGTYPE=void			# Standard definition
+-CDEF3=	-UNO_SLEEP			# Use the usleep function
+-CDEF4=	-DFNDELAY=O_NDELAY		# Old name value
+-CDEFS=	$(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
++include ../Makedefs.com
  
 -COPTS=	-O2 -g -pipe
 -CFLAGS=	$(COPTS) $(CDEFS)
-+CPPFLAGS?=
-+CFLAGS?=-O2 -g -pipe
-+LDFLAGS?=
++CDEF1=-DTERMIOS			# Use the termios structure
++CDEF2=-DSIGTYPE=void		# Standard definition
++CDEF3=-UNO_SLEEP		# Use the usleep function
++CDEF4=-DFNDELAY=O_NDELA		# Old name value
++CDEFS=$(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
  
- INSTALL= install
+-INSTALL= install
++CPPFLAGS += $(CDEFS)
  
- all:	chat
+-all:	chat
++PROG = chat
++OBJS = chat.o
  
- chat:	chat.o
+-chat:	chat.o
 -	$(CC) -o chat chat.o
-+	$(CC) $(LDFLAGS) -o chat chat.o
++all:	$(PROG)
  
- chat.o:	chat.c
+-chat.o:	chat.c
 -	$(CC) -c $(CFLAGS) -o chat.o chat.c
-+	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o chat.o chat.c
++$(PROG): $(OBJS)
  
- install: chat
- 	mkdir -p $(BINDIR) $(MANDIR)
+-install: chat
+-	mkdir -p $(BINDIR) $(MANDIR)
 -	$(INSTALL) -s -c chat $(BINDIR)
-+	$(INSTALL) -c chat $(BINDIR)
++install: $(PROG)
++	$(INSTALL) -d -m 755 $(BINDIR) 
++	$(INSTALL) -d -m 755 $(MANDIR)
++	$(INSTALL) $(STRIP) -c $(PROG) $(BINDIR)
  	$(INSTALL) -c -m 644 chat.8 $(MANDIR)
  
  clean:
+-	rm -f chat.o chat *~
++	rm -f $(OBJS) $(PROG) *~
diff --git a/package/ppp/patches/patch-configure b/package/ppp/patches/patch-configure
index 4ec084e2e..b4be911dd 100644
--- a/package/ppp/patches/patch-configure
+++ b/package/ppp/patches/patch-configure
@@ -1,15 +1,87 @@
---- ppp-2.4.4.orig/configure	2005-07-09 02:23:05.000000000 +0200
-+++ ppp-2.4.4/configure	2009-06-05 19:12:00.000000000 +0200
-@@ -8,9 +8,9 @@ SYSCONF=/etc
+--- ppp-2.4.5.orig/configure	2009-11-16 23:26:07.000000000 +0100
++++ ppp-2.4.5/configure	2011-01-21 21:29:57.977408326 +0100
+@@ -5,12 +5,42 @@
+ DESTDIR=/usr/local
+ SYSCONF=/etc
+ 
++# Parse arguments
++while [ $# -gt 0 ]; do
++    arg=$1
++    val=
++    shift
++    case $arg in
++	*=*)
++	    val=`expr "x$arg" : 'x[^=]*=\(.*\)'`
++	    arg=`expr "x$arg" : 'x\([^=]*\)=.*'`
++	    ;;
++	--prefix|--sysconf|--system|--arch|--release)
++	    if [ $# -eq 0 ]; then
++		echo "error: the $arg argument requires a value" 1>&2
++		exit 1
++	    fi
++	    val=$1
++	    shift
++	    ;;
++    esac
++    case $arg in
++	--prefix)	DESTDIR=$val ;;
++	--sysconfdir)	SYSCONF=$val ;;
++	--system)	system=$val ;;
++	--release)	release=$val ;;
++	--arch)		arch=$val ;;
++    esac
++done
++
++echo "DESTDIR is $DESTDIR"
++
  #  if [ -d /NextApps ]; then
  #    system="NeXTStep"
  #  else
 -  system=`uname -s`
 -  release=`uname -r`
 -  arch=`uname -m`
-+  system=${UNAME_S:-`uname -s`}
-+  release=${UNAME_R:-`uname -r`}
-+  arch=${UNAME_M:-`uname -m`}
++if [ -z "$system" ];then system=`uname -s`;fi
++if [ -z "$release" ];then release=`uname -r`;fi
++if [ -z "$arch" ];then arch=`uname -m`;fi
  #  fi
  state="unknown"
  
+@@ -18,6 +48,7 @@ case $system in
+   Linux)
+     makext="linux";
+     ksrc="linux";
++    compiletype=.gcc;
+     state="known";;
+   SunOS)
+     karch=`/usr/bin/isainfo -k`
+@@ -156,30 +187,6 @@ case $state in
+     echo "Configuring for $system";;
+ esac
+ 
+-# Parse arguments
+-while [ $# -gt 0 ]; do
+-    arg=$1
+-    val=
+-    shift
+-    case $arg in
+-	*=*)
+-	    val=`expr "x$arg" : 'x[^=]*=\(.*\)'`
+-	    arg=`expr "x$arg" : 'x\([^=]*\)=.*'`
+-	    ;;
+-	--prefix|--sysconf)
+-	    if [ $# -eq 0 ]; then
+-		echo "error: the $arg argument requires a value" 1>&2
+-		exit 1
+-	    fi
+-	    val=$1
+-	    shift
+-	    ;;
+-    esac
+-    case $arg in
+-	--prefix)	DESTDIR=$val ;;
+-	--sysconfdir)	SYSCONF=$val ;;
+-    esac
+-done
+ 
+ mkmkf() {
+     rm -f $2
diff --git a/package/ppp/patches/patch-linux_Makefile_top b/package/ppp/patches/patch-linux_Makefile_top
new file mode 100644
index 000000000..b433c4dd9
--- /dev/null
+++ b/package/ppp/patches/patch-linux_Makefile_top
@@ -0,0 +1,17 @@
+--- ppp-2.4.5.orig/linux/Makefile.top	2009-11-16 23:26:07.000000000 +0100
++++ ppp-2.4.5/linux/Makefile.top	2011-01-21 21:29:58.018658307 +0100
+@@ -1,13 +1,6 @@
+ # PPP top-level Makefile for Linux.
+ 
+-DESTDIR = $(INSTROOT)@DESTDIR@
+-BINDIR = $(DESTDIR)/sbin
+-INCDIR = $(DESTDIR)/include
+-MANDIR = $(DESTDIR)/share/man
+-ETCDIR = $(INSTROOT)@SYSCONF@/ppp
+-
+-# uid 0 = root
+-INSTALL= install
++include Makedefs.com
+ 
+ all:
+ 	cd chat; $(MAKE) $(MFLAGS) all
diff --git a/package/ppp/patches/patch-pppd_Makefile_linux b/package/ppp/patches/patch-pppd_Makefile_linux
index a447ae1ea..0096f7018 100644
--- a/package/ppp/patches/patch-pppd_Makefile_linux
+++ b/package/ppp/patches/patch-pppd_Makefile_linux
@@ -1,109 +1,215 @@
 --- ppp-2.4.5.orig/pppd/Makefile.linux	2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/Makefile.linux	2011-01-16 17:09:40.000000000 +0100
-@@ -2,12 +2,7 @@
- # pppd makefile for Linux
++++ ppp-2.4.5/pppd/Makefile.linux	2011-01-21 21:40:47.384898388 +0100
+@@ -3,11 +3,7 @@
  # $Id: Makefile.linux,v 1.70 2007/06/19 02:08:34 carlsonj Exp $
  #
--
+ 
 -# Default installation locations
 -DESTDIR = $(INSTROOT)@DESTDIR@
 -BINDIR = $(DESTDIR)/sbin
 -MANDIR = $(DESTDIR)/share/man/man8
 -INCDIR = $(DESTDIR)/include
-+include ../makedefs.linux
++include ../Makedefs.com
  
  TARGETS = pppd
  
-@@ -30,10 +25,6 @@ ifeq (.depend,$(wildcard .depend))
- include .depend
- endif
+@@ -24,17 +20,6 @@ PPPDOBJS = main.o magic.o fsm.o lcp.o ip
+ 	   ecp.o auth.o options.o demand.o utils.o sys-linux.o ipxcp.o tty.o \
+ 	   eap.o chap-md5.o session.o
  
+-#
+-# include dependencies if present
+-ifeq (.depend,$(wildcard .depend))
+-include .depend
+-endif
+-
 -# CC = gcc
 -#
 -COPTS = -O2 -pipe -Wall -g
 -LIBS =
- 
+-
  # Uncomment the next 2 lines to include support for Microsoft's
  # MS-CHAP authentication protocol.  Also, edit plugins/radius/Makefile.linux.
-@@ -48,7 +39,7 @@ MPPE=y
- # Uncomment the next line to include support for PPP packet filtering.
- # This requires that the libpcap library and headers be installed
- # and that the kernel driver support PPP packet filtering.
--FILTER=y
-+#FILTER=y
- 
- # Uncomment the next line to enable multilink PPP (enabled by default)
- # Linux distributions: Please leave multilink ENABLED in your builds
-@@ -58,9 +49,9 @@ HAVE_MULTILINK=y
- # Uncomment the next line to enable the TDB database (enabled by default.)
- # If you enable multilink, then TDB is automatically enabled also.
- # Linux distributions: Please leave TDB ENABLED in your builds.
--USE_TDB=y
-+#USE_TDB=y
- 
--HAS_SHADOW=y
-+#HAS_SHADOW=y
- #USE_PAM=y
- #HAVE_INET6=y
- 
-@@ -75,11 +66,10 @@ PLUGIN=y
+ CHAPMS=y
+@@ -75,28 +60,25 @@ PLUGIN=y
  
  MAXOCTETS=y
  
 -INCLUDE_DIRS= -I../include
 -
 -COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP
-+CPPFLAGS += -I../include
-+CPPFLAGS += -DHAVE_PATHS_H -DHAVE_MMAP
- 
+-
 -CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"'
-+CFLAGS+= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"'
++CPPFLAGS += -I../include
++CPPFLAGS += -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP '-DDESTDIR="@DESTDIR@"'
  
  ifdef CHAPMS
- CFLAGS   += -DCHAPMS=1
-@@ -99,7 +89,7 @@ ifdef USE_SRP
- CFLAGS	+= -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
+-CFLAGS   += -DCHAPMS=1
++CPPFLAGS += -DCHAPMS=1
+ NEEDDES=y
+ PPPDOBJS += md4.o chap_ms.o
+ HEADERS	+= md4.h chap_ms.h
+ ifdef MSLANMAN
+-CFLAGS   += -DMSLANMAN=1
++CPPFLAGS += -DMSLANMAN=1
+ endif
+ ifdef MPPE
+-CFLAGS   += -DMPPE=1
++CPPFLAGS += -DMPPE=1
+ endif
+ endif
+ 
+ # EAP SRP-SHA1
+ ifdef USE_SRP
+-CFLAGS	+= -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
++CPPFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
  LIBS	+= -lsrp -L/usr/local/ssl/lib -lcrypto
  TARGETS	+= srp-entry
--EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
-+EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
- MANPAGES += srp-entry.8
- EXTRACLEAN += srp-entry.o
- NEEDDES=y
-@@ -117,10 +107,8 @@ CFLAGS   += -DHAS_SHADOW
+ EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
+@@ -113,12 +95,12 @@ PPPDOBJS += sha1.o
+ endif
+ 
+ ifdef HAS_SHADOW
+-CFLAGS   += -DHAS_SHADOW
++CPPFLAGS += -DHAS_SHADOW
  #LIBS     += -lshadow $(LIBS)
  endif
  
--ifneq ($(wildcard /usr/include/crypt.h),)
- CFLAGS  += -DHAVE_CRYPT_H=1
+ ifneq ($(wildcard /usr/include/crypt.h),)
+-CFLAGS  += -DHAVE_CRYPT_H=1
++CPPFLAGS += -DHAVE_CRYPT_H=1
  LIBS	+= -lcrypt
--endif
+ endif
  
- ifdef NEEDDES
+@@ -126,7 +108,7 @@ ifdef NEEDDES
  ifndef USE_CRYPT
-@@ -200,16 +188,16 @@ all: $(TARGETS)
+ LIBS     += -ldes $(LIBS)
+ else
+-CFLAGS   += -DUSE_CRYPT=1
++CPPFLAGS += -DUSE_CRYPT=1
+ endif
+ PPPDOBJS += pppcrypt.o
+ HEADERS += pppcrypt.h
+@@ -134,36 +116,36 @@ endif
+ 
+ # For "Pluggable Authentication Modules", see ftp.redhat.com:/pub/pam/.
+ ifdef USE_PAM
+-CFLAGS   += -DUSE_PAM
++CPPFLAGS += -DUSE_PAM
+ LIBS     += -lpam -ldl
+ endif
+ 
+ # Multi-linnk
+ ifdef HAVE_MULTILINK
+-	# Multilink implies the use of TDB
+-	USE_TDB=y
++# Multilink implies the use of TDB
++USE_TDB=y
+ 
+-	CFLAGS += -DHAVE_MULTILINK
+-	PPPDSRCS += multilink.c
+-	PPPDOBJS += multilink.o
++CPPFLAGS += -DHAVE_MULTILINK
++PPPDSRCS += multilink.c
++PPPDOBJS += multilink.o
+ endif
+ 
+ # TDB
+ ifdef USE_TDB
+-	CFLAGS += -DUSE_TDB=1
+-	PPPDSRCS += tdb.c spinlock.c
+-	PPPDOBJS += tdb.o spinlock.o
+-	HEADERS += tdb.h spinlock.h
++CPPFLAGS += -DUSE_TDB=1
++PPPDSRCS += tdb.c spinlock.c
++PPPDOBJS += tdb.o spinlock.o
++HEADERS += tdb.h spinlock.h
+ endif
+ 
+ # Lock library binary for Linux is included in 'linux' subdirectory.
+ ifdef LOCKLIB
+ LIBS     += -llock
+-CFLAGS   += -DLOCKLIB=1
++CPPFLAGS += -DLOCKLIB=1
+ endif
+ 
+ ifdef PLUGIN
+-CFLAGS	+= -DPLUGIN
++CPPFLAGS += -DPLUGIN
+ LDFLAGS	+= -Wl,-E
+ LIBS	+= -ldl
+ endif
+@@ -171,52 +153,51 @@ endif
+ ifdef FILTER
+ ifneq ($(wildcard /usr/include/pcap-bpf.h),)
+ LIBS    += -lpcap
+-CFLAGS  += -DPPP_FILTER
++CPPFLAGS += -DPPP_FILTER
+ endif
+ endif
+ 
+ ifdef HAVE_INET6
+-     PPPDSRCS += ipv6cp.c eui64.c
+-     HEADERS  += ipv6cp.h eui64.h
+-     PPPDOBJS += ipv6cp.o eui64.o
+-     CFLAGS   += -DINET6=1
++PPPDSRCS += ipv6cp.c eui64.c
++HEADERS  += ipv6cp.h eui64.h
++PPPDOBJS += ipv6cp.o eui64.o
++CPPFLAGS += -DINET6=1
+ endif
+ 
+ ifdef CBCP
+-     PPPDSRCS += cbcp.c
+-     PPPDOBJS += cbcp.o
+-     CFLAGS += -DCBCP_SUPPORT
+-     HEADERS += cbcp.h
++PPPDSRCS += cbcp.c
++PPPDOBJS += cbcp.o
++CPPFLAGS += -DCBCP_SUPPORT
++HEADERS += cbcp.h
+ endif
+ 
+ ifdef MAXOCTETS
+-     CFLAGS += -DMAXOCTETS
++CPPFLAGS += -DMAXOCTETS
+ endif
+ 
+-INSTALL= install
+-
+ all: $(TARGETS)
+ 
++# generate dependencies
++#include $(PPPDSRCS:.c=.d)
++
  install: pppd
- 	mkdir -p $(BINDIR) $(MANDIR)
+-	mkdir -p $(BINDIR) $(MANDIR)
++	$(INSTALL) -d -m 755 $(BINDIR)
++	$(INSTALL) -d -m 755 $(MANDIR)
  	$(EXTRAINSTALL)
 -	$(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
-+	$(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
++	$(INSTALL) $(STRIP) -c -m 555 pppd $(BINDIR)/pppd
  	if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
  	  chmod o-rx,u+s $(BINDIR)/pppd; fi
  	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
  
  pppd: $(PPPDOBJS)
 -	$(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
-+	$(CC) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
  
- srp-entry:	srp-entry.c
+-srp-entry:	srp-entry.c
 -	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ srp-entry.c $(LIBS)
-+	$(CC) $(LDFLAGS) -o $@ srp-entry.c $(LIBS)
++srp-entry: srp-entry.o
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
  
  install-devel:
- 	mkdir -p $(INCDIR)/pppd
-@@ -219,4 +207,4 @@ clean:
- 	rm -f $(PPPDOBJS) $(EXTRACLEAN) $(TARGETS) *~ #* core
+-	mkdir -p $(INCDIR)/pppd
++	$(INSTALL) -d -m 755 $(INCDIR)/pppd
+ 	$(INSTALL) -c -m 644 $(HEADERS) $(INCDIR)/pppd
  
- depend:
+ clean:
+-	rm -f $(PPPDOBJS) $(EXTRACLEAN) $(TARGETS) *~ #* core
+-
+-depend:
 -	$(CPP) -M $(CFLAGS) $(PPPDSRCS) >.depend
-+	$(CPP) -M $(CPPFLAGS) $(CFLAGS) $(PPPDSRCS) >.depend
++	rm -f $(PPPDOBJS) $(EXTRACLEAN) $(TARGETS) *.d *~ #* core
diff --git a/package/ppp/patches/patch-pppd_ccp_c b/package/ppp/patches/patch-pppd_ccp_c
deleted file mode 100644
index 66b76b03d..000000000
--- a/package/ppp/patches/patch-pppd_ccp_c
+++ /dev/null
@@ -1,1362 +0,0 @@
---- ppp-2.4.4.orig/pppd/ccp.c	2005-07-09 02:23:05.000000000 +0200
-+++ ppp-2.4.4/pppd/ccp.c	2009-06-05 19:12:00.000000000 +0200
-@@ -62,12 +62,10 @@ static int setdeflate __P((char **));
- static char bsd_value[8];
- static char deflate_value[8];
- 
--/*
-- * Option variables.
-- */
- #ifdef MPPE
--bool refuse_mppe_stateful = 1;		/* Allow stateful mode? */
--#endif
-+static int setmppe(char **);
-+static int setnomppe(void);
-+#endif /* MPPE */
- 
- static option_t ccp_option_list[] = {
-     { "noccp", o_bool, &ccp_protent.enabled_flag,
-@@ -108,54 +106,36 @@ static option_t ccp_option_list[] = {
-       "don't allow Predictor-1", OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLR,
-       &ccp_allowoptions[0].predictor_1 },
- 
--#ifdef MPPE
--    /* MPPE options are symmetrical ... we only set wantoptions here */
--    { "require-mppe", o_bool, &ccp_wantoptions[0].mppe,
--      "require MPPE encryption",
--      OPT_PRIO | MPPE_OPT_40 | MPPE_OPT_128 },
--    { "+mppe", o_bool, &ccp_wantoptions[0].mppe,
--      "require MPPE encryption",
--      OPT_ALIAS | OPT_PRIO | MPPE_OPT_40 | MPPE_OPT_128 },
--    { "nomppe", o_bool, &ccp_wantoptions[0].mppe,
--      "don't allow MPPE encryption", OPT_PRIO },
--    { "-mppe", o_bool, &ccp_wantoptions[0].mppe,
--      "don't allow MPPE encryption", OPT_ALIAS | OPT_PRIO },
--
--    /* We use ccp_allowoptions[0].mppe as a junk var ... it is reset later */
--    { "require-mppe-40", o_bool, &ccp_allowoptions[0].mppe,
--      "require MPPE 40-bit encryption", OPT_PRIO | OPT_A2OR | MPPE_OPT_40,
--      &ccp_wantoptions[0].mppe },
--    { "+mppe-40", o_bool, &ccp_allowoptions[0].mppe,
--      "require MPPE 40-bit encryption", OPT_PRIO | OPT_A2OR | MPPE_OPT_40,
--      &ccp_wantoptions[0].mppe },
--    { "nomppe-40", o_bool, &ccp_allowoptions[0].mppe,
--      "don't allow MPPE 40-bit encryption",
--      OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_40, &ccp_wantoptions[0].mppe },
--    { "-mppe-40", o_bool, &ccp_allowoptions[0].mppe,
--      "don't allow MPPE 40-bit encryption",
--      OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_40,
--      &ccp_wantoptions[0].mppe },
--
--    { "require-mppe-128", o_bool, &ccp_allowoptions[0].mppe,
--      "require MPPE 128-bit encryption", OPT_PRIO | OPT_A2OR | MPPE_OPT_128,
--      &ccp_wantoptions[0].mppe },
--    { "+mppe-128", o_bool, &ccp_allowoptions[0].mppe,
--      "require MPPE 128-bit encryption",
--      OPT_ALIAS | OPT_PRIO | OPT_A2OR | MPPE_OPT_128,
--      &ccp_wantoptions[0].mppe },
--    { "nomppe-128", o_bool, &ccp_allowoptions[0].mppe,
--      "don't allow MPPE 128-bit encryption",
--      OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_128, &ccp_wantoptions[0].mppe },
--    { "-mppe-128", o_bool, &ccp_allowoptions[0].mppe,
--      "don't allow MPPE 128-bit encryption",
--      OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_128,
--      &ccp_wantoptions[0].mppe },
-+    { "lzs", o_bool, &ccp_wantoptions[0].lzs,
-+      "request Stac LZS", 1, &ccp_allowoptions[0].lzs, OPT_PRIO },
-+    { "+lzs", o_bool, &ccp_wantoptions[0].lzs,
-+      "request Stac LZS", 1, &ccp_allowoptions[0].lzs, OPT_ALIAS | OPT_PRIO },
-+    { "nolzs", o_bool, &ccp_wantoptions[0].lzs,
-+      "don't allow Stac LZS", OPT_PRIOSUB | OPT_A2CLR,
-+      &ccp_allowoptions[0].lzs },
-+    { "-lzs", o_bool, &ccp_wantoptions[0].lzs,
-+      "don't allow Stac LZS", OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLR,
-+      &ccp_allowoptions[0].lzs },
- 
--    /* strange one; we always request stateless, but will we allow stateful? */
--    { "mppe-stateful", o_bool, &refuse_mppe_stateful,
--      "allow MPPE stateful mode", OPT_PRIO },
--    { "nomppe-stateful", o_bool, &refuse_mppe_stateful,
--      "disallow MPPE stateful mode", OPT_PRIO | 1 },
-+#ifdef MPPE
-+    { "mppc", o_bool, &ccp_wantoptions[0].mppc,
-+      "request MPPC compression", 1, &ccp_allowoptions[0].mppc },
-+    { "+mppc", o_bool, &ccp_wantoptions[0].mppc,
-+      "request MPPC compression", 1, &ccp_allowoptions[0].mppc, OPT_ALIAS },
-+    { "nomppc", o_bool, &ccp_wantoptions[0].mppc,
-+      "don't allow MPPC compression", OPT_PRIOSUB | OPT_A2CLR,
-+      &ccp_allowoptions[0].mppc },
-+    { "-mppc", o_bool, &ccp_wantoptions[0].mppc,
-+      "don't allow MPPC compression", OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLR,
-+      &ccp_allowoptions[0].mppc },
-+    { "mppe", o_special, (void *)setmppe,
-+      "request MPPE encryption" },
-+    { "+mppe", o_special, (void *)setmppe,
-+      "request MPPE encryption" },
-+    { "nomppe", o_special_noarg, (void *)setnomppe,
-+      "don't allow MPPE encryption" },
-+    { "-mppe", o_special_noarg, (void *)setnomppe,
-+      "don't allow MPPE encryption" },
- #endif /* MPPE */
- 
-     { NULL }
-@@ -241,7 +221,7 @@ static fsm_callbacks ccp_callbacks = {
-  */
- #define ANY_COMPRESS(opt)	((opt).deflate || (opt).bsd_compress \
- 				 || (opt).predictor_1 || (opt).predictor_2 \
--				 || (opt).mppe)
-+				 || (opt).lzs || (opt).mppc || (opt).mppe)
- 
- /*
-  * Local state (mainly for handling reset-reqs and reset-acks).
-@@ -344,6 +324,100 @@ setdeflate(argv)
-     return 1;
- }
- 
-+#ifdef MPPE
-+/*
-+ * Functions called from config options
-+ */
-+/* 
-+   MPPE suboptions:
-+	required - require MPPE; disconnect if peer doesn't support it
-+	stateless - use stateless mode
-+	no40 - disable 40 bit keys
-+	no56 - disable 56 bit keys
-+	no128 - disable 128 bit keys
-+*/
-+int setmppe(char **argv)
-+{
-+    int i;
-+    char *str, cmdbuf[16];
-+
-+    ccp_allowoptions[0].mppe = 1;
-+    ccp_allowoptions[0].mppe_40 = 1;
-+    ccp_allowoptions[0].mppe_56 = 1;
-+    ccp_allowoptions[0].mppe_128 = 1;
-+    ccp_allowoptions[0].mppe_stateless = 0;
-+    ccp_wantoptions[0].mppe = 0;
-+
-+    str = *argv;
-+
-+    while (1) {
-+	i = 0;
-+	memset(cmdbuf, '\0', 16);
-+	while ((i < 16) && (*str != ',') && (*str != '\0'))
-+	    cmdbuf[i++] = *str++;
-+	cmdbuf[i] = '\0';
-+	if (!strncasecmp(cmdbuf, "no40", strlen("no40"))) {
-+	    ccp_allowoptions[0].mppe_40 = 0;
-+	    goto next_param;
-+	} else if (!strncasecmp(cmdbuf, "no56", strlen("no56"))) {
-+	    ccp_allowoptions[0].mppe_56 = 0;
-+	    goto next_param;
-+	} else if (!strncasecmp(cmdbuf, "no128", strlen("no128"))) {
-+	    ccp_allowoptions[0].mppe_128 = 0;
-+	    goto next_param;
-+	} else if (!strncasecmp(cmdbuf, "stateless", strlen("stateless"))) {
-+	    ccp_allowoptions[0].mppe_stateless = 1;
-+	    goto next_param;
-+	} else if (!strncasecmp(cmdbuf, "required", strlen("required"))) {
-+	    ccp_wantoptions[0].mppe = 1;
-+	    goto next_param;
-+	} else {
-+	    option_error("invalid parameter '%s' for mppe option", cmdbuf);
-+	    return 0;
-+	}
-+
-+    next_param:
-+	if (*str == ',') {
-+	    str++;
-+	    continue;
-+	}
-+	if (*str == '\0') {
-+	    if (!(ccp_allowoptions[0].mppe_40 || ccp_allowoptions[0].mppe_56 ||
-+		  ccp_allowoptions[0].mppe_128)) {
-+		if (ccp_wantoptions[0].mppe == 1) {
-+		    option_error("You require MPPE but you have switched off "
-+				 "all encryption key lengths.");
-+		    return 0;
-+		}
-+		ccp_wantoptions[0].mppe = ccp_allowoptions[0].mppe = 0;
-+		ccp_wantoptions[0].mppe_stateless =
-+		    ccp_allowoptions[0].mppe_stateless = 0;
-+	    } else {
-+		ccp_allowoptions[0].mppe = 1;
-+		ccp_wantoptions[0].mppe_stateless =
-+		    ccp_allowoptions[0].mppe_stateless;
-+		if (ccp_wantoptions[0].mppe == 1) {
-+		    ccp_wantoptions[0].mppe_40 = ccp_allowoptions[0].mppe_40;
-+		    ccp_wantoptions[0].mppe_56 = ccp_allowoptions[0].mppe_56;
-+		    ccp_wantoptions[0].mppe_128 = ccp_allowoptions[0].mppe_128;
-+		}
-+	    }
-+	    return 1;
-+	}
-+    }
-+}
-+
-+int setnomppe(void)
-+{
-+    ccp_wantoptions[0].mppe = ccp_allowoptions[0].mppe = 0;
-+    ccp_wantoptions[0].mppe_40 = ccp_allowoptions[0].mppe_40 = 0;
-+    ccp_wantoptions[0].mppe_56 = ccp_allowoptions[0].mppe_56 = 0;
-+    ccp_wantoptions[0].mppe_128 = ccp_allowoptions[0].mppe_128 = 0;
-+    ccp_wantoptions[0].mppe_stateless = ccp_allowoptions[0].mppe_stateless = 0;
-+    return 1;
-+}
-+#endif /* MPPE */
-+
- /*
-  * ccp_init - initialize CCP.
-  */
-@@ -378,6 +452,30 @@ ccp_init(unit)
-     ccp_allowoptions[0].bsd_bits = BSD_MAX_BITS;
- 
-     ccp_allowoptions[0].predictor_1 = 1;
-+
-+    ccp_wantoptions[0].lzs = 0; /* Stac LZS  - will be enabled in the future */
-+    ccp_wantoptions[0].lzs_mode = LZS_MODE_SEQ;
-+    ccp_wantoptions[0].lzs_hists = 1;
-+    ccp_allowoptions[0].lzs = 0; /* Stac LZS  - will be enabled in the future */
-+    ccp_allowoptions[0].lzs_mode = LZS_MODE_SEQ;
-+    ccp_allowoptions[0].lzs_hists = 1;
-+
-+#ifdef MPPE
-+    /* by default allow and request MPPC... */
-+    ccp_wantoptions[0].mppc = ccp_allowoptions[0].mppc = 1;
-+
-+    /* ... and allow but don't request MPPE */
-+    ccp_allowoptions[0].mppe = 1;
-+    ccp_allowoptions[0].mppe_40 = 1;
-+    ccp_allowoptions[0].mppe_56 = 1;
-+    ccp_allowoptions[0].mppe_128 = 1;
-+    ccp_allowoptions[0].mppe_stateless = 1;
-+    ccp_wantoptions[0].mppe = 0;
-+    ccp_wantoptions[0].mppe_40 = 0;
-+    ccp_wantoptions[0].mppe_56 = 0;
-+    ccp_wantoptions[0].mppe_128 = 0;
-+    ccp_wantoptions[0].mppe_stateless = 0;
-+#endif /* MPPE */
- }
- 
- /*
-@@ -455,11 +553,11 @@ ccp_input(unit, p, len)
-     if (oldstate == OPENED && p[0] == TERMREQ && f->state != OPENED) {
- 	notice("Compression disabled by peer.");
- #ifdef MPPE
--	if (ccp_gotoptions[unit].mppe) {
-+	if (ccp_wantoptions[unit].mppe) {
- 	    error("MPPE disabled, closing LCP");
- 	    lcp_close(unit, "MPPE disabled by peer");
- 	}
--#endif
-+#endif /* MPPE */
-     }
- 
-     /*
-@@ -487,6 +585,15 @@ ccp_extcode(f, code, id, p, len)
- 	    break;
- 	/* send a reset-ack, which the transmitter will see and
- 	   reset its compression state. */
-+
-+	/* In case of MPPE/MPPC or LZS we shouldn't send CCP_RESETACK,
-+	   but we do it in order to reset compressor; CCP_RESETACK is
-+	   then silently discarded. See functions ppp_send_frame and
-+	   ppp_ccp_peek in ppp_generic.c (Linux only !!!). All the
-+	   confusion is caused by the fact that CCP code is splited
-+	   into two parts - one part is handled by pppd, the other one
-+	   is handled by kernel. */
-+
- 	fsm_sdata(f, CCP_RESETACK, id, NULL, 0);
- 	break;
- 
-@@ -515,12 +622,11 @@ ccp_protrej(unit)
-     fsm_lowerdown(&ccp_fsm[unit]);
- 
- #ifdef MPPE
--    if (ccp_gotoptions[unit].mppe) {
-+    if (ccp_wantoptions[unit].mppe) {
- 	error("MPPE required but peer negotiation failed");
- 	lcp_close(unit, "MPPE required but peer negotiation failed");
-     }
--#endif
--
-+#endif /* MPPE */
- }
- 
- /*
-@@ -537,7 +643,7 @@ ccp_resetci(f)
-     all_rejected[f->unit] = 0;
- 
- #ifdef MPPE
--    if (go->mppe) {
-+    if (go->mppe || go->mppc) {
- 	ccp_options *ao = &ccp_allowoptions[f->unit];
- 	int auth_mschap_bits = auth_done[f->unit];
- 	int numbits;
-@@ -551,80 +657,109 @@ ccp_resetci(f)
- 	 * NB: If MPPE is required, all other compression opts are invalid.
- 	 *     So, we return right away if we can't do it.
- 	 */
-+	if (ccp_wantoptions[f->unit].mppe) {
-+	    /* Leave only the mschap auth bits set */
-+	    auth_mschap_bits &= (CHAP_MS_WITHPEER  | CHAP_MS_PEER |
-+				 CHAP_MS2_WITHPEER | CHAP_MS2_PEER);
-+	    /* Count the mschap auths */
-+	    auth_mschap_bits >>= CHAP_MS_SHIFT;
-+	    numbits = 0;
-+	    do {
-+		numbits += auth_mschap_bits & 1;
-+		auth_mschap_bits >>= 1;
-+	    } while (auth_mschap_bits);
-+	    if (numbits > 1) {
-+		error("MPPE required, but auth done in both directions.");
-+		lcp_close(f->unit, "MPPE required but not available");
-+		return;
-+	    }
-+	    if (!numbits) {
-+		error("MPPE required, but MS-CHAP[v2] auth not performed.");
-+		lcp_close(f->unit, "MPPE required but not available");
-+		return;
-+	    }
- 
--	/* Leave only the mschap auth bits set */
--	auth_mschap_bits &= (CHAP_MS_WITHPEER  | CHAP_MS_PEER |
--			     CHAP_MS2_WITHPEER | CHAP_MS2_PEER);
--	/* Count the mschap auths */
--	auth_mschap_bits >>= CHAP_MS_SHIFT;
--	numbits = 0;
--	do {
--	    numbits += auth_mschap_bits & 1;
--	    auth_mschap_bits >>= 1;
--	} while (auth_mschap_bits);
--	if (numbits > 1) {
--	    error("MPPE required, but auth done in both directions.");
--	    lcp_close(f->unit, "MPPE required but not available");
--	    return;
--	}
--	if (!numbits) {
--	    error("MPPE required, but MS-CHAP[v2] auth not performed.");
--	    lcp_close(f->unit, "MPPE required but not available");
--	    return;
-+	    /* A plugin (eg radius) may not have obtained key material. */
-+	    if (!mppe_keys_set) {
-+		error("MPPE required, but keys are not available.  "
-+		      "Possible plugin problem?");
-+		lcp_close(f->unit, "MPPE required but not available");
-+		return;
-+	    }
- 	}
- 
--	/* A plugin (eg radius) may not have obtained key material. */
--	if (!mppe_keys_set) {
--	    error("MPPE required, but keys are not available.  "
--		  "Possible plugin problem?");
--	    lcp_close(f->unit, "MPPE required but not available");
--	    return;
-+	/*
-+	 * Check whether the kernel knows about the various
-+	 * compression methods we might request. Key material
-+	 * unimportant here.
-+	 */
-+	if (go->mppc) {
-+	    opt_buf[0] = CI_MPPE;
-+	    opt_buf[1] = CILEN_MPPE;
-+	    opt_buf[2] = 0;
-+	    opt_buf[3] = 0;
-+	    opt_buf[4] = 0;
-+	    opt_buf[5] = MPPE_MPPC;
-+	    if (ccp_test(f->unit, opt_buf, CILEN_MPPE, 0) <= 0)
-+		go->mppc = 0;
- 	}
--
--	/* LM auth not supported for MPPE */
--	if (auth_done[f->unit] & (CHAP_MS_WITHPEER | CHAP_MS_PEER)) {
--	    /* This might be noise */
--	    if (go->mppe & MPPE_OPT_40) {
--		notice("Disabling 40-bit MPPE; MS-CHAP LM not supported");
--		go->mppe &= ~MPPE_OPT_40;
--		ccp_wantoptions[f->unit].mppe &= ~MPPE_OPT_40;
--	    }
-+	if (go->mppe_40) {
-+	    opt_buf[0] = CI_MPPE;
-+	    opt_buf[1] = CILEN_MPPE;
-+	    opt_buf[2] = MPPE_STATELESS;
-+	    opt_buf[3] = 0;
-+	    opt_buf[4] = 0;
-+	    opt_buf[5] = MPPE_40BIT;
-+	    if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0)
-+		go->mppe_40 = 0;
- 	}
--
--	/* Last check: can we actually negotiate something? */
--	if (!(go->mppe & (MPPE_OPT_40 | MPPE_OPT_128))) {
--	    /* Could be misconfig, could be 40-bit disabled above. */
--	    error("MPPE required, but both 40-bit and 128-bit disabled.");
--	    lcp_close(f->unit, "MPPE required but not available");
--	    return;
-+	if (go->mppe_56) {
-+	    opt_buf[0] = CI_MPPE;
-+	    opt_buf[1] = CILEN_MPPE;
-+	    opt_buf[2] = MPPE_STATELESS;
-+	    opt_buf[3] = 0;
-+	    opt_buf[4] = 0;
-+	    opt_buf[5] = MPPE_56BIT;
-+	    if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0)
-+		go->mppe_56 = 0;
-+	}
-+	if (go->mppe_128) {
-+	    opt_buf[0] = CI_MPPE;
-+	    opt_buf[1] = CILEN_MPPE;
-+	    opt_buf[2] = MPPE_STATELESS;
-+	    opt_buf[3] = 0;
-+	    opt_buf[4] = 0;
-+	    opt_buf[5] = MPPE_128BIT;
-+	    if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0)
-+		go->mppe_128 = 0;
-+	}
-+	if (!go->mppe_40 && !go->mppe_56 && !go->mppe_128) {
-+	    if (ccp_wantoptions[f->unit].mppe) {
-+		error("MPPE required, but kernel has no support.");
-+		lcp_close(f->unit, "MPPE required but not available");
-+	    }
-+	    go->mppe = go->mppe_stateless = 0;
-+	} else {
-+	    /* MPPE is not compatible with other compression types */
-+	    if (ccp_wantoptions[f->unit].mppe) {
-+		ao->bsd_compress = go->bsd_compress = 0;
-+		ao->predictor_1  = go->predictor_1  = 0;
-+		ao->predictor_2  = go->predictor_2  = 0;
-+		ao->deflate	 = go->deflate	    = 0;
-+		ao->lzs		 = go->lzs	    = 0;
-+	    }
- 	}
--
--	/* sync options */
--	ao->mppe = go->mppe;
--	/* MPPE is not compatible with other compression types */
--	ao->bsd_compress = go->bsd_compress = 0;
--	ao->predictor_1  = go->predictor_1  = 0;
--	ao->predictor_2  = go->predictor_2  = 0;
--	ao->deflate      = go->deflate      = 0;
-     }
- #endif /* MPPE */
--
--    /*
--     * Check whether the kernel knows about the various
--     * compression methods we might request.
--     */
--#ifdef MPPE
--    if (go->mppe) {
--	opt_buf[0] = CI_MPPE;
--	opt_buf[1] = CILEN_MPPE;
--	MPPE_OPTS_TO_CI(go->mppe, &opt_buf[2]);
--	/* Key material unimportant here. */
--	if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0) {
--	    error("MPPE required, but kernel has no support.");
--	    lcp_close(f->unit, "MPPE required but not available");
--	}
-+    if (go->lzs) {
-+	opt_buf[0] = CI_LZS;
-+	opt_buf[1] = CILEN_LZS;
-+	opt_buf[2] = go->lzs_hists >> 8;
-+	opt_buf[3] = go->lzs_hists & 0xff;
-+	opt_buf[4] = LZS_MODE_SEQ;
-+	if (ccp_test(f->unit, opt_buf, CILEN_LZS, 0) <= 0)
-+	    go->lzs = 0;
-     }
--#endif
-     if (go->bsd_compress) {
- 	opt_buf[0] = CI_BSD_COMPRESS;
- 	opt_buf[1] = CILEN_BSD_COMPRESS;
-@@ -679,7 +814,8 @@ ccp_cilen(f)
- 	+ (go->deflate? CILEN_DEFLATE: 0)
- 	+ (go->predictor_1? CILEN_PREDICTOR_1: 0)
- 	+ (go->predictor_2? CILEN_PREDICTOR_2: 0)
--	+ (go->mppe? CILEN_MPPE: 0);
-+	+ (go->lzs? CILEN_LZS: 0)
-+	+ ((go->mppe || go->mppc)? CILEN_MPPE: 0);
- }
- 
- /*
-@@ -693,6 +829,8 @@ ccp_addci(f, p, lenp)
- {
-     int res;
-     ccp_options *go = &ccp_gotoptions[f->unit];
-+    ccp_options *ao = &ccp_allowoptions[f->unit];
-+    ccp_options *wo = &ccp_wantoptions[f->unit];
-     u_char *p0 = p;
- 
-     /*
-@@ -701,22 +839,43 @@ ccp_addci(f, p, lenp)
-      * in case it gets Acked.
-      */
- #ifdef MPPE
--    if (go->mppe) {
-+    if (go->mppe || go->mppc || (!wo->mppe && ao->mppe)) {
- 	u_char opt_buf[CILEN_MPPE + MPPE_MAX_KEY_LEN];
- 
--	p[0] = opt_buf[0] = CI_MPPE;
--	p[1] = opt_buf[1] = CILEN_MPPE;
--	MPPE_OPTS_TO_CI(go->mppe, &p[2]);
--	MPPE_OPTS_TO_CI(go->mppe, &opt_buf[2]);
-+	p[0] = CI_MPPE;
-+	p[1] = CILEN_MPPE;
-+	p[2] = (go->mppe_stateless ? MPPE_STATELESS : 0);
-+	p[3] = 0;
-+	p[4] = 0;
-+	p[5] = (go->mppe_40 ? MPPE_40BIT : 0) | (go->mppe_56 ? MPPE_56BIT : 0) |
-+	    (go->mppe_128 ? MPPE_128BIT : 0) | (go->mppc ? MPPE_MPPC : 0);
-+
-+	BCOPY(p, opt_buf, CILEN_MPPE);
- 	BCOPY(mppe_recv_key, &opt_buf[CILEN_MPPE], MPPE_MAX_KEY_LEN);
- 	res = ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0);
--	if (res > 0)
-+	if (res > 0) {
- 	    p += CILEN_MPPE;
--	else
-+	} else {
- 	    /* This shouldn't happen, we've already tested it! */
--	    lcp_close(f->unit, "MPPE required but not available in kernel");
-+	    go->mppe = go->mppe_40 = go->mppe_56 = go->mppe_128 =
-+		go->mppe_stateless = go->mppc = 0;
-+	    if (ccp_wantoptions[f->unit].mppe)
-+		lcp_close(f->unit, "MPPE required but not available in kernel");
-+	}
-+    }
-+#endif /* MPPE */
-+    if (go->lzs) {
-+	p[0] = CI_LZS;
-+	p[1] = CILEN_LZS;
-+	p[2] = go->lzs_hists >> 8;
-+	p[3] = go->lzs_hists & 0xff;
-+	p[4] = LZS_MODE_SEQ;
-+	res = ccp_test(f->unit, p, CILEN_LZS, 0);
-+	if (res > 0) {
-+	    p += CILEN_LZS;
-+	} else
-+	    go->lzs = 0;
-     }
--#endif
-     if (go->deflate) {
- 	p[0] = go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT;
- 	p[1] = CILEN_DEFLATE;
-@@ -802,7 +961,7 @@ ccp_addci(f, p, lenp)
- 
- /*
-  * ccp_ackci - process a received configure-ack, and return
-- * 1 iff the packet was OK.
-+ * 1 if the packet was OK.
-  */
- static int
- ccp_ackci(f, p, len)
-@@ -811,24 +970,44 @@ ccp_ackci(f, p, len)
-     int len;
- {
-     ccp_options *go = &ccp_gotoptions[f->unit];
-+    ccp_options *ao = &ccp_allowoptions[f->unit];
-+    ccp_options *wo = &ccp_wantoptions[f->unit];
-     u_char *p0 = p;
- 
- #ifdef MPPE
--    if (go->mppe) {
--	u_char opt_buf[CILEN_MPPE];
--
--	opt_buf[0] = CI_MPPE;
--	opt_buf[1] = CILEN_MPPE;
--	MPPE_OPTS_TO_CI(go->mppe, &opt_buf[2]);
--	if (len < CILEN_MPPE || memcmp(opt_buf, p, CILEN_MPPE))
-+    if (go->mppe || go->mppc || (!wo->mppe && ao->mppe)) {
-+	if (len < CILEN_MPPE
-+	    || p[1] != CILEN_MPPE || p[0] != CI_MPPE
-+	    || p[2] != (go->mppe_stateless ? MPPE_STATELESS : 0)
-+	    || p[3] != 0
-+	    || p[4] != 0
-+	    || (p[5] != ((go->mppe_40 ? MPPE_40BIT : 0) |
-+			 (go->mppc ? MPPE_MPPC : 0))
-+		&& p[5] != ((go->mppe_56 ? MPPE_56BIT : 0) |
-+			    (go->mppc ? MPPE_MPPC : 0))
-+		&& p[5] != ((go->mppe_128 ? MPPE_128BIT : 0) |
-+			    (go->mppc ? MPPE_MPPC : 0))))
- 	    return 0;
-+	if (go->mppe_40 || go->mppe_56 || go->mppe_128)
-+	    go->mppe = 1;
- 	p += CILEN_MPPE;
- 	len -= CILEN_MPPE;
-+	/* Cope with first/fast ack */
-+	if (p == p0 && len == 0)
-+	    return 1;
-+    }
-+#endif /* MPPE */
-+    if (go->lzs) {
-+	if (len < CILEN_LZS || p[0] != CI_LZS || p[1] != CILEN_LZS
-+	    || p[2] != go->lzs_hists>>8 || p[3] != (go->lzs_hists&0xff)
-+	    || p[4] != LZS_MODE_SEQ)
-+	    return 0;
-+	p += CILEN_LZS;
-+	len -= CILEN_LZS;
- 	/* XXX Cope with first/fast ack */
--	if (len == 0)
-+	if (p == p0 && len == 0)
- 	    return 1;
-     }
--#endif
-     if (go->deflate) {
- 	if (len < CILEN_DEFLATE
- 	    || p[0] != (go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT)
-@@ -891,7 +1070,7 @@ ccp_ackci(f, p, len)
- 
- /*
-  * ccp_nakci - process received configure-nak.
-- * Returns 1 iff the nak was OK.
-+ * Returns 1 if the nak was OK.
-  */
- static int
- ccp_nakci(f, p, len, treat_as_reject)
-@@ -901,6 +1080,8 @@ ccp_nakci(f, p, len, treat_as_reject)
-     int treat_as_reject;
- {
-     ccp_options *go = &ccp_gotoptions[f->unit];
-+    ccp_options *ao = &ccp_allowoptions[f->unit];
-+    ccp_options *wo = &ccp_wantoptions[f->unit];
-     ccp_options no;		/* options we've seen already */
-     ccp_options try;		/* options to ask for next time */
- 
-@@ -908,28 +1089,100 @@ ccp_nakci(f, p, len, treat_as_reject)
-     try = *go;
- 
- #ifdef MPPE
--    if (go->mppe && len >= CILEN_MPPE
--	&& p[0] == CI_MPPE && p[1] == CILEN_MPPE) {
--	no.mppe = 1;
--	/*
--	 * Peer wants us to use a different strength or other setting.
--	 * Fail if we aren't willing to use his suggestion.
--	 */
--	MPPE_CI_TO_OPTS(&p[2], try.mppe);
--	if ((try.mppe & MPPE_OPT_STATEFUL) && refuse_mppe_stateful) {
--	    error("Refusing MPPE stateful mode offered by peer");
--	    try.mppe = 0;
--	} else if (((go->mppe | MPPE_OPT_STATEFUL) & try.mppe) != try.mppe) {
--	    /* Peer must have set options we didn't request (suggest) */
--	    try.mppe = 0;
-+    if ((go->mppe || go->mppc || (!wo->mppe && ao->mppe)) &&
-+	len >= CILEN_MPPE && p[0] == CI_MPPE && p[1] == CILEN_MPPE) {
-+
-+	if (go->mppc) {
-+	    no.mppc = 1;
-+	    if (!(p[5] & MPPE_MPPC))
-+		try.mppc = 0;
- 	}
- 
--	if (!try.mppe) {
--	    error("MPPE required but peer negotiation failed");
--	    lcp_close(f->unit, "MPPE required but peer negotiation failed");
-+	if (go->mppe)
-+	    no.mppe = 1;
-+	if (go->mppe_40)
-+	    no.mppe_40 = 1;
-+	if (go->mppe_56)
-+	    no.mppe_56 = 1;
-+	if (go->mppe_128)
-+	    no.mppe_128 = 1;
-+	if (go->mppe_stateless)
-+	    no.mppe_stateless = 1;
-+
-+	if (ao->mppe_40) {
-+	    if ((p[5] & MPPE_40BIT))
-+		try.mppe_40 = 1;
-+	    else
-+		try.mppe_40 = (p[5] == 0) ? 1 : 0;
- 	}
-+	if (ao->mppe_56) {
-+	    if ((p[5] & MPPE_56BIT))
-+		try.mppe_56 = 1;
-+	    else
-+		try.mppe_56 = (p[5] == 0) ? 1 : 0;
-+	}
-+	if (ao->mppe_128) {
-+	    if ((p[5] & MPPE_128BIT))
-+		try.mppe_128 = 1;
-+	    else
-+		try.mppe_128 = (p[5] == 0) ? 1 : 0;
-+	}
-+
-+	if (ao->mppe_stateless) {
-+	    if ((p[2] & MPPE_STATELESS) || wo->mppe_stateless)
-+		try.mppe_stateless = 1;
-+	    else
-+		try.mppe_stateless = 0;
-+	}
-+
-+	if (!try.mppe_56 && !try.mppe_40 && !try.mppe_128) {
-+	    try.mppe = try.mppe_stateless = 0;
-+	    if (wo->mppe) {
-+		/* we require encryption, but peer doesn't support it
-+		   so we close connection */
-+		wo->mppc = wo->mppe = wo->mppe_stateless = wo->mppe_40 =
-+		    wo->mppe_56 = wo->mppe_128 = 0;
-+		lcp_close(f->unit, "MPPE required but cannot negotiate MPPE "
-+			  "key length");
-+	    }
-+        }
-+	if (wo->mppe && (wo->mppe_40 != try.mppe_40) &&
-+	    (wo->mppe_56 != try.mppe_56) && (wo->mppe_128 != try.mppe_128)) {
-+	    /* cannot negotiate key length */
-+	    wo->mppc = wo->mppe = wo->mppe_stateless = wo->mppe_40 =
-+		wo->mppe_56 = wo->mppe_128 = 0;
-+	    lcp_close(f->unit, "Cannot negotiate MPPE key length");
-+	}
-+	if (try.mppe_40 && try.mppe_56 && try.mppe_128)
-+	    try.mppe_40 = try.mppe_56 = 0;
-+	else
-+	    if (try.mppe_56 && try.mppe_128)
-+		try.mppe_56 = 0;
-+	    else
-+		if (try.mppe_40 && try.mppe_128)
-+		    try.mppe_40 = 0;
-+		else
-+		    if (try.mppe_40 && try.mppe_56)
-+			try.mppe_40 = 0;
-+
-+	p += CILEN_MPPE;
-+	len -= CILEN_MPPE;
-     }
- #endif /* MPPE */
-+
-+    if (go->lzs && len >= CILEN_LZS && p[0] == CI_LZS && p[1] == CILEN_LZS) {
-+	no.lzs = 1;
-+	if (((p[2]<<8)|p[3]) > 1 || (p[4] != LZS_MODE_SEQ &&
-+				     p[4] != LZS_MODE_EXT))
-+	    try.lzs = 0;
-+	else {
-+	    try.lzs_mode = p[4];
-+	    try.lzs_hists = (p[2] << 8) | p[3];
-+	}
-+	p += CILEN_LZS;
-+	len -= CILEN_LZS;
-+    }
-+
-     if (go->deflate && len >= CILEN_DEFLATE
- 	&& p[0] == (go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT)
- 	&& p[1] == CILEN_DEFLATE) {
-@@ -1002,14 +1255,50 @@ ccp_rejci(f, p, len)
- 	return -1;
- 
- #ifdef MPPE
--    if (go->mppe && len >= CILEN_MPPE
-+    if ((go->mppe || go->mppc) && len >= CILEN_MPPE
- 	&& p[0] == CI_MPPE && p[1] == CILEN_MPPE) {
--	error("MPPE required but peer refused");
--	lcp_close(f->unit, "MPPE required but peer refused");
-+	ccp_options *wo = &ccp_wantoptions[f->unit];
-+	if (p[2] != (go->mppe_stateless ? MPPE_STATELESS : 0) ||
-+	    p[3] != 0 ||
-+	    p[4] != 0 ||
-+	    p[5] != ((go->mppe_40 ? MPPE_40BIT : 0) |
-+		     (go->mppe_56 ? MPPE_56BIT : 0) |
-+		     (go->mppe_128 ? MPPE_128BIT : 0) |
-+		     (go->mppc ? MPPE_MPPC : 0)))
-+	    return 0;
-+	if (go->mppc)
-+	    try.mppc = 0;
-+	if (go->mppe) {
-+	    try.mppe = 0;
-+	    if (go->mppe_40)
-+		try.mppe_40 = 0;
-+	    if (go->mppe_56)
-+		try.mppe_56 = 0;
-+	    if (go->mppe_128)
-+		try.mppe_128 = 0;
-+	    if (go->mppe_stateless)
-+		try.mppe_stateless = 0;
-+	    if (!try.mppe_56 && !try.mppe_40 && !try.mppe_128)
-+		try.mppe = try.mppe_stateless = 0;
-+	    if (wo->mppe) { /* we want MPPE but cannot negotiate key length */
-+		wo->mppc = wo->mppe = wo->mppe_stateless = wo->mppe_40 =
-+		    wo->mppe_56 = wo->mppe_128 = 0;
-+		lcp_close(f->unit, "MPPE required but cannot negotiate MPPE "
-+			  "key length");
-+	    }
-+	}
- 	p += CILEN_MPPE;
- 	len -= CILEN_MPPE;
-     }
--#endif
-+#endif /* MPPE */
-+    if (go->lzs && len >= CILEN_LZS && p[0] == CI_LZS && p[1] == CILEN_LZS) {
-+	if (p[2] != go->lzs_hists>>8 || p[3] != (go->lzs_hists&0xff) 
-+	    || p[4] != go->lzs_mode)
-+	    return 0;
-+	try.lzs = 0;
-+	p += CILEN_LZS;
-+	len -= CILEN_LZS;
-+    }
-     if (go->deflate_correct && len >= CILEN_DEFLATE
- 	&& p[0] == CI_DEFLATE && p[1] == CILEN_DEFLATE) {
- 	if (p[2] != DEFLATE_MAKE_OPT(go->deflate_size)
-@@ -1073,14 +1362,15 @@ ccp_reqci(f, p, lenp, dont_nak)
-     int dont_nak;
- {
-     int ret, newret, res;
--    u_char *p0, *retp;
-+    u_char *p0, *retp, p2, p5;
-     int len, clen, type, nb;
-     ccp_options *ho = &ccp_hisoptions[f->unit];
-     ccp_options *ao = &ccp_allowoptions[f->unit];
-+    ccp_options *wo = &ccp_wantoptions[f->unit];
- #ifdef MPPE
--    bool rej_for_ci_mppe = 1;	/* Are we rejecting based on a bad/missing */
--				/* CI_MPPE, or due to other options?       */
--#endif
-+    u_char opt_buf[CILEN_MPPE + MPPE_MAX_KEY_LEN];
-+/*     int mtu; */
-+#endif /* MPPE */
- 
-     ret = CONFACK;
-     retp = p0 = p;
-@@ -1103,106 +1393,307 @@ ccp_reqci(f, p, lenp, dont_nak)
- 	    switch (type) {
- #ifdef MPPE
- 	    case CI_MPPE:
--		if (!ao->mppe || clen != CILEN_MPPE) {
-+		if ((!ao->mppc && !ao->mppe) || clen != CILEN_MPPE) {
- 		    newret = CONFREJ;
- 		    break;
- 		}
--		MPPE_CI_TO_OPTS(&p[2], ho->mppe);
- 
--		/* Nak if anything unsupported or unknown are set. */
--		if (ho->mppe & MPPE_OPT_UNSUPPORTED) {
--		    newret = CONFNAK;
--		    ho->mppe &= ~MPPE_OPT_UNSUPPORTED;
--		}
--		if (ho->mppe & MPPE_OPT_UNKNOWN) {
-+		p2 = p[2];
-+		p5 = p[5];
-+		/* not sure what they want, tell 'em what we got */
-+		if (((p[2] & ~MPPE_STATELESS) != 0 || p[3] != 0 || p[4] != 0 ||
-+		     (p[5] & ~(MPPE_40BIT | MPPE_56BIT | MPPE_128BIT |
-+			       MPPE_MPPC)) != 0 || p[5] == 0) ||
-+		    (p[2] == 0 && p[3] == 0 && p[4] == 0 &&  p[5] == 0)) {
- 		    newret = CONFNAK;
--		    ho->mppe &= ~MPPE_OPT_UNKNOWN;
-+		    p[2] = (wo->mppe_stateless ? MPPE_STATELESS : 0);
-+		    p[3] = 0;
-+		    p[4] = 0;
-+		    p[5] = (wo->mppe_40 ? MPPE_40BIT : 0) |
-+			(wo->mppe_56 ? MPPE_56BIT : 0) |
-+			(wo->mppe_128 ? MPPE_128BIT : 0) |
-+			(wo->mppc ? MPPE_MPPC : 0);
-+		    break;
- 		}
- 
--		/* Check state opt */
--		if (ho->mppe & MPPE_OPT_STATEFUL) {
--		    /*
--		     * We can Nak and request stateless, but it's a
--		     * lot easier to just assume the peer will request
--		     * it if he can do it; stateful mode is bad over
--		     * the Internet -- which is where we expect MPPE.
--		     */
--		   if (refuse_mppe_stateful) {
--			error("Refusing MPPE stateful mode offered by peer");
-+		if ((p[5] & MPPE_MPPC)) {
-+		    if (ao->mppc) {
-+			ho->mppc = 1;
-+			BCOPY(p, opt_buf, CILEN_MPPE);
-+			opt_buf[2] = opt_buf[3] = opt_buf[4] = 0;
-+			opt_buf[5] = MPPE_MPPC;
-+			if (ccp_test(f->unit, opt_buf, CILEN_MPPE, 1) <= 0) {
-+			    ho->mppc = 0;
-+			    p[5] &= ~MPPE_MPPC;
-+			    newret = CONFNAK;
-+			}
-+		    } else {
- 			newret = CONFREJ;
--			break;
-+			if (wo->mppe || ao->mppe) {
-+			    p[5] &= ~MPPE_MPPC;
-+			    newret = CONFNAK;
-+			}
- 		    }
- 		}
- 
--		/* Find out which of {S,L} are set. */
--		if ((ho->mppe & MPPE_OPT_128)
--		     && (ho->mppe & MPPE_OPT_40)) {
--		    /* Both are set, negotiate the strongest. */
-+		if (ao->mppe)
-+		    ho->mppe = 1;
-+
-+		if ((p[2] & MPPE_STATELESS)) {
-+		    if (ao->mppe_stateless) {
-+			if (wo->mppe_stateless)
-+			    ho->mppe_stateless = 1;
-+			else {
-+			    newret = CONFNAK;
-+			    if (!dont_nak)
-+				p[2] &= ~MPPE_STATELESS;
-+			}
-+		    } else {
-+			newret = CONFNAK;
-+			if (!dont_nak)
-+			    p[2] &= ~MPPE_STATELESS;
-+		    }
-+		} else {
-+		    if (wo->mppe_stateless && !dont_nak) {
-+			wo->mppe_stateless = 0;
-+			newret = CONFNAK;
-+			p[2] |= MPPE_STATELESS;
-+		    }
-+		}
-+
-+		if ((p[5] & ~MPPE_MPPC) == (MPPE_40BIT|MPPE_56BIT|MPPE_128BIT)) {
- 		    newret = CONFNAK;
--		    if (ao->mppe & MPPE_OPT_128)
--			ho->mppe &= ~MPPE_OPT_40;
--		    else if (ao->mppe & MPPE_OPT_40)
--			ho->mppe &= ~MPPE_OPT_128;
--		    else {
--			newret = CONFREJ;
--			break;
-+		    if (ao->mppe_128) {
-+			ho->mppe_128 = 1;
-+			p[5] &= ~(MPPE_40BIT|MPPE_56BIT);
-+			BCOPY(p, opt_buf, CILEN_MPPE);
-+			BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
-+			      MPPE_MAX_KEY_LEN);
-+			if (ccp_test(f->unit, opt_buf, CILEN_MPPE +
-+				     MPPE_MAX_KEY_LEN, 1) <= 0) {
-+			    ho->mppe_128 = 0;
-+			    p[5] |= (MPPE_40BIT|MPPE_56BIT);
-+			    p[5] &= ~MPPE_128BIT;
-+			    goto check_mppe_56_40;
-+			}
-+			goto check_mppe;
- 		    }
--		} else if (ho->mppe & MPPE_OPT_128) {
--		    if (!(ao->mppe & MPPE_OPT_128)) {
--			newret = CONFREJ;
--			break;
-+		    p[5] &= ~MPPE_128BIT;
-+		    goto check_mppe_56_40;
-+		}
-+		if ((p[5] & ~MPPE_MPPC) == (MPPE_56BIT|MPPE_128BIT)) {
-+		    newret = CONFNAK;
-+		    if (ao->mppe_128) {
-+			ho->mppe_128 = 1;
-+			p[5] &= ~MPPE_56BIT;
-+			BCOPY(p, opt_buf, CILEN_MPPE);
-+			BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
-+			      MPPE_MAX_KEY_LEN);
-+			if (ccp_test(f->unit, opt_buf, CILEN_MPPE +
-+				     MPPE_MAX_KEY_LEN, 1) <= 0) {
-+			    ho->mppe_128 = 0;
-+			    p[5] |= MPPE_56BIT;
-+			    p[5] &= ~MPPE_128BIT;
-+			    goto check_mppe_56;
-+			}
-+			goto check_mppe;
- 		    }
--		} else if (ho->mppe & MPPE_OPT_40) {
--		    if (!(ao->mppe & MPPE_OPT_40)) {
--			newret = CONFREJ;
--			break;
-+		    p[5] &= ~MPPE_128BIT;
-+		    goto check_mppe_56;
-+		}
-+		if ((p[5] & ~MPPE_MPPC) == (MPPE_40BIT|MPPE_128BIT)) {
-+		    newret = CONFNAK;
-+		    if (ao->mppe_128) {
-+			ho->mppe_128 = 1;
-+			p[5] &= ~MPPE_40BIT;
-+			BCOPY(p, opt_buf, CILEN_MPPE);
-+			BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
-+			      MPPE_MAX_KEY_LEN);
-+			if (ccp_test(f->unit, opt_buf, CILEN_MPPE +
-+				     MPPE_MAX_KEY_LEN, 1) <= 0) {
-+			    ho->mppe_128 = 0;
-+			    p[5] |= MPPE_40BIT;
-+			    p[5] &= ~MPPE_128BIT;
-+			    goto check_mppe_40;
-+			}
-+			goto check_mppe;
-+		    }
-+		    p[5] &= ~MPPE_128BIT;
-+		    goto check_mppe_40;
-+		}
-+		if ((p[5] & ~MPPE_MPPC) == MPPE_128BIT) {
-+		    if (ao->mppe_128) {
-+			ho->mppe_128 = 1;
-+			BCOPY(p, opt_buf, CILEN_MPPE);
-+			BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
-+			      MPPE_MAX_KEY_LEN);
-+			if (ccp_test(f->unit, opt_buf, CILEN_MPPE +
-+				     MPPE_MAX_KEY_LEN, 1) <= 0) {
-+			    ho->mppe_128 = 0;
-+			    p[5] &= ~MPPE_128BIT;
-+			    newret = CONFNAK;
-+			}
-+			goto check_mppe;
-+		    }
-+		    p[5] &= ~MPPE_128BIT;
-+		    newret = CONFNAK;
-+		    goto check_mppe;
-+		}
-+	    check_mppe_56_40:
-+		if ((p[5] & ~MPPE_MPPC) == (MPPE_40BIT|MPPE_56BIT)) {
-+		    newret = CONFNAK;
-+		    if (ao->mppe_56) {
-+			ho->mppe_56 = 1;
-+			p[5] &= ~MPPE_40BIT;
-+			BCOPY(p, opt_buf, CILEN_MPPE);
-+			BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
-+			      MPPE_MAX_KEY_LEN);
-+			if (ccp_test(f->unit, opt_buf, CILEN_MPPE +
-+				     MPPE_MAX_KEY_LEN, 1) <= 0) {
-+			    ho->mppe_56 = 0;
-+			    p[5] |= MPPE_40BIT;
-+			    p[5] &= ~MPPE_56BIT;
-+			    newret = CONFNAK;
-+			    goto check_mppe_40;
-+			}
-+			goto check_mppe;
-+		    }
-+		    p[5] &= ~MPPE_56BIT;
-+		    goto check_mppe_40;
-+		}
-+	    check_mppe_56:
-+		if ((p[5] & ~MPPE_MPPC) == MPPE_56BIT) {
-+		    if (ao->mppe_56) {
-+			ho->mppe_56 = 1;
-+			BCOPY(p, opt_buf, CILEN_MPPE);
-+			BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
-+			      MPPE_MAX_KEY_LEN);
-+			if (ccp_test(f->unit, opt_buf, CILEN_MPPE +
-+				     MPPE_MAX_KEY_LEN, 1) <= 0) {
-+			    ho->mppe_56 = 0;
-+			    p[5] &= ~MPPE_56BIT;
-+			    newret = CONFNAK;
-+			}
-+			goto check_mppe;
-+		    }
-+		    p[5] &= ~MPPE_56BIT;
-+		    newret = CONFNAK;
-+		    goto check_mppe;
-+		}
-+	    check_mppe_40:
-+		if ((p[5] & ~MPPE_MPPC) == MPPE_40BIT) {
-+		    if (ao->mppe_40) {
-+			ho->mppe_40 = 1;
-+			BCOPY(p, opt_buf, CILEN_MPPE);
-+			BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
-+			      MPPE_MAX_KEY_LEN);
-+			if (ccp_test(f->unit, opt_buf, CILEN_MPPE +
-+				     MPPE_MAX_KEY_LEN, 1) <= 0) {
-+			    ho->mppe_40 = 0;
-+			    p[5] &= ~MPPE_40BIT;
-+			    newret = CONFNAK;
-+			}
-+			goto check_mppe;
-+		    }
-+		    p[5] &= ~MPPE_40BIT;
-+		}
-+
-+	    check_mppe:
-+		if (!ho->mppe_40 && !ho->mppe_56 && !ho->mppe_128) {
-+		    if (wo->mppe_40 || wo->mppe_56 || wo->mppe_128) {
-+			newret = CONFNAK;
-+			p[2] |= (wo->mppe_stateless ? MPPE_STATELESS : 0);
-+			p[5] |= (wo->mppe_40 ? MPPE_40BIT : 0) |
-+			    (wo->mppe_56 ? MPPE_56BIT : 0) |
-+			    (wo->mppe_128 ? MPPE_128BIT : 0) |
-+			    (wo->mppc ? MPPE_MPPC : 0);
-+		    } else {
-+			ho->mppe = ho->mppe_stateless = 0;
- 		    }
- 		} else {
--		    /* Neither are set. */
--		    /* We cannot accept this.  */
-+		    /* MPPE is not compatible with other compression types */
-+		    if (wo->mppe) {
-+			ao->bsd_compress = 0;
-+			ao->predictor_1 = 0;
-+			ao->predictor_2 = 0;
-+			ao->deflate = 0;
-+			ao->lzs = 0;
-+		    }
-+		}
-+		if ((!ho->mppc || !ao->mppc) && !ho->mppe) {
-+		    p[2] = p2;
-+		    p[5] = p5;
- 		    newret = CONFNAK;
- 		    /* Give the peer our idea of what can be used,
- 		       so it can choose and confirm */
- 		    ho->mppe = ao->mppe;
- 		}
- 
--		/* rebuild the opts */
--		MPPE_OPTS_TO_CI(ho->mppe, &p[2]);
--		if (newret == CONFACK) {
--		    u_char opt_buf[CILEN_MPPE + MPPE_MAX_KEY_LEN];
--		    int mtu;
--
--		    BCOPY(p, opt_buf, CILEN_MPPE);
--		    BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
--			  MPPE_MAX_KEY_LEN);
--		    if (ccp_test(f->unit, opt_buf,
--				 CILEN_MPPE + MPPE_MAX_KEY_LEN, 1) <= 0) {
--			/* This shouldn't happen, we've already tested it! */
--			error("MPPE required, but kernel has no support.");
--			lcp_close(f->unit, "MPPE required but not available");
--			newret = CONFREJ;
--			break;
--		    }
--		    /*
--		     * We need to decrease the interface MTU by MPPE_PAD
--		     * because MPPE frames **grow**.  The kernel [must]
--		     * allocate MPPE_PAD extra bytes in xmit buffers.
--		     */
--		    mtu = netif_get_mtu(f->unit);
--		    if (mtu)
--			netif_set_mtu(f->unit, mtu - MPPE_PAD);
--		    else
--			newret = CONFREJ;
--		}
-+		/*
-+		 * I have commented the code below because according to RFC1547
-+		 * MTU is only information for higher level protocols about
-+		 * "the maximum allowable length for a packet (q.v.) transmitted
-+		 * over a point-to-point link without incurring network layer
-+		 * fragmentation." Of course a PPP implementation should be able
-+		 * to handle overhead added by MPPE - in our case apropriate code
-+		 * is located in drivers/net/ppp_generic.c in the kernel sources.
-+		 *
-+		 * According to RFC1661:
-+		 * - when negotiated MRU is less than 1500 octets, a PPP
-+		 *   implementation must still be able to receive at least 1500
-+		 *   octets,
-+		 * - when PFC is negotiated, a PPP implementation is still
-+		 *   required to receive frames with uncompressed protocol field.
-+		 *
-+		 * So why not to handle MPPE overhead without changing MTU value?
-+		 * I am sure that RFC3078, unfortunately silently, assumes that.
-+		 */
- 
- 		/*
--		 * We have accepted MPPE or are willing to negotiate
--		 * MPPE parameters.  A CONFREJ is due to subsequent
--		 * (non-MPPE) processing.
-+		 * We need to decrease the interface MTU by MPPE_PAD
-+		 * because MPPE frames **grow**.  The kernel [must]
-+		 * allocate MPPE_PAD extra bytes in xmit buffers.
- 		 */
--		rej_for_ci_mppe = 0;
-+/*
-+		mtu = netif_get_mtu(f->unit);
-+		if (mtu) {
-+		    netif_set_mtu(f->unit, mtu - MPPE_PAD);
-+		} else {
-+		    newret = CONFREJ;
-+		    if (ccp_wantoptions[f->unit].mppe) {
-+			error("Cannot adjust MTU needed by MPPE.");
-+			lcp_close(f->unit, "Cannot adjust MTU needed by MPPE.");
-+		    }
-+		}
-+*/
- 		break;
- #endif /* MPPE */
-+
-+	    case CI_LZS:
-+		if (!ao->lzs || clen != CILEN_LZS) {
-+		    newret = CONFREJ;
-+		    break;
-+		}
-+
-+		ho->lzs = 1;
-+		ho->lzs_hists = (p[2] << 8) | p[3];
-+		ho->lzs_mode = p[4];
-+		if ((ho->lzs_hists != ao->lzs_hists) ||
-+		    (ho->lzs_mode != ao->lzs_mode)) {
-+		    newret = CONFNAK;
-+		    if (!dont_nak) {
-+			p[2] = ao->lzs_hists >> 8;
-+			p[3] = ao->lzs_hists & 0xff;
-+			p[4] = ao->lzs_mode;
-+		    } else
-+			break;
-+		}
-+
-+		if (p == p0 && ccp_test(f->unit, p, CILEN_LZS, 1) <= 0) {
-+		    newret = CONFREJ;
-+		}
-+		break;
-+
- 	    case CI_DEFLATE:
- 	    case CI_DEFLATE_DRAFT:
- 		if (!ao->deflate || clen != CILEN_DEFLATE
-@@ -1344,12 +1835,6 @@ ccp_reqci(f, p, lenp, dont_nak)
- 	else
- 	    *lenp = retp - p0;
-     }
--#ifdef MPPE
--    if (ret == CONFREJ && ao->mppe && rej_for_ci_mppe) {
--	error("MPPE required but peer negotiation failed");
--	lcp_close(f->unit, "MPPE required but peer negotiation failed");
--    }
--#endif
-     return ret;
- }
- 
-@@ -1371,24 +1856,35 @@ method_name(opt, opt2)
- 	char *p = result;
- 	char *q = result + sizeof(result); /* 1 past result */
- 
--	slprintf(p, q - p, "MPPE ");
--	p += 5;
--	if (opt->mppe & MPPE_OPT_128) {
--	    slprintf(p, q - p, "128-bit ");
--	    p += 8;
--	}
--	if (opt->mppe & MPPE_OPT_40) {
--	    slprintf(p, q - p, "40-bit ");
--	    p += 7;
--	}
--	if (opt->mppe & MPPE_OPT_STATEFUL)
--	    slprintf(p, q - p, "stateful");
--	else
--	    slprintf(p, q - p, "stateless");
--
-+	if (opt->mppe) {
-+	    if (opt->mppc) {
-+		slprintf(p, q - p, "MPPC/MPPE ");
-+		p += 10;
-+	    } else {
-+		slprintf(p, q - p, "MPPE ");
-+		p += 5;
-+	    }
-+	    if (opt->mppe_128) {
-+		slprintf(p, q - p, "128-bit ");
-+		p += 8;
-+	    } else if (opt->mppe_56) {
-+		slprintf(p, q - p, "56-bit ");
-+		p += 7;
-+	    } else if (opt->mppe_40) {
-+		slprintf(p, q - p, "40-bit ");
-+		p += 7;
-+	    }
-+	    if (opt->mppe_stateless)
-+		slprintf(p, q - p, "stateless");
-+	    else
-+		slprintf(p, q - p, "stateful");
-+	} else if (opt->mppc)
-+	    slprintf(p, q - p, "MPPC");
- 	break;
-     }
--#endif
-+#endif /* MPPE */
-+    case CI_LZS:
-+	return "Stac LZS";
-     case CI_DEFLATE:
-     case CI_DEFLATE_DRAFT:
- 	if (opt2 != NULL && opt2->deflate_size != opt->deflate_size)
-@@ -1444,12 +1940,12 @@ ccp_up(f)
-     } else if (ANY_COMPRESS(*ho))
- 	notice("%s transmit compression enabled", method_name(ho, NULL));
- #ifdef MPPE
--    if (go->mppe) {
-+    if (go->mppe || go->mppc) {
- 	BZERO(mppe_recv_key, MPPE_MAX_KEY_LEN);
- 	BZERO(mppe_send_key, MPPE_MAX_KEY_LEN);
- 	continue_networks(f->unit);		/* Bring up IP et al */
-     }
--#endif
-+#endif /* MPPE */
- }
- 
- /*
-@@ -1472,7 +1968,7 @@ ccp_down(f)
- 	    lcp_close(f->unit, "MPPE disabled");
- 	}
-     }
--#endif
-+#endif /* MPPE */
- }
- 
- /*
-@@ -1532,24 +2028,28 @@ ccp_printpkt(p, plen, printer, arg)
- #ifdef MPPE
- 	    case CI_MPPE:
- 		if (optlen >= CILEN_MPPE) {
--		    u_char mppe_opts;
--
--		    MPPE_CI_TO_OPTS(&p[2], mppe_opts);
--		    printer(arg, "mppe %s %s %s %s %s %s%s",
--			    (p[2] & MPPE_H_BIT)? "+H": "-H",
--			    (p[5] & MPPE_M_BIT)? "+M": "-M",
--			    (p[5] & MPPE_S_BIT)? "+S": "-S",
--			    (p[5] & MPPE_L_BIT)? "+L": "-L",
-+		    printer(arg, "mppe %s %s %s %s %s %s",
-+			    (p[2] & MPPE_STATELESS)? "+H": "-H",
-+			    (p[5] & MPPE_56BIT)? "+M": "-M",
-+			    (p[5] & MPPE_128BIT)? "+S": "-S",
-+			    (p[5] & MPPE_40BIT)? "+L": "-L",
- 			    (p[5] & MPPE_D_BIT)? "+D": "-D",
--			    (p[5] & MPPE_C_BIT)? "+C": "-C",
--			    (mppe_opts & MPPE_OPT_UNKNOWN)? " +U": "");
--		    if (mppe_opts & MPPE_OPT_UNKNOWN)
-+			    (p[5] & MPPE_MPPC)? "+C": "-C");
-+		    if ((p[5] & ~(MPPE_56BIT | MPPE_128BIT | MPPE_40BIT |
-+				  MPPE_D_BIT | MPPE_MPPC)) ||
-+			(p[2] & ~MPPE_STATELESS))
- 			printer(arg, " (%.2x %.2x %.2x %.2x)",
- 				p[2], p[3], p[4], p[5]);
- 		    p += CILEN_MPPE;
- 		}
- 		break;
--#endif
-+#endif /* MPPE */
-+	    case CI_LZS:
-+		if (optlen >= CILEN_LZS) {
-+		    printer(arg, "lzs %.2x %.2x %.2x", p[2], p[3], p[4]);
-+		    p += CILEN_LZS;
-+		}
-+		break;
- 	    case CI_DEFLATE:
- 	    case CI_DEFLATE_DRAFT:
- 		if (optlen >= CILEN_DEFLATE) {
-@@ -1635,6 +2135,7 @@ ccp_datainput(unit, pkt, len)
- 	    error("Lost compression sync: disabling compression");
- 	    ccp_close(unit, "Lost compression sync");
- #ifdef MPPE
-+	    /* My module dosn't need this. J.D., 2003-07-06 */
- 	    /*
- 	     * If we were doing MPPE, we must also take the link down.
- 	     */
-@@ -1642,9 +2143,18 @@ ccp_datainput(unit, pkt, len)
- 		error("Too many MPPE errors, closing LCP");
- 		lcp_close(unit, "Too many MPPE errors");
- 	    }
--#endif
-+#endif /* MPPE */
- 	} else {
- 	    /*
-+	     * When LZS or MPPE/MPPC is negotiated we just send CCP_RESETREQ
-+	     * and don't wait for CCP_RESETACK
-+	     */
-+	    if ((ccp_gotoptions[f->unit].method == CI_LZS) ||
-+		(ccp_gotoptions[f->unit].method == CI_MPPE)) {
-+		fsm_sdata(f, CCP_RESETREQ, f->reqid = ++f->id, NULL, 0);
-+		return;
-+	    }
-+	    /*
- 	     * Send a reset-request to reset the peer's compressor.
- 	     * We don't do that if we are still waiting for an
- 	     * acknowledgement to a previous reset-request.
-@@ -1675,4 +2185,3 @@ ccp_rack_timeout(arg)
-     } else
- 	ccp_localstate[f->unit] &= ~RACK_PENDING;
- }
--
diff --git a/package/ppp/patches/patch-pppd_ccp_h b/package/ppp/patches/patch-pppd_ccp_h
deleted file mode 100644
index fe2c3875f..000000000
--- a/package/ppp/patches/patch-pppd_ccp_h
+++ /dev/null
@@ -1,20 +0,0 @@
---- ppp-2.4.4.orig/pppd/ccp.h	2004-11-04 11:02:26.000000000 +0100
-+++ ppp-2.4.4/pppd/ccp.h	2009-06-05 19:12:00.000000000 +0200
-@@ -37,9 +37,17 @@ typedef struct ccp_options {
-     bool predictor_2;		/* do Predictor-2? */
-     bool deflate_correct;	/* use correct code for deflate? */
-     bool deflate_draft;		/* use draft RFC code for deflate? */
-+    bool lzs;			/* do Stac LZS? */
-+    bool mppc;			/* do MPPC? */
-     bool mppe;			/* do MPPE? */
-+    bool mppe_40;		/* allow 40 bit encryption? */
-+    bool mppe_56;		/* allow 56 bit encryption? */
-+    bool mppe_128;		/* allow 128 bit encryption? */
-+    bool mppe_stateless;	/* allow stateless encryption */
-     u_short bsd_bits;		/* # bits/code for BSD Compress */
-     u_short deflate_size;	/* lg(window size) for Deflate */
-+    u_short lzs_mode;		/* LZS check mode */
-+    u_short lzs_hists;		/* number of LZS histories */
-     short method;		/* code for chosen compression method */
- } ccp_options;
- 
diff --git a/package/ppp/patches/patch-pppd_chap_ms_c b/package/ppp/patches/patch-pppd_chap_ms_c
deleted file mode 100644
index b829221d4..000000000
--- a/package/ppp/patches/patch-pppd_chap_ms_c
+++ /dev/null
@@ -1,22 +0,0 @@
---- ppp-2.4.5.orig/pppd/chap_ms.c	2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/chap_ms.c	2011-01-16 15:51:05.000000000 +0100
-@@ -898,13 +898,17 @@ set_mppe_enc_types(int policy, int types
-     /*
-      * Disable undesirable encryption types.  Note that we don't ENABLE
-      * any encryption types, to avoid overriding manual configuration.
-+     *
-+     * It seems that 56 bit keys are unsupported in MS-RADIUS (see RFC 2548)
-      */
-     switch(types) {
- 	case MPPE_ENC_TYPES_RC4_40:
--	    ccp_wantoptions[0].mppe &= ~MPPE_OPT_128;	/* disable 128-bit */
-+	    ccp_wantoptions[0].mppe_128 = 0;	/* disable 128-bit */
-+	    ccp_wantoptions[0].mppe_56 = 0;	/* disable 56-bit */
- 	    break;
- 	case MPPE_ENC_TYPES_RC4_128:
--	    ccp_wantoptions[0].mppe &= ~MPPE_OPT_40;	/* disable 40-bit */
-+	    ccp_wantoptions[0].mppe_56 = 0;	/* disable 56-bit */
-+	    ccp_wantoptions[0].mppe_40 = 0;	/* disable 40-bit */
- 	    break;
- 	default:
- 	    break;
diff --git a/package/ppp/patches/patch-pppd_plugins_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_Makefile_linux
index 9f78f3d19..8351654c7 100644
--- a/package/ppp/patches/patch-pppd_plugins_Makefile_linux
+++ b/package/ppp/patches/patch-pppd_plugins_Makefile_linux
@@ -1,29 +1,47 @@
 --- ppp-2.4.5.orig/pppd/plugins/Makefile.linux	2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/plugins/Makefile.linux	2011-01-16 17:14:34.000000000 +0100
-@@ -1,13 +1,8 @@
++++ ppp-2.4.5/pppd/plugins/Makefile.linux	2011-01-21 21:29:58.118658260 +0100
+@@ -1,13 +1,13 @@
 -#CC	= gcc
 -COPTS	= -O2 -g
 -CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
 -LDFLAGS	= -shared
 -INSTALL	= install
-+include ../../makedefs.linux
++#
++# makefile for pppd/plugins
++#
++VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h)
  
 -DESTDIR = $(INSTROOT)@DESTDIR@
 -BINDIR = $(DESTDIR)/sbin
 -MANDIR = $(DESTDIR)/share/man/man8
 -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
++include ../../Makedefs.com
++
 +CPPFLAGS += -I.. -I../../include
-+CFLAGS += -fPIC
++CFLAGS	+= -fPIC
 +LDFLAGS	+= -shared
  
  SUBDIRS := rp-pppoe pppoatm pppol2tp
  # Uncomment the next line to include the radius authentication plugin
-@@ -23,7 +18,7 @@ all:	$(PLUGINS)
+@@ -23,12 +23,10 @@ all:	$(PLUGINS)
  	for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done
  
  %.so: %.c
 -	$(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^
-+	$(CC) -o $@ $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) $^
+-
+-VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^
  
- VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h)
+ install: $(PLUGINS)
+-	$(INSTALL) -d $(LIBDIR)
++	$(INSTALL) -d -m 755 $(LIBDIR)
+ 	$(INSTALL) $? $(LIBDIR)
+ 	for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d install; done
  
+@@ -37,5 +35,4 @@ clean:
+ 	for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d clean; done
+ 
+ depend:
+-	$(CPP) -M $(CFLAGS) *.c >.depend
+-	for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d depend; done
++	$(CPP) -M $(CPPFLAGS) *.c >.depend
diff --git a/package/ppp/patches/patch-pppd_plugins_pppoatm_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_pppoatm_Makefile_linux
index e7fb3f5e7..32a86eaf7 100644
--- a/package/ppp/patches/patch-pppd_plugins_pppoatm_Makefile_linux
+++ b/package/ppp/patches/patch-pppd_plugins_pppoatm_Makefile_linux
@@ -1,36 +1,60 @@
 --- ppp-2.4.5.orig/pppd/plugins/pppoatm/Makefile.linux	2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux	2011-01-16 21:12:55.000000000 +0100
-@@ -1,13 +1,10 @@
++++ ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux	2011-01-21 21:29:58.177408277 +0100
+@@ -1,15 +1,16 @@
 -#CC	= gcc
 -COPTS	= -O2 -g
 -CFLAGS	= $(COPTS) -I../.. -I../../../include -fPIC
 -LDFLAGS	= -shared
 -INSTALL	= install
-+include ../../../makedefs.linux
++VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
  
 -#***********************************************************************
-+CPPFLAGS += -I../.. -I../../../include
-+CFLAGS += -fPIC
-+LDFLAGS	+= -shared
++include ../../../Makedefs.com
  
 -DESTDIR = $(INSTROOT)@DESTDIR@
 -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
++CPPFLAGS += -I../.. -I../../../include
++ifeq (,$(filter -fPIC,$(CFLAGS)))
++CFLAGS += -fPIC
++endif
++ifeq (,$(filter -shared,$(LDFLAGS)))
++LDFLAGS += -shared
++endif
+ 
+-VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
 +#***********************************************************************
  
- VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+ PLUGIN := pppoatm.so
+ PLUGIN_OBJS := pppoatm.o 
+@@ -22,25 +23,22 @@ PLUGIN_OBJS := pppoatm.o 
+ #HAVE_LIBATM=yes
+ 
+ ifdef HAVE_LIBATM
+-LIBS := -latm
++LIBS += -latm
+ else
+-CFLAGS += -I.
++CPPFLAGS += -I.
+ PLUGIN_OBJS += text2qos.o text2atm.o misc.o ans.o
+-LIBS := -lresolv
++LIBS += -lresolv
+ endif
  
-@@ -33,7 +30,7 @@ endif
+ #*********
  all: $(PLUGIN)
  
  $(PLUGIN): $(PLUGIN_OBJS)
 -	$(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS)
 +	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
  
- install: all
+-install: all
++install: $(PLUGIN)
  	$(INSTALL) -d -m 755 $(LIBDIR)
-@@ -43,4 +40,4 @@ clean:
- 	rm -f *.o *.so
+-	$(INSTALL) -c -m 4550 $(PLUGIN) $(LIBDIR)
++	$(INSTALL) $(STRIP) -c -m 4550 $(PLUGIN) $(LIBDIR)
  
- %.o: %.c
+ clean:
+ 	rm -f *.o *.so
+-
+-%.o: %.c
 -	$(CC) $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
diff --git a/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux
index 4c46c5971..481f1e41c 100644
--- a/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux
+++ b/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux
@@ -1,41 +1,45 @@
 --- ppp-2.4.5.orig/pppd/plugins/pppol2tp/Makefile.linux	2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux	2011-01-16 21:32:19.000000000 +0100
-@@ -1,13 +1,10 @@
++++ ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux	2011-01-21 21:30:05.208658673 +0100
+@@ -1,29 +1,27 @@
 -#CC	= gcc
 -COPTS	= -O2 -g
 -CFLAGS	= $(COPTS) -I. -I../.. -I../../../include -fPIC
 -LDFLAGS	= -shared
 -INSTALL	= install
-+include ../../../makedefs.linux
++VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
  
 -#***********************************************************************
-+CPPFLAGS += -I. -I../.. -I../../../include
-+#CFLAGS += -fPIC
-+#LDFLAGS	+= -shared
++include ../../../Makedefs.com
  
 -DESTDIR = @DESTDIR@
 -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
++CPPFLAGS += -I. -I../.. -I../../../include
++ifeq (,$(filter -fPIC,$(CFLAGS)))
++CFLAGS += -fPIC
++endif
++ifeq (,$(filter -shared,$(LDFLAGS)))
++LDFLAGS += -shared
++endif
+ 
+-VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
 +#***********************************************************************
  
- VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+ PLUGINS := pppol2tp.so openl2tp.so
  
-@@ -16,7 +13,11 @@ PLUGINS := pppol2tp.so openl2tp.so
  all: $(PLUGINS)
  
  %.so: %.o
 -	$(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS)
 +	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+	echo $(LDFLAGS)
-+
-+%.o: %.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
  
- install: all
+-install: all
++install: $(PLUGINS)
  	$(INSTALL) -d -m 755 $(LIBDIR)
-@@ -25,5 +26,4 @@ install: all
+-	$(INSTALL) -c -m 4550 $(PLUGINS) $(LIBDIR)
++	$(INSTALL) $(STRIP) -c -m 755 $(PLUGINS) $(LIBDIR)
+ 
  clean:
  	rm -f *.o *.so
- 
+-
 -%.o: %.c
 -	$(CC) $(CFLAGS) -c -o $@ $<
-+.PHONY: clean
diff --git a/package/ppp/patches/patch-pppd_plugins_radius_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_radius_Makefile_linux
index d01aeb86c..4c7123243 100644
--- a/package/ppp/patches/patch-pppd_plugins_radius_Makefile_linux
+++ b/package/ppp/patches/patch-pppd_plugins_radius_Makefile_linux
@@ -1,58 +1,94 @@
 --- ppp-2.4.5.orig/pppd/plugins/radius/Makefile.linux	2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/plugins/radius/Makefile.linux	2011-01-16 21:35:47.000000000 +0100
-@@ -1,18 +1,14 @@
++++ ppp-2.4.5/pppd/plugins/radius/Makefile.linux	2011-01-21 21:29:58.278658282 +0100
+@@ -1,18 +1,20 @@
  # Makefile for RADIUS plugin
- #
- # Copyright 2002 Roaring Penguin Software Inc.
 -#
+ # Copyright 2002 Roaring Penguin Software Inc.
+ #
  
 -DESTDIR = $(INSTROOT)@DESTDIR@
 -MANDIR = $(DESTDIR)/share/man/man8
 -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
-+include ../../../makedefs.linux
- 
--VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
-+CPPFLAGS+=-I. -I../.. -I../../../include -DRC_LOG_FACILITY=LOG_DAEMON
+-
+ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
  
 -INSTALL	= install
-+VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
++include ../../../Makedefs.com
  
- PLUGIN=radius.so radattr.so radrealms.so
+-PLUGIN=radius.so radattr.so radrealms.so
 -CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
++CPPFLAGS += -I. -I../.. -I../../../include -DRC_LOG_FACILITY=LOG_DAEMON
++ifeq (,$(filter -fPIC,$(CFLAGS)))
++CFLAGS += -fPIC
++endif
++ifeq (,$(filter -shared,$(LDFLAGS)))
++LDFLAGS += -shared
++endif
++
++PLUGINS = radius.so radattr.so radrealms.so
  
  # Uncomment the next line to include support for Microsoft's
  # MS-CHAP authentication protocol.
-@@ -36,25 +32,26 @@ all: $(PLUGIN)
+@@ -23,43 +25,40 @@ MPPE=y
+ MAXOCTETS=y
+ 
+ ifdef CHAPMS
+-CFLAGS += -DCHAPMS=1
++CPPFLAGS += -DCHAPMS=1
+ ifdef MPPE
+-CFLAGS += -DMPPE=1
++CPPFLAGS += -DMPPE=1
+ endif
+ endif
+ ifdef MAXOCTETS
+-CFLAGS += -DMAXOCTETS=1
++CPPFLAGS += -DMAXOCTETS=1
+ endif
+ 
+-all: $(PLUGIN)
++CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \
++	clientid.o sendserver.o lock.o util.o md5.o
  
- install: all
- 	$(INSTALL) -d -m 755 $(LIBDIR)
+-install: all
+-	$(INSTALL) -d -m 755 $(LIBDIR)
 -	$(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
 -	$(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
 -	$(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR)
-+	$(INSTALL) -c -m 755 radius.so $(LIBDIR)
-+	$(INSTALL) -c -m 755 radattr.so $(LIBDIR)
-+	$(INSTALL) -c -m 755 radrealms.so $(LIBDIR)
- 	$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
- 	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
+-	$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
+-	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
++all: $(PLUGINS)
  
  radius.so: radius.o libradiusclient.a
 -	$(CC) -o radius.so -shared radius.o libradiusclient.a
-+	$(CC) $(LDFLAGS) -o radius.so radius.o libradiusclient.a
++	$(CC) $(LDFLAGS) -o $@ $^
  
  radattr.so: radattr.o
 -	$(CC) -o radattr.so -shared radattr.o
-+	$(CC) $(LDFLAGS) -o radattr.so radattr.o
++	$(CC) $(LDFLAGS) -o $@ $^
  
  radrealms.so: radrealms.o
 -	$(CC) -o radrealms.so -shared radrealms.o
-+	$(CC) $(LDFLAGS) -o radrealms.so radrealms.o
++	$(CC) $(LDFLAGS) -o $@ $^
  
- CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \
- 	clientid.o sendserver.o lock.o util.o md5.o
-+
+-CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \
+-	clientid.o sendserver.o lock.o util.o md5.o
  libradiusclient.a: $(CLIENTOBJS)
 -	$(AR) rv $@ $?
-+	$(TARGET_AR) rcsv $@ $?
++	$(AR) $(ARFLAGS) $@ $?
+ 
+-clean:
+-	rm -f *.o *.so *.a
++install: $(PLUGINS)
++	$(INSTALL) -d -m 755 $(LIBDIR)
++	$(INSTALL) -d -m 755 $(MANDIR)
++	$(INSTALL) $(STRIP) -c -m 755 radius.so $(LIBDIR)
++	$(INSTALL) $(STRIP) -c -m 755 radattr.so $(LIBDIR)
++	$(INSTALL) $(STRIP) -c -m 755 radrealms.so $(LIBDIR)
++	$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
++	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
  
- clean:
+-distclean:
++clean:
  	rm -f *.o *.so *.a
+-
+-dist-clean: distclean
diff --git a/package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux
index 09d845f6a..844525b54 100644
--- a/package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux
+++ b/package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux
@@ -1,50 +1,51 @@
 --- ppp-2.4.5.orig/pppd/plugins/rp-pppoe/Makefile.linux	2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux	2011-01-16 21:38:08.000000000 +0100
-@@ -1,6 +1,3 @@
++++ ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux	2011-01-21 21:29:58.318658312 +0100
+@@ -1,6 +1,4 @@
 -# Generated automatically from Makefile.in by configure.
--#***********************************************************************
+ #***********************************************************************
 -#
  # Makefile
  #
  # Makefile for Roaring Penguin's Linux PPPoE plugin.
-@@ -13,52 +10,50 @@
- #
+@@ -14,51 +12,35 @@
  # $Id: Makefile.linux,v 1.8 2008/06/09 08:34:23 paulus Exp $
  #***********************************************************************
--
+ 
 -DESTDIR = $(INSTROOT)@DESTDIR@
 -BINDIR = $(DESTDIR)/sbin
 -LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION)
 -
 -PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
--
++VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+ 
 -INSTALL	= install
-+include ../../../makedefs.linux
++include ../../../Makedefs.com
  
  # Version is set ONLY IN THE MAKEFILE!  Don't delete this!
  RP_VERSION=3.8p
  
 -COPTS=-O2 -g
 -CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
-+CPPFLAGS += -I../../.. -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
++CPPFLAGS += -I../../../include -I../../..
++CPPFLAGS += '-DRP_VERSION="$(RP_VERSION)"'
++ifeq (,$(filter -fPIC,$(CFLAGS)))
 +CFLAGS += -fPIC
++endif
++ifeq (,$(filter -shared,$(LDFLAGS)))
 +LDFLAGS += -shared
-+
-+VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
++endif
 +
  all: rp-pppoe.so pppoe-discovery
  
  pppoe-discovery: pppoe-discovery.o debug.o
 -	$(CC) -o pppoe-discovery pppoe-discovery.o debug.o
-+	$(CC) $(LDFLAGS) -o pppoe-discovery pppoe-discovery.o debug.o
- 
- pppoe-discovery.o: pppoe-discovery.c
+-
+-pppoe-discovery.o: pppoe-discovery.c
 -	$(CC) $(CFLAGS) -c -o pppoe-discovery.o pppoe-discovery.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^
- 
- debug.o: debug.c
+-
+-debug.o: debug.c
 -	$(CC) $(CFLAGS) -c -o debug.o debug.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^
++	$(CC) $(LDFLAGS) -o $@ $^
  
  rp-pppoe.so: plugin.o discovery.o if.o common.o
 -	$(CC) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o
@@ -53,28 +54,23 @@
  install: all
  	$(INSTALL) -d -m 755 $(LIBDIR)
 -	$(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
-+	$(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
++	$(INSTALL) $(STRIP) -c -m 4550 rp-pppoe.so $(LIBDIR)
  	$(INSTALL) -d -m 755 $(BINDIR)
 -	$(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
-+	$(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
++	$(INSTALL) $(STRIP) -c -m 555 pppoe-discovery $(BINDIR)
  
  clean:
  	rm -f *.o *.so pppoe-discovery
- 
- plugin.o: plugin.c
+-
+-plugin.o: plugin.c
 -	$(CC) $(CFLAGS) -I../../.. -c -o plugin.o -fPIC plugin.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o plugin.o plugin.c
- 
- discovery.o: discovery.c
+-
+-discovery.o: discovery.c
 -	$(CC) $(CFLAGS) -I../../.. -c -o discovery.o -fPIC discovery.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o discovery.o discovery.c
- 
- if.o: if.c
+-
+-if.o: if.c
 -	$(CC) $(CFLAGS) -I../../.. -c -o if.o -fPIC if.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o if.o if.c
- 
- common.o: common.c
+-
+-common.o: common.c
 -	$(CC) $(CFLAGS) -I../../.. -c -o common.o -fPIC common.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o common.o common.c
- 
-+.PHONY: clean
+-
diff --git a/package/ppp/patches/patch-pppd_sys-linux_c b/package/ppp/patches/patch-pppd_sys-linux_c
deleted file mode 100644
index 94c9e7a2e..000000000
--- a/package/ppp/patches/patch-pppd_sys-linux_c
+++ /dev/null
@@ -1,16 +0,0 @@
---- ppp-2.4.4.orig/pppd/sys-linux.c	2005-08-27 00:44:35.000000000 +0200
-+++ ppp-2.4.4/pppd/sys-linux.c	2009-06-05 19:12:00.000000000 +0200
-@@ -453,6 +453,13 @@ int generic_establish_ppp (int fd)
-     if (new_style_driver) {
- 	int flags;
- 
-+        /* if a ppp_fd is already open, close it first */
-+        if(ppp_fd > 0) {
-+          close(ppp_fd);
-+          remove_fd(ppp_fd);
-+          ppp_fd = -1;
-+        }
-+
- 	/* Open an instance of /dev/ppp and connect the channel to it */
- 	if (ioctl(fd, PPPIOCGCHAN, &chindex) == -1) {
- 	    error("Couldn't get channel number: %m");
diff --git a/package/ppp/patches/patch-pppdump_Makefile_linux b/package/ppp/patches/patch-pppdump_Makefile_linux
index 796548ab7..3c44233bf 100644
--- a/package/ppp/patches/patch-pppdump_Makefile_linux
+++ b/package/ppp/patches/patch-pppdump_Makefile_linux
@@ -1,33 +1,40 @@
 --- ppp-2.4.5.orig/pppdump/Makefile.linux	2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppdump/Makefile.linux	2011-01-16 16:58:39.000000000 +0100
-@@ -1,21 +1,19 @@
++++ ppp-2.4.5/pppdump/Makefile.linux	2011-01-21 21:29:58.380124461 +0100
+@@ -1,21 +1,24 @@
 -DESTDIR = $(INSTROOT)@DESTDIR@
 -BINDIR = $(DESTDIR)/sbin
 -MANDIR = $(DESTDIR)/share/man/man8
-+include ../makedefs.linux
++#
++# pppdump makefile
++# $id$
++#
  
 -CFLAGS= -O -I../include/net
-+CPPFLAGS+= -I../include/net
- OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
+-OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
++include ../Makedefs.com
  
 -INSTALL= install
--
- all:	pppdump
++CPPFLAGS += -I../include/net
  
- pppdump: $(OBJS)
+-all:	pppdump
++PROG = pppdump
++OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
+ 
+-pppdump: $(OBJS)
 -	$(CC) -o pppdump $(OBJS)
--
++all: $(PROG)
+ 
 -clean:
 -	rm -f pppdump $(OBJS) *~
-+	$(CC) $(LDFLAGS) -o pppdump $(OBJS)
++$(PROG): $(OBJS)
  
  install:
- 	mkdir -p $(BINDIR) $(MANDIR)
+-	mkdir -p $(BINDIR) $(MANDIR)
 -	$(INSTALL) -s -c pppdump $(BINDIR)
-+	$(INSTALL) -c pppdump $(BINDIR)
++	$(INSTALL) -d -m 755 $(BINDIR) 
++	$(INSTALL) -d -m 755 $(MANDIR)
++	$(INSTALL) $(STRIP) -c $(PROG) $(BINDIR)
  	$(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
 +
 +clean:
-+	rm -f pppdump $(OBJS) *~
-+
-+.PHONY: clean
++	rm -f $(PROG) $(OBJS) *~
diff --git a/package/ppp/patches/patch-pppstats_Makefile_linux b/package/ppp/patches/patch-pppstats_Makefile_linux
index 81dfd920b..d08bab07a 100644
--- a/package/ppp/patches/patch-pppstats_Makefile_linux
+++ b/package/ppp/patches/patch-pppstats_Makefile_linux
@@ -1,48 +1,50 @@
 --- ppp-2.4.5.orig/pppstats/Makefile.linux	2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppstats/Makefile.linux	2011-01-16 17:11:22.000000000 +0100
-@@ -1,36 +1,27 @@
- #
++++ ppp-2.4.5/pppstats/Makefile.linux	2011-01-21 21:29:58.437408223 +0100
+@@ -2,35 +2,26 @@
  # pppstats makefile
  # $Id: Makefile.linux,v 1.9 2006/06/04 05:07:46 paulus Exp $
--#
+ #
 -DESTDIR = $(INSTROOT)@DESTDIR@
 -BINDIR = $(DESTDIR)/sbin
 -MANDIR = $(DESTDIR)/share/man/man8
  
-+include ../makedefs.linux
-+
-+CPPFLAGS += -I../include
- PPPSTATSRCS = pppstats.c
- PPPSTATOBJS = pppstats.o
+-PPPSTATSRCS = pppstats.c
+-PPPSTATOBJS = pppstats.o
++include ../Makedefs.com
  
 -#CC = gcc
 -COPTS = -O
 -COMPILE_FLAGS = -I../include
 -LIBS =
--
++CPPFLAGS += -I../include
+ 
 -INSTALL= install
--
++PROG = pppstats
++OBJS = pppstats.o
++SRCS = pppstats.c
+ 
 -CFLAGS = $(COPTS) $(COMPILE_FLAGS)
--
- all: pppstats
++all: $(PROG)
+ 
+-all: pppstats
++$(PROG): $(OBJS)
  
-+pppstats: $(PPPSTATSRCS)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDLAGS) -o pppstats pppstats.c $(LIBS)
-+
- install: pppstats
- 	-mkdir -p $(MANDIR)
+-install: pppstats
+-	-mkdir -p $(MANDIR)
 -	$(INSTALL) -s -c pppstats $(BINDIR)
-+	$(INSTALL) -c pppstats $(BINDIR)
++install: $(PROG)
++	$(INSTALL) -d -m 755 $(MANDIR) $(BINDIR)
++	$(INSTALL) $(STRIP) -c $(PROG) $(BINDIR)
  	$(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
  
 -pppstats: $(PPPSTATSRCS)
 -	$(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS)
 -
  clean:
- 	rm -f pppstats *~ #* core
+-	rm -f pppstats *~ #* core
++	rm -f $(PROG) $(OBJS) *~ #* core
  
  depend:
- 	cpp -M $(CFLAGS) $(PPPSTATSRCS) >.depend
+-	cpp -M $(CFLAGS) $(PPPSTATSRCS) >.depend
 -#	makedepend $(CFLAGS) $(PPPSTATSRCS)
-+
-+.PHONY: clean
++	$(CPP) -M $(CPPFLAGS) $(CFLAGS) $(SRCS) >.depend
diff --git a/package/ppp/src/linux/Makedefs.gcc b/package/ppp/src/linux/Makedefs.gcc
new file mode 100644
index 000000000..618eabcc9
--- /dev/null
+++ b/package/ppp/src/linux/Makedefs.gcc
@@ -0,0 +1,21 @@
+CPPFLAGS ?=
+CFLAGS ?= -O2 -pipe
+LDFLAGS ?=
+LIBS ?=
+ARFLAGS ?= rv
+
+INSTALL ?= install
+STRIP ?= -s
+
+DESTDIR ?= $(INSTROOT)@DESTDIR@
+BINDIR = $(DESTDIR)/sbin
+MANDIR = $(DESTDIR)/share/man/man8
+LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
+INCDIR = $(DESTDIR)/include
+ETCDIR = $(DESTDIR)@SYSCONF@/ppp
+
+%.d: %.c
+	@set -e; rm -f $@; \
+	$(CC) -M $(CPPFLAGS) $< > $@.$$$$; \
+	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	rm -f $@.$$$$
diff --git a/package/ppp/src/makedefs.linux b/package/ppp/src/makedefs.linux
deleted file mode 100644
index 061efabc6..000000000
--- a/package/ppp/src/makedefs.linux
+++ /dev/null
@@ -1,14 +0,0 @@
-CC ?= gcc
-CPPFLAGS ?=
-CFLAGS ?= -O -pipe
-LDFLAGS ?= 
-LIBS ?=
-
-INSTALL ?= install
-
-# Default installation locations
-DESTDIR = $(INSTROOT)/usr
-BINDIR = $(DESTDIR)/sbin
-MANDIR = $(DESTDIR)/share/man/man8
-INCDIR = $(DESTDIR)/include
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile
index f2875b0ae..20f7d770c 100644
--- a/package/pptpd/Makefile
+++ b/package/pptpd/Makefile
@@ -17,7 +17,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PPTPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-fPIC -DSBINDIR='\\\"/usr/sbin\\\"'
+TARGET_CFLAGS+=		-fPIC -DSBINDIR='\\\"/usr/sbin\\\"'
 FAKE_FLAGS+=		INSTALL="install"
 
 post-install:
diff --git a/package/privoxy/Makefile b/package/privoxy/Makefile
index ef55349b5..7e83f7607 100644
--- a/package/privoxy/Makefile
+++ b/package/privoxy/Makefile
@@ -22,14 +22,14 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PRIVOXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TLDFLAGS+=		-pthread
+TARGET_LDFLAGS+=	-pthread
 CONFIGURE_ARGS+=	--disable-editor \
 			--disable-jar-files \
 			--sysconfdir=/etc/privoxy
 # uClibc setpgrp does not take arguments
 CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes \
 			ac_cv_lib_nsl_gethostbyname=no
-MAKE_FLAGS+=		SPECIAL_CFLAGS='${TLDFLAGS}'
+MAKE_FLAGS+=		SPECIAL_CFLAGS='${TARGET_LDFLAGS}'
 MAKE_FILE:=		GNUmakefile
 
 post-install:
diff --git a/package/procmail/Makefile b/package/procmail/Makefile
index 3bd2b7da3..8841add60 100644
--- a/package/procmail/Makefile
+++ b/package/procmail/Makefile
@@ -20,7 +20,7 @@ CONFIG_STYLE:=          manual
 BUILD_STYLE:=           manual
 INSTALL_STYLE:=         manual
 
-TCFLAGS+=		-DPROCMAIL
+TARGET_CPPFLAGS+=	-DPROCMAIL
 
 do-build:
 	${MAKE} -C ${WRKBUILD}/src -f ../Makefile.new
diff --git a/package/python/Makefile b/package/python/Makefile
index 0e81cd10b..b41a7f3ba 100644
--- a/package/python/Makefile
+++ b/package/python/Makefile
@@ -31,7 +31,7 @@ CONFIGURE_ARGS:=	--with-threads \
 
 post-extract:
 	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
-		OPT="$(HOSTCFLAGS)" \
+		OPT="$(CFLAGS_FOR_BUILD)" \
 		./configure --without-cxx-main --without-threads \
 		--prefix=$(STAGING_HOST_DIR) \
 	);
diff --git a/package/python2/Makefile b/package/python2/Makefile
index dc9092dd9..60cb0c705 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -38,7 +38,7 @@ CONFIGURE_ARGS:=	--with-threads \
 post-extract:
 	$(CP) ./files/python-config.in ${WRKBUILD}/Misc/python-config.in
 	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
-		OPT="$(HOSTCFLAGS)" \
+		OPT="$(CFLAGS_FOR_BUILD)" \
 		./configure --without-cxx-main --without-threads \
 		--prefix=$(STAGING_HOST_DIR)/usr \
 	);
diff --git a/package/python2/patches/patch-Makefile_pre b/package/python2/patches/patch-Makefile_pre
new file mode 100644
index 000000000..e12bc29de
--- /dev/null
+++ b/package/python2/patches/patch-Makefile_pre
@@ -0,0 +1,267 @@
+--- Python-2.7.1.orig/Makefile.pre	2011-01-20 22:14:19.477398102 +0100
++++ Python-2.7.1/Makefile.pre	2011-01-20 22:11:27.957401058 +0100
+@@ -28,12 +28,12 @@ VERSION=	2.7
+ srcdir=		.
+ 
+ 
+-CC=		gcc
+-CXX=		g++
++CC=		/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc
++CXX=		/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-g++
+ MAINCC=		$(CC)
+ LINKCC=		$(PURIFY) $(MAINCC)
+-AR=		ar
+-RANLIB=		ranlib
++AR=		/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ar
++RANLIB=		/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-ranlib
+ SVNVERSION=	svnversion $(srcdir)
+ 
+ GNULD=          yes
+@@ -57,21 +57,21 @@ INSTALL_SHARED= ${INSTALL} -m 555
+ MAKESETUP=      $(srcdir)/Modules/makesetup
+ 
+ # Compiler options
+-OPT=		-DNDEBUG -O2 -Wall
++OPT=		-DNDEBUG -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe
+ BASECFLAGS=	 -fno-strict-aliasing
+-CFLAGS=		$(BASECFLAGS) -g -O2 $(OPT) $(EXTRA_CFLAGS)
++CFLAGS=		$(BASECFLAGS) -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe $(OPT) $(EXTRA_CFLAGS)
+ # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
+ # be able to build extension modules using the directories specified in the
+ # environment variables
+-CPPFLAGS=	-I. -IInclude -I$(srcdir)/Include 
+-LDFLAGS=	
++CPPFLAGS=	-I. -IInclude -I$(srcdir)/Include -I/home/wbx/adk/openadk/target_i686_uclibc/usr/include
++LDFLAGS=	-Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib
+ LDLAST=		
+ SGI_ABI=	
+ CCSHARED=	-fPIC
+ LINKFORSHARED=	-Xlinker -export-dynamic
+ ARFLAGS=	rc
+ # Extra C flags added for building the interpreter object files.
+-CFLAGSFORSHARED=
++CFLAGSFORSHARED=$(CCSHARED)
+ # C flags used for building the interpreter object files
+ PY_CFLAGS=	$(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
+ 
+@@ -80,7 +80,7 @@ PY_CFLAGS=	$(CFLAGS) $(CPPFLAGS) $(CFLAG
+ MACHDEP=	linux2
+ 
+ # Install prefix for architecture-independent files
+-prefix=		/home/wbx/adk/openadk/host_i686_uclibc/usr
++prefix=		/usr
+ 
+ # Install prefix for architecture-dependent files
+ exec_prefix=	${prefix}
+@@ -89,9 +89,9 @@ exec_prefix=	${prefix}
+ datarootdir=    ${prefix}/share
+ 
+ # Expanded directories
+-BINDIR=		${exec_prefix}/bin
++BINDIR=		/usr/bin
+ LIBDIR=		${exec_prefix}/lib
+-MANDIR=		${datarootdir}/man
++MANDIR=		/usr/share/man
+ INCLUDEDIR=	${prefix}/include
+ CONFINCLUDEDIR=	$(exec_prefix)/include
+ SCRIPTDIR=	$(prefix)/lib
+@@ -130,7 +130,7 @@ MACOSX_DEPLOYMENT_TARGET=
+ OTHER_LIBTOOL_OPT=
+ 
+ # Environment to run shared python without installed libraries
+-RUNSHARED=       
++RUNSHARED=       LD_LIBRARY_PATH=/home/wbx/adk/openadk/build_ibm-x40_i686_uclibc/w-python2-2.7.1-1/Python-2.7.1:
+ 
+ # Modes for directories, executables and data files created by the
+ # install process.  Default to user-only-writable for all file types.
+@@ -139,7 +139,7 @@ EXEMODE=	755
+ FILEMODE=	644
+ 
+ # configure script arguments
+-CONFIG_ARGS=	 '--without-cxx-main' '--without-threads' '--prefix=/home/wbx/adk/openadk/host_i686_uclibc/usr'
++CONFIG_ARGS=	 '--build=x86_64-linux-gnu' '--host=i686-openadk-linux' '--target=i686-openadk-linux' '--program-prefix=' '--program-suffix=' '--prefix=/usr' '--bindir=/usr/bin' '--datadir=/usr/share' '--mandir=/usr/share/man' '--libexecdir=/usr/libexec' '--localstatedir=/var' '--sysconfdir=/etc' '--disable-nls' '--enable-shared' '--enable-static' '--disable-dependency-tracking' '--disable-libtool-lock' '--with-threads' '--disable-toolbox-glue' '--with-system-ffi' '--without-cxx-main' 'build_alias=x86_64-linux-gnu' 'host_alias=i686-openadk-linux' 'target_alias=i686-openadk-linux' 'CC=/home/wbx/adk/openadk/host_i686_uclibc/bin/i686-openadk-linux-uclibc-gcc' 'CFLAGS=-march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe' 'LDFLAGS=-Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/adk/openadk/target_i686_uclibc/usr/lib -L/home/wbx/adk/openadk/target_i686_uclibc/lib -L/home/wbx/adk/openadk/target_i686_uclibc/usr/lib' 'LIBS=' 'CPPFLAGS=-I/home/wbx/adk/openadk/target_i686_uclibc/usr/include'
+ 
+ 
+ # Subdirectories with code
+@@ -156,20 +156,20 @@ DIST=		$(DISTFILES) $(DISTDIRS)
+ 
+ 
+ LIBRARY=	libpython$(VERSION).a
+-LDLIBRARY=      libpython$(VERSION).a
+-BLDLIBRARY=     $(LDLIBRARY)
++LDLIBRARY=      libpython$(VERSION).so
++BLDLIBRARY=     -L. -lpython$(VERSION)
+ DLLLIBRARY=	
+ LDLIBRARYDIR=   
+-INSTSONAME=	$(LDLIBRARY)
++INSTSONAME=	libpython$(VERSION).so.1.0
+ 
+ 
+-LIBS=		-ldl  -lutil
++LIBS=		-lpthread -ldl  -lpthread -lutil
+ LIBM=		-lm
+ LIBC=		
+ SYSLIBS=	$(LIBM) $(LIBC)
+ SHLIBS=		$(LIBS)
+ 
+-THREADOBJ=	
++THREADOBJ=	Python/thread.o
+ DLINCLDIR=	.
+ DYNLOADFILE=	dynload_shlib.o
+ MACHDEP_OBJS=	
+@@ -179,6 +179,7 @@ UNICODE_OBJS=   Objects/unicodeobject.o 
+ 
+ PYTHON=		python$(EXE)
+ BUILDPYTHON=	python$(BUILDEXE)
++HOSTPYTHON?=    $(BUILDPYTHON)
+ 
+ # The task to run while instrument when building the profile-opt target
+ PROFILE_TASK=	$(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
+@@ -206,11 +207,12 @@ GRAMMAR_C=	$(srcdir)/Python/graminit.c
+ GRAMMAR_INPUT=	$(srcdir)/Grammar/Grammar
+ 
+ 
+-LIBFFI_INCLUDEDIR=	
++LIBFFI_INCLUDEDIR=	/home/wbx/adk/openadk/target_i686_uclibc/usr/include
+ 
+ ##########################################################################
+ # Parser
+ PGEN=		Parser/pgen$(EXE)
++HOSTPGEN?=      $(PGEN)$(EXE)
+ 
+ POBJS=		\
+ 		Parser/acceler.o \
+@@ -380,7 +382,7 @@ build_all_generate_profile:
+ 	$(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov"
+ 
+ run_profile_task:
+-	./$(BUILDPYTHON) $(PROFILE_TASK)
++	$(HOSTPYTHON) $(PROFILE_TASK)
+ 
+ build_all_use_profile:
+ 	$(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use"
+@@ -398,14 +400,14 @@ $(BUILDPYTHON):	Modules/python.o $(LIBRA
+ 			$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ 
+ platform: $(BUILDPYTHON)
+-	$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
++	$(RUNSHARED) $(HOSTPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
+ 
+ 
+ # Build the shared modules
+ sharedmods: $(BUILDPYTHON)
+ 	@case $$MAKEFLAGS in \
+-	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
+-	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
++	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
++	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
+ 	esac
+ 
+ # Build static library
+@@ -538,7 +540,7 @@ Modules/python.o: $(srcdir)/Modules/pyth
+ 
+ $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
+ 		-@$(INSTALL) -d Include
+-		-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
++		-$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+ 
+ $(PGEN):	$(PGENOBJS)
+ 		$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
+@@ -702,7 +704,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho
+ 
+ TESTOPTS=	-l $(EXTRATESTOPTS)
+ TESTPROG=	$(srcdir)/Lib/test/regrtest.py
+-TESTPYTHON=	$(RUNSHARED) ./$(BUILDPYTHON) -Wd -3 -E -tt $(TESTPYTHONOPTS)
++TESTPYTHON=	$(RUNSHARED) $(HOSTPYTHON) -Wd -3 -E -tt $(TESTPYTHONOPTS)
+ test:		all platform
+ 		-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
+ 		-$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
+@@ -725,7 +727,7 @@ testuniversal:	all platform
+ 		-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
+ 		-$(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS)
+ 		$(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS)
+-		$(RUNSHARED) /usr/libexec/oah/translate ./$(BUILDPYTHON) -E -tt $(TESTPROG) -uall $(TESTOPTS)
++		$(RUNSHARED) /usr/libexec/oah/translate $(HOSTPYTHON) -E -tt $(TESTPROG) -uall $(TESTOPTS)
+ 
+ 
+ # Like testall, but with a single pass only
+@@ -920,26 +922,26 @@ libinstall:	build_all $(srcdir)/Lib/$(PL
+ 		done; \
+ 	done
+ 	$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
+-	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+-		./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
++	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
++		$(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
+ 		-d $(LIBDEST) -f \
+ 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ 		$(DESTDIR)$(LIBDEST)
+-	PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+-		./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
++	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
++		$(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
+ 		-d $(LIBDEST) -f \
+ 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ 		$(DESTDIR)$(LIBDEST)
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+-		./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
++		$(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
+ 		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+-		./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
++		$(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
+ 		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+-		./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
++		$(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
+ 
+ # Create the PLATDIR source directory, if one wasn't distributed..
+ $(srcdir)/Lib/$(PLATDIR):
+@@ -1044,7 +1046,8 @@ libainstall:	all python-config
+ # Install the dynamically loadable modules
+ # This goes into $(exec_prefix)
+ sharedinstall: sharedmods
+-	$(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
++	CROSS_COMPILE='$(CROSS_COMPILE)' \
++	$(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \
+ 	   	--prefix=$(prefix) \
+ 		--install-scripts=$(BINDIR) \
+ 		--install-platlib=$(DESTSHARED) \
+@@ -1082,7 +1085,7 @@ frameworkinstallstructure:	$(LDLIBRARY)
+ 		fi; \
+ 	done
+ 	$(LN) -fsn include/python$(VERSION) $(DESTDIR)$(prefix)/Headers
+-	sed 's/%VERSION%/'"`$(RUNSHARED) ./$(BUILDPYTHON) -c 'import platform; print platform.python_version()'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
++	sed 's/%VERSION%/'"`$(RUNSHARED) $(HOSTPYTHON) -c 'import platform; print platform.python_version()'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
+ 	$(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
+ 	$(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
+ 	$(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
+@@ -1117,7 +1120,7 @@ frameworkinstallextras:
+ # This installs a few of the useful scripts in Tools/scripts
+ scriptsinstall:
+ 	SRCDIR=$(srcdir) $(RUNSHARED) \
+-	./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \
++	$(HOSTPYTHON) $(srcdir)/Tools/scripts/setup.py install \
+ 	--prefix=$(prefix) \
+ 	--install-scripts=$(BINDIR) \
+ 	--root=/$(DESTDIR)
+@@ -1139,7 +1142,7 @@ config.status:	$(srcdir)/configure
+ 
+ # Run reindent on the library
+ reindent:
+-	./$(BUILDPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
++	$(HOSTPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
+ 
+ # Rerun configure with the same options as it was run last time,
+ # provided the config.status script exists
+@@ -1242,7 +1245,7 @@ funny:
+ 
+ # Perform some verification checks on any modified files.
+ patchcheck:
+-	$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
++	$(RUNSHARED) $(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
+ 
+ # Dependencies
+ 
diff --git a/package/python2/patches/patch-Makefile_pre_in b/package/python2/patches/patch-Makefile_pre_in
index 5fec2d1a1..d3737ae3e 100644
--- a/package/python2/patches/patch-Makefile_pre_in
+++ b/package/python2/patches/patch-Makefile_pre_in
@@ -1,6 +1,15 @@
 diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in
 --- Python-2.7.1.orig/Makefile.pre.in	2010-10-14 13:37:30.000000000 +0200
-+++ Python-2.7.1/Makefile.pre.in	2010-12-27 21:06:29.000000000 +0100
++++ Python-2.7.1/Makefile.pre.in	2011-01-20 22:13:22.464906869 +0100
+@@ -59,7 +59,7 @@ MAKESETUP=      $(srcdir)/Modules/makese
+ # Compiler options
+ OPT=		@OPT@
+ BASECFLAGS=	@BASECFLAGS@
+-CFLAGS=		$(BASECFLAGS) @CFLAGS@ $(OPT) $(EXTRA_CFLAGS)
++CFLAGS=		$(BASECFLAGS) @CFLAGS@ $(EXTRA_CFLAGS)
+ # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
+ # be able to build extension modules using the directories specified in the
+ # environment variables
 @@ -179,6 +179,7 @@ UNICODE_OBJS=   @UNICODE_OBJS@
  
  PYTHON=		python$(EXE)
diff --git a/package/qemu/Makefile b/package/qemu/Makefile
index 4b8c33c9c..121017277 100644
--- a/package/qemu/Makefile
+++ b/package/qemu/Makefile
@@ -19,13 +19,13 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,QEMU,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		minimal
-CONFIGURE_ARGS+=	--host-cc=$(HOSTCC) \
+CONFIGURE_ARGS+=	--host-cc=$(CC_FOR_BUILD) \
 			--cross-prefix=$(TARGET_CROSS) \
 			--disable-user \
 			--prefix=/usr \
 			--sysconfdir=/etc \
 			--bindir=/usr/bin
-TLDFLAGS+=		-pthread -lrt
+TARGET_LDFLAGS+=	-pthread -lrt
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_QEMU)/usr/share/qemu
diff --git a/package/rarpd/Makefile b/package/rarpd/Makefile
index 8769658db..16e7a78dd 100644
--- a/package/rarpd/Makefile
+++ b/package/rarpd/Makefile
@@ -19,7 +19,7 @@ $(eval $(call PKG_template,RARPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG
 
 CONFIGURE_ARGS+=	--with-libnet="${STAGING_TARGET_DIR}/usr" \
 			--with-pcap="${STAGING_TARGET_DIR}/usr"
-TCFLAGS+=		-DNEW_LIBNET_INTERFACE
+TARGET_CPPFLAGS+=	-DNEW_LIBNET_INTERFACE
 
 post-install:
 	${INSTALL_DIR} ${IDIR_RARPD}/usr/sbin
diff --git a/package/rarpd/patches/patch-Makefile_in b/package/rarpd/patches/patch-Makefile_in
index 58be90d10..f846712b0 100644
--- a/package/rarpd/patches/patch-Makefile_in
+++ b/package/rarpd/patches/patch-Makefile_in
@@ -1,6 +1,20 @@
 --- rarpd-1.1.orig/Makefile.in	1999-10-20 22:57:13.000000000 +0200
-+++ rarpd-1.1/Makefile.in	2010-07-16 14:34:08.453125000 +0200
-@@ -13,5 +13,5 @@ rarpd: rarpd.o @LIBOBJS@
++++ rarpd-1.1/Makefile.in	2011-01-20 15:06:00.144913893 +0100
+@@ -1,17 +1,18 @@
+ INSTALL		=	@srcdir@/install.sh
+ CC		=	@CC@
+ CFLAGS		=	@CFLAGS@ @DEFS@
++CPPFLAGS	=	@CPPFLAGS@
+ ENSUREDIR	=	@srcdir@/ensure-dir.sh
+ SBINDIR		=	@sbindir@
+ 
+ all: rarpd
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+ 
+ rarpd: rarpd.o @LIBOBJS@
  	$(CC) @LDFLAGS@ -o $@ rarpd.o @LIBOBJS@ @LIBS@
  
  install: rarpd
diff --git a/package/rpcbind/Makefile b/package/rpcbind/Makefile
index a175dbfdf..f87c21fb2 100644
--- a/package/rpcbind/Makefile
+++ b/package/rpcbind/Makefile
@@ -20,7 +20,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,RPCBIND,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-I${STAGING_TARGET_DIR}/usr/include/tirpc
+TARGET_CPPFLAGS+=	-I${STAGING_TARGET_DIR}/usr/include/tirpc
 CONFIGURE_ARGS+=	--disable-libwrap
 
 post-install:
diff --git a/package/rpm/Makefile b/package/rpm/Makefile
index 5c23deb71..566b56251 100644
--- a/package/rpm/Makefile
+++ b/package/rpm/Makefile
@@ -4,14 +4,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		rpm
-PKG_VERSION:=		5.3.3
+PKG_VERSION:=		5.3.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		08027af2368ecad8060f9f5bf46c2bd9
+PKG_MD5SUM:=		7a5112fd208bfda7a1cab20b9ce17a02
 PKG_DESCR:=		Package Manager
 PKG_SECTION:=		base
 PKG_URL:=		http://www.rpm.org/
 PKG_SITES:=		http://rpm5.org/files/rpm/rpm-5.3/
 
+PKG_CFLINE_RPM:=	depends on ADK_BROKEN
 PKG_HOST_DEPENDS:=	!cygwin !darwin
 PKG_ARCH_DEPENDS:=	!cris
 
@@ -22,7 +23,7 @@ $(eval $(call PKG_template,RPM,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
 CONFIGURE_ENV+=		ac_cv_va_copy=no
 CONFIGURE_ARGS+=	--with-usecrypto=BeeCrypt \
 			--with-beecrypt=internal \
-			--with-dbapi=db \
+			--with-db=external \
 			--with-sqlite=none \
 			--without-python \
 			--without-perl \
diff --git a/package/rpm/patches/patch-configure b/package/rpm/patches/patch-configure
new file mode 100644
index 000000000..e5e2a854c
--- /dev/null
+++ b/package/rpm/patches/patch-configure
@@ -0,0 +1,11 @@
+--- rpm-5.3.5.orig/configure	2010-10-25 18:35:18.000000000 +0200
++++ rpm-5.3.5/configure	2011-01-21 22:37:21.147399617 +0100
+@@ -17673,7 +17673,7 @@ if test "${enable_build_debug+set}" = se
+ fi
+ 
+ if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then
+- for c in -fno-delete-null-pointer-checks -D_FORTIFY_SOURCE=2 -fstack-protector -fexceptions -fnested-functions
++ for c in -fno-delete-null-pointer-checks -D_FORTIFY_SOURCE=2 -fexceptions -fnested-functions
+  do
+  my_save_cflags="$CFLAGS"
+  CFLAGS=$c
diff --git a/package/rrdcollect/Makefile b/package/rrdcollect/Makefile
index f4d562e3a..3eb98204f 100644
--- a/package/rrdcollect/Makefile
+++ b/package/rrdcollect/Makefile
@@ -26,9 +26,8 @@ CONFIGURE_ENV+=		LIBS="${RRDTOOL_LIBS} -lz" \
 CONFIGURE_ARGS+=	--enable-exec \
 			--without-rrdtool \
 			--with-librrd \
-			--without-libpcre \
-			--without-libpcap
-TCFLAGS+=		-DSOCKET_COMM
+			--without-libpcre
+TARGET_CPPFLAGS+=	-DSOCKET_COMM
 
 post-install:
 	${INSTALL_DIR} ${IDIR_RRDCOLLECT}/usr/sbin
diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile
index bf3ed8c39..a047f032c 100644
--- a/package/rrdtool/Makefile
+++ b/package/rrdtool/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+=	--enable-rrdcgi \
 			--disable-python \
 			--without-x \
 			--with-rrd-default-font=/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
-TCPPFLAGS+=		-I${STAGING_TARGET_DIR}/usr/include/freetype2
+TARGET_CPPFLAGS+=	-I${STAGING_TARGET_DIR}/usr/include/freetype2
 
 post-install:
 	${INSTALL_DIR} ${IDIR_RRDTOOL}/usr/bin
diff --git a/package/rtsp/Makefile b/package/rtsp/Makefile
index bc11f10a0..098b77c67 100644
--- a/package/rtsp/Makefile
+++ b/package/rtsp/Makefile
@@ -22,10 +22,7 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 pre-build:
-	ARCH=${ARCH} KERNELDIR=${LINUX_DIR} \
-	PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \
-	LD=$(TARGET_CROSS)gcc LDFLAGS="" CFLAGS="-Wall" \
-	$(MAKE) -C ${WRKBUILD} debug V=1
+	$(MAKE) -C ${WRKBUILD} $(KERNEL_MODULE_FLAGS) all
 
 do-install:
 	${INSTALL_DIR} ${IDIR_RTSP_KMOD}/etc/modules.d/
diff --git a/package/samba/Makefile b/package/samba/Makefile
index 67f9924eb..273d84609 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -22,7 +22,7 @@ $(eval $(call PKG_template,SAMBA,samba,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
 $(eval $(call PKG_template,SAMBA_CLIENT,samba-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SAMBA_PASSWD,samba-passwd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TLDFLAGS+=		-Wl,-rpath -Wl,/usr/lib/samba -lintl
+TARGET_LDFLAGS+=	-Wl,-rpath -Wl,/usr/lib/samba -lintl
 CONFIGURE_ENV+=		samba_cv_CC_NEGATIVE_ENUM_VALUES=no \
 			samba_cv_USE_SETRESUID=no \
 			ac_cv_lib_ext_nsl_connect=no \
diff --git a/package/scsi-spin/Makefile b/package/scsi-spin/Makefile
index a7abd2b9a..a46dd8106 100644
--- a/package/scsi-spin/Makefile
+++ b/package/scsi-spin/Makefile
@@ -20,9 +20,11 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
+TARGET_CFLAGS+=		-Wall
+
 do-build:
-	${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} -o ${WRKBUILD}/scsi-spin \
-		${WRKBUILD}/scsi-spin.c
+	${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
+		-o ${WRKBUILD}/scsi-spin ${WRKBUILD}/scsi-spin.c
 
 do-install:
 	${INSTALL_DIR} ${IDIR_SCSI_SPIN}/usr/sbin
diff --git a/package/serdisplib/Makefile b/package/serdisplib/Makefile
index f13830610..ec32edf9e 100644
--- a/package/serdisplib/Makefile
+++ b/package/serdisplib/Makefile
@@ -9,7 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		2aa91c43d01d2dfc9fbc1116e3063ae1
 PKG_DESCR:=		display drivers (serial, parallel, USB)
 PKG_SECTION:=		serial
-PKG_BUILDDEP:=		libgd libusb
+PKG_DEPENDS:=		libusb-compat
+PKG_BUILDDEP:=		libgd libusb-compat
 PKG_URL:=		http://serdisplib.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=serdisplib/}
 
@@ -21,10 +22,10 @@ INSTALL_STYLE:=		manual
 
 CONFIGURE_ENV+=		PACKAGE_VERSION_MAJOR=1 PACKAGE_VERSION_MINOR=97
 CONFIGURE_ARGS+=	--enable-libusb
-TCFLAGS+=		${TCPPFLAGS}
+TARGET_CFLAGS+=		${TARGET_CPPFLAGS}
 
 do-install:
 	${INSTALL_DIR} ${IDIR_SERDISPLIB}/usr/lib
-	${CP} ${WRKBUILD}/lib/libserdisp.so.* ${IDIR_SERDISPLIB}/usr/lib
+	${CP} ${WRKBUILD}/lib/libserdisp.so* ${IDIR_SERDISPLIB}/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/setpwc/Makefile b/package/setpwc/Makefile
index 981234027..80d398a31 100644
--- a/package/setpwc/Makefile
+++ b/package/setpwc/Makefile
@@ -22,8 +22,11 @@ CONFIG_STYLE:=          manual
 BUILD_STYLE:=           manual
 INSTALL_STYLE:=         manual
 
+TARGET_CPPFLAGS+=	-DVERSION=\"${PKG_VERSION}\"
+TARGET_CFLAGS+=		-Wall
+
 do-build:
-	${TARGET_CC} -Wall ${TCFLAGS} -DVERSION=\"${PKG_VERSION}\" \
+	${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
 		-o ${WRKBUILD}/setpwc ${WRKBUILD}/setpwc.c
 
 do-install:
diff --git a/package/setserial/Makefile b/package/setserial/Makefile
index 2411332e7..7056550aa 100644
--- a/package/setserial/Makefile
+++ b/package/setserial/Makefile
@@ -16,8 +16,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,SETSERIAL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 INSTALL_STYLE:=         manual
-
-TCFLAGS+=		-DFIOQSIZE=1
+TARGET_CPPFLAGS+=	-DFIOQSIZE=1
 
 do-install:
 	${INSTALL_DIR} ${IDIR_SETSERIAL}/usr/sbin
diff --git a/package/setserial/patches/patch-Makefile_in b/package/setserial/patches/patch-Makefile_in
new file mode 100644
index 000000000..f04fbd036
--- /dev/null
+++ b/package/setserial/patches/patch-Makefile_in
@@ -0,0 +1,20 @@
+--- setserial-2.17.orig/Makefile.in	2000-01-27 16:39:07.000000000 +0100
++++ setserial-2.17/Makefile.in	2011-01-20 14:37:16.418658083 +0100
+@@ -13,14 +13,14 @@ STRIP = @STRIP@
+ CC = @CC@
+ RM = rm -f
+ CFLAGS = @CFLAGS@
+-DEFS = @DEFS@
+-INCS = -I.
++CPPFLAGS = @DEFS@ @CPPFLAGS@ -I.
++LDFLAGS = @LDFLAGS@
+ TAR = tar
+ 
+ all: setserial setserial.cat
+ 
+ setserial: setserial.c
+-	$(CC) $(CFLAGS) $(DEFS) $(INCS) setserial.c -o setserial
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) setserial.c -o setserial
+ 
+ setserial.cat: setserial.8
+ 	nroff -man setserial.8 > setserial.cat
diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile
index 4f3db591e..175c53518 100644
--- a/package/sqlite/Makefile
+++ b/package/sqlite/Makefile
@@ -20,14 +20,14 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBSQLITE,libsqlite,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SQLITE_CLI,sqlite-cli,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ENV+=		config_BUILD_CC="${HOSTCC}" \
-			config_BUILD_CFLAGS="${HOSTCFLAGS}" \
+CONFIGURE_ENV+=		config_BUILD_CC="${CC_FOR_BUILD}" \
+			config_BUILD_CFLAGS="${CFLAGS_FOR_BUILD}" \
 			config_TARGET_CC="${TARGET_CC}" \
 			config_TARGET_CFLAGS="${TARGET_CFLAGS}" \
 			config_TARGET_READLINE_INC="-I${STAGING_TARGET_DIR}/usr/include" \
 			config_TARGET_READLINE_LIBS="-L${STAGING_TARGET_DIR}/usr/lib -lreadline -lncurses"
 MAKE_FLAGS+=		LIBPTHREAD=-lm
-TCFLAGS+=		-DSQLITE_SECURE_DELETE=1
+TARGET_CPPFLAGS+=	-DSQLITE_SECURE_DELETE=1
 CONFIGURE_ARGS+=	--disable-tcl \
 			--without-tcl \
 			--disable-amalgamation
diff --git a/package/stress/patches/patch-src_Makefile_in b/package/stress/patches/patch-src_Makefile_in
new file mode 100644
index 000000000..e91e5b1e5
--- /dev/null
+++ b/package/stress/patches/patch-src_Makefile_in
@@ -0,0 +1,11 @@
+--- stress-1.0.0.orig/src/Makefile.in	2007-12-17 03:32:20.000000000 +0100
++++ stress-1.0.0/src/Makefile.in	2011-01-21 23:21:19.878658831 +0100
+@@ -65,7 +65,7 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -Wall -Werror -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
++CFLAGS = @CFLAGS@ -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
diff --git a/package/strongswan/patches/patch-configure b/package/strongswan/patches/patch-configure
new file mode 100644
index 000000000..86e29c72f
--- /dev/null
+++ b/package/strongswan/patches/patch-configure
@@ -0,0 +1,19 @@
+--- strongswan-4.5.0.orig/configure	2010-10-29 07:13:56.000000000 +0200
++++ strongswan-4.5.0/configure	2011-01-21 21:54:43.396152093 +0100
+@@ -13865,16 +13865,6 @@ $as_echo "$ipsecuid" >&6; }
+ else
+ 	as_fn_error $? "not found" "$LINENO" 5
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gid of group \"$ipsecgroup\"" >&5
+-$as_echo_n "checking for gid of group \"$ipsecgroup\"... " >&6; }
+-ipsecgid=`$EGREP "^$ipsecgroup:" /etc/group | $AWK -F: '{ print $3 }'`
+-if test -n "$ipsecgid"; then
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipsecgid" >&5
+-$as_echo "$ipsecgid" >&6; }
+-
+-else
+-	as_fn_error $? "not found" "$LINENO" 5
+-fi
+ 
+ 
+ if test x$eap_aka_3gpp2 = xtrue; then
diff --git a/package/syslinux/Makefile b/package/syslinux/Makefile
index 4a877426f..b7effc013 100644
--- a/package/syslinux/Makefile
+++ b/package/syslinux/Makefile
@@ -13,6 +13,7 @@ PKG_BUILDDEP:=		nasm
 PKG_URL:=		http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project
 PKG_SITES:=		http://www.kernel.org/pub/linux/utils/boot/syslinux/
 
+PKG_CFLINE_SYSLINUX:=	depends on ADK_NATIVE
 PKG_HOST_DEPENDS:=	!darwin !netbsd !openbsd !cygwin !freebsd
 
 include $(TOPDIR)/mk/package.mk
@@ -21,6 +22,7 @@ $(eval $(call PKG_template,SYSLINUX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${
 
 CONFIG_STYLE:=		manual
 FAKE_FLAGS+=		INSTALLROOT=${WRKINST}
+TARGET_CFLAGS+=		-std=c99
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_SYSLINUX)/usr/bin
diff --git a/package/syslinux/patches/patch-MCONFIG b/package/syslinux/patches/patch-MCONFIG
new file mode 100644
index 000000000..fec7d2644
--- /dev/null
+++ b/package/syslinux/patches/patch-MCONFIG
@@ -0,0 +1,19 @@
+--- syslinux-4.03.orig/MCONFIG	2010-10-20 21:25:38.000000000 +0200
++++ syslinux-4.03/MCONFIG	2011-01-22 00:19:37.688658635 +0100
+@@ -39,14 +39,14 @@ UPX	 = upx
+ 
+ CHMOD	 = chmod
+ 
+-CC	 = gcc
++CC	 ?= gcc
+ gcc_ok   = $(shell tmpf=gcc_ok.$$$$.tmp; \
+ 		   if $(CC) $(GCCOPT) $(1) -c $(topdir)/dummy.c \
+ 			-o $$tmpf 2>/dev/null ; \
+ 		   then echo '$(1)'; else echo '$(2)'; fi; \
+ 		   rm -f $$tmpf)
+ 
+-LD	 = ld
++LD	 ?= ld
+ OBJDUMP	 = objdump
+ OBJCOPY  = objcopy
+ AR       = ar
diff --git a/package/syslinux/patches/patch-MCONFIG_build b/package/syslinux/patches/patch-MCONFIG_build
new file mode 100644
index 000000000..792d179f1
--- /dev/null
+++ b/package/syslinux/patches/patch-MCONFIG_build
@@ -0,0 +1,12 @@
+--- syslinux-4.03.orig/MCONFIG.build	2010-10-20 21:25:38.000000000 +0200
++++ syslinux-4.03/MCONFIG.build	2011-01-22 00:21:14.348658474 +0100
+@@ -18,7 +18,8 @@ include $(topdir)/MCONFIG
+ 
+ OPTFLAGS   = -g -Os
+ INCLUDES   =
+-CFLAGS     = -W -Wall -Wno-sign-compare -D_FILE_OFFSET_BITS=64 \
++CFLAGS	  ?=
++CFLAGS     += -W -Wall -Wno-sign-compare -D_FILE_OFFSET_BITS=64 \
+              $(OPTFLAGS) $(INCLUDES)
+ LDFLAGS    =
+ LIBS	   =
diff --git a/package/syslinux/patches/patch-com32_cmenu_complex_c32 b/package/syslinux/patches/patch-com32_cmenu_complex_c32
new file mode 100644
index 000000000..ce7a13776
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_cmenu_complex_c32
diff --git a/package/syslinux/patches/patch-com32_cmenu_display_c32 b/package/syslinux/patches/patch-com32_cmenu_display_c32
new file mode 100644
index 000000000..686aac0b4
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_cmenu_display_c32
diff --git a/package/syslinux/patches/patch-com32_cmenu_simple_c32 b/package/syslinux/patches/patch-com32_cmenu_simple_c32
new file mode 100644
index 000000000..82ceb24e8
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_cmenu_simple_c32
diff --git a/package/syslinux/patches/patch-com32_cmenu_test2_c32 b/package/syslinux/patches/patch-com32_cmenu_test2_c32
new file mode 100644
index 000000000..ee201edd4
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_cmenu_test2_c32
diff --git a/package/syslinux/patches/patch-com32_cmenu_test_c32 b/package/syslinux/patches/patch-com32_cmenu_test_c32
new file mode 100644
index 000000000..c1673c4fa
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_cmenu_test_c32
diff --git a/package/syslinux/patches/patch-com32_gfxboot_gfxboot_c32 b/package/syslinux/patches/patch-com32_gfxboot_gfxboot_c32
new file mode 100644
index 000000000..36dcebf12
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_gfxboot_gfxboot_c32
diff --git a/package/syslinux/patches/patch-com32_hdt_hdt_c32 b/package/syslinux/patches/patch-com32_hdt_hdt_c32
new file mode 100644
index 000000000..ddc934500
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_hdt_hdt_c32
diff --git a/package/syslinux/patches/patch-com32_lib_MCONFIG b/package/syslinux/patches/patch-com32_lib_MCONFIG
new file mode 100644
index 000000000..4e7f72c8e
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_lib_MCONFIG
@@ -0,0 +1,27 @@
+--- syslinux-4.03.orig/com32/lib/MCONFIG	2010-10-20 21:25:38.000000000 +0200
++++ syslinux-4.03/com32/lib/MCONFIG	2011-01-22 00:29:01.978658237 +0100
+@@ -11,10 +11,10 @@ GCCOPT += $(call gcc_ok,-fPIE,-fPIC)
+ GCCOPT += $(call gcc_ok,-fno-exceptions,)
+ GCCOPT += $(call gcc_ok,-fno-asynchronous-unwind-tables,)
+ GCCOPT += $(call gcc_ok,-fno-strict-aliasing,)
+-GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0)
+-GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
+-GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
+-GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
++GCCOPT += $(call gcc_ok,-falign-functions=0,)
++GCCOPT += $(call gcc_ok,-falign-jumps=0,)
++GCCOPT += $(call gcc_ok,-falign-labels=0,)
++GCCOPT += $(call gcc_ok,-falign-loops=0,)
+ GCCOPT += $(call gcc_ok,-mpreferred-stack-boundary=2,)
+ 
+ INCLUDE	= -I.
+@@ -37,7 +37,8 @@ OPTFLAGS  = -Os -march=i386 -falign-func
+ 	    -falign-labels=0 -ffast-math -fomit-frame-pointer
+ WARNFLAGS = $(GCCWARN) -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Winline
+ 
+-CFLAGS  = $(OPTFLAGS) $(REQFLAGS) $(WARNFLAGS) $(LIBFLAGS)
++CFLAGS ?=
++CFLAGS  += $(OPTFLAGS) $(REQFLAGS) $(WARNFLAGS) $(LIBFLAGS)
+ LDFLAGS	= -m elf32_i386
+ 
+ .SUFFIXES: .c .o .a .so .lo .i .S .s .ls .ss .lss
diff --git a/package/syslinux/patches/patch-com32_libutil_libutil_com_a b/package/syslinux/patches/patch-com32_libutil_libutil_com_a
new file mode 100644
index 000000000..850f1eafc
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_libutil_libutil_com_a
diff --git a/package/syslinux/patches/patch-com32_libutil_libutil_lnx_a b/package/syslinux/patches/patch-com32_libutil_libutil_lnx_a
new file mode 100644
index 000000000..a4f01a321
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_libutil_libutil_lnx_a
diff --git a/package/syslinux/patches/patch-com32_lua_src_lua_c32 b/package/syslinux/patches/patch-com32_lua_src_lua_c32
new file mode 100644
index 000000000..015aa7d00
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_lua_src_lua_c32
diff --git a/package/syslinux/patches/patch-com32_mboot_mboot_c32 b/package/syslinux/patches/patch-com32_mboot_mboot_c32
new file mode 100644
index 000000000..e7263f792
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_mboot_mboot_c32
diff --git a/package/syslinux/patches/patch-com32_menu_menu_c32 b/package/syslinux/patches/patch-com32_menu_menu_c32
new file mode 100644
index 000000000..667de4f2d
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_menu_menu_c32
diff --git a/package/syslinux/patches/patch-com32_menu_vesamenu_c32 b/package/syslinux/patches/patch-com32_menu_vesamenu_c32
new file mode 100644
index 000000000..ad02006a1
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_menu_vesamenu_c32
diff --git a/package/syslinux/patches/patch-com32_modules_cat_c32 b/package/syslinux/patches/patch-com32_modules_cat_c32
new file mode 100644
index 000000000..5d2d85cdd
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_cat_c32
diff --git a/package/syslinux/patches/patch-com32_modules_chain_c32 b/package/syslinux/patches/patch-com32_modules_chain_c32
new file mode 100644
index 000000000..7fd7990fa
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_chain_c32
diff --git a/package/syslinux/patches/patch-com32_modules_cmd_c32 b/package/syslinux/patches/patch-com32_modules_cmd_c32
new file mode 100644
index 000000000..28a8193bf
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_cmd_c32
diff --git a/package/syslinux/patches/patch-com32_modules_config_c32 b/package/syslinux/patches/patch-com32_modules_config_c32
new file mode 100644
index 000000000..231bb1594
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_config_c32
diff --git a/package/syslinux/patches/patch-com32_modules_cpuid_c32 b/package/syslinux/patches/patch-com32_modules_cpuid_c32
new file mode 100644
index 000000000..07ceaae67
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_cpuid_c32
diff --git a/package/syslinux/patches/patch-com32_modules_cpuidtest_c32 b/package/syslinux/patches/patch-com32_modules_cpuidtest_c32
new file mode 100644
index 000000000..9409d12e1
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_cpuidtest_c32
diff --git a/package/syslinux/patches/patch-com32_modules_disk_c32 b/package/syslinux/patches/patch-com32_modules_disk_c32
new file mode 100644
index 000000000..2f4f85d0c
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_disk_c32
diff --git a/package/syslinux/patches/patch-com32_modules_dmitest_c32 b/package/syslinux/patches/patch-com32_modules_dmitest_c32
new file mode 100644
index 000000000..2e667b9fc
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_dmitest_c32
diff --git a/package/syslinux/patches/patch-com32_modules_elf_c32 b/package/syslinux/patches/patch-com32_modules_elf_c32
new file mode 100644
index 000000000..27b88dc15
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_elf_c32
diff --git a/package/syslinux/patches/patch-com32_modules_ethersel_c32 b/package/syslinux/patches/patch-com32_modules_ethersel_c32
new file mode 100644
index 000000000..95f1650ac
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_ethersel_c32
diff --git a/package/syslinux/patches/patch-com32_modules_gpxecmd_c32 b/package/syslinux/patches/patch-com32_modules_gpxecmd_c32
new file mode 100644
index 000000000..35b0c7d1e
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_gpxecmd_c32
diff --git a/package/syslinux/patches/patch-com32_modules_host_c32 b/package/syslinux/patches/patch-com32_modules_host_c32
new file mode 100644
index 000000000..1593366ea
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_host_c32
diff --git a/package/syslinux/patches/patch-com32_modules_ifcpu64_c32 b/package/syslinux/patches/patch-com32_modules_ifcpu64_c32
new file mode 100644
index 000000000..8b193ed54
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_ifcpu64_c32
diff --git a/package/syslinux/patches/patch-com32_modules_ifcpu_c32 b/package/syslinux/patches/patch-com32_modules_ifcpu_c32
new file mode 100644
index 000000000..4a2382717
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_ifcpu_c32
diff --git a/package/syslinux/patches/patch-com32_modules_ifplop_c32 b/package/syslinux/patches/patch-com32_modules_ifplop_c32
new file mode 100644
index 000000000..cc379a00b
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_ifplop_c32
diff --git a/package/syslinux/patches/patch-com32_modules_kbdmap_c32 b/package/syslinux/patches/patch-com32_modules_kbdmap_c32
new file mode 100644
index 000000000..88510ffde
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_kbdmap_c32
diff --git a/package/syslinux/patches/patch-com32_modules_linux_c32 b/package/syslinux/patches/patch-com32_modules_linux_c32
new file mode 100644
index 000000000..2fd270f90
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_linux_c32
diff --git a/package/syslinux/patches/patch-com32_modules_ls_c32 b/package/syslinux/patches/patch-com32_modules_ls_c32
new file mode 100644
index 000000000..1cf11f7e8
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_ls_c32
diff --git a/package/syslinux/patches/patch-com32_modules_meminfo_c32 b/package/syslinux/patches/patch-com32_modules_meminfo_c32
new file mode 100644
index 000000000..4f8a803ac
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_meminfo_c32
diff --git a/package/syslinux/patches/patch-com32_modules_pcitest_c32 b/package/syslinux/patches/patch-com32_modules_pcitest_c32
new file mode 100644
index 000000000..b88ce546e
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_pcitest_c32
diff --git a/package/syslinux/patches/patch-com32_modules_pmload_c32 b/package/syslinux/patches/patch-com32_modules_pmload_c32
new file mode 100644
index 000000000..a178c141f
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_pmload_c32
diff --git a/package/syslinux/patches/patch-com32_modules_pwd_c32 b/package/syslinux/patches/patch-com32_modules_pwd_c32
new file mode 100644
index 000000000..36273414e
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_pwd_c32
diff --git a/package/syslinux/patches/patch-com32_modules_sanboot_c32 b/package/syslinux/patches/patch-com32_modules_sanboot_c32
new file mode 100644
index 000000000..bfa90d7d9
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_sanboot_c32
diff --git a/package/syslinux/patches/patch-com32_modules_sdi_c32 b/package/syslinux/patches/patch-com32_modules_sdi_c32
new file mode 100644
index 000000000..afbc5e158
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_sdi_c32
diff --git a/package/syslinux/patches/patch-com32_modules_vesainfo_c32 b/package/syslinux/patches/patch-com32_modules_vesainfo_c32
new file mode 100644
index 000000000..8b82a0117
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_vesainfo_c32
diff --git a/package/syslinux/patches/patch-com32_modules_vpdtest_c32 b/package/syslinux/patches/patch-com32_modules_vpdtest_c32
new file mode 100644
index 000000000..034904a4b
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_vpdtest_c32
diff --git a/package/syslinux/patches/patch-com32_modules_whichsys_c32 b/package/syslinux/patches/patch-com32_modules_whichsys_c32
new file mode 100644
index 000000000..86a3aa625
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_modules_whichsys_c32
diff --git a/package/syslinux/patches/patch-com32_rosh_rosh_c32 b/package/syslinux/patches/patch-com32_rosh_rosh_c32
new file mode 100644
index 000000000..f4a1033a0
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_rosh_rosh_c32
diff --git a/package/syslinux/patches/patch-com32_samples_advdump_c32 b/package/syslinux/patches/patch-com32_samples_advdump_c32
new file mode 100644
index 000000000..996dfeb5e
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_samples_advdump_c32
diff --git a/package/syslinux/patches/patch-com32_samples_entrydump_c32 b/package/syslinux/patches/patch-com32_samples_entrydump_c32
new file mode 100644
index 000000000..1e11bcc99
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_samples_entrydump_c32
diff --git a/package/syslinux/patches/patch-com32_samples_fancyhello_c32 b/package/syslinux/patches/patch-com32_samples_fancyhello_c32
new file mode 100644
index 000000000..cf57e59b7
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_samples_fancyhello_c32
diff --git a/package/syslinux/patches/patch-com32_samples_fancyhello_lnx b/package/syslinux/patches/patch-com32_samples_fancyhello_lnx
new file mode 100644
index 000000000..4c48644ee
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_samples_fancyhello_lnx
diff --git a/package/syslinux/patches/patch-com32_samples_hello_c32 b/package/syslinux/patches/patch-com32_samples_hello_c32
new file mode 100644
index 000000000..90db9bc3f
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_samples_hello_c32
diff --git a/package/syslinux/patches/patch-com32_samples_keytest_c32 b/package/syslinux/patches/patch-com32_samples_keytest_c32
new file mode 100644
index 000000000..cbe089765
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_samples_keytest_c32
diff --git a/package/syslinux/patches/patch-com32_samples_keytest_lnx b/package/syslinux/patches/patch-com32_samples_keytest_lnx
new file mode 100644
index 000000000..dbdf4080a
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_samples_keytest_lnx
diff --git a/package/syslinux/patches/patch-com32_samples_resolv_c32 b/package/syslinux/patches/patch-com32_samples_resolv_c32
new file mode 100644
index 000000000..2351b270f
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_samples_resolv_c32
diff --git a/package/syslinux/patches/patch-com32_samples_serialinfo_c32 b/package/syslinux/patches/patch-com32_samples_serialinfo_c32
new file mode 100644
index 000000000..920ca3fa3
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_samples_serialinfo_c32
diff --git a/package/syslinux/patches/patch-com32_sysdump_sysdump_c32 b/package/syslinux/patches/patch-com32_sysdump_sysdump_c32
new file mode 100644
index 000000000..340637da4
--- /dev/null
+++ b/package/syslinux/patches/patch-com32_sysdump_sysdump_c32
diff --git a/package/tcl/Makefile b/package/tcl/Makefile
index 7b96c3b45..964bb6250 100644
--- a/package/tcl/Makefile
+++ b/package/tcl/Makefile
@@ -19,7 +19,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TCL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-ldl
+TARGET_LDFLAGS+=	-ldl
 CONFIGURE_ENV+=		tcl_cv_strstr_unbroken=ok \
 			tcl_cv_strtod_buggy=ok \
 			tcl_cv_strtod_unbroken=ok \
diff --git a/package/tcsh/patches/patch-Makefile_in b/package/tcsh/patches/patch-Makefile_in
index 1844fedea..1f206f2b4 100644
--- a/package/tcsh/patches/patch-Makefile_in
+++ b/package/tcsh/patches/patch-Makefile_in
@@ -6,7 +6,7 @@ use host compiler and flags
  gethost:  gethost.c sh.err.h tc.const.h sh.h
  	rm -f gethost
 -	${CC} -o gethost ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS}
-+	${HOSTCC} -o gethost ${HOSTLDFLAGS} ${HOSTCFLAGS} ${HOSTCPPFLAGS} $(srcdir)/gethost.c
++	${CC_FOR_BUILD} -o gethost ${LDFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${CPPFLAGS_FOR_BUILD} $(srcdir)/gethost.c
  
  tc.defs.c:	gethost host.defs
  	@rm -f $@.tmp
diff --git a/package/tinc/patches/patch-src_Makefile_in b/package/tinc/patches/patch-src_Makefile_in
new file mode 100644
index 000000000..49bcf90dc
--- /dev/null
+++ b/package/tinc/patches/patch-src_Makefile_in
@@ -0,0 +1,11 @@
+--- tinc-1.0.11.orig/src/Makefile.in	2009-11-01 16:23:33.000000000 +0100
++++ tinc-1.0.11/src/Makefile.in	2011-01-21 23:31:11.568658762 +0100
+@@ -197,7 +197,7 @@ noinst_HEADERS = conf.h connection.h dev
+ tincd_LDADD = \
+ 	$(top_builddir)/lib/libvpn.a
+ 
+-AM_CFLAGS = @CFLAGS@ -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\"
++AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\"
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile
index 5abe6456b..5d53a45db 100644
--- a/package/tntnet/Makefile
+++ b/package/tntnet/Makefile
@@ -23,11 +23,9 @@ CONFIGURE_ARGS+=	--without-epoll \
 			--without-cgi \
 			--without-sendfile \
 			--without-ssl
-
-CONFIGURE_ENV+= 	CXXFLAGS='${TCXXFLAGS}' \
+CONFIGURE_ENV+= 	CXXFLAGS='${TARGET_CXXFLAGS}' \
 			ac_cv_path_cxxtools_config=${STAGING_TARGET_DIR}/usr/bin
-
-TLDFLAGS+=		-ldl
+TARGET_LDFLAGS+=	-ldl
 
 post-install:
 	${INSTALL_DIR} ${IDIR_TNTNET}/www
diff --git a/package/traceroute/Makefile b/package/traceroute/Makefile
index 65e5342c3..36967b593 100644
--- a/package/traceroute/Makefile
+++ b/package/traceroute/Makefile
@@ -21,7 +21,7 @@ CONFIG_STYLE:=          manual
 MAKE_FLAGS+=		CC="${TARGET_CC}" \
 			AR="${TARGET_CROSS}ar" \
 			RANLIB="${TARGET_CROSS}ranlib" \
-			CFLAGS="${TCFLAGS}" \
+			CFLAGS="${TARGET_CFLAGS}" \
 			LDFLAGS="${TARGET_LDFLAGS} -L${WRKSRC}/libsupp"
 
 post-install:
diff --git a/package/trafshow/Makefile b/package/trafshow/Makefile
index 4ef0d742b..17d9879db 100644
--- a/package/trafshow/Makefile
+++ b/package/trafshow/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		0b2f0bb23b7832138b7d841437b9e182
 PKG_DESCR:=		traffic analyzing tool
 PKG_SECTION:=		net
+PKG_BUILDDEP:=		libpcap ncurses
+PKG_DEPENDS:=		libpcap libncurses libpthread
 PKG_SITES:=		http://www.sfr-fresh.com/linux/misc/
 PKG_NOPARALLEL:=	1
 
@@ -18,8 +20,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TRAFSHOW,trafshow,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-DHAVE_SOCKADDR_STORAGE -DHAVE_HAS_COLORS
-TLDFLAGS+=		-pthread
+TARGET_CPPFLAGS+=	-DHAVE_SOCKADDR_STORAGE -DHAVE_HAS_COLORS
 
 post-install:
 	${INSTALL_DIR} ${IDIR_TRAFSHOW}/usr/bin
diff --git a/package/trafshow/patches/patch-Makefile_in b/package/trafshow/patches/patch-Makefile_in
index d5562d64c..f3f681f14 100644
--- a/package/trafshow/patches/patch-Makefile_in
+++ b/package/trafshow/patches/patch-Makefile_in
@@ -1,6 +1,32 @@
 --- trafshow-5.2.3.orig/Makefile.in	2004-06-15 10:29:14.000000000 +0200
-+++ trafshow-5.2.3/Makefile.in	2010-02-05 23:07:13.164334256 +0100
-@@ -59,6 +59,8 @@ OBJ	= $(CSRC:.c=.o) $(YSRC:.y=.o) $(LSRC
++++ trafshow-5.2.3/Makefile.in	2011-01-21 23:49:58.988658729 +0100
+@@ -28,21 +28,22 @@ MANDEST = @mandir@
+ 
+ PROG = trafshow
+ CC = @PTHREAD_CC@
+-CFLAGS = @CFLAGS@ -Wall -I. @DEFS@ @PTHREAD_CFLAGS@
++CFLAGS = @CFLAGS@ -Wall @PTHREAD_CFLAGS@
++CPPFLAGS = -I. @DEFS@ @CPPFLAGS@
+ YACC = @YACC@
+ YFLAGS = -d -p `echo $@ | sed -e 's/\..*/_/'`
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LFLAGS =
+ LDFLAGS = @LDFLAGS@
+-LIBS = @PTHREAD_LIBS@ @LIBS@
++LIBS = @PTHREAD_LIBS@ @LIBS@ -pthread
+ 
+ # Explicitly define compilation rule since SunOS 4's make doesn't like gcc.
+ # Also, gcc does not remove the .o before forking 'as', which can be a
+ # problem if you don't own the file but can write to the directory.
+ .c.o:
+ 	@rm -f $@
+-	$(CC) $(CFLAGS) -c $*.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c
+ 
+ CSRC	= trafshow.c screen.c colormask.c getkey.c selector.c \
+ 	events.c session.c show_if.c show_stat.c show_dump.c \
+@@ -59,9 +60,11 @@ OBJ	= $(CSRC:.c=.o) $(YSRC:.y=.o) $(LSRC
  
  CLEANFILES = $(PROG) $(OBJ) $(GENSRC) y.tab.h
  
@@ -8,8 +34,12 @@
 +
  $(PROG): $(OBJ)
  	@rm -f $@
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
-@@ -73,9 +75,9 @@ version.c: VERSION Makefile
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
++	$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+ 
+ $(OBJ): config.h trafshow.h Makefile
+ version.o: version.c
+@@ -73,9 +76,9 @@ version.c: VERSION Makefile
  	@echo 'char compiled[] = "$(CC) $(CFLAGS) $(LIBS)";' >> $@
  
  install:
diff --git a/package/tslib/patches/autotool.patch b/package/tslib/patches/autotool.patch
index c72fd2dc1..f4e8ef9eb 100644
--- a/package/tslib/patches/autotool.patch
+++ b/package/tslib/patches/autotool.patch
@@ -30564,7 +30564,7 @@ diff -Nur tslib-1.0.orig/ltmain.sh tslib-1.0/ltmain.sh
 +      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
 +      # @file GCC response files
 +      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
 +        func_quote_for_eval "$arg"
 +	arg="$func_quote_for_eval_result"
 +        func_append compile_command " $arg"
diff --git a/package/tslib/patches/patch-ltmain_sh b/package/tslib/patches/patch-ltmain_sh
deleted file mode 100644
index 8abaeff72..000000000
--- a/package/tslib/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,8416 +0,0 @@
---- tslib-1.0.orig/ltmain.sh	1970-01-01 00:00:00.000000000 +0100
-+++ tslib-1.0/ltmain.sh	2011-01-14 23:22:44.000000000 +0100
-@@ -0,0 +1,8413 @@
-+# Generated from ltmain.m4sh.
-+
-+# ltmain.sh (GNU libtool) 2.2.6b
-+# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
-+# This is free software; see the source for copying conditions.  There is NO
-+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+
-+# GNU Libtool is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# As a special exception to the GNU General Public License,
-+# if you distribute this file as part of a program or library that
-+# is built using GNU Libtool, you may include this file under the
-+# same distribution terms that you use for the rest of that program.
-+#
-+# GNU Libtool is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with GNU Libtool; see the file COPYING.  If not, a copy
-+# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-+# or obtained by writing to the Free Software Foundation, Inc.,
-+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+
-+# Usage: $progname [OPTION]... [MODE-ARG]...
-+#
-+# Provide generalized library-building support services.
-+#
-+#     --config             show all configuration variables
-+#     --debug              enable verbose shell tracing
-+# -n, --dry-run            display commands without modifying any files
-+#     --features           display basic configuration information and exit
-+#     --mode=MODE          use operation mode MODE
-+#     --preserve-dup-deps  don't remove duplicate dependency libraries
-+#     --quiet, --silent    don't print informational messages
-+#     --tag=TAG            use configuration variables from tag TAG
-+# -v, --verbose            print informational messages (default)
-+#     --version            print version information
-+# -h, --help               print short or long help message
-+#
-+# MODE must be one of the following:
-+#
-+#       clean              remove files from the build directory
-+#       compile            compile a source file into a libtool object
-+#       execute            automatically set library path, then run a program
-+#       finish             complete the installation of libtool libraries
-+#       install            install libraries or executables
-+#       link               create a library or an executable
-+#       uninstall          remove libraries from an installed directory
-+#
-+# MODE-ARGS vary depending on the MODE.
-+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-+#
-+# When reporting a bug, please describe a test case to reproduce it and
-+# include the following information:
-+#
-+#       host-triplet:	$host
-+#       shell:		$SHELL
-+#       compiler:		$LTCC
-+#       compiler flags:		$LTCFLAGS
-+#       linker:		$LD (gnu? $with_gnu_ld)
-+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
-+#       automake:		$automake_version
-+#       autoconf:		$autoconf_version
-+#
-+# Report bugs to <bug-libtool@gnu.org>.
-+
-+PROGRAM=ltmain.sh
-+PACKAGE=libtool
-+VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
-+TIMESTAMP=""
-+package_revision=1.3017
-+
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+  emulate sh
-+  NULLCMD=:
-+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '${1+"$@"}'='"$@"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+# NLS nuisances: We save the old values to restore during execute mode.
-+# Only set LANG and LC_ALL to C if already set.
-+# These must not be set unconditionally because not all systems understand
-+# e.g. LANG=C (notably SCO).
-+lt_user_locale=
-+lt_safe_locale=
-+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+do
-+  eval "if test \"\${$lt_var+set}\" = set; then
-+          save_$lt_var=\$$lt_var
-+          $lt_var=C
-+	  export $lt_var
-+	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
-+	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
-+	fi"
-+done
-+
-+$lt_unset CDPATH
-+
-+
-+
-+
-+
-+: ${CP="cp -f"}
-+: ${ECHO="echo"}
-+: ${EGREP="/bin/grep -E"}
-+: ${FGREP="/bin/grep -F"}
-+: ${GREP="/bin/grep"}
-+: ${LN_S="ln -s"}
-+: ${MAKE="make"}
-+: ${MKDIR="mkdir"}
-+: ${MV="mv -f"}
-+: ${RM="rm -f"}
-+: ${SED="/bin/sed"}
-+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-+: ${Xsed="$SED -e 1s/^X//"}
-+
-+# Global variables:
-+EXIT_SUCCESS=0
-+EXIT_FAILURE=1
-+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
-+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
-+
-+exit_status=$EXIT_SUCCESS
-+
-+# Make sure IFS has a sensible default
-+lt_nl='
-+'
-+IFS=" 	$lt_nl"
-+
-+dirname="s,/[^/]*$,,"
-+basename="s,^.*/,,"
-+
-+# func_dirname_and_basename file append nondir_replacement
-+# perform func_basename and func_dirname in a single function
-+# call:
-+#   dirname:  Compute the dirname of FILE.  If nonempty,
-+#             add APPEND to the result, otherwise set result
-+#             to NONDIR_REPLACEMENT.
-+#             value returned in "$func_dirname_result"
-+#   basename: Compute filename of FILE.
-+#             value retuned in "$func_basename_result"
-+# Implementation must be kept synchronized with func_dirname
-+# and func_basename. For efficiency, we do not delegate to
-+# those functions but instead duplicate the functionality here.
-+func_dirname_and_basename ()
-+{
-+  # Extract subdirectory from the argument.
-+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-+  if test "X$func_dirname_result" = "X${1}"; then
-+    func_dirname_result="${3}"
-+  else
-+    func_dirname_result="$func_dirname_result${2}"
-+  fi
-+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-+}
-+
-+# Generated shell functions inserted here.
-+
-+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-+# is ksh but when the shell is invoked as "sh" and the current value of
-+# the _XPG environment variable is not equal to 1 (one), the special
-+# positional parameter $0, within a function call, is the name of the
-+# function.
-+progpath="$0"
-+
-+# The name of this program:
-+# In the unlikely event $progname began with a '-', it would play havoc with
-+# func_echo (imagine progname=-n), so we prepend ./ in that case:
-+func_dirname_and_basename "$progpath"
-+progname=$func_basename_result
-+case $progname in
-+  -*) progname=./$progname ;;
-+esac
-+
-+# Make sure we have an absolute path for reexecution:
-+case $progpath in
-+  [\\/]*|[A-Za-z]:\\*) ;;
-+  *[\\/]*)
-+     progdir=$func_dirname_result
-+     progdir=`cd "$progdir" && pwd`
-+     progpath="$progdir/$progname"
-+     ;;
-+  *)
-+     save_IFS="$IFS"
-+     IFS=:
-+     for progdir in $PATH; do
-+       IFS="$save_IFS"
-+       test -x "$progdir/$progname" && break
-+     done
-+     IFS="$save_IFS"
-+     test -n "$progdir" || progdir=`pwd`
-+     progpath="$progdir/$progname"
-+     ;;
-+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_quote_subst='s/\([`"$\\]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\(["`\\]\)/\\\1/g'
-+
-+# Re-`\' parameter expansions in output of double_quote_subst that were
-+# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
-+# in input to double_quote_subst, that '$' was protected from expansion.
-+# Since each input `\' is now two `\'s, look for any number of runs of
-+# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
-+bs='\\'
-+bs2='\\\\'
-+bs4='\\\\\\\\'
-+dollar='\$'
-+sed_double_backslash="\
-+  s/$bs4/&\\
-+/g
-+  s/^$bs2$dollar/$bs&/
-+  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
-+  s/\n//g"
-+
-+# Standard options:
-+opt_dry_run=false
-+opt_help=false
-+opt_quiet=false
-+opt_verbose=false
-+opt_warning=:
-+
-+# func_echo arg...
-+# Echo program name prefixed message, along with the current mode
-+# name if it has been set yet.
-+func_echo ()
-+{
-+    $ECHO "$progname${mode+: }$mode: $*"
-+}
-+
-+# func_verbose arg...
-+# Echo program name prefixed message in verbose mode only.
-+func_verbose ()
-+{
-+    $opt_verbose && func_echo ${1+"$@"}
-+
-+    # A bug in bash halts the script if the last line of a function
-+    # fails when set -e is in force, so we need another command to
-+    # work around that:
-+    :
-+}
-+
-+# func_error arg...
-+# Echo program name prefixed message to standard error.
-+func_error ()
-+{
-+    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
-+}
-+
-+# func_warning arg...
-+# Echo program name prefixed warning message to standard error.
-+func_warning ()
-+{
-+    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
-+
-+    # bash bug again:
-+    :
-+}
-+
-+# func_fatal_error arg...
-+# Echo program name prefixed message to standard error, and exit.
-+func_fatal_error ()
-+{
-+    func_error ${1+"$@"}
-+    exit $EXIT_FAILURE
-+}
-+
-+# func_fatal_help arg...
-+# Echo program name prefixed message to standard error, followed by
-+# a help hint, and exit.
-+func_fatal_help ()
-+{
-+    func_error ${1+"$@"}
-+    func_fatal_error "$help"
-+}
-+help="Try \`$progname --help' for more information."  ## default
-+
-+
-+# func_grep expression filename
-+# Check whether EXPRESSION matches any line of FILENAME, without output.
-+func_grep ()
-+{
-+    $GREP "$1" "$2" >/dev/null 2>&1
-+}
-+
-+
-+# func_mkdir_p directory-path
-+# Make sure the entire path to DIRECTORY-PATH is available.
-+func_mkdir_p ()
-+{
-+    my_directory_path="$1"
-+    my_dir_list=
-+
-+    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
-+
-+      # Protect directory names starting with `-'
-+      case $my_directory_path in
-+        -*) my_directory_path="./$my_directory_path" ;;
-+      esac
-+
-+      # While some portion of DIR does not yet exist...
-+      while test ! -d "$my_directory_path"; do
-+        # ...make a list in topmost first order.  Use a colon delimited
-+	# list incase some portion of path contains whitespace.
-+        my_dir_list="$my_directory_path:$my_dir_list"
-+
-+        # If the last portion added has no slash in it, the list is done
-+        case $my_directory_path in */*) ;; *) break ;; esac
-+
-+        # ...otherwise throw away the child directory and loop
-+        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
-+      done
-+      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
-+
-+      save_mkdir_p_IFS="$IFS"; IFS=':'
-+      for my_dir in $my_dir_list; do
-+	IFS="$save_mkdir_p_IFS"
-+        # mkdir can fail with a `File exist' error if two processes
-+        # try to create one of the directories concurrently.  Don't
-+        # stop in that case!
-+        $MKDIR "$my_dir" 2>/dev/null || :
-+      done
-+      IFS="$save_mkdir_p_IFS"
-+
-+      # Bail out if we (or some other process) failed to create a directory.
-+      test -d "$my_directory_path" || \
-+        func_fatal_error "Failed to create \`$1'"
-+    fi
-+}
-+
-+
-+# func_mktempdir [string]
-+# Make a temporary directory that won't clash with other running
-+# libtool processes, and avoids race conditions if possible.  If
-+# given, STRING is the basename for that directory.
-+func_mktempdir ()
-+{
-+    my_template="${TMPDIR-/tmp}/${1-$progname}"
-+
-+    if test "$opt_dry_run" = ":"; then
-+      # Return a directory name, but don't create it in dry-run mode
-+      my_tmpdir="${my_template}-$$"
-+    else
-+
-+      # If mktemp works, use that first and foremost
-+      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-+
-+      if test ! -d "$my_tmpdir"; then
-+        # Failing that, at least try and use $RANDOM to avoid a race
-+        my_tmpdir="${my_template}-${RANDOM-0}$$"
-+
-+        save_mktempdir_umask=`umask`
-+        umask 0077
-+        $MKDIR "$my_tmpdir"
-+        umask $save_mktempdir_umask
-+      fi
-+
-+      # If we're not in dry-run mode, bomb out on failure
-+      test -d "$my_tmpdir" || \
-+        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-+    fi
-+
-+    $ECHO "X$my_tmpdir" | $Xsed
-+}
-+
-+
-+# func_quote_for_eval arg
-+# Aesthetically quote ARG to be evaled later.
-+# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-+# is double-quoted, suitable for a subsequent eval, whereas
-+# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-+# which are still active within double quotes backslashified.
-+func_quote_for_eval ()
-+{
-+    case $1 in
-+      *[\\\`\"\$]*)
-+	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
-+      *)
-+        func_quote_for_eval_unquoted_result="$1" ;;
-+    esac
-+
-+    case $func_quote_for_eval_unquoted_result in
-+      # Double-quote args containing shell metacharacters to delay
-+      # word splitting, command substitution and and variable
-+      # expansion for a subsequent eval.
-+      # Many Bourne shells cannot handle close brackets correctly
-+      # in scan sets, so we specify it separately.
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
-+        ;;
-+      *)
-+        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
-+    esac
-+}
-+
-+
-+# func_quote_for_expand arg
-+# Aesthetically quote ARG to be evaled later; same as above,
-+# but do not quote variable references.
-+func_quote_for_expand ()
-+{
-+    case $1 in
-+      *[\\\`\"]*)
-+	my_arg=`$ECHO "X$1" | $Xsed \
-+	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
-+      *)
-+        my_arg="$1" ;;
-+    esac
-+
-+    case $my_arg in
-+      # Double-quote args containing shell metacharacters to delay
-+      # word splitting and command substitution for a subsequent eval.
-+      # Many Bourne shells cannot handle close brackets correctly
-+      # in scan sets, so we specify it separately.
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+        my_arg="\"$my_arg\""
-+        ;;
-+    esac
-+
-+    func_quote_for_expand_result="$my_arg"
-+}
-+
-+
-+# func_show_eval cmd [fail_exp]
-+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-+# is given, then evaluate it.
-+func_show_eval ()
-+{
-+    my_cmd="$1"
-+    my_fail_exp="${2-:}"
-+
-+    ${opt_silent-false} || {
-+      func_quote_for_expand "$my_cmd"
-+      eval "func_echo $func_quote_for_expand_result"
-+    }
-+
-+    if ${opt_dry_run-false}; then :; else
-+      eval "$my_cmd"
-+      my_status=$?
-+      if test "$my_status" -eq 0; then :; else
-+	eval "(exit $my_status); $my_fail_exp"
-+      fi
-+    fi
-+}
-+
-+
-+# func_show_eval_locale cmd [fail_exp]
-+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-+# is given, then evaluate it.  Use the saved locale for evaluation.
-+func_show_eval_locale ()
-+{
-+    my_cmd="$1"
-+    my_fail_exp="${2-:}"
-+
-+    ${opt_silent-false} || {
-+      func_quote_for_expand "$my_cmd"
-+      eval "func_echo $func_quote_for_expand_result"
-+    }
-+
-+    if ${opt_dry_run-false}; then :; else
-+      eval "$lt_user_locale
-+	    $my_cmd"
-+      my_status=$?
-+      eval "$lt_safe_locale"
-+      if test "$my_status" -eq 0; then :; else
-+	eval "(exit $my_status); $my_fail_exp"
-+      fi
-+    fi
-+}
-+
-+
-+
-+
-+
-+# func_version
-+# Echo version message to standard output and exit.
-+func_version ()
-+{
-+    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
-+        s/^# //
-+	s/^# *$//
-+        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-+        p
-+     }' < "$progpath"
-+     exit $?
-+}
-+
-+# func_usage
-+# Echo short help message to standard output and exit.
-+func_usage ()
-+{
-+    $SED -n '/^# Usage:/,/# -h/ {
-+        s/^# //
-+	s/^# *$//
-+	s/\$progname/'$progname'/
-+	p
-+    }' < "$progpath"
-+    $ECHO
-+    $ECHO "run \`$progname --help | more' for full usage"
-+    exit $?
-+}
-+
-+# func_help
-+# Echo long help message to standard output and exit.
-+func_help ()
-+{
-+    $SED -n '/^# Usage:/,/# Report bugs to/ {
-+        s/^# //
-+	s/^# *$//
-+	s*\$progname*'$progname'*
-+	s*\$host*'"$host"'*
-+	s*\$SHELL*'"$SHELL"'*
-+	s*\$LTCC*'"$LTCC"'*
-+	s*\$LTCFLAGS*'"$LTCFLAGS"'*
-+	s*\$LD*'"$LD"'*
-+	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-+	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-+	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
-+	p
-+     }' < "$progpath"
-+    exit $?
-+}
-+
-+# func_missing_arg argname
-+# Echo program name prefixed message to standard error and set global
-+# exit_cmd.
-+func_missing_arg ()
-+{
-+    func_error "missing argument for $1"
-+    exit_cmd=exit
-+}
-+
-+exit_cmd=:
-+
-+
-+
-+
-+
-+# Check that we have a working $ECHO.
-+if test "X$1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X$1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
-+  # Yippee, $ECHO works!
-+  :
-+else
-+  # Restart under the correct shell, and then maybe $ECHO will work.
-+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-+fi
-+
-+if test "X$1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<EOF
-+$*
-+EOF
-+  exit $EXIT_SUCCESS
-+fi
-+
-+magic="%%%MAGIC variable%%%"
-+magic_exe="%%%MAGIC EXE variable%%%"
-+
-+# Global variables.
-+# $mode is unset
-+nonopt=
-+execute_dlfiles=
-+preserve_args=
-+lo2o="s/\\.lo\$/.${objext}/"
-+o2lo="s/\\.${objext}\$/.lo/"
-+extracted_archives=
-+extracted_serial=0
-+
-+opt_dry_run=false
-+opt_duplicate_deps=false
-+opt_silent=false
-+opt_debug=:
-+
-+# If this variable is set in any of the actions, the command in it
-+# will be execed at the end.  This prevents here-documents from being
-+# left over by shells.
-+exec_cmd=
-+
-+# func_fatal_configuration arg...
-+# Echo program name prefixed message to standard error, followed by
-+# a configuration failure hint, and exit.
-+func_fatal_configuration ()
-+{
-+    func_error ${1+"$@"}
-+    func_error "See the $PACKAGE documentation for more information."
-+    func_fatal_error "Fatal configuration error."
-+}
-+
-+
-+# func_config
-+# Display the configuration for all the tags in this script.
-+func_config ()
-+{
-+    re_begincf='^# ### BEGIN LIBTOOL'
-+    re_endcf='^# ### END LIBTOOL'
-+
-+    # Default configuration.
-+    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
-+
-+    # Now print the configurations for the tags.
-+    for tagname in $taglist; do
-+      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
-+    done
-+
-+    exit $?
-+}
-+
-+# func_features
-+# Display the features supported by this script.
-+func_features ()
-+{
-+    $ECHO "host: $host"
-+    if test "$build_libtool_libs" = yes; then
-+      $ECHO "enable shared libraries"
-+    else
-+      $ECHO "disable shared libraries"
-+    fi
-+    if test "$build_old_libs" = yes; then
-+      $ECHO "enable static libraries"
-+    else
-+      $ECHO "disable static libraries"
-+    fi
-+
-+    exit $?
-+}
-+
-+# func_enable_tag tagname
-+# Verify that TAGNAME is valid, and either flag an error and exit, or
-+# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
-+# variable here.
-+func_enable_tag ()
-+{
-+  # Global variable:
-+  tagname="$1"
-+
-+  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-+  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-+  sed_extractcf="/$re_begincf/,/$re_endcf/p"
-+
-+  # Validate tagname.
-+  case $tagname in
-+    *[!-_A-Za-z0-9,/]*)
-+      func_fatal_error "invalid tag name: $tagname"
-+      ;;
-+  esac
-+
-+  # Don't test for the "default" C tag, as we know it's
-+  # there but not specially marked.
-+  case $tagname in
-+    CC) ;;
-+    *)
-+      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-+	taglist="$taglist $tagname"
-+
-+	# Evaluate the configuration.  Be careful to quote the path
-+	# and the sed script, to avoid splitting on whitespace, but
-+	# also don't use non-portable quotes within backquotes within
-+	# quotes we have to do it in 2 steps:
-+	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-+	eval "$extractedcf"
-+      else
-+	func_error "ignoring unknown tag $tagname"
-+      fi
-+      ;;
-+  esac
-+}
-+
-+# Parse options once, thoroughly.  This comes as soon as possible in
-+# the script to make things like `libtool --version' happen quickly.
-+{
-+
-+  # Shorthand for --mode=foo, only valid as the first argument
-+  case $1 in
-+  clean|clea|cle|cl)
-+    shift; set dummy --mode clean ${1+"$@"}; shift
-+    ;;
-+  compile|compil|compi|comp|com|co|c)
-+    shift; set dummy --mode compile ${1+"$@"}; shift
-+    ;;
-+  execute|execut|execu|exec|exe|ex|e)
-+    shift; set dummy --mode execute ${1+"$@"}; shift
-+    ;;
-+  finish|finis|fini|fin|fi|f)
-+    shift; set dummy --mode finish ${1+"$@"}; shift
-+    ;;
-+  install|instal|insta|inst|ins|in|i)
-+    shift; set dummy --mode install ${1+"$@"}; shift
-+    ;;
-+  link|lin|li|l)
-+    shift; set dummy --mode link ${1+"$@"}; shift
-+    ;;
-+  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-+    shift; set dummy --mode uninstall ${1+"$@"}; shift
-+    ;;
-+  esac
-+
-+  # Parse non-mode specific arguments:
-+  while test "$#" -gt 0; do
-+    opt="$1"
-+    shift
-+
-+    case $opt in
-+      --config)		func_config					;;
-+
-+      --debug)		preserve_args="$preserve_args $opt"
-+			func_echo "enabling shell trace mode"
-+			opt_debug='set -x'
-+			$opt_debug
-+			;;
-+
-+      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-+			execute_dlfiles="$execute_dlfiles $1"
-+			shift
-+			;;
-+
-+      --dry-run | -n)	opt_dry_run=:					;;
-+      --features)       func_features					;;
-+      --finish)		mode="finish"					;;
-+
-+      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-+			case $1 in
-+			  # Valid mode arguments:
-+			  clean)	;;
-+			  compile)	;;
-+			  execute)	;;
-+			  finish)	;;
-+			  install)	;;
-+			  link)		;;
-+			  relink)	;;
-+			  uninstall)	;;
-+
-+			  # Catch anything else as an error
-+			  *) func_error "invalid argument for $opt"
-+			     exit_cmd=exit
-+			     break
-+			     ;;
-+		        esac
-+
-+			mode="$1"
-+			shift
-+			;;
-+
-+      --preserve-dup-deps)
-+			opt_duplicate_deps=:				;;
-+
-+      --quiet|--silent)	preserve_args="$preserve_args $opt"
-+			opt_silent=:
-+			;;
-+
-+      --verbose| -v)	preserve_args="$preserve_args $opt"
-+			opt_silent=false
-+			;;
-+
-+      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-+			preserve_args="$preserve_args $opt $1"
-+			func_enable_tag "$1"	# tagname is set here
-+			shift
-+			;;
-+
-+      # Separate optargs to long options:
-+      -dlopen=*|--mode=*|--tag=*)
-+			func_opt_split "$opt"
-+			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
-+			shift
-+			;;
-+
-+      -\?|-h)		func_usage					;;
-+      --help)		opt_help=:					;;
-+      --version)	func_version					;;
-+
-+      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
-+
-+      *)		nonopt="$opt"
-+			break
-+			;;
-+    esac
-+  done
-+
-+
-+  case $host in
-+    *cygwin* | *mingw* | *pw32* | *cegcc*)
-+      # don't eliminate duplications in $postdeps and $predeps
-+      opt_duplicate_compiler_generated_deps=:
-+      ;;
-+    *)
-+      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
-+      ;;
-+  esac
-+
-+  # Having warned about all mis-specified options, bail out if
-+  # anything was wrong.
-+  $exit_cmd $EXIT_FAILURE
-+}
-+
-+# func_check_version_match
-+# Ensure that we are using m4 macros, and libtool script from the same
-+# release of libtool.
-+func_check_version_match ()
-+{
-+  if test "$package_revision" != "$macro_revision"; then
-+    if test "$VERSION" != "$macro_version"; then
-+      if test -z "$macro_version"; then
-+        cat >&2 <<_LT_EOF
-+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-+$progname: definition of this LT_INIT comes from an older release.
-+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-+$progname: and run autoconf again.
-+_LT_EOF
-+      else
-+        cat >&2 <<_LT_EOF
-+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-+$progname: and run autoconf again.
-+_LT_EOF
-+      fi
-+    else
-+      cat >&2 <<_LT_EOF
-+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-+$progname: of $PACKAGE $VERSION and run autoconf again.
-+_LT_EOF
-+    fi
-+
-+    exit $EXIT_MISMATCH
-+  fi
-+}
-+
-+
-+## ----------- ##
-+##    Main.    ##
-+## ----------- ##
-+
-+$opt_help || {
-+  # Sanity checks first:
-+  func_check_version_match
-+
-+  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-+    func_fatal_configuration "not configured to build any kind of library"
-+  fi
-+
-+  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
-+
-+
-+  # Darwin sucks
-+  eval std_shrext=\"$shrext_cmds\"
-+
-+
-+  # Only execute mode is allowed to have -dlopen flags.
-+  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-+    func_error "unrecognized option \`-dlopen'"
-+    $ECHO "$help" 1>&2
-+    exit $EXIT_FAILURE
-+  fi
-+
-+  # Change the help message to a mode-specific one.
-+  generic_help="$help"
-+  help="Try \`$progname --help --mode=$mode' for more information."
-+}
-+
-+
-+# func_lalib_p file
-+# True iff FILE is a libtool `.la' library or `.lo' object file.
-+# This function is only a basic sanity check; it will hardly flush out
-+# determined imposters.
-+func_lalib_p ()
-+{
-+    test -f "$1" &&
-+      $SED -e 4q "$1" 2>/dev/null \
-+        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
-+}
-+
-+# func_lalib_unsafe_p file
-+# True iff FILE is a libtool `.la' library or `.lo' object file.
-+# This function implements the same check as func_lalib_p without
-+# resorting to external programs.  To this end, it redirects stdin and
-+# closes it afterwards, without saving the original file descriptor.
-+# As a safety measure, use it only where a negative result would be
-+# fatal anyway.  Works if `file' does not exist.
-+func_lalib_unsafe_p ()
-+{
-+    lalib_p=no
-+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
-+	for lalib_p_l in 1 2 3 4
-+	do
-+	    read lalib_p_line
-+	    case "$lalib_p_line" in
-+		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
-+	    esac
-+	done
-+	exec 0<&5 5<&-
-+    fi
-+    test "$lalib_p" = yes
-+}
-+
-+# func_ltwrapper_script_p file
-+# True iff FILE is a libtool wrapper script
-+# This function is only a basic sanity check; it will hardly flush out
-+# determined imposters.
-+func_ltwrapper_script_p ()
-+{
-+    func_lalib_p "$1"
-+}
-+
-+# func_ltwrapper_executable_p file
-+# True iff FILE is a libtool wrapper executable
-+# This function is only a basic sanity check; it will hardly flush out
-+# determined imposters.
-+func_ltwrapper_executable_p ()
-+{
-+    func_ltwrapper_exec_suffix=
-+    case $1 in
-+    *.exe) ;;
-+    *) func_ltwrapper_exec_suffix=.exe ;;
-+    esac
-+    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
-+}
-+
-+# func_ltwrapper_scriptname file
-+# Assumes file is an ltwrapper_executable
-+# uses $file to determine the appropriate filename for a
-+# temporary ltwrapper_script.
-+func_ltwrapper_scriptname ()
-+{
-+    func_ltwrapper_scriptname_result=""
-+    if func_ltwrapper_executable_p "$1"; then
-+	func_dirname_and_basename "$1" "" "."
-+	func_stripname '' '.exe' "$func_basename_result"
-+	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-+    fi
-+}
-+
-+# func_ltwrapper_p file
-+# True iff FILE is a libtool wrapper script or wrapper executable
-+# This function is only a basic sanity check; it will hardly flush out
-+# determined imposters.
-+func_ltwrapper_p ()
-+{
-+    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
-+}
-+
-+
-+# func_execute_cmds commands fail_cmd
-+# Execute tilde-delimited COMMANDS.
-+# If FAIL_CMD is given, eval that upon failure.
-+# FAIL_CMD may read-access the current command in variable CMD!
-+func_execute_cmds ()
-+{
-+    $opt_debug
-+    save_ifs=$IFS; IFS='~'
-+    for cmd in $1; do
-+      IFS=$save_ifs
-+      eval cmd=\"$cmd\"
-+      func_show_eval "$cmd" "${2-:}"
-+    done
-+    IFS=$save_ifs
-+}
-+
-+
-+# func_source file
-+# Source FILE, adding directory component if necessary.
-+# Note that it is not necessary on cygwin/mingw to append a dot to
-+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
-+# behavior happens only for exec(3), not for open(2)!  Also, sourcing
-+# `FILE.' does not work on cygwin managed mounts.
-+func_source ()
-+{
-+    $opt_debug
-+    case $1 in
-+    */* | *\\*)	. "$1" ;;
-+    *)		. "./$1" ;;
-+    esac
-+}
-+
-+
-+# func_infer_tag arg
-+# Infer tagged configuration to use if any are available and
-+# if one wasn't chosen via the "--tag" command line option.
-+# Only attempt this if the compiler in the base compile
-+# command doesn't match the default compiler.
-+# arg is usually of the form 'gcc ...'
-+func_infer_tag ()
-+{
-+    $opt_debug
-+    if test -n "$available_tags" && test -z "$tagname"; then
-+      CC_quoted=
-+      for arg in $CC; do
-+        func_quote_for_eval "$arg"
-+	CC_quoted="$CC_quoted $func_quote_for_eval_result"
-+      done
-+      case $@ in
-+      # Blanks in the command may have been stripped by the calling shell,
-+      # but not from the CC environment variable when configure was run.
-+      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
-+      # Blanks at the start of $base_compile will cause this to fail
-+      # if we don't check for them as well.
-+      *)
-+	for z in $available_tags; do
-+	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-+	    # Evaluate the configuration.
-+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-+	    CC_quoted=
-+	    for arg in $CC; do
-+	      # Double-quote args containing other shell metacharacters.
-+	      func_quote_for_eval "$arg"
-+	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
-+	    done
-+	    case "$@ " in
-+	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
-+	      # The compiler in the base compile command matches
-+	      # the one in the tagged configuration.
-+	      # Assume this is the tagged configuration we want.
-+	      tagname=$z
-+	      break
-+	      ;;
-+	    esac
-+	  fi
-+	done
-+	# If $tagname still isn't set, then no tagged configuration
-+	# was found and let the user know that the "--tag" command
-+	# line option must be used.
-+	if test -z "$tagname"; then
-+	  func_echo "unable to infer tagged configuration"
-+	  func_fatal_error "specify a tag with \`--tag'"
-+#	else
-+#	  func_verbose "using $tagname tagged configuration"
-+	fi
-+	;;
-+      esac
-+    fi
-+}
-+
-+
-+
-+# func_write_libtool_object output_name pic_name nonpic_name
-+# Create a libtool object file (analogous to a ".la" file),
-+# but don't create it if we're doing a dry run.
-+func_write_libtool_object ()
-+{
-+    write_libobj=${1}
-+    if test "$build_libtool_libs" = yes; then
-+      write_lobj=\'${2}\'
-+    else
-+      write_lobj=none
-+    fi
-+
-+    if test "$build_old_libs" = yes; then
-+      write_oldobj=\'${3}\'
-+    else
-+      write_oldobj=none
-+    fi
-+
-+    $opt_dry_run || {
-+      cat >${write_libobj}T <<EOF
-+# $write_libobj - a libtool object file
-+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-+#
-+# Please DO NOT delete this file!
-+# It is necessary for linking the library.
-+
-+# Name of the PIC object.
-+pic_object=$write_lobj
-+
-+# Name of the non-PIC object
-+non_pic_object=$write_oldobj
-+
-+EOF
-+      $MV "${write_libobj}T" "${write_libobj}"
-+    }
-+}
-+
-+# func_mode_compile arg...
-+func_mode_compile ()
-+{
-+    $opt_debug
-+    # Get the compilation command and the source file.
-+    base_compile=
-+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-+    suppress_opt=yes
-+    suppress_output=
-+    arg_mode=normal
-+    libobj=
-+    later=
-+    pie_flag=
-+
-+    for arg
-+    do
-+      case $arg_mode in
-+      arg  )
-+	# do not "continue".  Instead, add this to base_compile
-+	lastarg="$arg"
-+	arg_mode=normal
-+	;;
-+
-+      target )
-+	libobj="$arg"
-+	arg_mode=normal
-+	continue
-+	;;
-+
-+      normal )
-+	# Accept any command-line options.
-+	case $arg in
-+	-o)
-+	  test -n "$libobj" && \
-+	    func_fatal_error "you cannot specify \`-o' more than once"
-+	  arg_mode=target
-+	  continue
-+	  ;;
-+
-+	-pie | -fpie | -fPIE)
-+          pie_flag="$pie_flag $arg"
-+	  continue
-+	  ;;
-+
-+	-shared | -static | -prefer-pic | -prefer-non-pic)
-+	  later="$later $arg"
-+	  continue
-+	  ;;
-+
-+	-no-suppress)
-+	  suppress_opt=no
-+	  continue
-+	  ;;
-+
-+	-Xcompiler)
-+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-+	  continue      #  The current "srcfile" will either be retained or
-+	  ;;            #  replaced later.  I would guess that would be a bug.
-+
-+	-Wc,*)
-+	  func_stripname '-Wc,' '' "$arg"
-+	  args=$func_stripname_result
-+	  lastarg=
-+	  save_ifs="$IFS"; IFS=','
-+	  for arg in $args; do
-+	    IFS="$save_ifs"
-+	    func_quote_for_eval "$arg"
-+	    lastarg="$lastarg $func_quote_for_eval_result"
-+	  done
-+	  IFS="$save_ifs"
-+	  func_stripname ' ' '' "$lastarg"
-+	  lastarg=$func_stripname_result
-+
-+	  # Add the arguments to base_compile.
-+	  base_compile="$base_compile $lastarg"
-+	  continue
-+	  ;;
-+
-+	*)
-+	  # Accept the current argument as the source file.
-+	  # The previous "srcfile" becomes the current argument.
-+	  #
-+	  lastarg="$srcfile"
-+	  srcfile="$arg"
-+	  ;;
-+	esac  #  case $arg
-+	;;
-+      esac    #  case $arg_mode
-+
-+      # Aesthetically quote the previous argument.
-+      func_quote_for_eval "$lastarg"
-+      base_compile="$base_compile $func_quote_for_eval_result"
-+    done # for arg
-+
-+    case $arg_mode in
-+    arg)
-+      func_fatal_error "you must specify an argument for -Xcompile"
-+      ;;
-+    target)
-+      func_fatal_error "you must specify a target with \`-o'"
-+      ;;
-+    *)
-+      # Get the name of the library object.
-+      test -z "$libobj" && {
-+	func_basename "$srcfile"
-+	libobj="$func_basename_result"
-+      }
-+      ;;
-+    esac
-+
-+    # Recognize several different file suffixes.
-+    # If the user specifies -o file.o, it is replaced with file.lo
-+    case $libobj in
-+    *.[cCFSifmso] | \
-+    *.ada | *.adb | *.ads | *.asm | \
-+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-+    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
-+      func_xform "$libobj"
-+      libobj=$func_xform_result
-+      ;;
-+    esac
-+
-+    case $libobj in
-+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
-+    *)
-+      func_fatal_error "cannot determine name of library object from \`$libobj'"
-+      ;;
-+    esac
-+
-+    func_infer_tag $base_compile
-+
-+    for arg in $later; do
-+      case $arg in
-+      -shared)
-+	test "$build_libtool_libs" != yes && \
-+	  func_fatal_configuration "can not build a shared library"
-+	build_old_libs=no
-+	continue
-+	;;
-+
-+      -static)
-+	build_libtool_libs=no
-+	build_old_libs=yes
-+	continue
-+	;;
-+
-+      -prefer-pic)
-+	pic_mode=yes
-+	continue
-+	;;
-+
-+      -prefer-non-pic)
-+	pic_mode=no
-+	continue
-+	;;
-+      esac
-+    done
-+
-+    func_quote_for_eval "$libobj"
-+    test "X$libobj" != "X$func_quote_for_eval_result" \
-+      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
-+      && func_warning "libobj name \`$libobj' may not contain shell special characters."
-+    func_dirname_and_basename "$obj" "/" ""
-+    objname="$func_basename_result"
-+    xdir="$func_dirname_result"
-+    lobj=${xdir}$objdir/$objname
-+
-+    test -z "$base_compile" && \
-+      func_fatal_help "you must specify a compilation command"
-+
-+    # Delete any leftover library objects.
-+    if test "$build_old_libs" = yes; then
-+      removelist="$obj $lobj $libobj ${libobj}T"
-+    else
-+      removelist="$lobj $libobj ${libobj}T"
-+    fi
-+
-+    # On Cygwin there's no "real" PIC flag so we must build both object types
-+    case $host_os in
-+    cygwin* | mingw* | pw32* | os2* | cegcc*)
-+      pic_mode=default
-+      ;;
-+    esac
-+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-+      # non-PIC code in shared libraries is not supported
-+      pic_mode=default
-+    fi
-+
-+    # Calculate the filename of the output object if compiler does
-+    # not support -o with -c
-+    if test "$compiler_c_o" = no; then
-+      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-+      lockfile="$output_obj.lock"
-+    else
-+      output_obj=
-+      need_locks=no
-+      lockfile=
-+    fi
-+
-+    # Lock this critical section if it is needed
-+    # We use this script file to make the link, it avoids creating a new file
-+    if test "$need_locks" = yes; then
-+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-+	func_echo "Waiting for $lockfile to be removed"
-+	sleep 2
-+      done
-+    elif test "$need_locks" = warn; then
-+      if test -f "$lockfile"; then
-+	$ECHO "\
-+*** ERROR, $lockfile exists and contains:
-+`cat $lockfile 2>/dev/null`
-+
-+This indicates that another process is trying to use the same
-+temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together.  If you
-+repeat this compilation, it may succeed, by chance, but you had better
-+avoid parallel builds (make -j) in this platform, or get a better
-+compiler."
-+
-+	$opt_dry_run || $RM $removelist
-+	exit $EXIT_FAILURE
-+      fi
-+      removelist="$removelist $output_obj"
-+      $ECHO "$srcfile" > "$lockfile"
-+    fi
-+
-+    $opt_dry_run || $RM $removelist
-+    removelist="$removelist $lockfile"
-+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
-+
-+    if test -n "$fix_srcfile_path"; then
-+      eval srcfile=\"$fix_srcfile_path\"
-+    fi
-+    func_quote_for_eval "$srcfile"
-+    qsrcfile=$func_quote_for_eval_result
-+
-+    # Only build a PIC object if we are building libtool libraries.
-+    if test "$build_libtool_libs" = yes; then
-+      # Without this assignment, base_compile gets emptied.
-+      fbsd_hideous_sh_bug=$base_compile
-+
-+      if test "$pic_mode" != no; then
-+	command="$base_compile $qsrcfile $pic_flag"
-+      else
-+	# Don't build PIC code
-+	command="$base_compile $qsrcfile"
-+      fi
-+
-+      func_mkdir_p "$xdir$objdir"
-+
-+      if test -z "$output_obj"; then
-+	# Place PIC objects in $objdir
-+	command="$command -o $lobj"
-+      fi
-+
-+      func_show_eval_locale "$command"	\
-+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
-+
-+      if test "$need_locks" = warn &&
-+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-+	$ECHO "\
-+*** ERROR, $lockfile contains:
-+`cat $lockfile 2>/dev/null`
-+
-+but it should contain:
-+$srcfile
-+
-+This indicates that another process is trying to use the same
-+temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together.  If you
-+repeat this compilation, it may succeed, by chance, but you had better
-+avoid parallel builds (make -j) in this platform, or get a better
-+compiler."
-+
-+	$opt_dry_run || $RM $removelist
-+	exit $EXIT_FAILURE
-+      fi
-+
-+      # Just move the object if needed, then go on to compile the next one
-+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-+	func_show_eval '$MV "$output_obj" "$lobj"' \
-+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-+      fi
-+
-+      # Allow error messages only from the first compilation.
-+      if test "$suppress_opt" = yes; then
-+	suppress_output=' >/dev/null 2>&1'
-+      fi
-+    fi
-+
-+    # Only build a position-dependent object if we build old libraries.
-+    if test "$build_old_libs" = yes; then
-+      if test "$pic_mode" != yes; then
-+	# Don't build PIC code
-+	command="$base_compile $qsrcfile$pie_flag"
-+      else
-+	command="$base_compile $qsrcfile $pic_flag"
-+      fi
-+      if test "$compiler_c_o" = yes; then
-+	command="$command -o $obj"
-+      fi
-+
-+      # Suppress compiler output if we already did a PIC compilation.
-+      command="$command$suppress_output"
-+      func_show_eval_locale "$command" \
-+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
-+
-+      if test "$need_locks" = warn &&
-+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-+	$ECHO "\
-+*** ERROR, $lockfile contains:
-+`cat $lockfile 2>/dev/null`
-+
-+but it should contain:
-+$srcfile
-+
-+This indicates that another process is trying to use the same
-+temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together.  If you
-+repeat this compilation, it may succeed, by chance, but you had better
-+avoid parallel builds (make -j) in this platform, or get a better
-+compiler."
-+
-+	$opt_dry_run || $RM $removelist
-+	exit $EXIT_FAILURE
-+      fi
-+
-+      # Just move the object if needed
-+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-+	func_show_eval '$MV "$output_obj" "$obj"' \
-+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-+      fi
-+    fi
-+
-+    $opt_dry_run || {
-+      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
-+
-+      # Unlock the critical section if it was locked
-+      if test "$need_locks" != no; then
-+	removelist=$lockfile
-+        $RM "$lockfile"
-+      fi
-+    }
-+
-+    exit $EXIT_SUCCESS
-+}
-+
-+$opt_help || {
-+test "$mode" = compile && func_mode_compile ${1+"$@"}
-+}
-+
-+func_mode_help ()
-+{
-+    # We need to display help for each of the modes.
-+    case $mode in
-+      "")
-+        # Generic help is extracted from the usage comments
-+        # at the start of this file.
-+        func_help
-+        ;;
-+
-+      clean)
-+        $ECHO \
-+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-+
-+Remove files from the build directory.
-+
-+RM is the name of the program to use to delete files associated with each FILE
-+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-+to RM.
-+
-+If FILE is a libtool library, object or program, all the files associated
-+with it are deleted. Otherwise, only FILE itself is deleted using RM."
-+        ;;
-+
-+      compile)
-+      $ECHO \
-+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-+
-+Compile a source file into a libtool library object.
-+
-+This mode accepts the following additional options:
-+
-+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-+  -no-suppress      do not suppress compiler output for multiple passes
-+  -prefer-pic       try to building PIC objects only
-+  -prefer-non-pic   try to building non-PIC objects only
-+  -shared           do not build a \`.o' file suitable for static linking
-+  -static           only build a \`.o' file suitable for static linking
-+
-+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-+from the given SOURCEFILE.
-+
-+The output file name is determined by removing the directory component from
-+SOURCEFILE, then substituting the C source code suffix \`.c' with the
-+library object suffix, \`.lo'."
-+        ;;
-+
-+      execute)
-+        $ECHO \
-+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
-+
-+Automatically set library path, then run a program.
-+
-+This mode accepts the following additional options:
-+
-+  -dlopen FILE      add the directory containing FILE to the library path
-+
-+This mode sets the library path environment variable according to \`-dlopen'
-+flags.
-+
-+If any of the ARGS are libtool executable wrappers, then they are translated
-+into their corresponding uninstalled binary, and any of their required library
-+directories are added to the library path.
-+
-+Then, COMMAND is executed, with ARGS as arguments."
-+        ;;
-+
-+      finish)
-+        $ECHO \
-+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
-+
-+Complete the installation of libtool libraries.
-+
-+Each LIBDIR is a directory that contains libtool libraries.
-+
-+The commands that this mode executes may require superuser privileges.  Use
-+the \`--dry-run' option if you just want to see what would be executed."
-+        ;;
-+
-+      install)
-+        $ECHO \
-+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
-+
-+Install executables or libraries.
-+
-+INSTALL-COMMAND is the installation command.  The first component should be
-+either the \`install' or \`cp' program.
-+
-+The following components of INSTALL-COMMAND are treated specially:
-+
-+  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
-+
-+The rest of the components are interpreted as arguments to that command (only
-+BSD-compatible install options are recognized)."
-+        ;;
-+
-+      link)
-+        $ECHO \
-+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
-+
-+Link object files or libraries together to form another library, or to
-+create an executable program.
-+
-+LINK-COMMAND is a command using the C compiler that you would use to create
-+a program from several object files.
-+
-+The following components of LINK-COMMAND are treated specially:
-+
-+  -all-static       do not do any dynamic linking at all
-+  -avoid-version    do not add a version suffix if possible
-+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-+  -export-symbols SYMFILE
-+                    try to export only the symbols listed in SYMFILE
-+  -export-symbols-regex REGEX
-+                    try to export only the symbols matching REGEX
-+  -LLIBDIR          search LIBDIR for required installed libraries
-+  -lNAME            OUTPUT-FILE requires the installed library libNAME
-+  -module           build a library that can dlopened
-+  -no-fast-install  disable the fast-install mode
-+  -no-install       link a not-installable executable
-+  -no-undefined     declare that a library does not refer to external symbols
-+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-+  -objectlist FILE  Use a list of object files found in FILE to specify objects
-+  -precious-files-regex REGEX
-+                    don't remove output files matching REGEX
-+  -release RELEASE  specify package release information
-+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-+  -shared           only do dynamic linking of libtool libraries
-+  -shrext SUFFIX    override the standard shared library file extension
-+  -static           do not do any dynamic linking of uninstalled libtool libraries
-+  -static-libtool-libs
-+                    do not do any dynamic linking of libtool libraries
-+  -version-info CURRENT[:REVISION[:AGE]]
-+                    specify library version info [each variable defaults to 0]
-+  -weak LIBNAME     declare that the target provides the LIBNAME interface
-+
-+All other options (arguments beginning with \`-') are ignored.
-+
-+Every other argument is treated as a filename.  Files ending in \`.la' are
-+treated as uninstalled libtool libraries, other files are standard or library
-+object files.
-+
-+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-+only library objects (\`.lo' files) may be specified, and \`-rpath' is
-+required, except when creating a convenience library.
-+
-+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-+using \`ar' and \`ranlib', or on Windows using \`lib'.
-+
-+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-+is created, otherwise an executable program is created."
-+        ;;
-+
-+      uninstall)
-+        $ECHO \
-+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-+
-+Remove libraries from an installation directory.
-+
-+RM is the name of the program to use to delete files associated with each FILE
-+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-+to RM.
-+
-+If FILE is a libtool library, all the files associated with it are deleted.
-+Otherwise, only FILE itself is deleted using RM."
-+        ;;
-+
-+      *)
-+        func_fatal_help "invalid operation mode \`$mode'"
-+        ;;
-+    esac
-+
-+    $ECHO
-+    $ECHO "Try \`$progname --help' for more information about other modes."
-+
-+    exit $?
-+}
-+
-+  # Now that we've collected a possible --mode arg, show help if necessary
-+  $opt_help && func_mode_help
-+
-+
-+# func_mode_execute arg...
-+func_mode_execute ()
-+{
-+    $opt_debug
-+    # The first argument is the command name.
-+    cmd="$nonopt"
-+    test -z "$cmd" && \
-+      func_fatal_help "you must specify a COMMAND"
-+
-+    # Handle -dlopen flags immediately.
-+    for file in $execute_dlfiles; do
-+      test -f "$file" \
-+	|| func_fatal_help "\`$file' is not a file"
-+
-+      dir=
-+      case $file in
-+      *.la)
-+	# Check to see that this really is a libtool archive.
-+	func_lalib_unsafe_p "$file" \
-+	  || func_fatal_help "\`$lib' is not a valid libtool archive"
-+
-+	# Read the libtool library.
-+	dlname=
-+	library_names=
-+	func_source "$file"
-+
-+	# Skip this library if it cannot be dlopened.
-+	if test -z "$dlname"; then
-+	  # Warn if it was a shared library.
-+	  test -n "$library_names" && \
-+	    func_warning "\`$file' was not linked with \`-export-dynamic'"
-+	  continue
-+	fi
-+
-+	func_dirname "$file" "" "."
-+	dir="$func_dirname_result"
-+
-+	if test -f "$dir/$objdir/$dlname"; then
-+	  dir="$dir/$objdir"
-+	else
-+	  if test ! -f "$dir/$dlname"; then
-+	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-+	  fi
-+	fi
-+	;;
-+
-+      *.lo)
-+	# Just add the directory containing the .lo file.
-+	func_dirname "$file" "" "."
-+	dir="$func_dirname_result"
-+	;;
-+
-+      *)
-+	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
-+	continue
-+	;;
-+      esac
-+
-+      # Get the absolute pathname.
-+      absdir=`cd "$dir" && pwd`
-+      test -n "$absdir" && dir="$absdir"
-+
-+      # Now add the directory to shlibpath_var.
-+      if eval "test -z \"\$$shlibpath_var\""; then
-+	eval "$shlibpath_var=\"\$dir\""
-+      else
-+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-+      fi
-+    done
-+
-+    # This variable tells wrapper scripts just to set shlibpath_var
-+    # rather than running their programs.
-+    libtool_execute_magic="$magic"
-+
-+    # Check if any of the arguments is a wrapper script.
-+    args=
-+    for file
-+    do
-+      case $file in
-+      -*) ;;
-+      *)
-+	# Do a test to see if this is really a libtool program.
-+	if func_ltwrapper_script_p "$file"; then
-+	  func_source "$file"
-+	  # Transform arg to wrapped name.
-+	  file="$progdir/$program"
-+	elif func_ltwrapper_executable_p "$file"; then
-+	  func_ltwrapper_scriptname "$file"
-+	  func_source "$func_ltwrapper_scriptname_result"
-+	  # Transform arg to wrapped name.
-+	  file="$progdir/$program"
-+	fi
-+	;;
-+      esac
-+      # Quote arguments (to preserve shell metacharacters).
-+      func_quote_for_eval "$file"
-+      args="$args $func_quote_for_eval_result"
-+    done
-+
-+    if test "X$opt_dry_run" = Xfalse; then
-+      if test -n "$shlibpath_var"; then
-+	# Export the shlibpath_var.
-+	eval "export $shlibpath_var"
-+      fi
-+
-+      # Restore saved environment variables
-+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+      do
-+	eval "if test \"\${save_$lt_var+set}\" = set; then
-+                $lt_var=\$save_$lt_var; export $lt_var
-+	      else
-+		$lt_unset $lt_var
-+	      fi"
-+      done
-+
-+      # Now prepare to actually exec the command.
-+      exec_cmd="\$cmd$args"
-+    else
-+      # Display what would be done.
-+      if test -n "$shlibpath_var"; then
-+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-+	$ECHO "export $shlibpath_var"
-+      fi
-+      $ECHO "$cmd$args"
-+      exit $EXIT_SUCCESS
-+    fi
-+}
-+
-+test "$mode" = execute && func_mode_execute ${1+"$@"}
-+
-+
-+# func_mode_finish arg...
-+func_mode_finish ()
-+{
-+    $opt_debug
-+    libdirs="$nonopt"
-+    admincmds=
-+
-+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-+      for dir
-+      do
-+	libdirs="$libdirs $dir"
-+      done
-+
-+      for libdir in $libdirs; do
-+	if test -n "$finish_cmds"; then
-+	  # Do each command in the finish commands.
-+	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
-+'"$cmd"'"'
-+	fi
-+	if test -n "$finish_eval"; then
-+	  # Do the single finish_eval.
-+	  eval cmds=\"$finish_eval\"
-+	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
-+       $cmds"
-+	fi
-+      done
-+    fi
-+
-+    # Exit here if they wanted silent mode.
-+    $opt_silent && exit $EXIT_SUCCESS
-+
-+    $ECHO "X----------------------------------------------------------------------" | $Xsed
-+    $ECHO "Libraries have been installed in:"
-+    for libdir in $libdirs; do
-+      $ECHO "   $libdir"
-+    done
-+    $ECHO
-+    $ECHO "If you ever happen to want to link against installed libraries"
-+    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
-+    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
-+    $ECHO "flag during linking and do at least one of the following:"
-+    if test -n "$shlibpath_var"; then
-+      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-+      $ECHO "     during execution"
-+    fi
-+    if test -n "$runpath_var"; then
-+      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
-+      $ECHO "     during linking"
-+    fi
-+    if test -n "$hardcode_libdir_flag_spec"; then
-+      libdir=LIBDIR
-+      eval flag=\"$hardcode_libdir_flag_spec\"
-+
-+      $ECHO "   - use the \`$flag' linker flag"
-+    fi
-+    if test -n "$admincmds"; then
-+      $ECHO "   - have your system administrator run these commands:$admincmds"
-+    fi
-+    if test -f /etc/ld.so.conf; then
-+      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-+    fi
-+    $ECHO
-+
-+    $ECHO "See any operating system documentation about shared libraries for"
-+    case $host in
-+      solaris2.[6789]|solaris2.1[0-9])
-+        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-+	$ECHO "pages."
-+	;;
-+      *)
-+        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
-+        ;;
-+    esac
-+    $ECHO "X----------------------------------------------------------------------" | $Xsed
-+    exit $EXIT_SUCCESS
-+}
-+
-+test "$mode" = finish && func_mode_finish ${1+"$@"}
-+
-+
-+# func_mode_install arg...
-+func_mode_install ()
-+{
-+    $opt_debug
-+    # There may be an optional sh(1) argument at the beginning of
-+    # install_prog (especially on Windows NT).
-+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-+       # Allow the use of GNU shtool's install command.
-+       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
-+      # Aesthetically quote it.
-+      func_quote_for_eval "$nonopt"
-+      install_prog="$func_quote_for_eval_result "
-+      arg=$1
-+      shift
-+    else
-+      install_prog=
-+      arg=$nonopt
-+    fi
-+
-+    # The real first argument should be the name of the installation program.
-+    # Aesthetically quote it.
-+    func_quote_for_eval "$arg"
-+    install_prog="$install_prog$func_quote_for_eval_result"
-+
-+    # We need to accept at least all the BSD install flags.
-+    dest=
-+    files=
-+    opts=
-+    prev=
-+    install_type=
-+    isdir=no
-+    stripme=
-+    for arg
-+    do
-+      if test -n "$dest"; then
-+	files="$files $dest"
-+	dest=$arg
-+	continue
-+      fi
-+
-+      case $arg in
-+      -d) isdir=yes ;;
-+      -f)
-+	case " $install_prog " in
-+	*[\\\ /]cp\ *) ;;
-+	*) prev=$arg ;;
-+	esac
-+	;;
-+      -g | -m | -o)
-+	prev=$arg
-+	;;
-+      -s)
-+	stripme=" -s"
-+	continue
-+	;;
-+      -*)
-+	;;
-+      *)
-+	# If the previous option needed an argument, then skip it.
-+	if test -n "$prev"; then
-+	  prev=
-+	else
-+	  dest=$arg
-+	  continue
-+	fi
-+	;;
-+      esac
-+
-+      # Aesthetically quote the argument.
-+      func_quote_for_eval "$arg"
-+      install_prog="$install_prog $func_quote_for_eval_result"
-+    done
-+
-+    test -z "$install_prog" && \
-+      func_fatal_help "you must specify an install program"
-+
-+    test -n "$prev" && \
-+      func_fatal_help "the \`$prev' option requires an argument"
-+
-+    if test -z "$files"; then
-+      if test -z "$dest"; then
-+	func_fatal_help "no file or destination specified"
-+      else
-+	func_fatal_help "you must specify a destination"
-+      fi
-+    fi
-+
-+    # Strip any trailing slash from the destination.
-+    func_stripname '' '/' "$dest"
-+    dest=$func_stripname_result
-+
-+    # Check to see that the destination is a directory.
-+    test -d "$dest" && isdir=yes
-+    if test "$isdir" = yes; then
-+      destdir="$dest"
-+      destname=
-+    else
-+      func_dirname_and_basename "$dest" "" "."
-+      destdir="$func_dirname_result"
-+      destname="$func_basename_result"
-+
-+      # Not a directory, so check to see that there is only one file specified.
-+      set dummy $files; shift
-+      test "$#" -gt 1 && \
-+	func_fatal_help "\`$dest' is not a directory"
-+    fi
-+    case $destdir in
-+    [\\/]* | [A-Za-z]:[\\/]*) ;;
-+    *)
-+      for file in $files; do
-+	case $file in
-+	*.lo) ;;
-+	*)
-+	  func_fatal_help "\`$destdir' must be an absolute directory name"
-+	  ;;
-+	esac
-+      done
-+      ;;
-+    esac
-+
-+    # This variable tells wrapper scripts just to set variables rather
-+    # than running their programs.
-+    libtool_install_magic="$magic"
-+
-+    staticlibs=
-+    future_libdirs=
-+    current_libdirs=
-+    for file in $files; do
-+
-+      # Do each installation.
-+      case $file in
-+      *.$libext)
-+	# Do the static libraries later.
-+	staticlibs="$staticlibs $file"
-+	;;
-+
-+      *.la)
-+	# Check to see that this really is a libtool archive.
-+	func_lalib_unsafe_p "$file" \
-+	  || func_fatal_help "\`$file' is not a valid libtool archive"
-+
-+	library_names=
-+	old_library=
-+	relink_command=
-+	func_source "$file"
-+
-+	# Add the libdir to current_libdirs if it is the destination.
-+	if test "X$destdir" = "X$libdir"; then
-+	  case "$current_libdirs " in
-+	  *" $libdir "*) ;;
-+	  *) current_libdirs="$current_libdirs $libdir" ;;
-+	  esac
-+	else
-+	  # Note the libdir as a future libdir.
-+	  case "$future_libdirs " in
-+	  *" $libdir "*) ;;
-+	  *) future_libdirs="$future_libdirs $libdir" ;;
-+	  esac
-+	fi
-+
-+	func_dirname "$file" "/" ""
-+	dir="$func_dirname_result"
-+	dir="$dir$objdir"
-+
-+	if test -n "$relink_command"; then
-+	  # Determine the prefix the user has applied to our future dir.
-+	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
-+
-+	  # Don't allow the user to place us outside of our expected
-+	  # location b/c this prevents finding dependent libraries that
-+	  # are installed to the same prefix.
-+	  # At present, this check doesn't affect windows .dll's that
-+	  # are installed into $libdir/../bin (currently, that works fine)
-+	  # but it's something to keep an eye on.
-+	  test "$inst_prefix_dir" = "$destdir" && \
-+	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
-+
-+	  if test -n "$inst_prefix_dir"; then
-+	    # Stick the inst_prefix_dir data into the link command.
-+	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+	  else
-+	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
-+	  fi
-+
-+	  func_warning "relinking \`$file'"
-+	  func_show_eval "$relink_command" \
-+	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
-+	fi
-+
-+	# See the names of the shared library.
-+	set dummy $library_names; shift
-+	if test -n "$1"; then
-+	  realname="$1"
-+	  shift
-+
-+	  srcname="$realname"
-+	  test -n "$relink_command" && srcname="$realname"T
-+
-+	  # Install the shared library and build the symlinks.
-+	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
-+	      'exit $?'
-+	  tstripme="$stripme"
-+	  case $host_os in
-+	  cygwin* | mingw* | pw32* | cegcc*)
-+	    case $realname in
-+	    *.dll.a)
-+	      tstripme=""
-+	      ;;
-+	    esac
-+	    ;;
-+	  esac
-+	  if test -n "$tstripme" && test -n "$striplib"; then
-+	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
-+	  fi
-+
-+	  if test "$#" -gt 0; then
-+	    # Delete the old symlinks, and create new ones.
-+	    # Try `ln -sf' first, because the `ln' binary might depend on
-+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-+	    # so we also need to try rm && ln -s.
-+	    for linkname
-+	    do
-+	      test "$linkname" != "$realname" \
-+		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
-+	    done
-+	  fi
-+
-+	  # Do each command in the postinstall commands.
-+	  lib="$destdir/$realname"
-+	  func_execute_cmds "$postinstall_cmds" 'exit $?'
-+	fi
-+
-+	# Install the pseudo-library for information purposes.
-+	func_basename "$file"
-+	name="$func_basename_result"
-+	instname="$dir/$name"i
-+	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-+
-+	# Maybe install the static library, too.
-+	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-+	;;
-+
-+      *.lo)
-+	# Install (i.e. copy) a libtool object.
-+
-+	# Figure out destination file name, if it wasn't already specified.
-+	if test -n "$destname"; then
-+	  destfile="$destdir/$destname"
-+	else
-+	  func_basename "$file"
-+	  destfile="$func_basename_result"
-+	  destfile="$destdir/$destfile"
-+	fi
-+
-+	# Deduce the name of the destination old-style object file.
-+	case $destfile in
-+	*.lo)
-+	  func_lo2o "$destfile"
-+	  staticdest=$func_lo2o_result
-+	  ;;
-+	*.$objext)
-+	  staticdest="$destfile"
-+	  destfile=
-+	  ;;
-+	*)
-+	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
-+	  ;;
-+	esac
-+
-+	# Install the libtool object if requested.
-+	test -n "$destfile" && \
-+	  func_show_eval "$install_prog $file $destfile" 'exit $?'
-+
-+	# Install the old object if enabled.
-+	if test "$build_old_libs" = yes; then
-+	  # Deduce the name of the old-style object file.
-+	  func_lo2o "$file"
-+	  staticobj=$func_lo2o_result
-+	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
-+	fi
-+	exit $EXIT_SUCCESS
-+	;;
-+
-+      *)
-+	# Figure out destination file name, if it wasn't already specified.
-+	if test -n "$destname"; then
-+	  destfile="$destdir/$destname"
-+	else
-+	  func_basename "$file"
-+	  destfile="$func_basename_result"
-+	  destfile="$destdir/$destfile"
-+	fi
-+
-+	# If the file is missing, and there is a .exe on the end, strip it
-+	# because it is most likely a libtool script we actually want to
-+	# install
-+	stripped_ext=""
-+	case $file in
-+	  *.exe)
-+	    if test ! -f "$file"; then
-+	      func_stripname '' '.exe' "$file"
-+	      file=$func_stripname_result
-+	      stripped_ext=".exe"
-+	    fi
-+	    ;;
-+	esac
-+
-+	# Do a test to see if this is really a libtool program.
-+	case $host in
-+	*cygwin* | *mingw*)
-+	    if func_ltwrapper_executable_p "$file"; then
-+	      func_ltwrapper_scriptname "$file"
-+	      wrapper=$func_ltwrapper_scriptname_result
-+	    else
-+	      func_stripname '' '.exe' "$file"
-+	      wrapper=$func_stripname_result
-+	    fi
-+	    ;;
-+	*)
-+	    wrapper=$file
-+	    ;;
-+	esac
-+	if func_ltwrapper_script_p "$wrapper"; then
-+	  notinst_deplibs=
-+	  relink_command=
-+
-+	  func_source "$wrapper"
-+
-+	  # Check the variables that should have been set.
-+	  test -z "$generated_by_libtool_version" && \
-+	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
-+
-+	  finalize=yes
-+	  for lib in $notinst_deplibs; do
-+	    # Check to see that each library is installed.
-+	    libdir=
-+	    if test -f "$lib"; then
-+	      func_source "$lib"
-+	    fi
-+	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-+	    if test -n "$libdir" && test ! -f "$libfile"; then
-+	      func_warning "\`$lib' has not been installed in \`$libdir'"
-+	      finalize=no
-+	    fi
-+	  done
-+
-+	  relink_command=
-+	  func_source "$wrapper"
-+
-+	  outputname=
-+	  if test "$fast_install" = no && test -n "$relink_command"; then
-+	    $opt_dry_run || {
-+	      if test "$finalize" = yes; then
-+	        tmpdir=`func_mktempdir`
-+		func_basename "$file$stripped_ext"
-+		file="$func_basename_result"
-+	        outputname="$tmpdir/$file"
-+	        # Replace the output file specification.
-+	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-+
-+	        $opt_silent || {
-+	          func_quote_for_expand "$relink_command"
-+		  eval "func_echo $func_quote_for_expand_result"
-+	        }
-+	        if eval "$relink_command"; then :
-+	          else
-+		  func_error "error: relink \`$file' with the above command before installing it"
-+		  $opt_dry_run || ${RM}r "$tmpdir"
-+		  continue
-+	        fi
-+	        file="$outputname"
-+	      else
-+	        func_warning "cannot relink \`$file'"
-+	      fi
-+	    }
-+	  else
-+	    # Install the binary that we compiled earlier.
-+	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-+	  fi
-+	fi
-+
-+	# remove .exe since cygwin /usr/bin/install will append another
-+	# one anyway
-+	case $install_prog,$host in
-+	*/usr/bin/install*,*cygwin*)
-+	  case $file:$destfile in
-+	  *.exe:*.exe)
-+	    # this is ok
-+	    ;;
-+	  *.exe:*)
-+	    destfile=$destfile.exe
-+	    ;;
-+	  *:*.exe)
-+	    func_stripname '' '.exe' "$destfile"
-+	    destfile=$func_stripname_result
-+	    ;;
-+	  esac
-+	  ;;
-+	esac
-+	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
-+	$opt_dry_run || if test -n "$outputname"; then
-+	  ${RM}r "$tmpdir"
-+	fi
-+	;;
-+      esac
-+    done
-+
-+    for file in $staticlibs; do
-+      func_basename "$file"
-+      name="$func_basename_result"
-+
-+      # Set up the ranlib parameters.
-+      oldlib="$destdir/$name"
-+
-+      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
-+
-+      if test -n "$stripme" && test -n "$old_striplib"; then
-+	func_show_eval "$old_striplib $oldlib" 'exit $?'
-+      fi
-+
-+      # Do each command in the postinstall commands.
-+      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
-+    done
-+
-+    test -n "$future_libdirs" && \
-+      func_warning "remember to run \`$progname --finish$future_libdirs'"
-+
-+    if test -n "$current_libdirs"; then
-+      # Maybe just do a dry run.
-+      $opt_dry_run && current_libdirs=" -n$current_libdirs"
-+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-+    else
-+      exit $EXIT_SUCCESS
-+    fi
-+}
-+
-+test "$mode" = install && func_mode_install ${1+"$@"}
-+
-+
-+# func_generate_dlsyms outputname originator pic_p
-+# Extract symbols from dlprefiles and create ${outputname}S.o with
-+# a dlpreopen symbol table.
-+func_generate_dlsyms ()
-+{
-+    $opt_debug
-+    my_outputname="$1"
-+    my_originator="$2"
-+    my_pic_p="${3-no}"
-+    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
-+    my_dlsyms=
-+
-+    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+      if test -n "$NM" && test -n "$global_symbol_pipe"; then
-+	my_dlsyms="${my_outputname}S.c"
-+      else
-+	func_error "not configured to extract global symbols from dlpreopened files"
-+      fi
-+    fi
-+
-+    if test -n "$my_dlsyms"; then
-+      case $my_dlsyms in
-+      "") ;;
-+      *.c)
-+	# Discover the nlist of each of the dlfiles.
-+	nlist="$output_objdir/${my_outputname}.nm"
-+
-+	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
-+
-+	# Parse the name list into a source file.
-+	func_verbose "creating $output_objdir/$my_dlsyms"
-+
-+	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-+/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-+/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
-+
-+#ifdef __cplusplus
-+extern \"C\" {
-+#endif
-+
-+/* External symbol declarations for the compiler. */\
-+"
-+
-+	if test "$dlself" = yes; then
-+	  func_verbose "generating symbol list for \`$output'"
-+
-+	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
-+
-+	  # Add our own program objects to the symbol list.
-+	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	  for progfile in $progfiles; do
-+	    func_verbose "extracting global C symbols from \`$progfile'"
-+	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
-+	  done
-+
-+	  if test -n "$exclude_expsyms"; then
-+	    $opt_dry_run || {
-+	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-+	      eval '$MV "$nlist"T "$nlist"'
-+	    }
-+	  fi
-+
-+	  if test -n "$export_symbols_regex"; then
-+	    $opt_dry_run || {
-+	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-+	      eval '$MV "$nlist"T "$nlist"'
-+	    }
-+	  fi
-+
-+	  # Prepare the list of exported symbols
-+	  if test -z "$export_symbols"; then
-+	    export_symbols="$output_objdir/$outputname.exp"
-+	    $opt_dry_run || {
-+	      $RM $export_symbols
-+	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-+	      case $host in
-+	      *cygwin* | *mingw* | *cegcc* )
-+                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-+	        ;;
-+	      esac
-+	    }
-+	  else
-+	    $opt_dry_run || {
-+	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-+	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-+	      eval '$MV "$nlist"T "$nlist"'
-+	      case $host in
-+	        *cygwin | *mingw* | *cegcc* )
-+	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-+	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-+	          ;;
-+	      esac
-+	    }
-+	  fi
-+	fi
-+
-+	for dlprefile in $dlprefiles; do
-+	  func_verbose "extracting global C symbols from \`$dlprefile'"
-+	  func_basename "$dlprefile"
-+	  name="$func_basename_result"
-+	  $opt_dry_run || {
-+	    eval '$ECHO ": $name " >> "$nlist"'
-+	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-+	  }
-+	done
-+
-+	$opt_dry_run || {
-+	  # Make sure we have at least an empty file.
-+	  test -f "$nlist" || : > "$nlist"
-+
-+	  if test -n "$exclude_expsyms"; then
-+	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-+	    $MV "$nlist"T "$nlist"
-+	  fi
-+
-+	  # Try sorting and uniquifying the output.
-+	  if $GREP -v "^: " < "$nlist" |
-+	      if sort -k 3 </dev/null >/dev/null 2>&1; then
-+		sort -k 3
-+	      else
-+		sort +2
-+	      fi |
-+	      uniq > "$nlist"S; then
-+	    :
-+	  else
-+	    $GREP -v "^: " < "$nlist" > "$nlist"S
-+	  fi
-+
-+	  if test -f "$nlist"S; then
-+	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
-+	  else
-+	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
-+	  fi
-+
-+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-+
-+/* The mapping between symbol names and symbols.  */
-+typedef struct {
-+  const char *name;
-+  void *address;
-+} lt_dlsymlist;
-+"
-+	  case $host in
-+	  *cygwin* | *mingw* | *cegcc* )
-+	    $ECHO >> "$output_objdir/$my_dlsyms" "\
-+/* DATA imports from DLLs on WIN32 con't be const, because
-+   runtime relocations are performed -- see ld's documentation
-+   on pseudo-relocs.  */"
-+	    lt_dlsym_const= ;;
-+	  *osf5*)
-+	    echo >> "$output_objdir/$my_dlsyms" "\
-+/* This system does not cope well with relocations in const data */"
-+	    lt_dlsym_const= ;;
-+	  *)
-+	    lt_dlsym_const=const ;;
-+	  esac
-+
-+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-+extern $lt_dlsym_const lt_dlsymlist
-+lt_${my_prefix}_LTX_preloaded_symbols[];
-+$lt_dlsym_const lt_dlsymlist
-+lt_${my_prefix}_LTX_preloaded_symbols[] =
-+{\
-+  { \"$my_originator\", (void *) 0 },"
-+
-+	  case $need_lib_prefix in
-+	  no)
-+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
-+	    ;;
-+	  *)
-+	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
-+	    ;;
-+	  esac
-+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-+  {0, (void *) 0}
-+};
-+
-+/* This works around a problem in FreeBSD linker */
-+#ifdef FREEBSD_WORKAROUND
-+static const void *lt_preloaded_setup() {
-+  return lt_${my_prefix}_LTX_preloaded_symbols;
-+}
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif\
-+"
-+	} # !$opt_dry_run
-+
-+	pic_flag_for_symtable=
-+	case "$compile_command " in
-+	*" -static "*) ;;
-+	*)
-+	  case $host in
-+	  # compiling the symbol table file with pic_flag works around
-+	  # a FreeBSD bug that causes programs to crash when -lm is
-+	  # linked before any other PIC object.  But we must not use
-+	  # pic_flag when linking with -static.  The problem exists in
-+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-+	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-+	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
-+	  *-*-hpux*)
-+	    pic_flag_for_symtable=" $pic_flag"  ;;
-+	  *)
-+	    if test "X$my_pic_p" != Xno; then
-+	      pic_flag_for_symtable=" $pic_flag"
-+	    fi
-+	    ;;
-+	  esac
-+	  ;;
-+	esac
-+	symtab_cflags=
-+	for arg in $LTCFLAGS; do
-+	  case $arg in
-+	  -pie | -fpie | -fPIE) ;;
-+	  *) symtab_cflags="$symtab_cflags $arg" ;;
-+	  esac
-+	done
-+
-+	# Now compile the dynamic symbol file.
-+	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
-+
-+	# Clean up the generated files.
-+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
-+
-+	# Transform the symbol file into the correct name.
-+	symfileobj="$output_objdir/${my_outputname}S.$objext"
-+	case $host in
-+	*cygwin* | *mingw* | *cegcc* )
-+	  if test -f "$output_objdir/$my_outputname.def"; then
-+	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-+	  else
-+	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+	  fi
-+	  ;;
-+	*)
-+	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+	  ;;
-+	esac
-+	;;
-+      *)
-+	func_fatal_error "unknown suffix for \`$my_dlsyms'"
-+	;;
-+      esac
-+    else
-+      # We keep going just in case the user didn't refer to
-+      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-+      # really was required.
-+
-+      # Nullify the symbol file.
-+      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-+      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-+    fi
-+}
-+
-+# func_win32_libid arg
-+# return the library type of file 'arg'
-+#
-+# Need a lot of goo to handle *both* DLLs and import libs
-+# Has to be a shell function in order to 'eat' the argument
-+# that is supplied when $file_magic_command is called.
-+func_win32_libid ()
-+{
-+  $opt_debug
-+  win32_libid_type="unknown"
-+  win32_fileres=`file -L $1 2>/dev/null`
-+  case $win32_fileres in
-+  *ar\ archive\ import\ library*) # definitely import
-+    win32_libid_type="x86 archive import"
-+    ;;
-+  *ar\ archive*) # could be an import, or static
-+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-+       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-+      win32_nmres=`eval $NM -f posix -A $1 |
-+	$SED -n -e '
-+	    1,100{
-+		/ I /{
-+		    s,.*,import,
-+		    p
-+		    q
-+		}
-+	    }'`
-+      case $win32_nmres in
-+      import*)  win32_libid_type="x86 archive import";;
-+      *)        win32_libid_type="x86 archive static";;
-+      esac
-+    fi
-+    ;;
-+  *DLL*)
-+    win32_libid_type="x86 DLL"
-+    ;;
-+  *executable*) # but shell scripts are "executable" too...
-+    case $win32_fileres in
-+    *MS\ Windows\ PE\ Intel*)
-+      win32_libid_type="x86 DLL"
-+      ;;
-+    esac
-+    ;;
-+  esac
-+  $ECHO "$win32_libid_type"
-+}
-+
-+
-+
-+# func_extract_an_archive dir oldlib
-+func_extract_an_archive ()
-+{
-+    $opt_debug
-+    f_ex_an_ar_dir="$1"; shift
-+    f_ex_an_ar_oldlib="$1"
-+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
-+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-+     :
-+    else
-+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
-+    fi
-+}
-+
-+
-+# func_extract_archives gentop oldlib ...
-+func_extract_archives ()
-+{
-+    $opt_debug
-+    my_gentop="$1"; shift
-+    my_oldlibs=${1+"$@"}
-+    my_oldobjs=""
-+    my_xlib=""
-+    my_xabs=""
-+    my_xdir=""
-+
-+    for my_xlib in $my_oldlibs; do
-+      # Extract the objects.
-+      case $my_xlib in
-+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-+	*) my_xabs=`pwd`"/$my_xlib" ;;
-+      esac
-+      func_basename "$my_xlib"
-+      my_xlib="$func_basename_result"
-+      my_xlib_u=$my_xlib
-+      while :; do
-+        case " $extracted_archives " in
-+	*" $my_xlib_u "*)
-+	  func_arith $extracted_serial + 1
-+	  extracted_serial=$func_arith_result
-+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
-+	*) break ;;
-+	esac
-+      done
-+      extracted_archives="$extracted_archives $my_xlib_u"
-+      my_xdir="$my_gentop/$my_xlib_u"
-+
-+      func_mkdir_p "$my_xdir"
-+
-+      case $host in
-+      *-darwin*)
-+	func_verbose "Extracting $my_xabs"
-+	# Do not bother doing anything if just a dry run
-+	$opt_dry_run || {
-+	  darwin_orig_dir=`pwd`
-+	  cd $my_xdir || exit $?
-+	  darwin_archive=$my_xabs
-+	  darwin_curdir=`pwd`
-+	  darwin_base_archive=`basename "$darwin_archive"`
-+	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
-+	  if test -n "$darwin_arches"; then
-+	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
-+	    darwin_arch=
-+	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-+	    for darwin_arch in  $darwin_arches ; do
-+	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-+	      cd "$darwin_curdir"
-+	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-+	    done # $darwin_arches
-+            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
-+	    darwin_file=
-+	    darwin_files=
-+	    for darwin_file in $darwin_filelist; do
-+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-+	      $LIPO -create -output "$darwin_file" $darwin_files
-+	    done # $darwin_filelist
-+	    $RM -rf unfat-$$
-+	    cd "$darwin_orig_dir"
-+	  else
-+	    cd $darwin_orig_dir
-+	    func_extract_an_archive "$my_xdir" "$my_xabs"
-+	  fi # $darwin_arches
-+	} # !$opt_dry_run
-+	;;
-+      *)
-+        func_extract_an_archive "$my_xdir" "$my_xabs"
-+	;;
-+      esac
-+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-+    done
-+
-+    func_extract_archives_result="$my_oldobjs"
-+}
-+
-+
-+
-+# func_emit_wrapper_part1 [arg=no]
-+#
-+# Emit the first part of a libtool wrapper script on stdout.
-+# For more information, see the description associated with
-+# func_emit_wrapper(), below.
-+func_emit_wrapper_part1 ()
-+{
-+	func_emit_wrapper_part1_arg1=no
-+	if test -n "$1" ; then
-+	  func_emit_wrapper_part1_arg1=$1
-+	fi
-+
-+	$ECHO "\
-+#! $SHELL
-+
-+# $output - temporary wrapper script for $objdir/$outputname
-+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-+#
-+# The $output program cannot be directly executed until all the libtool
-+# libraries that it depends on are installed.
-+#
-+# This wrapper script should never be moved out of the build directory.
-+# If it is, it will not operate correctly.
-+
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='${SED} -e 1s/^X//'
-+sed_quote_subst='$sed_quote_subst'
-+
-+# Be Bourne compatible
-+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-+  emulate sh
-+  NULLCMD=:
-+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-+fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+relink_command=\"$relink_command\"
-+
-+# This environment variable determines our operation mode.
-+if test \"\$libtool_install_magic\" = \"$magic\"; then
-+  # install mode needs the following variables:
-+  generated_by_libtool_version='$macro_version'
-+  notinst_deplibs='$notinst_deplibs'
-+else
-+  # When we are sourced in execute mode, \$file and \$ECHO are already set.
-+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-+    ECHO=\"$qecho\"
-+    file=\"\$0\"
-+    # Make sure echo works.
-+    if test \"X\$1\" = X--no-reexec; then
-+      # Discard the --no-reexec flag, and continue.
-+      shift
-+    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
-+      # Yippee, \$ECHO works!
-+      :
-+    else
-+      # Restart under the correct shell, and then maybe \$ECHO will work.
-+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-+    fi
-+  fi\
-+"
-+	$ECHO "\
-+
-+  # Find the directory that this script lives in.
-+  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-+
-+  # Follow symbolic links until we get to the real thisdir.
-+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-+  while test -n \"\$file\"; do
-+    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-+
-+    # If there was a directory component, then change thisdir.
-+    if test \"x\$destdir\" != \"x\$file\"; then
-+      case \"\$destdir\" in
-+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-+      *) thisdir=\"\$thisdir/\$destdir\" ;;
-+      esac
-+    fi
-+
-+    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-+  done
-+"
-+}
-+# end: func_emit_wrapper_part1
-+
-+# func_emit_wrapper_part2 [arg=no]
-+#
-+# Emit the second part of a libtool wrapper script on stdout.
-+# For more information, see the description associated with
-+# func_emit_wrapper(), below.
-+func_emit_wrapper_part2 ()
-+{
-+	func_emit_wrapper_part2_arg1=no
-+	if test -n "$1" ; then
-+	  func_emit_wrapper_part2_arg1=$1
-+	fi
-+
-+	$ECHO "\
-+
-+  # Usually 'no', except on cygwin/mingw when embedded into
-+  # the cwrapper.
-+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
-+  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
-+    # special case for '.'
-+    if test \"\$thisdir\" = \".\"; then
-+      thisdir=\`pwd\`
-+    fi
-+    # remove .libs from thisdir
-+    case \"\$thisdir\" in
-+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
-+    $objdir )   thisdir=. ;;
-+    esac
-+  fi
-+
-+  # Try to get the absolute directory name.
-+  absdir=\`cd \"\$thisdir\" && pwd\`
-+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-+"
-+
-+	if test "$fast_install" = yes; then
-+	  $ECHO "\
-+  program=lt-'$outputname'$exeext
-+  progdir=\"\$thisdir/$objdir\"
-+
-+  if test ! -f \"\$progdir/\$program\" ||
-+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-+
-+    file=\"\$\$-\$program\"
-+
-+    if test ! -d \"\$progdir\"; then
-+      $MKDIR \"\$progdir\"
-+    else
-+      $RM \"\$progdir/\$file\"
-+    fi"
-+
-+	  $ECHO "\
-+
-+    # relink executable if necessary
-+    if test -n \"\$relink_command\"; then
-+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-+      else
-+	$ECHO \"\$relink_command_output\" >&2
-+	$RM \"\$progdir/\$file\"
-+	exit 1
-+      fi
-+    fi
-+
-+    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-+    { $RM \"\$progdir/\$program\";
-+      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-+    $RM \"\$progdir/\$file\"
-+  fi"
-+	else
-+	  $ECHO "\
-+  program='$outputname'
-+  progdir=\"\$thisdir/$objdir\"
-+"
-+	fi
-+
-+	$ECHO "\
-+
-+  if test -f \"\$progdir/\$program\"; then"
-+
-+	# Export our shlibpath_var if we have one.
-+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-+	  $ECHO "\
-+    # Add our own library path to $shlibpath_var
-+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-+
-+    # Some systems cannot cope with colon-terminated $shlibpath_var
-+    # The second colon is a workaround for a bug in BeOS R4 sed
-+    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-+
-+    export $shlibpath_var
-+"
-+	fi
-+
-+	# fixup the dll searchpath if we need to.
-+	if test -n "$dllsearchpath"; then
-+	  $ECHO "\
-+    # Add the dll search path components to the executable PATH
-+    PATH=$dllsearchpath:\$PATH
-+"
-+	fi
-+
-+	$ECHO "\
-+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-+      # Run the actual program with our arguments.
-+"
-+	case $host in
-+	# Backslashes separate directories on plain windows
-+	*-*-mingw | *-*-os2* | *-cegcc*)
-+	  $ECHO "\
-+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-+"
-+	  ;;
-+
-+	*)
-+	  $ECHO "\
-+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-+"
-+	  ;;
-+	esac
-+	$ECHO "\
-+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-+      exit 1
-+    fi
-+  else
-+    # The program doesn't exist.
-+    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-+    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-+    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-+    exit 1
-+  fi
-+fi\
-+"
-+}
-+# end: func_emit_wrapper_part2
-+
-+
-+# func_emit_wrapper [arg=no]
-+#
-+# Emit a libtool wrapper script on stdout.
-+# Don't directly open a file because we may want to
-+# incorporate the script contents within a cygwin/mingw
-+# wrapper executable.  Must ONLY be called from within
-+# func_mode_link because it depends on a number of variables
-+# set therein.
-+#
-+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-+# variable will take.  If 'yes', then the emitted script
-+# will assume that the directory in which it is stored is
-+# the $objdir directory.  This is a cygwin/mingw-specific
-+# behavior.
-+func_emit_wrapper ()
-+{
-+	func_emit_wrapper_arg1=no
-+	if test -n "$1" ; then
-+	  func_emit_wrapper_arg1=$1
-+	fi
-+
-+	# split this up so that func_emit_cwrapperexe_src
-+	# can call each part independently.
-+	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
-+	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
-+}
-+
-+
-+# func_to_host_path arg
-+#
-+# Convert paths to host format when used with build tools.
-+# Intended for use with "native" mingw (where libtool itself
-+# is running under the msys shell), or in the following cross-
-+# build environments:
-+#    $build          $host
-+#    mingw (msys)    mingw  [e.g. native]
-+#    cygwin          mingw
-+#    *nix + wine     mingw
-+# where wine is equipped with the `winepath' executable.
-+# In the native mingw case, the (msys) shell automatically
-+# converts paths for any non-msys applications it launches,
-+# but that facility isn't available from inside the cwrapper.
-+# Similar accommodations are necessary for $host mingw and
-+# $build cygwin.  Calling this function does no harm for other
-+# $host/$build combinations not listed above.
-+#
-+# ARG is the path (on $build) that should be converted to
-+# the proper representation for $host. The result is stored
-+# in $func_to_host_path_result.
-+func_to_host_path ()
-+{
-+  func_to_host_path_result="$1"
-+  if test -n "$1" ; then
-+    case $host in
-+      *mingw* )
-+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-+        case $build in
-+          *mingw* ) # actually, msys
-+            # awkward: cmd appends spaces to result
-+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-+            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
-+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-+              $SED -e "$lt_sed_naive_backslashify"`
-+            ;;
-+          *cygwin* )
-+            func_to_host_path_tmp1=`cygpath -w "$1"`
-+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-+              $SED -e "$lt_sed_naive_backslashify"`
-+            ;;
-+          * )
-+            # Unfortunately, winepath does not exit with a non-zero
-+            # error code, so we are forced to check the contents of
-+            # stdout. On the other hand, if the command is not
-+            # found, the shell will set an exit code of 127 and print
-+            # *an error message* to stdout. So we must check for both
-+            # error code of zero AND non-empty stdout, which explains
-+            # the odd construction:
-+            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
-+            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
-+              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-+                $SED -e "$lt_sed_naive_backslashify"`
-+            else
-+              # Allow warning below.
-+              func_to_host_path_result=""
-+            fi
-+            ;;
-+        esac
-+        if test -z "$func_to_host_path_result" ; then
-+          func_error "Could not determine host path corresponding to"
-+          func_error "  '$1'"
-+          func_error "Continuing, but uninstalled executables may not work."
-+          # Fallback:
-+          func_to_host_path_result="$1"
-+        fi
-+        ;;
-+    esac
-+  fi
-+}
-+# end: func_to_host_path
-+
-+# func_to_host_pathlist arg
-+#
-+# Convert pathlists to host format when used with build tools.
-+# See func_to_host_path(), above. This function supports the
-+# following $build/$host combinations (but does no harm for
-+# combinations not listed here):
-+#    $build          $host
-+#    mingw (msys)    mingw  [e.g. native]
-+#    cygwin          mingw
-+#    *nix + wine     mingw
-+#
-+# Path separators are also converted from $build format to
-+# $host format. If ARG begins or ends with a path separator
-+# character, it is preserved (but converted to $host format)
-+# on output.
-+#
-+# ARG is a pathlist (on $build) that should be converted to
-+# the proper representation on $host. The result is stored
-+# in $func_to_host_pathlist_result.
-+func_to_host_pathlist ()
-+{
-+  func_to_host_pathlist_result="$1"
-+  if test -n "$1" ; then
-+    case $host in
-+      *mingw* )
-+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-+        # Remove leading and trailing path separator characters from
-+        # ARG. msys behavior is inconsistent here, cygpath turns them
-+        # into '.;' and ';.', and winepath ignores them completely.
-+        func_to_host_pathlist_tmp2="$1"
-+        # Once set for this call, this variable should not be
-+        # reassigned. It is used in tha fallback case.
-+        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
-+          $SED -e 's|^:*||' -e 's|:*$||'`
-+        case $build in
-+          *mingw* ) # Actually, msys.
-+            # Awkward: cmd appends spaces to result.
-+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-+            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
-+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-+              $SED -e "$lt_sed_naive_backslashify"`
-+            ;;
-+          *cygwin* )
-+            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
-+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-+              $SED -e "$lt_sed_naive_backslashify"`
-+            ;;
-+          * )
-+            # unfortunately, winepath doesn't convert pathlists
-+            func_to_host_pathlist_result=""
-+            func_to_host_pathlist_oldIFS=$IFS
-+            IFS=:
-+            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
-+              IFS=$func_to_host_pathlist_oldIFS
-+              if test -n "$func_to_host_pathlist_f" ; then
-+                func_to_host_path "$func_to_host_pathlist_f"
-+                if test -n "$func_to_host_path_result" ; then
-+                  if test -z "$func_to_host_pathlist_result" ; then
-+                    func_to_host_pathlist_result="$func_to_host_path_result"
-+                  else
-+                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
-+                  fi
-+                fi
-+              fi
-+              IFS=:
-+            done
-+            IFS=$func_to_host_pathlist_oldIFS
-+            ;;
-+        esac
-+        if test -z "$func_to_host_pathlist_result" ; then
-+          func_error "Could not determine the host path(s) corresponding to"
-+          func_error "  '$1'"
-+          func_error "Continuing, but uninstalled executables may not work."
-+          # Fallback. This may break if $1 contains DOS-style drive
-+          # specifications. The fix is not to complicate the expression
-+          # below, but for the user to provide a working wine installation
-+          # with winepath so that path translation in the cross-to-mingw
-+          # case works properly.
-+          lt_replace_pathsep_nix_to_dos="s|:|;|g"
-+          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
-+            $SED -e "$lt_replace_pathsep_nix_to_dos"`
-+        fi
-+        # Now, add the leading and trailing path separators back
-+        case "$1" in
-+          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
-+            ;;
-+        esac
-+        case "$1" in
-+          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
-+            ;;
-+        esac
-+        ;;
-+    esac
-+  fi
-+}
-+# end: func_to_host_pathlist
-+
-+# func_emit_cwrapperexe_src
-+# emit the source code for a wrapper executable on stdout
-+# Must ONLY be called from within func_mode_link because
-+# it depends on a number of variable set therein.
-+func_emit_cwrapperexe_src ()
-+{
-+	cat <<EOF
-+
-+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-+   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-+
-+   The $output program cannot be directly executed until all the libtool
-+   libraries that it depends on are installed.
-+
-+   This wrapper executable should never be moved out of the build directory.
-+   If it is, it will not operate correctly.
-+
-+   Currently, it simply execs the wrapper *script* "$SHELL $output",
-+   but could eventually absorb all of the scripts functionality and
-+   exec $objdir/$outputname directly.
-+*/
-+EOF
-+	    cat <<"EOF"
-+#include <stdio.h>
-+#include <stdlib.h>
-+#ifdef _MSC_VER
-+# include <direct.h>
-+# include <process.h>
-+# include <io.h>
-+# define setmode _setmode
-+#else
-+# include <unistd.h>
-+# include <stdint.h>
-+# ifdef __CYGWIN__
-+#  include <io.h>
-+#  define HAVE_SETENV
-+#  ifdef __STRICT_ANSI__
-+char *realpath (const char *, char *);
-+int putenv (char *);
-+int setenv (const char *, const char *, int);
-+#  endif
-+# endif
-+#endif
-+#include <malloc.h>
-+#include <stdarg.h>
-+#include <assert.h>
-+#include <string.h>
-+#include <ctype.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/stat.h>
-+
-+#if defined(PATH_MAX)
-+# define LT_PATHMAX PATH_MAX
-+#elif defined(MAXPATHLEN)
-+# define LT_PATHMAX MAXPATHLEN
-+#else
-+# define LT_PATHMAX 1024
-+#endif
-+
-+#ifndef S_IXOTH
-+# define S_IXOTH 0
-+#endif
-+#ifndef S_IXGRP
-+# define S_IXGRP 0
-+#endif
-+
-+#ifdef _MSC_VER
-+# define S_IXUSR _S_IEXEC
-+# define stat _stat
-+# ifndef _INTPTR_T_DEFINED
-+#  define intptr_t int
-+# endif
-+#endif
-+
-+#ifndef DIR_SEPARATOR
-+# define DIR_SEPARATOR '/'
-+# define PATH_SEPARATOR ':'
-+#endif
-+
-+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-+  defined (__OS2__)
-+# define HAVE_DOS_BASED_FILE_SYSTEM
-+# define FOPEN_WB "wb"
-+# ifndef DIR_SEPARATOR_2
-+#  define DIR_SEPARATOR_2 '\\'
-+# endif
-+# ifndef PATH_SEPARATOR_2
-+#  define PATH_SEPARATOR_2 ';'
-+# endif
-+#endif
-+
-+#ifndef DIR_SEPARATOR_2
-+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-+#else /* DIR_SEPARATOR_2 */
-+# define IS_DIR_SEPARATOR(ch) \
-+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-+#endif /* DIR_SEPARATOR_2 */
-+
-+#ifndef PATH_SEPARATOR_2
-+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-+#else /* PATH_SEPARATOR_2 */
-+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-+#endif /* PATH_SEPARATOR_2 */
-+
-+#ifdef __CYGWIN__
-+# define FOPEN_WB "wb"
-+#endif
-+
-+#ifndef FOPEN_WB
-+# define FOPEN_WB "w"
-+#endif
-+#ifndef _O_BINARY
-+# define _O_BINARY 0
-+#endif
-+
-+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-+#define XFREE(stale) do { \
-+  if (stale) { free ((void *) stale); stale = 0; } \
-+} while (0)
-+
-+#undef LTWRAPPER_DEBUGPRINTF
-+#if defined DEBUGWRAPPER
-+# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
-+static void
-+ltwrapper_debugprintf (const char *fmt, ...)
-+{
-+    va_list args;
-+    va_start (args, fmt);
-+    (void) vfprintf (stderr, fmt, args);
-+    va_end (args);
-+}
-+#else
-+# define LTWRAPPER_DEBUGPRINTF(args)
-+#endif
-+
-+const char *program_name = NULL;
-+
-+void *xmalloc (size_t num);
-+char *xstrdup (const char *string);
-+const char *base_name (const char *name);
-+char *find_executable (const char *wrapper);
-+char *chase_symlinks (const char *pathspec);
-+int make_executable (const char *path);
-+int check_executable (const char *path);
-+char *strendzap (char *str, const char *pat);
-+void lt_fatal (const char *message, ...);
-+void lt_setenv (const char *name, const char *value);
-+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-+void lt_opt_process_env_set (const char *arg);
-+void lt_opt_process_env_prepend (const char *arg);
-+void lt_opt_process_env_append (const char *arg);
-+int lt_split_name_value (const char *arg, char** name, char** value);
-+void lt_update_exe_path (const char *name, const char *value);
-+void lt_update_lib_path (const char *name, const char *value);
-+
-+static const char *script_text_part1 =
-+EOF
-+
-+	    func_emit_wrapper_part1 yes |
-+	        $SED -e 's/\([\\"]\)/\\\1/g' \
-+	             -e 's/^/  "/' -e 's/$/\\n"/'
-+	    echo ";"
-+	    cat <<EOF
-+
-+static const char *script_text_part2 =
-+EOF
-+	    func_emit_wrapper_part2 yes |
-+	        $SED -e 's/\([\\"]\)/\\\1/g' \
-+	             -e 's/^/  "/' -e 's/$/\\n"/'
-+	    echo ";"
-+
-+	    cat <<EOF
-+const char * MAGIC_EXE = "$magic_exe";
-+const char * LIB_PATH_VARNAME = "$shlibpath_var";
-+EOF
-+
-+	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-+              func_to_host_pathlist "$temp_rpath"
-+	      cat <<EOF
-+const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
-+EOF
-+	    else
-+	      cat <<"EOF"
-+const char * LIB_PATH_VALUE   = "";
-+EOF
-+	    fi
-+
-+	    if test -n "$dllsearchpath"; then
-+              func_to_host_pathlist "$dllsearchpath:"
-+	      cat <<EOF
-+const char * EXE_PATH_VARNAME = "PATH";
-+const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
-+EOF
-+	    else
-+	      cat <<"EOF"
-+const char * EXE_PATH_VARNAME = "";
-+const char * EXE_PATH_VALUE   = "";
-+EOF
-+	    fi
-+
-+	    if test "$fast_install" = yes; then
-+	      cat <<EOF
-+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
-+EOF
-+	    else
-+	      cat <<EOF
-+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
-+EOF
-+	    fi
-+
-+
-+	    cat <<"EOF"
-+
-+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
-+#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
-+
-+static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
-+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-+
-+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
-+
-+static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
-+static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
-+  /* argument is putenv-style "foo=bar", value of foo is set to bar */
-+
-+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
-+static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
-+  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
-+
-+static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
-+static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
-+  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
-+
-+int
-+main (int argc, char *argv[])
-+{
-+  char **newargz;
-+  int  newargc;
-+  char *tmp_pathspec;
-+  char *actual_cwrapper_path;
-+  char *actual_cwrapper_name;
-+  char *target_name;
-+  char *lt_argv_zero;
-+  intptr_t rval = 127;
-+
-+  int i;
-+
-+  program_name = (char *) xstrdup (base_name (argv[0]));
-+  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
-+  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
-+
-+  /* very simple arg parsing; don't want to rely on getopt */
-+  for (i = 1; i < argc; i++)
-+    {
-+      if (strcmp (argv[i], dumpscript_opt) == 0)
-+	{
-+EOF
-+	    case "$host" in
-+	      *mingw* | *cygwin* )
-+		# make stdout use "unix" line endings
-+		echo "          setmode(1,_O_BINARY);"
-+		;;
-+	      esac
-+
-+	    cat <<"EOF"
-+	  printf ("%s", script_text_part1);
-+	  printf ("%s", script_text_part2);
-+	  return 0;
-+	}
-+    }
-+
-+  newargz = XMALLOC (char *, argc + 1);
-+  tmp_pathspec = find_executable (argv[0]);
-+  if (tmp_pathspec == NULL)
-+    lt_fatal ("Couldn't find %s", argv[0]);
-+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
-+			  tmp_pathspec));
-+
-+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
-+			  actual_cwrapper_path));
-+  XFREE (tmp_pathspec);
-+
-+  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
-+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
-+
-+  /* wrapper name transforms */
-+  strendzap (actual_cwrapper_name, ".exe");
-+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
-+  XFREE (actual_cwrapper_name);
-+  actual_cwrapper_name = tmp_pathspec;
-+  tmp_pathspec = 0;
-+
-+  /* target_name transforms -- use actual target program name; might have lt- prefix */
-+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
-+  strendzap (target_name, ".exe");
-+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
-+  XFREE (target_name);
-+  target_name = tmp_pathspec;
-+  tmp_pathspec = 0;
-+
-+  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
-+			  target_name));
-+EOF
-+
-+	    cat <<EOF
-+  newargz[0] =
-+    XMALLOC (char, (strlen (actual_cwrapper_path) +
-+		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
-+  strcpy (newargz[0], actual_cwrapper_path);
-+  strcat (newargz[0], "$objdir");
-+  strcat (newargz[0], "/");
-+EOF
-+
-+	    cat <<"EOF"
-+  /* stop here, and copy so we don't have to do this twice */
-+  tmp_pathspec = xstrdup (newargz[0]);
-+
-+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
-+  strcat (newargz[0], actual_cwrapper_name);
-+
-+  /* DO want the lt- prefix here if it exists, so use target_name */
-+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
-+  XFREE (tmp_pathspec);
-+  tmp_pathspec = NULL;
-+EOF
-+
-+	    case $host_os in
-+	      mingw*)
-+	    cat <<"EOF"
-+  {
-+    char* p;
-+    while ((p = strchr (newargz[0], '\\')) != NULL)
-+      {
-+	*p = '/';
-+      }
-+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
-+      {
-+	*p = '/';
-+      }
-+  }
-+EOF
-+	    ;;
-+	    esac
-+
-+	    cat <<"EOF"
-+  XFREE (target_name);
-+  XFREE (actual_cwrapper_path);
-+  XFREE (actual_cwrapper_name);
-+
-+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
-+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
-+
-+  newargc=0;
-+  for (i = 1; i < argc; i++)
-+    {
-+      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
-+        {
-+          if (argv[i][env_set_opt_len] == '=')
-+            {
-+              const char *p = argv[i] + env_set_opt_len + 1;
-+              lt_opt_process_env_set (p);
-+            }
-+          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
-+            {
-+              lt_opt_process_env_set (argv[++i]); /* don't copy */
-+            }
-+          else
-+            lt_fatal ("%s missing required argument", env_set_opt);
-+          continue;
-+        }
-+      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
-+        {
-+          if (argv[i][env_prepend_opt_len] == '=')
-+            {
-+              const char *p = argv[i] + env_prepend_opt_len + 1;
-+              lt_opt_process_env_prepend (p);
-+            }
-+          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
-+            {
-+              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
-+            }
-+          else
-+            lt_fatal ("%s missing required argument", env_prepend_opt);
-+          continue;
-+        }
-+      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
-+        {
-+          if (argv[i][env_append_opt_len] == '=')
-+            {
-+              const char *p = argv[i] + env_append_opt_len + 1;
-+              lt_opt_process_env_append (p);
-+            }
-+          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
-+            {
-+              lt_opt_process_env_append (argv[++i]); /* don't copy */
-+            }
-+          else
-+            lt_fatal ("%s missing required argument", env_append_opt);
-+          continue;
-+        }
-+      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
-+        {
-+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-+             namespace, but it is not one of the ones we know about and
-+             have already dealt with, above (inluding dump-script), then
-+             report an error. Otherwise, targets might begin to believe
-+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-+             namespace. The first time any user complains about this, we'll
-+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-+             or a configure.ac-settable value.
-+           */
-+          lt_fatal ("Unrecognized option in %s namespace: '%s'",
-+                    ltwrapper_option_prefix, argv[i]);
-+        }
-+      /* otherwise ... */
-+      newargz[++newargc] = xstrdup (argv[i]);
-+    }
-+  newargz[++newargc] = NULL;
-+
-+  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
-+  for (i = 0; i < newargc; i++)
-+    {
-+      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
-+    }
-+
-+EOF
-+
-+	    case $host_os in
-+	      mingw*)
-+		cat <<"EOF"
-+  /* execv doesn't actually work on mingw as expected on unix */
-+  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
-+  if (rval == -1)
-+    {
-+      /* failed to start process */
-+      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
-+      return 127;
-+    }
-+  return rval;
-+EOF
-+		;;
-+	      *)
-+		cat <<"EOF"
-+  execv (lt_argv_zero, newargz);
-+  return rval; /* =127, but avoids unused variable warning */
-+EOF
-+		;;
-+	    esac
-+
-+	    cat <<"EOF"
-+}
-+
-+void *
-+xmalloc (size_t num)
-+{
-+  void *p = (void *) malloc (num);
-+  if (!p)
-+    lt_fatal ("Memory exhausted");
-+
-+  return p;
-+}
-+
-+char *
-+xstrdup (const char *string)
-+{
-+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
-+			  string) : NULL;
-+}
-+
-+const char *
-+base_name (const char *name)
-+{
-+  const char *base;
-+
-+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-+  /* Skip over the disk name in MSDOS pathnames. */
-+  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
-+    name += 2;
-+#endif
-+
-+  for (base = name; *name; name++)
-+    if (IS_DIR_SEPARATOR (*name))
-+      base = name + 1;
-+  return base;
-+}
-+
-+int
-+check_executable (const char *path)
-+{
-+  struct stat st;
-+
-+  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
-+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-+  if ((!path) || (!*path))
-+    return 0;
-+
-+  if ((stat (path, &st) >= 0)
-+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
-+    return 1;
-+  else
-+    return 0;
-+}
-+
-+int
-+make_executable (const char *path)
-+{
-+  int rval = 0;
-+  struct stat st;
-+
-+  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
-+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-+  if ((!path) || (!*path))
-+    return 0;
-+
-+  if (stat (path, &st) >= 0)
-+    {
-+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
-+    }
-+  return rval;
-+}
-+
-+/* Searches for the full path of the wrapper.  Returns
-+   newly allocated full path name if found, NULL otherwise
-+   Does not chase symlinks, even on platforms that support them.
-+*/
-+char *
-+find_executable (const char *wrapper)
-+{
-+  int has_slash = 0;
-+  const char *p;
-+  const char *p_next;
-+  /* static buffer for getcwd */
-+  char tmp[LT_PATHMAX + 1];
-+  int tmp_len;
-+  char *concat_name;
-+
-+  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
-+			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
-+
-+  if ((wrapper == NULL) || (*wrapper == '\0'))
-+    return NULL;
-+
-+  /* Absolute path? */
-+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-+  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
-+    {
-+      concat_name = xstrdup (wrapper);
-+      if (check_executable (concat_name))
-+	return concat_name;
-+      XFREE (concat_name);
-+    }
-+  else
-+    {
-+#endif
-+      if (IS_DIR_SEPARATOR (wrapper[0]))
-+	{
-+	  concat_name = xstrdup (wrapper);
-+	  if (check_executable (concat_name))
-+	    return concat_name;
-+	  XFREE (concat_name);
-+	}
-+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-+    }
-+#endif
-+
-+  for (p = wrapper; *p; p++)
-+    if (*p == '/')
-+      {
-+	has_slash = 1;
-+	break;
-+      }
-+  if (!has_slash)
-+    {
-+      /* no slashes; search PATH */
-+      const char *path = getenv ("PATH");
-+      if (path != NULL)
-+	{
-+	  for (p = path; *p; p = p_next)
-+	    {
-+	      const char *q;
-+	      size_t p_len;
-+	      for (q = p; *q; q++)
-+		if (IS_PATH_SEPARATOR (*q))
-+		  break;
-+	      p_len = q - p;
-+	      p_next = (*q == '\0' ? q : q + 1);
-+	      if (p_len == 0)
-+		{
-+		  /* empty path: current directory */
-+		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-+		    lt_fatal ("getcwd failed");
-+		  tmp_len = strlen (tmp);
-+		  concat_name =
-+		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-+		  memcpy (concat_name, tmp, tmp_len);
-+		  concat_name[tmp_len] = '/';
-+		  strcpy (concat_name + tmp_len + 1, wrapper);
-+		}
-+	      else
-+		{
-+		  concat_name =
-+		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
-+		  memcpy (concat_name, p, p_len);
-+		  concat_name[p_len] = '/';
-+		  strcpy (concat_name + p_len + 1, wrapper);
-+		}
-+	      if (check_executable (concat_name))
-+		return concat_name;
-+	      XFREE (concat_name);
-+	    }
-+	}
-+      /* not found in PATH; assume curdir */
-+    }
-+  /* Relative path | not found in path: prepend cwd */
-+  if (getcwd (tmp, LT_PATHMAX) == NULL)
-+    lt_fatal ("getcwd failed");
-+  tmp_len = strlen (tmp);
-+  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-+  memcpy (concat_name, tmp, tmp_len);
-+  concat_name[tmp_len] = '/';
-+  strcpy (concat_name + tmp_len + 1, wrapper);
-+
-+  if (check_executable (concat_name))
-+    return concat_name;
-+  XFREE (concat_name);
-+  return NULL;
-+}
-+
-+char *
-+chase_symlinks (const char *pathspec)
-+{
-+#ifndef S_ISLNK
-+  return xstrdup (pathspec);
-+#else
-+  char buf[LT_PATHMAX];
-+  struct stat s;
-+  char *tmp_pathspec = xstrdup (pathspec);
-+  char *p;
-+  int has_symlinks = 0;
-+  while (strlen (tmp_pathspec) && !has_symlinks)
-+    {
-+      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
-+			      tmp_pathspec));
-+      if (lstat (tmp_pathspec, &s) == 0)
-+	{
-+	  if (S_ISLNK (s.st_mode) != 0)
-+	    {
-+	      has_symlinks = 1;
-+	      break;
-+	    }
-+
-+	  /* search backwards for last DIR_SEPARATOR */
-+	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
-+	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-+	    p--;
-+	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-+	    {
-+	      /* no more DIR_SEPARATORS left */
-+	      break;
-+	    }
-+	  *p = '\0';
-+	}
-+      else
-+	{
-+	  char *errstr = strerror (errno);
-+	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
-+	}
-+    }
-+  XFREE (tmp_pathspec);
-+
-+  if (!has_symlinks)
-+    {
-+      return xstrdup (pathspec);
-+    }
-+
-+  tmp_pathspec = realpath (pathspec, buf);
-+  if (tmp_pathspec == 0)
-+    {
-+      lt_fatal ("Could not follow symlinks for %s", pathspec);
-+    }
-+  return xstrdup (tmp_pathspec);
-+#endif
-+}
-+
-+char *
-+strendzap (char *str, const char *pat)
-+{
-+  size_t len, patlen;
-+
-+  assert (str != NULL);
-+  assert (pat != NULL);
-+
-+  len = strlen (str);
-+  patlen = strlen (pat);
-+
-+  if (patlen <= len)
-+    {
-+      str += len - patlen;
-+      if (strcmp (str, pat) == 0)
-+	*str = '\0';
-+    }
-+  return str;
-+}
-+
-+static void
-+lt_error_core (int exit_status, const char *mode,
-+	       const char *message, va_list ap)
-+{
-+  fprintf (stderr, "%s: %s: ", program_name, mode);
-+  vfprintf (stderr, message, ap);
-+  fprintf (stderr, ".\n");
-+
-+  if (exit_status >= 0)
-+    exit (exit_status);
-+}
-+
-+void
-+lt_fatal (const char *message, ...)
-+{
-+  va_list ap;
-+  va_start (ap, message);
-+  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-+  va_end (ap);
-+}
-+
-+void
-+lt_setenv (const char *name, const char *value)
-+{
-+  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
-+                          (name ? name : "<NULL>"),
-+                          (value ? value : "<NULL>")));
-+  {
-+#ifdef HAVE_SETENV
-+    /* always make a copy, for consistency with !HAVE_SETENV */
-+    char *str = xstrdup (value);
-+    setenv (name, str, 1);
-+#else
-+    int len = strlen (name) + 1 + strlen (value) + 1;
-+    char *str = XMALLOC (char, len);
-+    sprintf (str, "%s=%s", name, value);
-+    if (putenv (str) != EXIT_SUCCESS)
-+      {
-+        XFREE (str);
-+      }
-+#endif
-+  }
-+}
-+
-+char *
-+lt_extend_str (const char *orig_value, const char *add, int to_end)
-+{
-+  char *new_value;
-+  if (orig_value && *orig_value)
-+    {
-+      int orig_value_len = strlen (orig_value);
-+      int add_len = strlen (add);
-+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
-+      if (to_end)
-+        {
-+          strcpy (new_value, orig_value);
-+          strcpy (new_value + orig_value_len, add);
-+        }
-+      else
-+        {
-+          strcpy (new_value, add);
-+          strcpy (new_value + add_len, orig_value);
-+        }
-+    }
-+  else
-+    {
-+      new_value = xstrdup (add);
-+    }
-+  return new_value;
-+}
-+
-+int
-+lt_split_name_value (const char *arg, char** name, char** value)
-+{
-+  const char *p;
-+  int len;
-+  if (!arg || !*arg)
-+    return 1;
-+
-+  p = strchr (arg, (int)'=');
-+
-+  if (!p)
-+    return 1;
-+
-+  *value = xstrdup (++p);
-+
-+  len = strlen (arg) - strlen (*value);
-+  *name = XMALLOC (char, len);
-+  strncpy (*name, arg, len-1);
-+  (*name)[len - 1] = '\0';
-+
-+  return 0;
-+}
-+
-+void
-+lt_opt_process_env_set (const char *arg)
-+{
-+  char *name = NULL;
-+  char *value = NULL;
-+
-+  if (lt_split_name_value (arg, &name, &value) != 0)
-+    {
-+      XFREE (name);
-+      XFREE (value);
-+      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
-+    }
-+
-+  lt_setenv (name, value);
-+  XFREE (name);
-+  XFREE (value);
-+}
-+
-+void
-+lt_opt_process_env_prepend (const char *arg)
-+{
-+  char *name = NULL;
-+  char *value = NULL;
-+  char *new_value = NULL;
-+
-+  if (lt_split_name_value (arg, &name, &value) != 0)
-+    {
-+      XFREE (name);
-+      XFREE (value);
-+      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
-+    }
-+
-+  new_value = lt_extend_str (getenv (name), value, 0);
-+  lt_setenv (name, new_value);
-+  XFREE (new_value);
-+  XFREE (name);
-+  XFREE (value);
-+}
-+
-+void
-+lt_opt_process_env_append (const char *arg)
-+{
-+  char *name = NULL;
-+  char *value = NULL;
-+  char *new_value = NULL;
-+
-+  if (lt_split_name_value (arg, &name, &value) != 0)
-+    {
-+      XFREE (name);
-+      XFREE (value);
-+      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
-+    }
-+
-+  new_value = lt_extend_str (getenv (name), value, 1);
-+  lt_setenv (name, new_value);
-+  XFREE (new_value);
-+  XFREE (name);
-+  XFREE (value);
-+}
-+
-+void
-+lt_update_exe_path (const char *name, const char *value)
-+{
-+  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-+                          (name ? name : "<NULL>"),
-+                          (value ? value : "<NULL>")));
-+
-+  if (name && *name && value && *value)
-+    {
-+      char *new_value = lt_extend_str (getenv (name), value, 0);
-+      /* some systems can't cope with a ':'-terminated path #' */
-+      int len = strlen (new_value);
-+      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
-+        {
-+          new_value[len-1] = '\0';
-+        }
-+      lt_setenv (name, new_value);
-+      XFREE (new_value);
-+    }
-+}
-+
-+void
-+lt_update_lib_path (const char *name, const char *value)
-+{
-+  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-+                          (name ? name : "<NULL>"),
-+                          (value ? value : "<NULL>")));
-+
-+  if (name && *name && value && *value)
-+    {
-+      char *new_value = lt_extend_str (getenv (name), value, 0);
-+      lt_setenv (name, new_value);
-+      XFREE (new_value);
-+    }
-+}
-+
-+
-+EOF
-+}
-+# end: func_emit_cwrapperexe_src
-+
-+# func_mode_link arg...
-+func_mode_link ()
-+{
-+    $opt_debug
-+    case $host in
-+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-+      # It is impossible to link a dll without this setting, and
-+      # we shouldn't force the makefile maintainer to figure out
-+      # which system we are compiling for in order to pass an extra
-+      # flag for every libtool invocation.
-+      # allow_undefined=no
-+
-+      # FIXME: Unfortunately, there are problems with the above when trying
-+      # to make a dll which has undefined symbols, in which case not
-+      # even a static library is built.  For now, we need to specify
-+      # -no-undefined on the libtool link line when we can be certain
-+      # that all symbols are satisfied, otherwise we get a static library.
-+      allow_undefined=yes
-+      ;;
-+    *)
-+      allow_undefined=yes
-+      ;;
-+    esac
-+    libtool_args=$nonopt
-+    base_compile="$nonopt $@"
-+    compile_command=$nonopt
-+    finalize_command=$nonopt
-+
-+    compile_rpath=
-+    finalize_rpath=
-+    compile_shlibpath=
-+    finalize_shlibpath=
-+    convenience=
-+    old_convenience=
-+    deplibs=
-+    old_deplibs=
-+    compiler_flags=
-+    linker_flags=
-+    dllsearchpath=
-+    lib_search_path=`pwd`
-+    inst_prefix_dir=
-+    new_inherited_linker_flags=
-+
-+    avoid_version=no
-+    dlfiles=
-+    dlprefiles=
-+    dlself=no
-+    export_dynamic=no
-+    export_symbols=
-+    export_symbols_regex=
-+    generated=
-+    libobjs=
-+    ltlibs=
-+    module=no
-+    no_install=no
-+    objs=
-+    non_pic_objects=
-+    precious_files_regex=
-+    prefer_static_libs=no
-+    preload=no
-+    prev=
-+    prevarg=
-+    release=
-+    rpath=
-+    xrpath=
-+    perm_rpath=
-+    temp_rpath=
-+    thread_safe=no
-+    vinfo=
-+    vinfo_number=no
-+    weak_libs=
-+    single_module="${wl}-single_module"
-+    func_infer_tag $base_compile
-+
-+    # We need to know -static, to get the right output filenames.
-+    for arg
-+    do
-+      case $arg in
-+      -shared)
-+	test "$build_libtool_libs" != yes && \
-+	  func_fatal_configuration "can not build a shared library"
-+	build_old_libs=no
-+	break
-+	;;
-+      -all-static | -static | -static-libtool-libs)
-+	case $arg in
-+	-all-static)
-+	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-+	    func_warning "complete static linking is impossible in this configuration"
-+	  fi
-+	  if test -n "$link_static_flag"; then
-+	    dlopen_self=$dlopen_self_static
-+	  fi
-+	  prefer_static_libs=yes
-+	  ;;
-+	-static)
-+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-+	    dlopen_self=$dlopen_self_static
-+	  fi
-+	  prefer_static_libs=built
-+	  ;;
-+	-static-libtool-libs)
-+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-+	    dlopen_self=$dlopen_self_static
-+	  fi
-+	  prefer_static_libs=yes
-+	  ;;
-+	esac
-+	build_libtool_libs=no
-+	build_old_libs=yes
-+	break
-+	;;
-+      esac
-+    done
-+
-+    # See if our shared archives depend on static archives.
-+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-+
-+    # Go through the arguments, transforming them on the way.
-+    while test "$#" -gt 0; do
-+      arg="$1"
-+      shift
-+      func_quote_for_eval "$arg"
-+      qarg=$func_quote_for_eval_unquoted_result
-+      func_append libtool_args " $func_quote_for_eval_result"
-+
-+      # If the previous option needs an argument, assign it.
-+      if test -n "$prev"; then
-+	case $prev in
-+	output)
-+	  func_append compile_command " @OUTPUT@"
-+	  func_append finalize_command " @OUTPUT@"
-+	  ;;
-+	esac
-+
-+	case $prev in
-+	dlfiles|dlprefiles)
-+	  if test "$preload" = no; then
-+	    # Add the symbol object into the linking commands.
-+	    func_append compile_command " @SYMFILE@"
-+	    func_append finalize_command " @SYMFILE@"
-+	    preload=yes
-+	  fi
-+	  case $arg in
-+	  *.la | *.lo) ;;  # We handle these cases below.
-+	  force)
-+	    if test "$dlself" = no; then
-+	      dlself=needless
-+	      export_dynamic=yes
-+	    fi
-+	    prev=
-+	    continue
-+	    ;;
-+	  self)
-+	    if test "$prev" = dlprefiles; then
-+	      dlself=yes
-+	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-+	      dlself=yes
-+	    else
-+	      dlself=needless
-+	      export_dynamic=yes
-+	    fi
-+	    prev=
-+	    continue
-+	    ;;
-+	  *)
-+	    if test "$prev" = dlfiles; then
-+	      dlfiles="$dlfiles $arg"
-+	    else
-+	      dlprefiles="$dlprefiles $arg"
-+	    fi
-+	    prev=
-+	    continue
-+	    ;;
-+	  esac
-+	  ;;
-+	expsyms)
-+	  export_symbols="$arg"
-+	  test -f "$arg" \
-+	    || func_fatal_error "symbol file \`$arg' does not exist"
-+	  prev=
-+	  continue
-+	  ;;
-+	expsyms_regex)
-+	  export_symbols_regex="$arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	framework)
-+	  case $host in
-+	    *-*-darwin*)
-+	      case "$deplibs " in
-+		*" $qarg.ltframework "*) ;;
-+		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
-+		   ;;
-+	      esac
-+	      ;;
-+	  esac
-+	  prev=
-+	  continue
-+	  ;;
-+	inst_prefix)
-+	  inst_prefix_dir="$arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	objectlist)
-+	  if test -f "$arg"; then
-+	    save_arg=$arg
-+	    moreargs=
-+	    for fil in `cat "$save_arg"`
-+	    do
-+#	      moreargs="$moreargs $fil"
-+	      arg=$fil
-+	      # A libtool-controlled object.
-+
-+	      # Check to see that this really is a libtool object.
-+	      if func_lalib_unsafe_p "$arg"; then
-+		pic_object=
-+		non_pic_object=
-+
-+		# Read the .lo file
-+		func_source "$arg"
-+
-+		if test -z "$pic_object" ||
-+		   test -z "$non_pic_object" ||
-+		   test "$pic_object" = none &&
-+		   test "$non_pic_object" = none; then
-+		  func_fatal_error "cannot find name of object for \`$arg'"
-+		fi
-+
-+		# Extract subdirectory from the argument.
-+		func_dirname "$arg" "/" ""
-+		xdir="$func_dirname_result"
-+
-+		if test "$pic_object" != none; then
-+		  # Prepend the subdirectory the object is found in.
-+		  pic_object="$xdir$pic_object"
-+
-+		  if test "$prev" = dlfiles; then
-+		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-+		      dlfiles="$dlfiles $pic_object"
-+		      prev=
-+		      continue
-+		    else
-+		      # If libtool objects are unsupported, then we need to preload.
-+		      prev=dlprefiles
-+		    fi
-+		  fi
-+
-+		  # CHECK ME:  I think I busted this.  -Ossama
-+		  if test "$prev" = dlprefiles; then
-+		    # Preload the old-style object.
-+		    dlprefiles="$dlprefiles $pic_object"
-+		    prev=
-+		  fi
-+
-+		  # A PIC object.
-+		  func_append libobjs " $pic_object"
-+		  arg="$pic_object"
-+		fi
-+
-+		# Non-PIC object.
-+		if test "$non_pic_object" != none; then
-+		  # Prepend the subdirectory the object is found in.
-+		  non_pic_object="$xdir$non_pic_object"
-+
-+		  # A standard non-PIC object
-+		  func_append non_pic_objects " $non_pic_object"
-+		  if test -z "$pic_object" || test "$pic_object" = none ; then
-+		    arg="$non_pic_object"
-+		  fi
-+		else
-+		  # If the PIC object exists, use it instead.
-+		  # $xdir was prepended to $pic_object above.
-+		  non_pic_object="$pic_object"
-+		  func_append non_pic_objects " $non_pic_object"
-+		fi
-+	      else
-+		# Only an error if not doing a dry-run.
-+		if $opt_dry_run; then
-+		  # Extract subdirectory from the argument.
-+		  func_dirname "$arg" "/" ""
-+		  xdir="$func_dirname_result"
-+
-+		  func_lo2o "$arg"
-+		  pic_object=$xdir$objdir/$func_lo2o_result
-+		  non_pic_object=$xdir$func_lo2o_result
-+		  func_append libobjs " $pic_object"
-+		  func_append non_pic_objects " $non_pic_object"
-+	        else
-+		  func_fatal_error "\`$arg' is not a valid libtool object"
-+		fi
-+	      fi
-+	    done
-+	  else
-+	    func_fatal_error "link input file \`$arg' does not exist"
-+	  fi
-+	  arg=$save_arg
-+	  prev=
-+	  continue
-+	  ;;
-+	precious_regex)
-+	  precious_files_regex="$arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	release)
-+	  release="-$arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	rpath | xrpath)
-+	  # We need an absolute path.
-+	  case $arg in
-+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-+	  *)
-+	    func_fatal_error "only absolute run-paths are allowed"
-+	    ;;
-+	  esac
-+	  if test "$prev" = rpath; then
-+	    case "$rpath " in
-+	    *" $arg "*) ;;
-+	    *) rpath="$rpath $arg" ;;
-+	    esac
-+	  else
-+	    case "$xrpath " in
-+	    *" $arg "*) ;;
-+	    *) xrpath="$xrpath $arg" ;;
-+	    esac
-+	  fi
-+	  prev=
-+	  continue
-+	  ;;
-+	shrext)
-+	  shrext_cmds="$arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	weak)
-+	  weak_libs="$weak_libs $arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	xcclinker)
-+	  linker_flags="$linker_flags $qarg"
-+	  compiler_flags="$compiler_flags $qarg"
-+	  prev=
-+	  func_append compile_command " $qarg"
-+	  func_append finalize_command " $qarg"
-+	  continue
-+	  ;;
-+	xcompiler)
-+	  compiler_flags="$compiler_flags $qarg"
-+	  prev=
-+	  func_append compile_command " $qarg"
-+	  func_append finalize_command " $qarg"
-+	  continue
-+	  ;;
-+	xlinker)
-+	  linker_flags="$linker_flags $qarg"
-+	  compiler_flags="$compiler_flags $wl$qarg"
-+	  prev=
-+	  func_append compile_command " $wl$qarg"
-+	  func_append finalize_command " $wl$qarg"
-+	  continue
-+	  ;;
-+	*)
-+	  eval "$prev=\"\$arg\""
-+	  prev=
-+	  continue
-+	  ;;
-+	esac
-+      fi # test -n "$prev"
-+
-+      prevarg="$arg"
-+
-+      case $arg in
-+      -all-static)
-+	if test -n "$link_static_flag"; then
-+	  # See comment for -static flag below, for more details.
-+	  func_append compile_command " $link_static_flag"
-+	  func_append finalize_command " $link_static_flag"
-+	fi
-+	continue
-+	;;
-+
-+      -allow-undefined)
-+	# FIXME: remove this flag sometime in the future.
-+	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
-+	;;
-+
-+      -avoid-version)
-+	avoid_version=yes
-+	continue
-+	;;
-+
-+      -dlopen)
-+	prev=dlfiles
-+	continue
-+	;;
-+
-+      -dlpreopen)
-+	prev=dlprefiles
-+	continue
-+	;;
-+
-+      -export-dynamic)
-+	export_dynamic=yes
-+	continue
-+	;;
-+
-+      -export-symbols | -export-symbols-regex)
-+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-+	  func_fatal_error "more than one -exported-symbols argument is not allowed"
-+	fi
-+	if test "X$arg" = "X-export-symbols"; then
-+	  prev=expsyms
-+	else
-+	  prev=expsyms_regex
-+	fi
-+	continue
-+	;;
-+
-+      -framework)
-+	prev=framework
-+	continue
-+	;;
-+
-+      -inst-prefix-dir)
-+	prev=inst_prefix
-+	continue
-+	;;
-+
-+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-+      # so, if we see these flags be careful not to treat them like -L
-+      -L[A-Z][A-Z]*:*)
-+	case $with_gcc/$host in
-+	no/*-*-irix* | /*-*-irix*)
-+	  func_append compile_command " $arg"
-+	  func_append finalize_command " $arg"
-+	  ;;
-+	esac
-+	continue
-+	;;
-+
-+      -L*)
-+	func_stripname '-L' '' "$arg"
-+	dir=$func_stripname_result
-+	if test -z "$dir"; then
-+	  if test "$#" -gt 0; then
-+	    func_fatal_error "require no space between \`-L' and \`$1'"
-+	  else
-+	    func_fatal_error "need path for \`-L' option"
-+	  fi
-+	fi
-+	# We need an absolute path.
-+	case $dir in
-+	[\\/]* | [A-Za-z]:[\\/]*) ;;
-+	*)
-+	  absdir=`cd "$dir" && pwd`
-+	  test -z "$absdir" && \
-+	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
-+	  dir="$absdir"
-+	  ;;
-+	esac
-+	case "$deplibs " in
-+	*" -L$dir "*) ;;
-+	*)
-+	  deplibs="$deplibs -L$dir"
-+	  lib_search_path="$lib_search_path $dir"
-+	  ;;
-+	esac
-+	case $host in
-+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-+	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
-+	  case :$dllsearchpath: in
-+	  *":$dir:"*) ;;
-+	  ::) dllsearchpath=$dir;;
-+	  *) dllsearchpath="$dllsearchpath:$dir";;
-+	  esac
-+	  case :$dllsearchpath: in
-+	  *":$testbindir:"*) ;;
-+	  ::) dllsearchpath=$testbindir;;
-+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-+	  esac
-+	  ;;
-+	esac
-+	continue
-+	;;
-+
-+      -l*)
-+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-+	  case $host in
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
-+	    # These systems don't actually have a C or math library (as such)
-+	    continue
-+	    ;;
-+	  *-*-os2*)
-+	    # These systems don't actually have a C library (as such)
-+	    test "X$arg" = "X-lc" && continue
-+	    ;;
-+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-+	    # Do not include libc due to us having libc/libc_r.
-+	    test "X$arg" = "X-lc" && continue
-+	    ;;
-+	  *-*-rhapsody* | *-*-darwin1.[012])
-+	    # Rhapsody C and math libraries are in the System framework
-+	    deplibs="$deplibs System.ltframework"
-+	    continue
-+	    ;;
-+	  *-*-sco3.2v5* | *-*-sco5v6*)
-+	    # Causes problems with __ctype
-+	    test "X$arg" = "X-lc" && continue
-+	    ;;
-+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-+	    # Compiler inserts libc in the correct place for threads to work
-+	    test "X$arg" = "X-lc" && continue
-+	    ;;
-+	  esac
-+	elif test "X$arg" = "X-lc_r"; then
-+	 case $host in
-+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-+	   # Do not include libc_r directly, use -pthread flag.
-+	   continue
-+	   ;;
-+	 esac
-+	fi
-+	deplibs="$deplibs $arg"
-+	continue
-+	;;
-+
-+      -module)
-+	module=yes
-+	continue
-+	;;
-+
-+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-+      # classes, name mangling, and exception handling.
-+      # Darwin uses the -arch flag to determine output architecture.
-+      -model|-arch|-isysroot)
-+	compiler_flags="$compiler_flags $arg"
-+	func_append compile_command " $arg"
-+	func_append finalize_command " $arg"
-+	prev=xcompiler
-+	continue
-+	;;
-+
-+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-+	compiler_flags="$compiler_flags $arg"
-+	func_append compile_command " $arg"
-+	func_append finalize_command " $arg"
-+	case "$new_inherited_linker_flags " in
-+	    *" $arg "*) ;;
-+	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
-+	esac
-+	continue
-+	;;
-+
-+      -multi_module)
-+	single_module="${wl}-multi_module"
-+	continue
-+	;;
-+
-+      -no-fast-install)
-+	fast_install=no
-+	continue
-+	;;
-+
-+      -no-install)
-+	case $host in
-+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
-+	  # The PATH hackery in wrapper scripts is required on Windows
-+	  # and Darwin in order for the loader to find any dlls it needs.
-+	  func_warning "\`-no-install' is ignored for $host"
-+	  func_warning "assuming \`-no-fast-install' instead"
-+	  fast_install=no
-+	  ;;
-+	*) no_install=yes ;;
-+	esac
-+	continue
-+	;;
-+
-+      -no-undefined)
-+	allow_undefined=no
-+	continue
-+	;;
-+
-+      -objectlist)
-+	prev=objectlist
-+	continue
-+	;;
-+
-+      -o) prev=output ;;
-+
-+      -precious-files-regex)
-+	prev=precious_regex
-+	continue
-+	;;
-+
-+      -release)
-+	prev=release
-+	continue
-+	;;
-+
-+      -rpath)
-+	prev=rpath
-+	continue
-+	;;
-+
-+      -R)
-+	prev=xrpath
-+	continue
-+	;;
-+
-+      -R*)
-+	func_stripname '-R' '' "$arg"
-+	dir=$func_stripname_result
-+	# We need an absolute path.
-+	case $dir in
-+	[\\/]* | [A-Za-z]:[\\/]*) ;;
-+	*)
-+	  func_fatal_error "only absolute run-paths are allowed"
-+	  ;;
-+	esac
-+	case "$xrpath " in
-+	*" $dir "*) ;;
-+	*) xrpath="$xrpath $dir" ;;
-+	esac
-+	continue
-+	;;
-+
-+      -shared)
-+	# The effects of -shared are defined in a previous loop.
-+	continue
-+	;;
-+
-+      -shrext)
-+	prev=shrext
-+	continue
-+	;;
-+
-+      -static | -static-libtool-libs)
-+	# The effects of -static are defined in a previous loop.
-+	# We used to do the same as -all-static on platforms that
-+	# didn't have a PIC flag, but the assumption that the effects
-+	# would be equivalent was wrong.  It would break on at least
-+	# Digital Unix and AIX.
-+	continue
-+	;;
-+
-+      -thread-safe)
-+	thread_safe=yes
-+	continue
-+	;;
-+
-+      -version-info)
-+	prev=vinfo
-+	continue
-+	;;
-+
-+      -version-number)
-+	prev=vinfo
-+	vinfo_number=yes
-+	continue
-+	;;
-+
-+      -weak)
-+        prev=weak
-+	continue
-+	;;
-+
-+      -Wc,*)
-+	func_stripname '-Wc,' '' "$arg"
-+	args=$func_stripname_result
-+	arg=
-+	save_ifs="$IFS"; IFS=','
-+	for flag in $args; do
-+	  IFS="$save_ifs"
-+          func_quote_for_eval "$flag"
-+	  arg="$arg $wl$func_quote_for_eval_result"
-+	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
-+	done
-+	IFS="$save_ifs"
-+	func_stripname ' ' '' "$arg"
-+	arg=$func_stripname_result
-+	;;
-+
-+      -Wl,*)
-+	func_stripname '-Wl,' '' "$arg"
-+	args=$func_stripname_result
-+	arg=
-+	save_ifs="$IFS"; IFS=','
-+	for flag in $args; do
-+	  IFS="$save_ifs"
-+          func_quote_for_eval "$flag"
-+	  arg="$arg $wl$func_quote_for_eval_result"
-+	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
-+	  linker_flags="$linker_flags $func_quote_for_eval_result"
-+	done
-+	IFS="$save_ifs"
-+	func_stripname ' ' '' "$arg"
-+	arg=$func_stripname_result
-+	;;
-+
-+      -Xcompiler)
-+	prev=xcompiler
-+	continue
-+	;;
-+
-+      -Xlinker)
-+	prev=xlinker
-+	continue
-+	;;
-+
-+      -XCClinker)
-+	prev=xcclinker
-+	continue
-+	;;
-+
-+      # -msg_* for osf cc
-+      -msg_*)
-+	func_quote_for_eval "$arg"
-+	arg="$func_quote_for_eval_result"
-+	;;
-+
-+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-+      # +DA*, +DD* enable 64-bit mode on the HP compiler
-+      # -q* pass through compiler args for the IBM compiler
-+      # -m*, -t[45]*, -txscale* pass through architecture-specific
-+      # compiler args for GCC
-+      # -F/path gives path to uninstalled frameworks, gcc on darwin
-+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-+      # @file GCC response files
-+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-+        func_quote_for_eval "$arg"
-+	arg="$func_quote_for_eval_result"
-+        func_append compile_command " $arg"
-+        func_append finalize_command " $arg"
-+        compiler_flags="$compiler_flags $arg"
-+        continue
-+        ;;
-+
-+      # Some other compiler flag.
-+      -* | +*)
-+        func_quote_for_eval "$arg"
-+	arg="$func_quote_for_eval_result"
-+	;;
-+
-+      *.$objext)
-+	# A standard object.
-+	objs="$objs $arg"
-+	;;
-+
-+      *.lo)
-+	# A libtool-controlled object.
-+
-+	# Check to see that this really is a libtool object.
-+	if func_lalib_unsafe_p "$arg"; then
-+	  pic_object=
-+	  non_pic_object=
-+
-+	  # Read the .lo file
-+	  func_source "$arg"
-+
-+	  if test -z "$pic_object" ||
-+	     test -z "$non_pic_object" ||
-+	     test "$pic_object" = none &&
-+	     test "$non_pic_object" = none; then
-+	    func_fatal_error "cannot find name of object for \`$arg'"
-+	  fi
-+
-+	  # Extract subdirectory from the argument.
-+	  func_dirname "$arg" "/" ""
-+	  xdir="$func_dirname_result"
-+
-+	  if test "$pic_object" != none; then
-+	    # Prepend the subdirectory the object is found in.
-+	    pic_object="$xdir$pic_object"
-+
-+	    if test "$prev" = dlfiles; then
-+	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-+		dlfiles="$dlfiles $pic_object"
-+		prev=
-+		continue
-+	      else
-+		# If libtool objects are unsupported, then we need to preload.
-+		prev=dlprefiles
-+	      fi
-+	    fi
-+
-+	    # CHECK ME:  I think I busted this.  -Ossama
-+	    if test "$prev" = dlprefiles; then
-+	      # Preload the old-style object.
-+	      dlprefiles="$dlprefiles $pic_object"
-+	      prev=
-+	    fi
-+
-+	    # A PIC object.
-+	    func_append libobjs " $pic_object"
-+	    arg="$pic_object"
-+	  fi
-+
-+	  # Non-PIC object.
-+	  if test "$non_pic_object" != none; then
-+	    # Prepend the subdirectory the object is found in.
-+	    non_pic_object="$xdir$non_pic_object"
-+
-+	    # A standard non-PIC object
-+	    func_append non_pic_objects " $non_pic_object"
-+	    if test -z "$pic_object" || test "$pic_object" = none ; then
-+	      arg="$non_pic_object"
-+	    fi
-+	  else
-+	    # If the PIC object exists, use it instead.
-+	    # $xdir was prepended to $pic_object above.
-+	    non_pic_object="$pic_object"
-+	    func_append non_pic_objects " $non_pic_object"
-+	  fi
-+	else
-+	  # Only an error if not doing a dry-run.
-+	  if $opt_dry_run; then
-+	    # Extract subdirectory from the argument.
-+	    func_dirname "$arg" "/" ""
-+	    xdir="$func_dirname_result"
-+
-+	    func_lo2o "$arg"
-+	    pic_object=$xdir$objdir/$func_lo2o_result
-+	    non_pic_object=$xdir$func_lo2o_result
-+	    func_append libobjs " $pic_object"
-+	    func_append non_pic_objects " $non_pic_object"
-+	  else
-+	    func_fatal_error "\`$arg' is not a valid libtool object"
-+	  fi
-+	fi
-+	;;
-+
-+      *.$libext)
-+	# An archive.
-+	deplibs="$deplibs $arg"
-+	old_deplibs="$old_deplibs $arg"
-+	continue
-+	;;
-+
-+      *.la)
-+	# A libtool-controlled library.
-+
-+	if test "$prev" = dlfiles; then
-+	  # This library was specified with -dlopen.
-+	  dlfiles="$dlfiles $arg"
-+	  prev=
-+	elif test "$prev" = dlprefiles; then
-+	  # The library was specified with -dlpreopen.
-+	  dlprefiles="$dlprefiles $arg"
-+	  prev=
-+	else
-+	  deplibs="$deplibs $arg"
-+	fi
-+	continue
-+	;;
-+
-+      # Some other compiler argument.
-+      *)
-+	# Unknown arguments in both finalize_command and compile_command need
-+	# to be aesthetically quoted because they are evaled later.
-+	func_quote_for_eval "$arg"
-+	arg="$func_quote_for_eval_result"
-+	;;
-+      esac # arg
-+
-+      # Now actually substitute the argument into the commands.
-+      if test -n "$arg"; then
-+	func_append compile_command " $arg"
-+	func_append finalize_command " $arg"
-+      fi
-+    done # argument parsing loop
-+
-+    test -n "$prev" && \
-+      func_fatal_help "the \`$prevarg' option requires an argument"
-+
-+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-+      eval arg=\"$export_dynamic_flag_spec\"
-+      func_append compile_command " $arg"
-+      func_append finalize_command " $arg"
-+    fi
-+
-+    oldlibs=
-+    # calculate the name of the file, without its directory
-+    func_basename "$output"
-+    outputname="$func_basename_result"
-+    libobjs_save="$libobjs"
-+
-+    if test -n "$shlibpath_var"; then
-+      # get the directories listed in $shlibpath_var
-+      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-+    else
-+      shlib_search_path=
-+    fi
-+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-+
-+    func_dirname "$output" "/" ""
-+    output_objdir="$func_dirname_result$objdir"
-+    # Create the object directory.
-+    func_mkdir_p "$output_objdir"
-+
-+    # Determine the type of output
-+    case $output in
-+    "")
-+      func_fatal_help "you must specify an output file"
-+      ;;
-+    *.$libext) linkmode=oldlib ;;
-+    *.lo | *.$objext) linkmode=obj ;;
-+    *.la) linkmode=lib ;;
-+    *) linkmode=prog ;; # Anything else should be a program.
-+    esac
-+
-+    specialdeplibs=
-+
-+    libs=
-+    # Find all interdependent deplibs by searching for libraries
-+    # that are linked more than once (e.g. -la -lb -la)
-+    for deplib in $deplibs; do
-+      if $opt_duplicate_deps ; then
-+	case "$libs " in
-+	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	esac
-+      fi
-+      libs="$libs $deplib"
-+    done
-+
-+    if test "$linkmode" = lib; then
-+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-+
-+      # Compute libraries that are listed more than once in $predeps
-+      # $postdeps and mark them as special (i.e., whose duplicates are
-+      # not to be eliminated).
-+      pre_post_deps=
-+      if $opt_duplicate_compiler_generated_deps; then
-+	for pre_post_dep in $predeps $postdeps; do
-+	  case "$pre_post_deps " in
-+	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-+	  esac
-+	  pre_post_deps="$pre_post_deps $pre_post_dep"
-+	done
-+      fi
-+      pre_post_deps=
-+    fi
-+
-+    deplibs=
-+    newdependency_libs=
-+    newlib_search_path=
-+    need_relink=no # whether we're linking any uninstalled libtool libraries
-+    notinst_deplibs= # not-installed libtool libraries
-+    notinst_path= # paths that contain not-installed libtool libraries
-+
-+    case $linkmode in
-+    lib)
-+	passes="conv dlpreopen link"
-+	for file in $dlfiles $dlprefiles; do
-+	  case $file in
-+	  *.la) ;;
-+	  *)
-+	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
-+	    ;;
-+	  esac
-+	done
-+	;;
-+    prog)
-+	compile_deplibs=
-+	finalize_deplibs=
-+	alldeplibs=no
-+	newdlfiles=
-+	newdlprefiles=
-+	passes="conv scan dlopen dlpreopen link"
-+	;;
-+    *)  passes="conv"
-+	;;
-+    esac
-+
-+    for pass in $passes; do
-+      # The preopen pass in lib mode reverses $deplibs; put it back here
-+      # so that -L comes before libs that need it for instance...
-+      if test "$linkmode,$pass" = "lib,link"; then
-+	## FIXME: Find the place where the list is rebuilt in the wrong
-+	##        order, and fix it there properly
-+        tmp_deplibs=
-+	for deplib in $deplibs; do
-+	  tmp_deplibs="$deplib $tmp_deplibs"
-+	done
-+	deplibs="$tmp_deplibs"
-+      fi
-+
-+      if test "$linkmode,$pass" = "lib,link" ||
-+	 test "$linkmode,$pass" = "prog,scan"; then
-+	libs="$deplibs"
-+	deplibs=
-+      fi
-+      if test "$linkmode" = prog; then
-+	case $pass in
-+	dlopen) libs="$dlfiles" ;;
-+	dlpreopen) libs="$dlprefiles" ;;
-+	link)
-+	  libs="$deplibs %DEPLIBS%"
-+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-+	  ;;
-+	esac
-+      fi
-+      if test "$linkmode,$pass" = "lib,dlpreopen"; then
-+	# Collect and forward deplibs of preopened libtool libs
-+	for lib in $dlprefiles; do
-+	  # Ignore non-libtool-libs
-+	  dependency_libs=
-+	  case $lib in
-+	  *.la)	func_source "$lib" ;;
-+	  esac
-+
-+	  # Collect preopened libtool deplibs, except any this library
-+	  # has declared as weak libs
-+	  for deplib in $dependency_libs; do
-+            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
-+	    case " $weak_libs " in
-+	    *" $deplib_base "*) ;;
-+	    *) deplibs="$deplibs $deplib" ;;
-+	    esac
-+	  done
-+	done
-+	libs="$dlprefiles"
-+      fi
-+      if test "$pass" = dlopen; then
-+	# Collect dlpreopened libraries
-+	save_deplibs="$deplibs"
-+	deplibs=
-+      fi
-+
-+      for deplib in $libs; do
-+	lib=
-+	found=no
-+	case $deplib in
-+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-+	  if test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$deplib $compile_deplibs"
-+	    finalize_deplibs="$deplib $finalize_deplibs"
-+	  else
-+	    compiler_flags="$compiler_flags $deplib"
-+	    if test "$linkmode" = lib ; then
-+		case "$new_inherited_linker_flags " in
-+		    *" $deplib "*) ;;
-+		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-+		esac
-+	    fi
-+	  fi
-+	  continue
-+	  ;;
-+	-l*)
-+	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-+	    func_warning "\`-l' is ignored for archives/objects"
-+	    continue
-+	  fi
-+	  func_stripname '-l' '' "$deplib"
-+	  name=$func_stripname_result
-+	  if test "$linkmode" = lib; then
-+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-+	  else
-+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-+	  fi
-+	  for searchdir in $searchdirs; do
-+	    for search_ext in .la $std_shrext .so .a; do
-+	      # Search the libtool library
-+	      lib="$searchdir/lib${name}${search_ext}"
-+	      if test -f "$lib"; then
-+		if test "$search_ext" = ".la"; then
-+		  found=yes
-+		else
-+		  found=no
-+		fi
-+		break 2
-+	      fi
-+	    done
-+	  done
-+	  if test "$found" != yes; then
-+	    # deplib doesn't seem to be a libtool library
-+	    if test "$linkmode,$pass" = "prog,link"; then
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    else
-+	      deplibs="$deplib $deplibs"
-+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-+	    fi
-+	    continue
-+	  else # deplib is a libtool library
-+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-+	    # We need to do some special things here, and not later.
-+	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+	      case " $predeps $postdeps " in
-+	      *" $deplib "*)
-+		if func_lalib_p "$lib"; then
-+		  library_names=
-+		  old_library=
-+		  func_source "$lib"
-+		  for l in $old_library $library_names; do
-+		    ll="$l"
-+		  done
-+		  if test "X$ll" = "X$old_library" ; then # only static version available
-+		    found=no
-+		    func_dirname "$lib" "" "."
-+		    ladir="$func_dirname_result"
-+		    lib=$ladir/$old_library
-+		    if test "$linkmode,$pass" = "prog,link"; then
-+		      compile_deplibs="$deplib $compile_deplibs"
-+		      finalize_deplibs="$deplib $finalize_deplibs"
-+		    else
-+		      deplibs="$deplib $deplibs"
-+		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-+		    fi
-+		    continue
-+		  fi
-+		fi
-+		;;
-+	      *) ;;
-+	      esac
-+	    fi
-+	  fi
-+	  ;; # -l
-+	*.ltframework)
-+	  if test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$deplib $compile_deplibs"
-+	    finalize_deplibs="$deplib $finalize_deplibs"
-+	  else
-+	    deplibs="$deplib $deplibs"
-+	    if test "$linkmode" = lib ; then
-+		case "$new_inherited_linker_flags " in
-+		    *" $deplib "*) ;;
-+		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-+		esac
-+	    fi
-+	  fi
-+	  continue
-+	  ;;
-+	-L*)
-+	  case $linkmode in
-+	  lib)
-+	    deplibs="$deplib $deplibs"
-+	    test "$pass" = conv && continue
-+	    newdependency_libs="$deplib $newdependency_libs"
-+	    func_stripname '-L' '' "$deplib"
-+	    newlib_search_path="$newlib_search_path $func_stripname_result"
-+	    ;;
-+	  prog)
-+	    if test "$pass" = conv; then
-+	      deplibs="$deplib $deplibs"
-+	      continue
-+	    fi
-+	    if test "$pass" = scan; then
-+	      deplibs="$deplib $deplibs"
-+	    else
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    fi
-+	    func_stripname '-L' '' "$deplib"
-+	    newlib_search_path="$newlib_search_path $func_stripname_result"
-+	    ;;
-+	  *)
-+	    func_warning "\`-L' is ignored for archives/objects"
-+	    ;;
-+	  esac # linkmode
-+	  continue
-+	  ;; # -L
-+	-R*)
-+	  if test "$pass" = link; then
-+	    func_stripname '-R' '' "$deplib"
-+	    dir=$func_stripname_result
-+	    # Make sure the xrpath contains only unique directories.
-+	    case "$xrpath " in
-+	    *" $dir "*) ;;
-+	    *) xrpath="$xrpath $dir" ;;
-+	    esac
-+	  fi
-+	  deplibs="$deplib $deplibs"
-+	  continue
-+	  ;;
-+	*.la) lib="$deplib" ;;
-+	*.$libext)
-+	  if test "$pass" = conv; then
-+	    deplibs="$deplib $deplibs"
-+	    continue
-+	  fi
-+	  case $linkmode in
-+	  lib)
-+	    # Linking convenience modules into shared libraries is allowed,
-+	    # but linking other static libraries is non-portable.
-+	    case " $dlpreconveniencelibs " in
-+	    *" $deplib "*) ;;
-+	    *)
-+	      valid_a_lib=no
-+	      case $deplibs_check_method in
-+		match_pattern*)
-+		  set dummy $deplibs_check_method; shift
-+		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-+		  if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
-+		    | $EGREP "$match_pattern_regex" > /dev/null; then
-+		    valid_a_lib=yes
-+		  fi
-+		;;
-+		pass_all)
-+		  valid_a_lib=yes
-+		;;
-+	      esac
-+	      if test "$valid_a_lib" != yes; then
-+		$ECHO
-+		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-+		$ECHO "*** I have the capability to make that library automatically link in when"
-+		$ECHO "*** you link to this library.  But I can only do this if you have a"
-+		$ECHO "*** shared version of the library, which you do not appear to have"
-+		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
-+		$ECHO "*** that it is just a static archive that I should not use here."
-+	      else
-+		$ECHO
-+		$ECHO "*** Warning: Linking the shared library $output against the"
-+		$ECHO "*** static library $deplib is not portable!"
-+		deplibs="$deplib $deplibs"
-+	      fi
-+	      ;;
-+	    esac
-+	    continue
-+	    ;;
-+	  prog)
-+	    if test "$pass" != link; then
-+	      deplibs="$deplib $deplibs"
-+	    else
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    fi
-+	    continue
-+	    ;;
-+	  esac # linkmode
-+	  ;; # *.$libext
-+	*.lo | *.$objext)
-+	  if test "$pass" = conv; then
-+	    deplibs="$deplib $deplibs"
-+	  elif test "$linkmode" = prog; then
-+	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-+	      # If there is no dlopen support or we're linking statically,
-+	      # we need to preload.
-+	      newdlprefiles="$newdlprefiles $deplib"
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    else
-+	      newdlfiles="$newdlfiles $deplib"
-+	    fi
-+	  fi
-+	  continue
-+	  ;;
-+	%DEPLIBS%)
-+	  alldeplibs=yes
-+	  continue
-+	  ;;
-+	esac # case $deplib
-+
-+	if test "$found" = yes || test -f "$lib"; then :
-+	else
-+	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-+	fi
-+
-+	# Check to see that this really is a libtool archive.
-+	func_lalib_unsafe_p "$lib" \
-+	  || func_fatal_error "\`$lib' is not a valid libtool archive"
-+
-+	func_dirname "$lib" "" "."
-+	ladir="$func_dirname_result"
-+
-+	dlname=
-+	dlopen=
-+	dlpreopen=
-+	libdir=
-+	library_names=
-+	old_library=
-+	inherited_linker_flags=
-+	# If the library was installed with an old release of libtool,
-+	# it will not redefine variables installed, or shouldnotlink
-+	installed=yes
-+	shouldnotlink=no
-+	avoidtemprpath=
-+
-+
-+	# Read the .la file
-+	func_source "$lib"
-+
-+	# Convert "-framework foo" to "foo.ltframework"
-+	if test -n "$inherited_linker_flags"; then
-+	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
-+	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
-+	    case " $new_inherited_linker_flags " in
-+	      *" $tmp_inherited_linker_flag "*) ;;
-+	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
-+	    esac
-+	  done
-+	fi
-+	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	if test "$linkmode,$pass" = "lib,link" ||
-+	   test "$linkmode,$pass" = "prog,scan" ||
-+	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-+	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-+	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-+	fi
-+
-+	if test "$pass" = conv; then
-+	  # Only check for convenience libraries
-+	  deplibs="$lib $deplibs"
-+	  if test -z "$libdir"; then
-+	    if test -z "$old_library"; then
-+	      func_fatal_error "cannot find name of link library for \`$lib'"
-+	    fi
-+	    # It is a libtool convenience library, so add in its objects.
-+	    convenience="$convenience $ladir/$objdir/$old_library"
-+	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-+	    tmp_libs=
-+	    for deplib in $dependency_libs; do
-+	      deplibs="$deplib $deplibs"
-+	      if $opt_duplicate_deps ; then
-+		case "$tmp_libs " in
-+		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+		esac
-+	      fi
-+	      tmp_libs="$tmp_libs $deplib"
-+	    done
-+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-+	    func_fatal_error "\`$lib' is not a convenience library"
-+	  fi
-+	  continue
-+	fi # $pass = conv
-+
-+
-+	# Get the name of the library we link against.
-+	linklib=
-+	for l in $old_library $library_names; do
-+	  linklib="$l"
-+	done
-+	if test -z "$linklib"; then
-+	  func_fatal_error "cannot find name of link library for \`$lib'"
-+	fi
-+
-+	# This library was specified with -dlopen.
-+	if test "$pass" = dlopen; then
-+	  if test -z "$libdir"; then
-+	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-+	  fi
-+	  if test -z "$dlname" ||
-+	     test "$dlopen_support" != yes ||
-+	     test "$build_libtool_libs" = no; then
-+	    # If there is no dlname, no dlopen support or we're linking
-+	    # statically, we need to preload.  We also need to preload any
-+	    # dependent libraries so libltdl's deplib preloader doesn't
-+	    # bomb out in the load deplibs phase.
-+	    dlprefiles="$dlprefiles $lib $dependency_libs"
-+	  else
-+	    newdlfiles="$newdlfiles $lib"
-+	  fi
-+	  continue
-+	fi # $pass = dlopen
-+
-+	# We need an absolute path.
-+	case $ladir in
-+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-+	*)
-+	  abs_ladir=`cd "$ladir" && pwd`
-+	  if test -z "$abs_ladir"; then
-+	    func_warning "cannot determine absolute directory name of \`$ladir'"
-+	    func_warning "passing it literally to the linker, although it might fail"
-+	    abs_ladir="$ladir"
-+	  fi
-+	  ;;
-+	esac
-+	func_basename "$lib"
-+	laname="$func_basename_result"
-+
-+	# Find the relevant object directory and library name.
-+	if test "X$installed" = Xyes; then
-+	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+	    func_warning "library \`$lib' was moved."
-+	    dir="$ladir"
-+	    absdir="$abs_ladir"
-+	    libdir="$abs_ladir"
-+	  else
-+	    dir="$libdir"
-+	    absdir="$libdir"
-+	  fi
-+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-+	else
-+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+	    dir="$ladir"
-+	    absdir="$abs_ladir"
-+	    # Remove this search path later
-+	    notinst_path="$notinst_path $abs_ladir"
-+	  else
-+	    dir="$ladir/$objdir"
-+	    absdir="$abs_ladir/$objdir"
-+	    # Remove this search path later
-+	    notinst_path="$notinst_path $abs_ladir"
-+	  fi
-+	fi # $installed = yes
-+	func_stripname 'lib' '.la' "$laname"
-+	name=$func_stripname_result
-+
-+	# This library was specified with -dlpreopen.
-+	if test "$pass" = dlpreopen; then
-+	  if test -z "$libdir" && test "$linkmode" = prog; then
-+	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
-+	  fi
-+	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-+	  # are required to link).
-+	  if test -n "$old_library"; then
-+	    newdlprefiles="$newdlprefiles $dir/$old_library"
-+	    # Keep a list of preopened convenience libraries to check
-+	    # that they are being used correctly in the link pass.
-+	    test -z "$libdir" && \
-+		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
-+	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-+	  elif test -n "$dlname"; then
-+	    newdlprefiles="$newdlprefiles $dir/$dlname"
-+	  else
-+	    newdlprefiles="$newdlprefiles $dir/$linklib"
-+	  fi
-+	fi # $pass = dlpreopen
-+
-+	if test -z "$libdir"; then
-+	  # Link the convenience library
-+	  if test "$linkmode" = lib; then
-+	    deplibs="$dir/$old_library $deplibs"
-+	  elif test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$dir/$old_library $compile_deplibs"
-+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-+	  else
-+	    deplibs="$lib $deplibs" # used for prog,scan pass
-+	  fi
-+	  continue
-+	fi
-+
-+
-+	if test "$linkmode" = prog && test "$pass" != link; then
-+	  newlib_search_path="$newlib_search_path $ladir"
-+	  deplibs="$lib $deplibs"
-+
-+	  linkalldeplibs=no
-+	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-+	     test "$build_libtool_libs" = no; then
-+	    linkalldeplibs=yes
-+	  fi
-+
-+	  tmp_libs=
-+	  for deplib in $dependency_libs; do
-+	    case $deplib in
-+	    -L*) func_stripname '-L' '' "$deplib"
-+	         newlib_search_path="$newlib_search_path $func_stripname_result"
-+		 ;;
-+	    esac
-+	    # Need to link against all dependency_libs?
-+	    if test "$linkalldeplibs" = yes; then
-+	      deplibs="$deplib $deplibs"
-+	    else
-+	      # Need to hardcode shared library paths
-+	      # or/and link against static libraries
-+	      newdependency_libs="$deplib $newdependency_libs"
-+	    fi
-+	    if $opt_duplicate_deps ; then
-+	      case "$tmp_libs " in
-+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	      esac
-+	    fi
-+	    tmp_libs="$tmp_libs $deplib"
-+	  done # for deplib
-+	  continue
-+	fi # $linkmode = prog...
-+
-+	if test "$linkmode,$pass" = "prog,link"; then
-+	  if test -n "$library_names" &&
-+	     { { test "$prefer_static_libs" = no ||
-+	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
-+	       test -z "$old_library"; }; then
-+	    # We need to hardcode the library path
-+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-+	      # Make sure the rpath contains only unique directories.
-+	      case "$temp_rpath:" in
-+	      *"$absdir:"*) ;;
-+	      *) temp_rpath="$temp_rpath$absdir:" ;;
-+	      esac
-+	    fi
-+
-+	    # Hardcode the library path.
-+	    # Skip directories that are in the system default run-time
-+	    # search path.
-+	    case " $sys_lib_dlsearch_path " in
-+	    *" $absdir "*) ;;
-+	    *)
-+	      case "$compile_rpath " in
-+	      *" $absdir "*) ;;
-+	      *) compile_rpath="$compile_rpath $absdir"
-+	      esac
-+	      ;;
-+	    esac
-+	    case " $sys_lib_dlsearch_path " in
-+	    *" $libdir "*) ;;
-+	    *)
-+	      case "$finalize_rpath " in
-+	      *" $libdir "*) ;;
-+	      *) finalize_rpath="$finalize_rpath $libdir"
-+	      esac
-+	      ;;
-+	    esac
-+	  fi # $linkmode,$pass = prog,link...
-+
-+	  if test "$alldeplibs" = yes &&
-+	     { test "$deplibs_check_method" = pass_all ||
-+	       { test "$build_libtool_libs" = yes &&
-+		 test -n "$library_names"; }; }; then
-+	    # We only need to search for static libraries
-+	    continue
-+	  fi
-+	fi
-+
-+	link_static=no # Whether the deplib will be linked statically
-+	use_static_libs=$prefer_static_libs
-+	if test "$use_static_libs" = built && test "$installed" = yes; then
-+	  use_static_libs=no
-+	fi
-+	if test -n "$library_names" &&
-+	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
-+	  case $host in
-+	  *cygwin* | *mingw* | *cegcc*)
-+	      # No point in relinking DLLs because paths are not encoded
-+	      notinst_deplibs="$notinst_deplibs $lib"
-+	      need_relink=no
-+	    ;;
-+	  *)
-+	    if test "$installed" = no; then
-+	      notinst_deplibs="$notinst_deplibs $lib"
-+	      need_relink=yes
-+	    fi
-+	    ;;
-+	  esac
-+	  # This is a shared library
-+
-+	  # Warn about portability, can't link against -module's on some
-+	  # systems (darwin).  Don't bleat about dlopened modules though!
-+	  dlopenmodule=""
-+	  for dlpremoduletest in $dlprefiles; do
-+	    if test "X$dlpremoduletest" = "X$lib"; then
-+	      dlopenmodule="$dlpremoduletest"
-+	      break
-+	    fi
-+	  done
-+	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-+	    $ECHO
-+	    if test "$linkmode" = prog; then
-+	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
-+	    else
-+	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
-+	    fi
-+	    $ECHO "*** $linklib is not portable!"
-+	  fi
-+	  if test "$linkmode" = lib &&
-+	     test "$hardcode_into_libs" = yes; then
-+	    # Hardcode the library path.
-+	    # Skip directories that are in the system default run-time
-+	    # search path.
-+	    case " $sys_lib_dlsearch_path " in
-+	    *" $absdir "*) ;;
-+	    *)
-+	      case "$compile_rpath " in
-+	      *" $absdir "*) ;;
-+	      *) compile_rpath="$compile_rpath $absdir"
-+	      esac
-+	      ;;
-+	    esac
-+	    case " $sys_lib_dlsearch_path " in
-+	    *" $libdir "*) ;;
-+	    *)
-+	      case "$finalize_rpath " in
-+	      *" $libdir "*) ;;
-+	      *) finalize_rpath="$finalize_rpath $libdir"
-+	      esac
-+	      ;;
-+	    esac
-+	  fi
-+
-+	  if test -n "$old_archive_from_expsyms_cmds"; then
-+	    # figure out the soname
-+	    set dummy $library_names
-+	    shift
-+	    realname="$1"
-+	    shift
-+	    libname=`eval "\\$ECHO \"$libname_spec\""`
-+	    # use dlname if we got it. it's perfectly good, no?
-+	    if test -n "$dlname"; then
-+	      soname="$dlname"
-+	    elif test -n "$soname_spec"; then
-+	      # bleh windows
-+	      case $host in
-+	      *cygwin* | mingw* | *cegcc*)
-+	        func_arith $current - $age
-+		major=$func_arith_result
-+		versuffix="-$major"
-+		;;
-+	      esac
-+	      eval soname=\"$soname_spec\"
-+	    else
-+	      soname="$realname"
-+	    fi
-+
-+	    # Make a new name for the extract_expsyms_cmds to use
-+	    soroot="$soname"
-+	    func_basename "$soroot"
-+	    soname="$func_basename_result"
-+	    func_stripname 'lib' '.dll' "$soname"
-+	    newlib=libimp-$func_stripname_result.a
-+
-+	    # If the library has no export list, then create one now
-+	    if test -f "$output_objdir/$soname-def"; then :
-+	    else
-+	      func_verbose "extracting exported symbol list from \`$soname'"
-+	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
-+	    fi
-+
-+	    # Create $newlib
-+	    if test -f "$output_objdir/$newlib"; then :; else
-+	      func_verbose "generating import library for \`$soname'"
-+	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
-+	    fi
-+	    # make sure the library variables are pointing to the new library
-+	    dir=$output_objdir
-+	    linklib=$newlib
-+	  fi # test -n "$old_archive_from_expsyms_cmds"
-+
-+	  if test "$linkmode" = prog || test "$mode" != relink; then
-+	    add_shlibpath=
-+	    add_dir=
-+	    add=
-+	    lib_linked=yes
-+	    case $hardcode_action in
-+	    immediate | unsupported)
-+	      if test "$hardcode_direct" = no; then
-+		add="$dir/$linklib"
-+		case $host in
-+		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-+		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-+		    *-*-unixware7*) add_dir="-L$dir" ;;
-+		  *-*-darwin* )
-+		    # if the lib is a (non-dlopened) module then we can not
-+		    # link against it, someone is ignoring the earlier warnings
-+		    if /usr/bin/file -L $add 2> /dev/null |
-+			 $GREP ": [^:]* bundle" >/dev/null ; then
-+		      if test "X$dlopenmodule" != "X$lib"; then
-+			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-+			if test -z "$old_library" ; then
-+			  $ECHO
-+			  $ECHO "*** And there doesn't seem to be a static archive available"
-+			  $ECHO "*** The link will probably fail, sorry"
-+			else
-+			  add="$dir/$old_library"
-+			fi
-+		      elif test -n "$old_library"; then
-+			add="$dir/$old_library"
-+		      fi
-+		    fi
-+		esac
-+	      elif test "$hardcode_minus_L" = no; then
-+		case $host in
-+		*-*-sunos*) add_shlibpath="$dir" ;;
-+		esac
-+		add_dir="-L$dir"
-+		add="-l$name"
-+	      elif test "$hardcode_shlibpath_var" = no; then
-+		add_shlibpath="$dir"
-+		add="-l$name"
-+	      else
-+		lib_linked=no
-+	      fi
-+	      ;;
-+	    relink)
-+	      if test "$hardcode_direct" = yes &&
-+	         test "$hardcode_direct_absolute" = no; then
-+		add="$dir/$linklib"
-+	      elif test "$hardcode_minus_L" = yes; then
-+		add_dir="-L$dir"
-+		# Try looking first in the location we're being installed to.
-+		if test -n "$inst_prefix_dir"; then
-+		  case $libdir in
-+		    [\\/]*)
-+		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-+		      ;;
-+		  esac
-+		fi
-+		add="-l$name"
-+	      elif test "$hardcode_shlibpath_var" = yes; then
-+		add_shlibpath="$dir"
-+		add="-l$name"
-+	      else
-+		lib_linked=no
-+	      fi
-+	      ;;
-+	    *) lib_linked=no ;;
-+	    esac
-+
-+	    if test "$lib_linked" != yes; then
-+	      func_fatal_configuration "unsupported hardcode properties"
-+	    fi
-+
-+	    if test -n "$add_shlibpath"; then
-+	      case :$compile_shlibpath: in
-+	      *":$add_shlibpath:"*) ;;
-+	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-+	      esac
-+	    fi
-+	    if test "$linkmode" = prog; then
-+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-+	    else
-+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-+	      test -n "$add" && deplibs="$add $deplibs"
-+	      if test "$hardcode_direct" != yes &&
-+		 test "$hardcode_minus_L" != yes &&
-+		 test "$hardcode_shlibpath_var" = yes; then
-+		case :$finalize_shlibpath: in
-+		*":$libdir:"*) ;;
-+		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+		esac
-+	      fi
-+	    fi
-+	  fi
-+
-+	  if test "$linkmode" = prog || test "$mode" = relink; then
-+	    add_shlibpath=
-+	    add_dir=
-+	    add=
-+	    # Finalize command for both is simple: just hardcode it.
-+	    if test "$hardcode_direct" = yes &&
-+	       test "$hardcode_direct_absolute" = no; then
-+	      add="$libdir/$linklib"
-+	    elif test "$hardcode_minus_L" = yes; then
-+	      add_dir="-L$libdir"
-+	      add="-l$name"
-+	    elif test "$hardcode_shlibpath_var" = yes; then
-+	      case :$finalize_shlibpath: in
-+	      *":$libdir:"*) ;;
-+	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+	      esac
-+	      add="-l$name"
-+	    elif test "$hardcode_automatic" = yes; then
-+	      if test -n "$inst_prefix_dir" &&
-+		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-+		add="$inst_prefix_dir$libdir/$linklib"
-+	      else
-+		add="$libdir/$linklib"
-+	      fi
-+	    else
-+	      # We cannot seem to hardcode it, guess we'll fake it.
-+	      add_dir="-L$libdir"
-+	      # Try looking first in the location we're being installed to.
-+	      if test -n "$inst_prefix_dir"; then
-+		case $libdir in
-+		  [\\/]*)
-+		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-+		    ;;
-+		esac
-+	      fi
-+	      add="-l$name"
-+	    fi
-+
-+	    if test "$linkmode" = prog; then
-+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-+	    else
-+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-+	      test -n "$add" && deplibs="$add $deplibs"
-+	    fi
-+	  fi
-+	elif test "$linkmode" = prog; then
-+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-+	  # is not unsupported.  This is valid on all known static and
-+	  # shared platforms.
-+	  if test "$hardcode_direct" != unsupported; then
-+	    test -n "$old_library" && linklib="$old_library"
-+	    compile_deplibs="$dir/$linklib $compile_deplibs"
-+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-+	  else
-+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-+	  fi
-+	elif test "$build_libtool_libs" = yes; then
-+	  # Not a shared library
-+	  if test "$deplibs_check_method" != pass_all; then
-+	    # We're trying link a shared library against a static one
-+	    # but the system doesn't support it.
-+
-+	    # Just print a warning and add the library to dependency_libs so
-+	    # that the program can be linked against the static library.
-+	    $ECHO
-+	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
-+	    $ECHO "*** I have the capability to make that library automatically link in when"
-+	    $ECHO "*** you link to this library.  But I can only do this if you have a"
-+	    $ECHO "*** shared version of the library, which you do not appear to have."
-+	    if test "$module" = yes; then
-+	      $ECHO "*** But as you try to build a module library, libtool will still create "
-+	      $ECHO "*** a static module, that should work as long as the dlopening application"
-+	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
-+	      if test -z "$global_symbol_pipe"; then
-+		$ECHO
-+		$ECHO "*** However, this would only work if libtool was able to extract symbol"
-+		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+		$ECHO "*** not find such a program.  So, this module is probably useless."
-+		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
-+	      fi
-+	      if test "$build_old_libs" = no; then
-+		build_libtool_libs=module
-+		build_old_libs=yes
-+	      else
-+		build_libtool_libs=no
-+	      fi
-+	    fi
-+	  else
-+	    deplibs="$dir/$old_library $deplibs"
-+	    link_static=yes
-+	  fi
-+	fi # link shared/static library?
-+
-+	if test "$linkmode" = lib; then
-+	  if test -n "$dependency_libs" &&
-+	     { test "$hardcode_into_libs" != yes ||
-+	       test "$build_old_libs" = yes ||
-+	       test "$link_static" = yes; }; then
-+	    # Extract -R from dependency_libs
-+	    temp_deplibs=
-+	    for libdir in $dependency_libs; do
-+	      case $libdir in
-+	      -R*) func_stripname '-R' '' "$libdir"
-+	           temp_xrpath=$func_stripname_result
-+		   case " $xrpath " in
-+		   *" $temp_xrpath "*) ;;
-+		   *) xrpath="$xrpath $temp_xrpath";;
-+		   esac;;
-+	      *) temp_deplibs="$temp_deplibs $libdir";;
-+	      esac
-+	    done
-+	    dependency_libs="$temp_deplibs"
-+	  fi
-+
-+	  newlib_search_path="$newlib_search_path $absdir"
-+	  # Link against this library
-+	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-+	  # ... and its dependency_libs
-+	  tmp_libs=
-+	  for deplib in $dependency_libs; do
-+	    newdependency_libs="$deplib $newdependency_libs"
-+	    if $opt_duplicate_deps ; then
-+	      case "$tmp_libs " in
-+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	      esac
-+	    fi
-+	    tmp_libs="$tmp_libs $deplib"
-+	  done
-+
-+	  if test "$link_all_deplibs" != no; then
-+	    # Add the search paths of all dependency libraries
-+	    for deplib in $dependency_libs; do
-+	      path=
-+	      case $deplib in
-+	      -L*) path="$deplib" ;;
-+	      *.la)
-+	        func_dirname "$deplib" "" "."
-+		dir="$func_dirname_result"
-+		# We need an absolute path.
-+		case $dir in
-+		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-+		*)
-+		  absdir=`cd "$dir" && pwd`
-+		  if test -z "$absdir"; then
-+		    func_warning "cannot determine absolute directory name of \`$dir'"
-+		    absdir="$dir"
-+		  fi
-+		  ;;
-+		esac
-+		if $GREP "^installed=no" $deplib > /dev/null; then
-+		case $host in
-+		*-*-darwin*)
-+		  depdepl=
-+		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-+		  if test -n "$deplibrary_names" ; then
-+		    for tmp in $deplibrary_names ; do
-+		      depdepl=$tmp
-+		    done
-+		    if test -f "$absdir/$objdir/$depdepl" ; then
-+		      depdepl="$absdir/$objdir/$depdepl"
-+		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
-+                      if test -z "$darwin_install_name"; then
-+                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
-+                      fi
-+		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-+		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
-+		      path=
-+		    fi
-+		  fi
-+		  ;;
-+		*)
-+		  path="-L$absdir/$objdir"
-+		  ;;
-+		esac
-+		else
-+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+		  test -z "$libdir" && \
-+		    func_fatal_error "\`$deplib' is not a valid libtool archive"
-+		  test "$absdir" != "$libdir" && \
-+		    func_warning "\`$deplib' seems to be moved"
-+
-+		  path="-L$absdir"
-+		fi
-+		;;
-+	      esac
-+	      case " $deplibs " in
-+	      *" $path "*) ;;
-+	      *) deplibs="$path $deplibs" ;;
-+	      esac
-+	    done
-+	  fi # link_all_deplibs != no
-+	fi # linkmode = lib
-+      done # for deplib in $libs
-+      if test "$pass" = link; then
-+	if test "$linkmode" = "prog"; then
-+	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
-+	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
-+	else
-+	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	fi
-+      fi
-+      dependency_libs="$newdependency_libs"
-+      if test "$pass" = dlpreopen; then
-+	# Link the dlpreopened libraries before other libraries
-+	for deplib in $save_deplibs; do
-+	  deplibs="$deplib $deplibs"
-+	done
-+      fi
-+      if test "$pass" != dlopen; then
-+	if test "$pass" != conv; then
-+	  # Make sure lib_search_path contains only unique directories.
-+	  lib_search_path=
-+	  for dir in $newlib_search_path; do
-+	    case "$lib_search_path " in
-+	    *" $dir "*) ;;
-+	    *) lib_search_path="$lib_search_path $dir" ;;
-+	    esac
-+	  done
-+	  newlib_search_path=
-+	fi
-+
-+	if test "$linkmode,$pass" != "prog,link"; then
-+	  vars="deplibs"
-+	else
-+	  vars="compile_deplibs finalize_deplibs"
-+	fi
-+	for var in $vars dependency_libs; do
-+	  # Add libraries to $var in reverse order
-+	  eval tmp_libs=\"\$$var\"
-+	  new_libs=
-+	  for deplib in $tmp_libs; do
-+	    # FIXME: Pedantically, this is the right thing to do, so
-+	    #        that some nasty dependency loop isn't accidentally
-+	    #        broken:
-+	    #new_libs="$deplib $new_libs"
-+	    # Pragmatically, this seems to cause very few problems in
-+	    # practice:
-+	    case $deplib in
-+	    -L*) new_libs="$deplib $new_libs" ;;
-+	    -R*) ;;
-+	    *)
-+	      # And here is the reason: when a library appears more
-+	      # than once as an explicit dependence of a library, or
-+	      # is implicitly linked in more than once by the
-+	      # compiler, it is considered special, and multiple
-+	      # occurrences thereof are not removed.  Compare this
-+	      # with having the same library being listed as a
-+	      # dependency of multiple other libraries: in this case,
-+	      # we know (pedantically, we assume) the library does not
-+	      # need to be listed more than once, so we keep only the
-+	      # last copy.  This is not always right, but it is rare
-+	      # enough that we require users that really mean to play
-+	      # such unportable linking tricks to link the library
-+	      # using -Wl,-lname, so that libtool does not consider it
-+	      # for duplicate removal.
-+	      case " $specialdeplibs " in
-+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-+	      *)
-+		case " $new_libs " in
-+		*" $deplib "*) ;;
-+		*) new_libs="$deplib $new_libs" ;;
-+		esac
-+		;;
-+	      esac
-+	      ;;
-+	    esac
-+	  done
-+	  tmp_libs=
-+	  for deplib in $new_libs; do
-+	    case $deplib in
-+	    -L*)
-+	      case " $tmp_libs " in
-+	      *" $deplib "*) ;;
-+	      *) tmp_libs="$tmp_libs $deplib" ;;
-+	      esac
-+	      ;;
-+	    *) tmp_libs="$tmp_libs $deplib" ;;
-+	    esac
-+	  done
-+	  eval $var=\"$tmp_libs\"
-+	done # for var
-+      fi
-+      # Last step: remove runtime libs from dependency_libs
-+      # (they stay in deplibs)
-+      tmp_libs=
-+      for i in $dependency_libs ; do
-+	case " $predeps $postdeps $compiler_lib_search_path " in
-+	*" $i "*)
-+	  i=""
-+	  ;;
-+	esac
-+	if test -n "$i" ; then
-+	  tmp_libs="$tmp_libs $i"
-+	fi
-+      done
-+      dependency_libs=$tmp_libs
-+    done # for pass
-+    if test "$linkmode" = prog; then
-+      dlfiles="$newdlfiles"
-+    fi
-+    if test "$linkmode" = prog || test "$linkmode" = lib; then
-+      dlprefiles="$newdlprefiles"
-+    fi
-+
-+    case $linkmode in
-+    oldlib)
-+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+	func_warning "\`-dlopen' is ignored for archives"
-+      fi
-+
-+      case " $deplibs" in
-+      *\ -l* | *\ -L*)
-+	func_warning "\`-l' and \`-L' are ignored for archives" ;;
-+      esac
-+
-+      test -n "$rpath" && \
-+	func_warning "\`-rpath' is ignored for archives"
-+
-+      test -n "$xrpath" && \
-+	func_warning "\`-R' is ignored for archives"
-+
-+      test -n "$vinfo" && \
-+	func_warning "\`-version-info/-version-number' is ignored for archives"
-+
-+      test -n "$release" && \
-+	func_warning "\`-release' is ignored for archives"
-+
-+      test -n "$export_symbols$export_symbols_regex" && \
-+	func_warning "\`-export-symbols' is ignored for archives"
-+
-+      # Now set the variables for building old libraries.
-+      build_libtool_libs=no
-+      oldlibs="$output"
-+      objs="$objs$old_deplibs"
-+      ;;
-+
-+    lib)
-+      # Make sure we only generate libraries of the form `libNAME.la'.
-+      case $outputname in
-+      lib*)
-+	func_stripname 'lib' '.la' "$outputname"
-+	name=$func_stripname_result
-+	eval shared_ext=\"$shrext_cmds\"
-+	eval libname=\"$libname_spec\"
-+	;;
-+      *)
-+	test "$module" = no && \
-+	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
-+
-+	if test "$need_lib_prefix" != no; then
-+	  # Add the "lib" prefix for modules if required
-+	  func_stripname '' '.la' "$outputname"
-+	  name=$func_stripname_result
-+	  eval shared_ext=\"$shrext_cmds\"
-+	  eval libname=\"$libname_spec\"
-+	else
-+	  func_stripname '' '.la' "$outputname"
-+	  libname=$func_stripname_result
-+	fi
-+	;;
-+      esac
-+
-+      if test -n "$objs"; then
-+	if test "$deplibs_check_method" != pass_all; then
-+	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
-+	else
-+	  $ECHO
-+	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
-+	  $ECHO "*** objects $objs is not portable!"
-+	  libobjs="$libobjs $objs"
-+	fi
-+      fi
-+
-+      test "$dlself" != no && \
-+	func_warning "\`-dlopen self' is ignored for libtool libraries"
-+
-+      set dummy $rpath
-+      shift
-+      test "$#" -gt 1 && \
-+	func_warning "ignoring multiple \`-rpath's for a libtool library"
-+
-+      install_libdir="$1"
-+
-+      oldlibs=
-+      if test -z "$rpath"; then
-+	if test "$build_libtool_libs" = yes; then
-+	  # Building a libtool convenience library.
-+	  # Some compilers have problems with a `.al' extension so
-+	  # convenience libraries should have the same extension an
-+	  # archive normally would.
-+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-+	  build_libtool_libs=convenience
-+	  build_old_libs=yes
-+	fi
-+
-+	test -n "$vinfo" && \
-+	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
-+
-+	test -n "$release" && \
-+	  func_warning "\`-release' is ignored for convenience libraries"
-+      else
-+
-+	# Parse the version information argument.
-+	save_ifs="$IFS"; IFS=':'
-+	set dummy $vinfo 0 0 0
-+	shift
-+	IFS="$save_ifs"
-+
-+	test -n "$7" && \
-+	  func_fatal_help "too many parameters to \`-version-info'"
-+
-+	# convert absolute version numbers to libtool ages
-+	# this retains compatibility with .la files and attempts
-+	# to make the code below a bit more comprehensible
-+
-+	case $vinfo_number in
-+	yes)
-+	  number_major="$1"
-+	  number_minor="$2"
-+	  number_revision="$3"
-+	  #
-+	  # There are really only two kinds -- those that
-+	  # use the current revision as the major version
-+	  # and those that subtract age and use age as
-+	  # a minor version.  But, then there is irix
-+	  # which has an extra 1 added just for fun
-+	  #
-+	  case $version_type in
-+	  darwin|linux|osf|windows|none)
-+	    func_arith $number_major + $number_minor
-+	    current=$func_arith_result
-+	    age="$number_minor"
-+	    revision="$number_revision"
-+	    ;;
-+	  freebsd-aout|freebsd-elf|sunos)
-+	    current="$number_major"
-+	    revision="$number_minor"
-+	    age="0"
-+	    ;;
-+	  irix|nonstopux)
-+	    func_arith $number_major + $number_minor
-+	    current=$func_arith_result
-+	    age="$number_minor"
-+	    revision="$number_minor"
-+	    lt_irix_increment=no
-+	    ;;
-+	  *)
-+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-+	    ;;
-+	  esac
-+	  ;;
-+	no)
-+	  current="$1"
-+	  revision="$2"
-+	  age="$3"
-+	  ;;
-+	esac
-+
-+	# Check that each of the things are valid numbers.
-+	case $current in
-+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-+	*)
-+	  func_error "CURRENT \`$current' must be a nonnegative integer"
-+	  func_fatal_error "\`$vinfo' is not valid version information"
-+	  ;;
-+	esac
-+
-+	case $revision in
-+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-+	*)
-+	  func_error "REVISION \`$revision' must be a nonnegative integer"
-+	  func_fatal_error "\`$vinfo' is not valid version information"
-+	  ;;
-+	esac
-+
-+	case $age in
-+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-+	*)
-+	  func_error "AGE \`$age' must be a nonnegative integer"
-+	  func_fatal_error "\`$vinfo' is not valid version information"
-+	  ;;
-+	esac
-+
-+	if test "$age" -gt "$current"; then
-+	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
-+	  func_fatal_error "\`$vinfo' is not valid version information"
-+	fi
-+
-+	# Calculate the version variables.
-+	major=
-+	versuffix=
-+	verstring=
-+	case $version_type in
-+	none) ;;
-+
-+	darwin)
-+	  # Like Linux, but with the current version available in
-+	  # verstring for coding it into the library header
-+	  func_arith $current - $age
-+	  major=.$func_arith_result
-+	  versuffix="$major.$age.$revision"
-+	  # Darwin ld doesn't like 0 for these options...
-+	  func_arith $current + 1
-+	  minor_current=$func_arith_result
-+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+	  ;;
-+
-+	freebsd-aout)
-+	  major=".$current"
-+	  versuffix=".$current.$revision";
-+	  ;;
-+
-+	freebsd-elf)
-+	  major=".$current"
-+	  versuffix=".$current"
-+	  ;;
-+
-+	irix | nonstopux)
-+	  if test "X$lt_irix_increment" = "Xno"; then
-+	    func_arith $current - $age
-+	  else
-+	    func_arith $current - $age + 1
-+	  fi
-+	  major=$func_arith_result
-+
-+	  case $version_type in
-+	    nonstopux) verstring_prefix=nonstopux ;;
-+	    *)         verstring_prefix=sgi ;;
-+	  esac
-+	  verstring="$verstring_prefix$major.$revision"
-+
-+	  # Add in all the interfaces that we are compatible with.
-+	  loop=$revision
-+	  while test "$loop" -ne 0; do
-+	    func_arith $revision - $loop
-+	    iface=$func_arith_result
-+	    func_arith $loop - 1
-+	    loop=$func_arith_result
-+	    verstring="$verstring_prefix$major.$iface:$verstring"
-+	  done
-+
-+	  # Before this point, $major must not contain `.'.
-+	  major=.$major
-+	  versuffix="$major.$revision"
-+	  ;;
-+
-+	linux)
-+	  func_arith $current - $age
-+	  major=.$func_arith_result
-+	  versuffix="$major.$age.$revision"
-+	  ;;
-+
-+	osf)
-+	  func_arith $current - $age
-+	  major=.$func_arith_result
-+	  versuffix=".$current.$age.$revision"
-+	  verstring="$current.$age.$revision"
-+
-+	  # Add in all the interfaces that we are compatible with.
-+	  loop=$age
-+	  while test "$loop" -ne 0; do
-+	    func_arith $current - $loop
-+	    iface=$func_arith_result
-+	    func_arith $loop - 1
-+	    loop=$func_arith_result
-+	    verstring="$verstring:${iface}.0"
-+	  done
-+
-+	  # Make executables depend on our current version.
-+	  verstring="$verstring:${current}.0"
-+	  ;;
-+
-+	qnx)
-+	  major=".$current"
-+	  versuffix=".$current"
-+	  ;;
-+
-+	sunos)
-+	  major=".$current"
-+	  versuffix=".$current.$revision"
-+	  ;;
-+
-+	windows)
-+	  # Use '-' rather than '.', since we only want one
-+	  # extension on DOS 8.3 filesystems.
-+	  func_arith $current - $age
-+	  major=$func_arith_result
-+	  versuffix="-$major"
-+	  ;;
-+
-+	*)
-+	  func_fatal_configuration "unknown library version type \`$version_type'"
-+	  ;;
-+	esac
-+
-+	# Clear the version info if we defaulted, and they specified a release.
-+	if test -z "$vinfo" && test -n "$release"; then
-+	  major=
-+	  case $version_type in
-+	  darwin)
-+	    # we can't check for "0.0" in archive_cmds due to quoting
-+	    # problems, so we reset it completely
-+	    verstring=
-+	    ;;
-+	  *)
-+	    verstring="0.0"
-+	    ;;
-+	  esac
-+	  if test "$need_version" = no; then
-+	    versuffix=
-+	  else
-+	    versuffix=".0.0"
-+	  fi
-+	fi
-+
-+	# Remove version info from name if versioning should be avoided
-+	if test "$avoid_version" = yes && test "$need_version" = no; then
-+	  major=
-+	  versuffix=
-+	  verstring=""
-+	fi
-+
-+	# Check to see if the archive will have undefined symbols.
-+	if test "$allow_undefined" = yes; then
-+	  if test "$allow_undefined_flag" = unsupported; then
-+	    func_warning "undefined symbols not allowed in $host shared libraries"
-+	    build_libtool_libs=no
-+	    build_old_libs=yes
-+	  fi
-+	else
-+	  # Don't allow undefined symbols.
-+	  allow_undefined_flag="$no_undefined_flag"
-+	fi
-+
-+      fi
-+
-+      func_generate_dlsyms "$libname" "$libname" "yes"
-+      libobjs="$libobjs $symfileobj"
-+      test "X$libobjs" = "X " && libobjs=
-+
-+      if test "$mode" != relink; then
-+	# Remove our outputs, but don't remove object files since they
-+	# may have been created when compiling PIC objects.
-+	removelist=
-+	tempremovelist=`$ECHO "$output_objdir/*"`
-+	for p in $tempremovelist; do
-+	  case $p in
-+	    *.$objext | *.gcno)
-+	       ;;
-+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-+	       if test "X$precious_files_regex" != "X"; then
-+		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-+		 then
-+		   continue
-+		 fi
-+	       fi
-+	       removelist="$removelist $p"
-+	       ;;
-+	    *) ;;
-+	  esac
-+	done
-+	test -n "$removelist" && \
-+	  func_show_eval "${RM}r \$removelist"
-+      fi
-+
-+      # Now set the variables for building old libraries.
-+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-+	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-+
-+	# Transform .lo files to .o files.
-+	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-+      fi
-+
-+      # Eliminate all temporary directories.
-+      #for path in $notinst_path; do
-+      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
-+      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
-+      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
-+      #done
-+
-+      if test -n "$xrpath"; then
-+	# If the user specified any rpath flags, then add them.
-+	temp_xrpath=
-+	for libdir in $xrpath; do
-+	  temp_xrpath="$temp_xrpath -R$libdir"
-+	  case "$finalize_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-+	  esac
-+	done
-+	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-+	  dependency_libs="$temp_xrpath $dependency_libs"
-+	fi
-+      fi
-+
-+      # Make sure dlfiles contains only unique files that won't be dlpreopened
-+      old_dlfiles="$dlfiles"
-+      dlfiles=
-+      for lib in $old_dlfiles; do
-+	case " $dlprefiles $dlfiles " in
-+	*" $lib "*) ;;
-+	*) dlfiles="$dlfiles $lib" ;;
-+	esac
-+      done
-+
-+      # Make sure dlprefiles contains only unique files
-+      old_dlprefiles="$dlprefiles"
-+      dlprefiles=
-+      for lib in $old_dlprefiles; do
-+	case "$dlprefiles " in
-+	*" $lib "*) ;;
-+	*) dlprefiles="$dlprefiles $lib" ;;
-+	esac
-+      done
-+
-+      if test "$build_libtool_libs" = yes; then
-+	if test -n "$rpath"; then
-+	  case $host in
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
-+	    # these systems don't actually have a c library (as such)!
-+	    ;;
-+	  *-*-rhapsody* | *-*-darwin1.[012])
-+	    # Rhapsody C library is in the System framework
-+	    deplibs="$deplibs System.ltframework"
-+	    ;;
-+	  *-*-netbsd*)
-+	    # Don't link with libc until the a.out ld.so is fixed.
-+	    ;;
-+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-+	    # Do not include libc due to us having libc/libc_r.
-+	    ;;
-+	  *-*-sco3.2v5* | *-*-sco5v6*)
-+	    # Causes problems with __ctype
-+	    ;;
-+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-+	    # Compiler inserts libc in the correct place for threads to work
-+	    ;;
-+	  *)
-+	    # Add libc to deplibs on all other systems if necessary.
-+	    if test "$build_libtool_need_lc" = "yes"; then
-+	      deplibs="$deplibs -lc"
-+	    fi
-+	    ;;
-+	  esac
-+	fi
-+
-+	# Transform deplibs into only deplibs that can be linked in shared.
-+	name_save=$name
-+	libname_save=$libname
-+	release_save=$release
-+	versuffix_save=$versuffix
-+	major_save=$major
-+	# I'm not sure if I'm treating the release correctly.  I think
-+	# release should show up in the -l (ie -lgmp5) so we don't want to
-+	# add it in twice.  Is that correct?
-+	release=""
-+	versuffix=""
-+	major=""
-+	newdeplibs=
-+	droppeddeps=no
-+	case $deplibs_check_method in
-+	pass_all)
-+	  # Don't check for shared/static.  Everything works.
-+	  # This might be a little naive.  We might want to check
-+	  # whether the library exists or not.  But this is on
-+	  # osf3 & osf4 and I'm not really sure... Just
-+	  # implementing what was already the behavior.
-+	  newdeplibs=$deplibs
-+	  ;;
-+	test_compile)
-+	  # This code stresses the "libraries are programs" paradigm to its
-+	  # limits. Maybe even breaks it.  We compile a program, linking it
-+	  # against the deplibs as a proxy for the library.  Then we can check
-+	  # whether they linked in statically or dynamically with ldd.
-+	  $opt_dry_run || $RM conftest.c
-+	  cat > conftest.c <<EOF
-+	  int main() { return 0; }
-+EOF
-+	  $opt_dry_run || $RM conftest
-+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
-+	    ldd_output=`ldd conftest`
-+	    for i in $deplibs; do
-+	      case $i in
-+	      -l*)
-+		func_stripname -l '' "$i"
-+		name=$func_stripname_result
-+		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+		  case " $predeps $postdeps " in
-+		  *" $i "*)
-+		    newdeplibs="$newdeplibs $i"
-+		    i=""
-+		    ;;
-+		  esac
-+		fi
-+		if test -n "$i" ; then
-+		  libname=`eval "\\$ECHO \"$libname_spec\""`
-+		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-+		  set dummy $deplib_matches; shift
-+		  deplib_match=$1
-+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-+		    newdeplibs="$newdeplibs $i"
-+		  else
-+		    droppeddeps=yes
-+		    $ECHO
-+		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-+		    $ECHO "*** I have the capability to make that library automatically link in when"
-+		    $ECHO "*** you link to this library.  But I can only do this if you have a"
-+		    $ECHO "*** shared version of the library, which I believe you do not have"
-+		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
-+		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
-+		  fi
-+		fi
-+		;;
-+	      *)
-+		newdeplibs="$newdeplibs $i"
-+		;;
-+	      esac
-+	    done
-+	  else
-+	    # Error occurred in the first compile.  Let's try to salvage
-+	    # the situation: Compile a separate program for each library.
-+	    for i in $deplibs; do
-+	      case $i in
-+	      -l*)
-+		func_stripname -l '' "$i"
-+		name=$func_stripname_result
-+		$opt_dry_run || $RM conftest
-+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
-+		  ldd_output=`ldd conftest`
-+		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+		    case " $predeps $postdeps " in
-+		    *" $i "*)
-+		      newdeplibs="$newdeplibs $i"
-+		      i=""
-+		      ;;
-+		    esac
-+		  fi
-+		  if test -n "$i" ; then
-+		    libname=`eval "\\$ECHO \"$libname_spec\""`
-+		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-+		    set dummy $deplib_matches; shift
-+		    deplib_match=$1
-+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-+		      newdeplibs="$newdeplibs $i"
-+		    else
-+		      droppeddeps=yes
-+		      $ECHO
-+		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-+		      $ECHO "*** I have the capability to make that library automatically link in when"
-+		      $ECHO "*** you link to this library.  But I can only do this if you have a"
-+		      $ECHO "*** shared version of the library, which you do not appear to have"
-+		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"
-+		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
-+		    fi
-+		  fi
-+		else
-+		  droppeddeps=yes
-+		  $ECHO
-+		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-+		  $ECHO "*** make it link in!  You will probably need to install it or some"
-+		  $ECHO "*** library that it depends on before this library will be fully"
-+		  $ECHO "*** functional.  Installing it before continuing would be even better."
-+		fi
-+		;;
-+	      *)
-+		newdeplibs="$newdeplibs $i"
-+		;;
-+	      esac
-+	    done
-+	  fi
-+	  ;;
-+	file_magic*)
-+	  set dummy $deplibs_check_method; shift
-+	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-+	  for a_deplib in $deplibs; do
-+	    case $a_deplib in
-+	    -l*)
-+	      func_stripname -l '' "$a_deplib"
-+	      name=$func_stripname_result
-+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+		case " $predeps $postdeps " in
-+		*" $a_deplib "*)
-+		  newdeplibs="$newdeplibs $a_deplib"
-+		  a_deplib=""
-+		  ;;
-+		esac
-+	      fi
-+	      if test -n "$a_deplib" ; then
-+		libname=`eval "\\$ECHO \"$libname_spec\""`
-+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-+		  for potent_lib in $potential_libs; do
-+		      # Follow soft links.
-+		      if ls -lLd "$potent_lib" 2>/dev/null |
-+			 $GREP " -> " >/dev/null; then
-+			continue
-+		      fi
-+		      # The statement above tries to avoid entering an
-+		      # endless loop below, in case of cyclic links.
-+		      # We might still enter an endless loop, since a link
-+		      # loop can be closed while we follow links,
-+		      # but so what?
-+		      potlib="$potent_lib"
-+		      while test -h "$potlib" 2>/dev/null; do
-+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-+			case $potliblink in
-+			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-+			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-+			esac
-+		      done
-+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
-+			 $SED -e 10q |
-+			 $EGREP "$file_magic_regex" > /dev/null; then
-+			newdeplibs="$newdeplibs $a_deplib"
-+			a_deplib=""
-+			break 2
-+		      fi
-+		  done
-+		done
-+	      fi
-+	      if test -n "$a_deplib" ; then
-+		droppeddeps=yes
-+		$ECHO
-+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-+		$ECHO "*** I have the capability to make that library automatically link in when"
-+		$ECHO "*** you link to this library.  But I can only do this if you have a"
-+		$ECHO "*** shared version of the library, which you do not appear to have"
-+		$ECHO "*** because I did check the linker path looking for a file starting"
-+		if test -z "$potlib" ; then
-+		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
-+		else
-+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-+		  $ECHO "*** using a file magic. Last file checked: $potlib"
-+		fi
-+	      fi
-+	      ;;
-+	    *)
-+	      # Add a -L argument.
-+	      newdeplibs="$newdeplibs $a_deplib"
-+	      ;;
-+	    esac
-+	  done # Gone through all deplibs.
-+	  ;;
-+	match_pattern*)
-+	  set dummy $deplibs_check_method; shift
-+	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-+	  for a_deplib in $deplibs; do
-+	    case $a_deplib in
-+	    -l*)
-+	      func_stripname -l '' "$a_deplib"
-+	      name=$func_stripname_result
-+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+		case " $predeps $postdeps " in
-+		*" $a_deplib "*)
-+		  newdeplibs="$newdeplibs $a_deplib"
-+		  a_deplib=""
-+		  ;;
-+		esac
-+	      fi
-+	      if test -n "$a_deplib" ; then
-+		libname=`eval "\\$ECHO \"$libname_spec\""`
-+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-+		  for potent_lib in $potential_libs; do
-+		    potlib="$potent_lib" # see symlink-check above in file_magic test
-+		    if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
-+		       $EGREP "$match_pattern_regex" > /dev/null; then
-+		      newdeplibs="$newdeplibs $a_deplib"
-+		      a_deplib=""
-+		      break 2
-+		    fi
-+		  done
-+		done
-+	      fi
-+	      if test -n "$a_deplib" ; then
-+		droppeddeps=yes
-+		$ECHO
-+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-+		$ECHO "*** I have the capability to make that library automatically link in when"
-+		$ECHO "*** you link to this library.  But I can only do this if you have a"
-+		$ECHO "*** shared version of the library, which you do not appear to have"
-+		$ECHO "*** because I did check the linker path looking for a file starting"
-+		if test -z "$potlib" ; then
-+		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
-+		else
-+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-+		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
-+		fi
-+	      fi
-+	      ;;
-+	    *)
-+	      # Add a -L argument.
-+	      newdeplibs="$newdeplibs $a_deplib"
-+	      ;;
-+	    esac
-+	  done # Gone through all deplibs.
-+	  ;;
-+	none | unknown | *)
-+	  newdeplibs=""
-+	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
-+	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
-+	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+	    for i in $predeps $postdeps ; do
-+	      # can't use Xsed below, because $i might contain '/'
-+	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
-+	    done
-+	  fi
-+	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
-+	     $GREP . >/dev/null; then
-+	    $ECHO
-+	    if test "X$deplibs_check_method" = "Xnone"; then
-+	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
-+	    else
-+	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
-+	    fi
-+	    $ECHO "*** All declared inter-library dependencies are being dropped."
-+	    droppeddeps=yes
-+	  fi
-+	  ;;
-+	esac
-+	versuffix=$versuffix_save
-+	major=$major_save
-+	release=$release_save
-+	libname=$libname_save
-+	name=$name_save
-+
-+	case $host in
-+	*-*-rhapsody* | *-*-darwin1.[012])
-+	  # On Rhapsody replace the C library with the System framework
-+	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-+	  ;;
-+	esac
-+
-+	if test "$droppeddeps" = yes; then
-+	  if test "$module" = yes; then
-+	    $ECHO
-+	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
-+	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-+	    $ECHO "*** a static module, that should work as long as the dlopening"
-+	    $ECHO "*** application is linked with the -dlopen flag."
-+	    if test -z "$global_symbol_pipe"; then
-+	      $ECHO
-+	      $ECHO "*** However, this would only work if libtool was able to extract symbol"
-+	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+	      $ECHO "*** not find such a program.  So, this module is probably useless."
-+	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
-+	    fi
-+	    if test "$build_old_libs" = no; then
-+	      oldlibs="$output_objdir/$libname.$libext"
-+	      build_libtool_libs=module
-+	      build_old_libs=yes
-+	    else
-+	      build_libtool_libs=no
-+	    fi
-+	  else
-+	    $ECHO "*** The inter-library dependencies that have been dropped here will be"
-+	    $ECHO "*** automatically added whenever a program is linked with this library"
-+	    $ECHO "*** or is declared to -dlopen it."
-+
-+	    if test "$allow_undefined" = no; then
-+	      $ECHO
-+	      $ECHO "*** Since this library must not contain undefined symbols,"
-+	      $ECHO "*** because either the platform does not support them or"
-+	      $ECHO "*** it was explicitly requested with -no-undefined,"
-+	      $ECHO "*** libtool will only create a static version of it."
-+	      if test "$build_old_libs" = no; then
-+		oldlibs="$output_objdir/$libname.$libext"
-+		build_libtool_libs=module
-+		build_old_libs=yes
-+	      else
-+		build_libtool_libs=no
-+	      fi
-+	    fi
-+	  fi
-+	fi
-+	# Done checking deplibs!
-+	deplibs=$newdeplibs
-+      fi
-+      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-+      case $host in
-+	*-*-darwin*)
-+	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  ;;
-+      esac
-+
-+      # move library search paths that coincide with paths to not yet
-+      # installed libraries to the beginning of the library search list
-+      new_libs=
-+      for path in $notinst_path; do
-+	case " $new_libs " in
-+	*" -L$path/$objdir "*) ;;
-+	*)
-+	  case " $deplibs " in
-+	  *" -L$path/$objdir "*)
-+	    new_libs="$new_libs -L$path/$objdir" ;;
-+	  esac
-+	  ;;
-+	esac
-+      done
-+      for deplib in $deplibs; do
-+	case $deplib in
-+	-L*)
-+	  case " $new_libs " in
-+	  *" $deplib "*) ;;
-+	  *) new_libs="$new_libs $deplib" ;;
-+	  esac
-+	  ;;
-+	*) new_libs="$new_libs $deplib" ;;
-+	esac
-+      done
-+      deplibs="$new_libs"
-+
-+      # All the library-specific variables (install_libdir is set above).
-+      library_names=
-+      old_library=
-+      dlname=
-+
-+      # Test again, we may have decided not to build it any more
-+      if test "$build_libtool_libs" = yes; then
-+	if test "$hardcode_into_libs" = yes; then
-+	  # Hardcode the library paths
-+	  hardcode_libdirs=
-+	  dep_rpath=
-+	  rpath="$finalize_rpath"
-+	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-+	  for libdir in $rpath; do
-+	    if test -n "$hardcode_libdir_flag_spec"; then
-+	      if test -n "$hardcode_libdir_separator"; then
-+		if test -z "$hardcode_libdirs"; then
-+		  hardcode_libdirs="$libdir"
-+		else
-+		  # Just accumulate the unique libdirs.
-+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+		    ;;
-+		  *)
-+		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		    ;;
-+		  esac
-+		fi
-+	      else
-+		eval flag=\"$hardcode_libdir_flag_spec\"
-+		dep_rpath="$dep_rpath $flag"
-+	      fi
-+	    elif test -n "$runpath_var"; then
-+	      case "$perm_rpath " in
-+	      *" $libdir "*) ;;
-+	      *) perm_rpath="$perm_rpath $libdir" ;;
-+	      esac
-+	    fi
-+	  done
-+	  # Substitute the hardcoded libdirs into the rpath.
-+	  if test -n "$hardcode_libdir_separator" &&
-+	     test -n "$hardcode_libdirs"; then
-+	    libdir="$hardcode_libdirs"
-+	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-+	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-+	    else
-+	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-+	    fi
-+	  fi
-+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-+	    # We should set the runpath_var.
-+	    rpath=
-+	    for dir in $perm_rpath; do
-+	      rpath="$rpath$dir:"
-+	    done
-+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-+	  fi
-+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-+	fi
-+
-+	shlibpath="$finalize_shlibpath"
-+	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-+	if test -n "$shlibpath"; then
-+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-+	fi
-+
-+	# Get the real and link names of the library.
-+	eval shared_ext=\"$shrext_cmds\"
-+	eval library_names=\"$library_names_spec\"
-+	set dummy $library_names
-+	shift
-+	realname="$1"
-+	shift
-+
-+	if test -n "$soname_spec"; then
-+	  eval soname=\"$soname_spec\"
-+	else
-+	  soname="$realname"
-+	fi
-+	if test -z "$dlname"; then
-+	  dlname=$soname
-+	fi
-+
-+	lib="$output_objdir/$realname"
-+	linknames=
-+	for link
-+	do
-+	  linknames="$linknames $link"
-+	done
-+
-+	# Use standard objects if they are pic
-+	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	test "X$libobjs" = "X " && libobjs=
-+
-+	delfiles=
-+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-+	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-+	  export_symbols="$output_objdir/$libname.uexp"
-+	  delfiles="$delfiles $export_symbols"
-+	fi
-+
-+	orig_export_symbols=
-+	case $host_os in
-+	cygwin* | mingw* | cegcc*)
-+	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
-+	    # exporting using user supplied symfile
-+	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
-+	      # and it's NOT already a .def file. Must figure out
-+	      # which of the given symbols are data symbols and tag
-+	      # them as such. So, trigger use of export_symbols_cmds.
-+	      # export_symbols gets reassigned inside the "prepare
-+	      # the list of exported symbols" if statement, so the
-+	      # include_expsyms logic still works.
-+	      orig_export_symbols="$export_symbols"
-+	      export_symbols=
-+	      always_export_symbols=yes
-+	    fi
-+	  fi
-+	  ;;
-+	esac
-+
-+	# Prepare the list of exported symbols
-+	if test -z "$export_symbols"; then
-+	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-+	    func_verbose "generating symbol list for \`$libname.la'"
-+	    export_symbols="$output_objdir/$libname.exp"
-+	    $opt_dry_run || $RM $export_symbols
-+	    cmds=$export_symbols_cmds
-+	    save_ifs="$IFS"; IFS='~'
-+	    for cmd in $cmds; do
-+	      IFS="$save_ifs"
-+	      eval cmd=\"$cmd\"
-+	      func_len " $cmd"
-+	      len=$func_len_result
-+	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-+		func_show_eval "$cmd" 'exit $?'
-+		skipped_export=false
-+	      else
-+		# The command line is too long to execute in one step.
-+		func_verbose "using reloadable object file for export list..."
-+		skipped_export=:
-+		# Break out early, otherwise skipped_export may be
-+		# set to false by a later but shorter cmd.
-+		break
-+	      fi
-+	    done
-+	    IFS="$save_ifs"
-+	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
-+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-+	    fi
-+	  fi
-+	fi
-+
-+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-+	  tmp_export_symbols="$export_symbols"
-+	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-+	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
-+	fi
-+
-+	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-+	  # The given exports_symbols file has to be filtered, so filter it.
-+	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-+	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
-+	  # 's' commands which not all seds can handle. GNU sed should be fine
-+	  # though. Also, the filter scales superlinearly with the number of
-+	  # global variables. join(1) would be nice here, but unfortunately
-+	  # isn't a blessed tool.
-+	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-+	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
-+	  export_symbols=$output_objdir/$libname.def
-+	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-+	fi
-+
-+	tmp_deplibs=
-+	for test_deplib in $deplibs; do
-+	  case " $convenience " in
-+	  *" $test_deplib "*) ;;
-+	  *)
-+	    tmp_deplibs="$tmp_deplibs $test_deplib"
-+	    ;;
-+	  esac
-+	done
-+	deplibs="$tmp_deplibs"
-+
-+	if test -n "$convenience"; then
-+	  if test -n "$whole_archive_flag_spec" &&
-+	    test "$compiler_needs_object" = yes &&
-+	    test -z "$libobjs"; then
-+	    # extract the archives, so we have objects to list.
-+	    # TODO: could optimize this to just extract one archive.
-+	    whole_archive_flag_spec=
-+	  fi
-+	  if test -n "$whole_archive_flag_spec"; then
-+	    save_libobjs=$libobjs
-+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-+	    test "X$libobjs" = "X " && libobjs=
-+	  else
-+	    gentop="$output_objdir/${outputname}x"
-+	    generated="$generated $gentop"
-+
-+	    func_extract_archives $gentop $convenience
-+	    libobjs="$libobjs $func_extract_archives_result"
-+	    test "X$libobjs" = "X " && libobjs=
-+	  fi
-+	fi
-+
-+	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-+	  eval flag=\"$thread_safe_flag_spec\"
-+	  linker_flags="$linker_flags $flag"
-+	fi
-+
-+	# Make a backup of the uninstalled library when relinking
-+	if test "$mode" = relink; then
-+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
-+	fi
-+
-+	# Do each of the archive commands.
-+	if test "$module" = yes && test -n "$module_cmds" ; then
-+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-+	    eval test_cmds=\"$module_expsym_cmds\"
-+	    cmds=$module_expsym_cmds
-+	  else
-+	    eval test_cmds=\"$module_cmds\"
-+	    cmds=$module_cmds
-+	  fi
-+	else
-+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-+	    eval test_cmds=\"$archive_expsym_cmds\"
-+	    cmds=$archive_expsym_cmds
-+	  else
-+	    eval test_cmds=\"$archive_cmds\"
-+	    cmds=$archive_cmds
-+	  fi
-+	fi
-+
-+	if test "X$skipped_export" != "X:" &&
-+	   func_len " $test_cmds" &&
-+	   len=$func_len_result &&
-+	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-+	  :
-+	else
-+	  # The command line is too long to link in one step, link piecewise
-+	  # or, if using GNU ld and skipped_export is not :, use a linker
-+	  # script.
-+
-+	  # Save the value of $output and $libobjs because we want to
-+	  # use them later.  If we have whole_archive_flag_spec, we
-+	  # want to use save_libobjs as it was before
-+	  # whole_archive_flag_spec was expanded, because we can't
-+	  # assume the linker understands whole_archive_flag_spec.
-+	  # This may have to be revisited, in case too many
-+	  # convenience libraries get linked in and end up exceeding
-+	  # the spec.
-+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-+	    save_libobjs=$libobjs
-+	  fi
-+	  save_output=$output
-+	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
-+
-+	  # Clear the reloadable object creation command queue and
-+	  # initialize k to one.
-+	  test_cmds=
-+	  concat_cmds=
-+	  objlist=
-+	  last_robj=
-+	  k=1
-+
-+	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-+	    output=${output_objdir}/${output_la}.lnkscript
-+	    func_verbose "creating GNU ld script: $output"
-+	    $ECHO 'INPUT (' > $output
-+	    for obj in $save_libobjs
-+	    do
-+	      $ECHO "$obj" >> $output
-+	    done
-+	    $ECHO ')' >> $output
-+	    delfiles="$delfiles $output"
-+	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-+	    output=${output_objdir}/${output_la}.lnk
-+	    func_verbose "creating linker input file list: $output"
-+	    : > $output
-+	    set x $save_libobjs
-+	    shift
-+	    firstobj=
-+	    if test "$compiler_needs_object" = yes; then
-+	      firstobj="$1 "
-+	      shift
-+	    fi
-+	    for obj
-+	    do
-+	      $ECHO "$obj" >> $output
-+	    done
-+	    delfiles="$delfiles $output"
-+	    output=$firstobj\"$file_list_spec$output\"
-+	  else
-+	    if test -n "$save_libobjs"; then
-+	      func_verbose "creating reloadable object files..."
-+	      output=$output_objdir/$output_la-${k}.$objext
-+	      eval test_cmds=\"$reload_cmds\"
-+	      func_len " $test_cmds"
-+	      len0=$func_len_result
-+	      len=$len0
-+
-+	      # Loop over the list of objects to be linked.
-+	      for obj in $save_libobjs
-+	      do
-+		func_len " $obj"
-+		func_arith $len + $func_len_result
-+		len=$func_arith_result
-+		if test "X$objlist" = X ||
-+		   test "$len" -lt "$max_cmd_len"; then
-+		  func_append objlist " $obj"
-+		else
-+		  # The command $test_cmds is almost too long, add a
-+		  # command to the queue.
-+		  if test "$k" -eq 1 ; then
-+		    # The first file doesn't have a previous command to add.
-+		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-+		  else
-+		    # All subsequent reloadable object files will link in
-+		    # the last one created.
-+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
-+		  fi
-+		  last_robj=$output_objdir/$output_la-${k}.$objext
-+		  func_arith $k + 1
-+		  k=$func_arith_result
-+		  output=$output_objdir/$output_la-${k}.$objext
-+		  objlist=$obj
-+		  func_len " $last_robj"
-+		  func_arith $len0 + $func_len_result
-+		  len=$func_arith_result
-+		fi
-+	      done
-+	      # Handle the remaining objects by creating one last
-+	      # reloadable object file.  All subsequent reloadable object
-+	      # files will link in the last one created.
-+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-+	      if test -n "$last_robj"; then
-+	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
-+	      fi
-+	      delfiles="$delfiles $output"
-+
-+	    else
-+	      output=
-+	    fi
-+
-+	    if ${skipped_export-false}; then
-+	      func_verbose "generating symbol list for \`$libname.la'"
-+	      export_symbols="$output_objdir/$libname.exp"
-+	      $opt_dry_run || $RM $export_symbols
-+	      libobjs=$output
-+	      # Append the command to create the export file.
-+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-+	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
-+	      if test -n "$last_robj"; then
-+		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
-+	      fi
-+	    fi
-+
-+	    test -n "$save_libobjs" &&
-+	      func_verbose "creating a temporary reloadable object file: $output"
-+
-+	    # Loop through the commands generated above and execute them.
-+	    save_ifs="$IFS"; IFS='~'
-+	    for cmd in $concat_cmds; do
-+	      IFS="$save_ifs"
-+	      $opt_silent || {
-+		  func_quote_for_expand "$cmd"
-+		  eval "func_echo $func_quote_for_expand_result"
-+	      }
-+	      $opt_dry_run || eval "$cmd" || {
-+		lt_exit=$?
-+
-+		# Restore the uninstalled library and exit
-+		if test "$mode" = relink; then
-+		  ( cd "$output_objdir" && \
-+		    $RM "${realname}T" && \
-+		    $MV "${realname}U" "$realname" )
-+		fi
-+
-+		exit $lt_exit
-+	      }
-+	    done
-+	    IFS="$save_ifs"
-+
-+	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
-+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-+	    fi
-+	  fi
-+
-+          if ${skipped_export-false}; then
-+	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
-+	      tmp_export_symbols="$export_symbols"
-+	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-+	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
-+	    fi
-+
-+	    if test -n "$orig_export_symbols"; then
-+	      # The given exports_symbols file has to be filtered, so filter it.
-+	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-+	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
-+	      # 's' commands which not all seds can handle. GNU sed should be fine
-+	      # though. Also, the filter scales superlinearly with the number of
-+	      # global variables. join(1) would be nice here, but unfortunately
-+	      # isn't a blessed tool.
-+	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-+	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
-+	      export_symbols=$output_objdir/$libname.def
-+	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-+	    fi
-+	  fi
-+
-+	  libobjs=$output
-+	  # Restore the value of output.
-+	  output=$save_output
-+
-+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-+	    test "X$libobjs" = "X " && libobjs=
-+	  fi
-+	  # Expand the library linking commands again to reset the
-+	  # value of $libobjs for piecewise linking.
-+
-+	  # Do each of the archive commands.
-+	  if test "$module" = yes && test -n "$module_cmds" ; then
-+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-+	      cmds=$module_expsym_cmds
-+	    else
-+	      cmds=$module_cmds
-+	    fi
-+	  else
-+	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-+	      cmds=$archive_expsym_cmds
-+	    else
-+	      cmds=$archive_cmds
-+	    fi
-+	  fi
-+	fi
-+
-+	if test -n "$delfiles"; then
-+	  # Append the command to remove temporary files to $cmds.
-+	  eval cmds=\"\$cmds~\$RM $delfiles\"
-+	fi
-+
-+	# Add any objects from preloaded convenience libraries
-+	if test -n "$dlprefiles"; then
-+	  gentop="$output_objdir/${outputname}x"
-+	  generated="$generated $gentop"
-+
-+	  func_extract_archives $gentop $dlprefiles
-+	  libobjs="$libobjs $func_extract_archives_result"
-+	  test "X$libobjs" = "X " && libobjs=
-+	fi
-+
-+	save_ifs="$IFS"; IFS='~'
-+	for cmd in $cmds; do
-+	  IFS="$save_ifs"
-+	  eval cmd=\"$cmd\"
-+	  $opt_silent || {
-+	    func_quote_for_expand "$cmd"
-+	    eval "func_echo $func_quote_for_expand_result"
-+	  }
-+	  $opt_dry_run || eval "$cmd" || {
-+	    lt_exit=$?
-+
-+	    # Restore the uninstalled library and exit
-+	    if test "$mode" = relink; then
-+	      ( cd "$output_objdir" && \
-+	        $RM "${realname}T" && \
-+		$MV "${realname}U" "$realname" )
-+	    fi
-+
-+	    exit $lt_exit
-+	  }
-+	done
-+	IFS="$save_ifs"
-+
-+	# Restore the uninstalled library and exit
-+	if test "$mode" = relink; then
-+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
-+
-+	  if test -n "$convenience"; then
-+	    if test -z "$whole_archive_flag_spec"; then
-+	      func_show_eval '${RM}r "$gentop"'
-+	    fi
-+	  fi
-+
-+	  exit $EXIT_SUCCESS
-+	fi
-+
-+	# Create links to the real library.
-+	for linkname in $linknames; do
-+	  if test "$realname" != "$linkname"; then
-+	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
-+	  fi
-+	done
-+
-+	# If -module or -export-dynamic was specified, set the dlname.
-+	if test "$module" = yes || test "$export_dynamic" = yes; then
-+	  # On all known operating systems, these are identical.
-+	  dlname="$soname"
-+	fi
-+      fi
-+      ;;
-+
-+    obj)
-+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+	func_warning "\`-dlopen' is ignored for objects"
-+      fi
-+
-+      case " $deplibs" in
-+      *\ -l* | *\ -L*)
-+	func_warning "\`-l' and \`-L' are ignored for objects" ;;
-+      esac
-+
-+      test -n "$rpath" && \
-+	func_warning "\`-rpath' is ignored for objects"
-+
-+      test -n "$xrpath" && \
-+	func_warning "\`-R' is ignored for objects"
-+
-+      test -n "$vinfo" && \
-+	func_warning "\`-version-info' is ignored for objects"
-+
-+      test -n "$release" && \
-+	func_warning "\`-release' is ignored for objects"
-+
-+      case $output in
-+      *.lo)
-+	test -n "$objs$old_deplibs" && \
-+	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
-+
-+	libobj=$output
-+	func_lo2o "$libobj"
-+	obj=$func_lo2o_result
-+	;;
-+      *)
-+	libobj=
-+	obj="$output"
-+	;;
-+      esac
-+
-+      # Delete the old objects.
-+      $opt_dry_run || $RM $obj $libobj
-+
-+      # Objects from convenience libraries.  This assumes
-+      # single-version convenience libraries.  Whenever we create
-+      # different ones for PIC/non-PIC, this we'll have to duplicate
-+      # the extraction.
-+      reload_conv_objs=
-+      gentop=
-+      # reload_cmds runs $LD directly, so let us get rid of
-+      # -Wl from whole_archive_flag_spec and hope we can get by with
-+      # turning comma into space..
-+      wl=
-+
-+      if test -n "$convenience"; then
-+	if test -n "$whole_archive_flag_spec"; then
-+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-+	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
-+	else
-+	  gentop="$output_objdir/${obj}x"
-+	  generated="$generated $gentop"
-+
-+	  func_extract_archives $gentop $convenience
-+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-+	fi
-+      fi
-+
-+      # Create the old-style object.
-+      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-+
-+      output="$obj"
-+      func_execute_cmds "$reload_cmds" 'exit $?'
-+
-+      # Exit if we aren't doing a library object file.
-+      if test -z "$libobj"; then
-+	if test -n "$gentop"; then
-+	  func_show_eval '${RM}r "$gentop"'
-+	fi
-+
-+	exit $EXIT_SUCCESS
-+      fi
-+
-+      if test "$build_libtool_libs" != yes; then
-+	if test -n "$gentop"; then
-+	  func_show_eval '${RM}r "$gentop"'
-+	fi
-+
-+	# Create an invalid libtool object if no PIC, so that we don't
-+	# accidentally link it into a program.
-+	# $show "echo timestamp > $libobj"
-+	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
-+	exit $EXIT_SUCCESS
-+      fi
-+
-+      if test -n "$pic_flag" || test "$pic_mode" != default; then
-+	# Only do commands if we really have different PIC objects.
-+	reload_objs="$libobjs $reload_conv_objs"
-+	output="$libobj"
-+	func_execute_cmds "$reload_cmds" 'exit $?'
-+      fi
-+
-+      if test -n "$gentop"; then
-+	func_show_eval '${RM}r "$gentop"'
-+      fi
-+
-+      exit $EXIT_SUCCESS
-+      ;;
-+
-+    prog)
-+      case $host in
-+	*cygwin*) func_stripname '' '.exe' "$output"
-+	          output=$func_stripname_result.exe;;
-+      esac
-+      test -n "$vinfo" && \
-+	func_warning "\`-version-info' is ignored for programs"
-+
-+      test -n "$release" && \
-+	func_warning "\`-release' is ignored for programs"
-+
-+      test "$preload" = yes \
-+        && test "$dlopen_support" = unknown \
-+	&& test "$dlopen_self" = unknown \
-+	&& test "$dlopen_self_static" = unknown && \
-+	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
-+
-+      case $host in
-+      *-*-rhapsody* | *-*-darwin1.[012])
-+	# On Rhapsody replace the C library is the System framework
-+	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-+	;;
-+      esac
-+
-+      case $host in
-+      *-*-darwin*)
-+	# Don't allow lazy linking, it breaks C++ global constructors
-+	# But is supposedly fixed on 10.4 or later (yay!).
-+	if test "$tagname" = CXX ; then
-+	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
-+	    10.[0123])
-+	      compile_command="$compile_command ${wl}-bind_at_load"
-+	      finalize_command="$finalize_command ${wl}-bind_at_load"
-+	    ;;
-+	  esac
-+	fi
-+	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-+	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	;;
-+      esac
-+
-+
-+      # move library search paths that coincide with paths to not yet
-+      # installed libraries to the beginning of the library search list
-+      new_libs=
-+      for path in $notinst_path; do
-+	case " $new_libs " in
-+	*" -L$path/$objdir "*) ;;
-+	*)
-+	  case " $compile_deplibs " in
-+	  *" -L$path/$objdir "*)
-+	    new_libs="$new_libs -L$path/$objdir" ;;
-+	  esac
-+	  ;;
-+	esac
-+      done
-+      for deplib in $compile_deplibs; do
-+	case $deplib in
-+	-L*)
-+	  case " $new_libs " in
-+	  *" $deplib "*) ;;
-+	  *) new_libs="$new_libs $deplib" ;;
-+	  esac
-+	  ;;
-+	*) new_libs="$new_libs $deplib" ;;
-+	esac
-+      done
-+      compile_deplibs="$new_libs"
-+
-+
-+      compile_command="$compile_command $compile_deplibs"
-+      finalize_command="$finalize_command $finalize_deplibs"
-+
-+      if test -n "$rpath$xrpath"; then
-+	# If the user specified any rpath flags, then add them.
-+	for libdir in $rpath $xrpath; do
-+	  # This is the magic to use -rpath.
-+	  case "$finalize_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-+	  esac
-+	done
-+      fi
-+
-+      # Now hardcode the library paths
-+      rpath=
-+      hardcode_libdirs=
-+      for libdir in $compile_rpath $finalize_rpath; do
-+	if test -n "$hardcode_libdir_flag_spec"; then
-+	  if test -n "$hardcode_libdir_separator"; then
-+	    if test -z "$hardcode_libdirs"; then
-+	      hardcode_libdirs="$libdir"
-+	    else
-+	      # Just accumulate the unique libdirs.
-+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+		;;
-+	      *)
-+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		;;
-+	      esac
-+	    fi
-+	  else
-+	    eval flag=\"$hardcode_libdir_flag_spec\"
-+	    rpath="$rpath $flag"
-+	  fi
-+	elif test -n "$runpath_var"; then
-+	  case "$perm_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) perm_rpath="$perm_rpath $libdir" ;;
-+	  esac
-+	fi
-+	case $host in
-+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-+	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
-+	  case :$dllsearchpath: in
-+	  *":$libdir:"*) ;;
-+	  ::) dllsearchpath=$libdir;;
-+	  *) dllsearchpath="$dllsearchpath:$libdir";;
-+	  esac
-+	  case :$dllsearchpath: in
-+	  *":$testbindir:"*) ;;
-+	  ::) dllsearchpath=$testbindir;;
-+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-+	  esac
-+	  ;;
-+	esac
-+      done
-+      # Substitute the hardcoded libdirs into the rpath.
-+      if test -n "$hardcode_libdir_separator" &&
-+	 test -n "$hardcode_libdirs"; then
-+	libdir="$hardcode_libdirs"
-+	eval rpath=\" $hardcode_libdir_flag_spec\"
-+      fi
-+      compile_rpath="$rpath"
-+
-+      rpath=
-+      hardcode_libdirs=
-+      for libdir in $finalize_rpath; do
-+	if test -n "$hardcode_libdir_flag_spec"; then
-+	  if test -n "$hardcode_libdir_separator"; then
-+	    if test -z "$hardcode_libdirs"; then
-+	      hardcode_libdirs="$libdir"
-+	    else
-+	      # Just accumulate the unique libdirs.
-+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+		;;
-+	      *)
-+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		;;
-+	      esac
-+	    fi
-+	  else
-+	    eval flag=\"$hardcode_libdir_flag_spec\"
-+	    rpath="$rpath $flag"
-+	  fi
-+	elif test -n "$runpath_var"; then
-+	  case "$finalize_perm_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-+	  esac
-+	fi
-+      done
-+      # Substitute the hardcoded libdirs into the rpath.
-+      if test -n "$hardcode_libdir_separator" &&
-+	 test -n "$hardcode_libdirs"; then
-+	libdir="$hardcode_libdirs"
-+	eval rpath=\" $hardcode_libdir_flag_spec\"
-+      fi
-+      finalize_rpath="$rpath"
-+
-+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-+	# Transform all the library objects into standard objects.
-+	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+      fi
-+
-+      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-+
-+      # template prelinking step
-+      if test -n "$prelink_cmds"; then
-+	func_execute_cmds "$prelink_cmds" 'exit $?'
-+      fi
-+
-+      wrappers_required=yes
-+      case $host in
-+      *cygwin* | *mingw* )
-+        if test "$build_libtool_libs" != yes; then
-+          wrappers_required=no
-+        fi
-+        ;;
-+      *cegcc)
-+        # Disable wrappers for cegcc, we are cross compiling anyway.
-+        wrappers_required=no
-+        ;;
-+      *)
-+        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-+          wrappers_required=no
-+        fi
-+        ;;
-+      esac
-+      if test "$wrappers_required" = no; then
-+	# Replace the output file specification.
-+	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+	link_command="$compile_command$compile_rpath"
-+
-+	# We have no uninstalled library dependencies, so finalize right now.
-+	exit_status=0
-+	func_show_eval "$link_command" 'exit_status=$?'
-+
-+	# Delete the generated files.
-+	if test -f "$output_objdir/${outputname}S.${objext}"; then
-+	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-+	fi
-+
-+	exit $exit_status
-+      fi
-+
-+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-+      fi
-+      if test -n "$finalize_shlibpath"; then
-+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-+      fi
-+
-+      compile_var=
-+      finalize_var=
-+      if test -n "$runpath_var"; then
-+	if test -n "$perm_rpath"; then
-+	  # We should set the runpath_var.
-+	  rpath=
-+	  for dir in $perm_rpath; do
-+	    rpath="$rpath$dir:"
-+	  done
-+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-+	fi
-+	if test -n "$finalize_perm_rpath"; then
-+	  # We should set the runpath_var.
-+	  rpath=
-+	  for dir in $finalize_perm_rpath; do
-+	    rpath="$rpath$dir:"
-+	  done
-+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-+	fi
-+      fi
-+
-+      if test "$no_install" = yes; then
-+	# We don't need to create a wrapper script.
-+	link_command="$compile_var$compile_command$compile_rpath"
-+	# Replace the output file specification.
-+	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+	# Delete the old output file.
-+	$opt_dry_run || $RM $output
-+	# Link the executable and exit
-+	func_show_eval "$link_command" 'exit $?'
-+	exit $EXIT_SUCCESS
-+      fi
-+
-+      if test "$hardcode_action" = relink; then
-+	# Fast installation is not supported
-+	link_command="$compile_var$compile_command$compile_rpath"
-+	relink_command="$finalize_var$finalize_command$finalize_rpath"
-+
-+	func_warning "this platform does not like uninstalled shared libraries"
-+	func_warning "\`$output' will be relinked during installation"
-+      else
-+	if test "$fast_install" != no; then
-+	  link_command="$finalize_var$compile_command$finalize_rpath"
-+	  if test "$fast_install" = yes; then
-+	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-+	  else
-+	    # fast_install is set to needless
-+	    relink_command=
-+	  fi
-+	else
-+	  link_command="$compile_var$compile_command$compile_rpath"
-+	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-+	fi
-+      fi
-+
-+      # Replace the output file specification.
-+      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-+
-+      # Delete the old output files.
-+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
-+
-+      func_show_eval "$link_command" 'exit $?'
-+
-+      # Now create the wrapper script.
-+      func_verbose "creating $output"
-+
-+      # Quote the relink command for shipping.
-+      if test -n "$relink_command"; then
-+	# Preserve any variables that may affect compiler behavior
-+	for var in $variables_saved_for_relink; do
-+	  if eval test -z \"\${$var+set}\"; then
-+	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-+	  elif eval var_value=\$$var; test -z "$var_value"; then
-+	    relink_command="$var=; export $var; $relink_command"
-+	  else
-+	    func_quote_for_eval "$var_value"
-+	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-+	  fi
-+	done
-+	relink_command="(cd `pwd`; $relink_command)"
-+	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+      fi
-+
-+      # Quote $ECHO for shipping.
-+      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
-+	case $progpath in
-+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-+	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-+	esac
-+	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
-+      else
-+	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
-+      fi
-+
-+      # Only actually do things if not in dry run mode.
-+      $opt_dry_run || {
-+	# win32 will think the script is a binary if it has
-+	# a .exe suffix, so we strip it off here.
-+	case $output in
-+	  *.exe) func_stripname '' '.exe' "$output"
-+	         output=$func_stripname_result ;;
-+	esac
-+	# test for cygwin because mv fails w/o .exe extensions
-+	case $host in
-+	  *cygwin*)
-+	    exeext=.exe
-+	    func_stripname '' '.exe' "$outputname"
-+	    outputname=$func_stripname_result ;;
-+	  *) exeext= ;;
-+	esac
-+	case $host in
-+	  *cygwin* | *mingw* )
-+	    func_dirname_and_basename "$output" "" "."
-+	    output_name=$func_basename_result
-+	    output_path=$func_dirname_result
-+	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
-+	    cwrapper="$output_path/$output_name.exe"
-+	    $RM $cwrappersource $cwrapper
-+	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-+
-+	    func_emit_cwrapperexe_src > $cwrappersource
-+
-+	    # The wrapper executable is built using the $host compiler,
-+	    # because it contains $host paths and files. If cross-
-+	    # compiling, it, like the target executable, must be
-+	    # executed on the $host or under an emulation environment.
-+	    $opt_dry_run || {
-+	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
-+	      $STRIP $cwrapper
-+	    }
-+
-+	    # Now, create the wrapper script for func_source use:
-+	    func_ltwrapper_scriptname $cwrapper
-+	    $RM $func_ltwrapper_scriptname_result
-+	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
-+	    $opt_dry_run || {
-+	      # note: this script will not be executed, so do not chmod.
-+	      if test "x$build" = "x$host" ; then
-+		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
-+	      else
-+		func_emit_wrapper no > $func_ltwrapper_scriptname_result
-+	      fi
-+	    }
-+	  ;;
-+	  * )
-+	    $RM $output
-+	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
-+
-+	    func_emit_wrapper no > $output
-+	    chmod +x $output
-+	  ;;
-+	esac
-+      }
-+      exit $EXIT_SUCCESS
-+      ;;
-+    esac
-+
-+    # See if we need to build an old-fashioned archive.
-+    for oldlib in $oldlibs; do
-+
-+      if test "$build_libtool_libs" = convenience; then
-+	oldobjs="$libobjs_save $symfileobj"
-+	addlibs="$convenience"
-+	build_libtool_libs=no
-+      else
-+	if test "$build_libtool_libs" = module; then
-+	  oldobjs="$libobjs_save"
-+	  build_libtool_libs=no
-+	else
-+	  oldobjs="$old_deplibs $non_pic_objects"
-+	  if test "$preload" = yes && test -f "$symfileobj"; then
-+	    oldobjs="$oldobjs $symfileobj"
-+	  fi
-+	fi
-+	addlibs="$old_convenience"
-+      fi
-+
-+      if test -n "$addlibs"; then
-+	gentop="$output_objdir/${outputname}x"
-+	generated="$generated $gentop"
-+
-+	func_extract_archives $gentop $addlibs
-+	oldobjs="$oldobjs $func_extract_archives_result"
-+      fi
-+
-+      # Do each command in the archive commands.
-+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-+	cmds=$old_archive_from_new_cmds
-+      else
-+
-+	# Add any objects from preloaded convenience libraries
-+	if test -n "$dlprefiles"; then
-+	  gentop="$output_objdir/${outputname}x"
-+	  generated="$generated $gentop"
-+
-+	  func_extract_archives $gentop $dlprefiles
-+	  oldobjs="$oldobjs $func_extract_archives_result"
-+	fi
-+
-+	# POSIX demands no paths to be encoded in archives.  We have
-+	# to avoid creating archives with duplicate basenames if we
-+	# might have to extract them afterwards, e.g., when creating a
-+	# static archive out of a convenience library, or when linking
-+	# the entirety of a libtool archive into another (currently
-+	# not supported by libtool).
-+	if (for obj in $oldobjs
-+	    do
-+	      func_basename "$obj"
-+	      $ECHO "$func_basename_result"
-+	    done | sort | sort -uc >/dev/null 2>&1); then
-+	  :
-+	else
-+	  $ECHO "copying selected object files to avoid basename conflicts..."
-+	  gentop="$output_objdir/${outputname}x"
-+	  generated="$generated $gentop"
-+	  func_mkdir_p "$gentop"
-+	  save_oldobjs=$oldobjs
-+	  oldobjs=
-+	  counter=1
-+	  for obj in $save_oldobjs
-+	  do
-+	    func_basename "$obj"
-+	    objbase="$func_basename_result"
-+	    case " $oldobjs " in
-+	    " ") oldobjs=$obj ;;
-+	    *[\ /]"$objbase "*)
-+	      while :; do
-+		# Make sure we don't pick an alternate name that also
-+		# overlaps.
-+		newobj=lt$counter-$objbase
-+		func_arith $counter + 1
-+		counter=$func_arith_result
-+		case " $oldobjs " in
-+		*[\ /]"$newobj "*) ;;
-+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-+		esac
-+	      done
-+	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-+	      oldobjs="$oldobjs $gentop/$newobj"
-+	      ;;
-+	    *) oldobjs="$oldobjs $obj" ;;
-+	    esac
-+	  done
-+	fi
-+	eval cmds=\"$old_archive_cmds\"
-+
-+	func_len " $cmds"
-+	len=$func_len_result
-+	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-+	  cmds=$old_archive_cmds
-+	else
-+	  # the command line is too long to link in one step, link in parts
-+	  func_verbose "using piecewise archive linking..."
-+	  save_RANLIB=$RANLIB
-+	  RANLIB=:
-+	  objlist=
-+	  concat_cmds=
-+	  save_oldobjs=$oldobjs
-+	  oldobjs=
-+	  # Is there a better way of finding the last object in the list?
-+	  for obj in $save_oldobjs
-+	  do
-+	    last_oldobj=$obj
-+	  done
-+	  eval test_cmds=\"$old_archive_cmds\"
-+	  func_len " $test_cmds"
-+	  len0=$func_len_result
-+	  len=$len0
-+	  for obj in $save_oldobjs
-+	  do
-+	    func_len " $obj"
-+	    func_arith $len + $func_len_result
-+	    len=$func_arith_result
-+	    func_append objlist " $obj"
-+	    if test "$len" -lt "$max_cmd_len"; then
-+	      :
-+	    else
-+	      # the above command should be used before it gets too long
-+	      oldobjs=$objlist
-+	      if test "$obj" = "$last_oldobj" ; then
-+		RANLIB=$save_RANLIB
-+	      fi
-+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-+	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-+	      objlist=
-+	      len=$len0
-+	    fi
-+	  done
-+	  RANLIB=$save_RANLIB
-+	  oldobjs=$objlist
-+	  if test "X$oldobjs" = "X" ; then
-+	    eval cmds=\"\$concat_cmds\"
-+	  else
-+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-+	  fi
-+	fi
-+      fi
-+      func_execute_cmds "$cmds" 'exit $?'
-+    done
-+
-+    test -n "$generated" && \
-+      func_show_eval "${RM}r$generated"
-+
-+    # Now create the libtool archive.
-+    case $output in
-+    *.la)
-+      old_library=
-+      test "$build_old_libs" = yes && old_library="$libname.$libext"
-+      func_verbose "creating $output"
-+
-+      # Preserve any variables that may affect compiler behavior
-+      for var in $variables_saved_for_relink; do
-+	if eval test -z \"\${$var+set}\"; then
-+	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-+	elif eval var_value=\$$var; test -z "$var_value"; then
-+	  relink_command="$var=; export $var; $relink_command"
-+	else
-+	  func_quote_for_eval "$var_value"
-+	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-+	fi
-+      done
-+      # Quote the link command for shipping.
-+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-+      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+      if test "$hardcode_automatic" = yes ; then
-+	relink_command=
-+      fi
-+
-+      # Only create the output if not a dry run.
-+      $opt_dry_run || {
-+	for installed in no yes; do
-+	  if test "$installed" = yes; then
-+	    if test -z "$install_libdir"; then
-+	      break
-+	    fi
-+	    output="$output_objdir/$outputname"i
-+	    # Replace all uninstalled libtool libraries with the installed ones
-+	    newdependency_libs=
-+	    for deplib in $dependency_libs; do
-+	      case $deplib in
-+	      *.la)
-+		func_basename "$deplib"
-+		name="$func_basename_result"
-+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+		test -z "$libdir" && \
-+		  func_fatal_error "\`$deplib' is not a valid libtool archive"
-+		newdependency_libs="$newdependency_libs $libdir/$name"
-+		;;
-+	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-+	      esac
-+	    done
-+	    dependency_libs="$newdependency_libs"
-+	    newdlfiles=
-+
-+	    for lib in $dlfiles; do
-+	      case $lib in
-+	      *.la)
-+	        func_basename "$lib"
-+		name="$func_basename_result"
-+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+		test -z "$libdir" && \
-+		  func_fatal_error "\`$lib' is not a valid libtool archive"
-+		newdlfiles="$newdlfiles $libdir/$name"
-+		;;
-+	      *) newdlfiles="$newdlfiles $lib" ;;
-+	      esac
-+	    done
-+	    dlfiles="$newdlfiles"
-+	    newdlprefiles=
-+	    for lib in $dlprefiles; do
-+	      case $lib in
-+	      *.la)
-+		# Only pass preopened files to the pseudo-archive (for
-+		# eventual linking with the app. that links it) if we
-+		# didn't already link the preopened objects directly into
-+		# the library:
-+		func_basename "$lib"
-+		name="$func_basename_result"
-+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+		test -z "$libdir" && \
-+		  func_fatal_error "\`$lib' is not a valid libtool archive"
-+		newdlprefiles="$newdlprefiles $libdir/$name"
-+		;;
-+	      esac
-+	    done
-+	    dlprefiles="$newdlprefiles"
-+	  else
-+	    newdlfiles=
-+	    for lib in $dlfiles; do
-+	      case $lib in
-+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-+		*) abs=`pwd`"/$lib" ;;
-+	      esac
-+	      newdlfiles="$newdlfiles $abs"
-+	    done
-+	    dlfiles="$newdlfiles"
-+	    newdlprefiles=
-+	    for lib in $dlprefiles; do
-+	      case $lib in
-+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-+		*) abs=`pwd`"/$lib" ;;
-+	      esac
-+	      newdlprefiles="$newdlprefiles $abs"
-+	    done
-+	    dlprefiles="$newdlprefiles"
-+	  fi
-+	  $RM $output
-+	  # place dlname in correct position for cygwin
-+	  tdlname=$dlname
-+	  case $host,$output,$installed,$module,$dlname in
-+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-+	  esac
-+	  $ECHO > $output "\
-+# $outputname - a libtool library file
-+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-+#
-+# Please DO NOT delete this file!
-+# It is necessary for linking the library.
-+
-+# The name that we can dlopen(3).
-+dlname='$tdlname'
-+
-+# Names of this library.
-+library_names='$library_names'
-+
-+# The name of the static archive.
-+old_library='$old_library'
-+
-+# Linker flags that can not go in dependency_libs.
-+inherited_linker_flags='$new_inherited_linker_flags'
-+
-+# Libraries that this one depends upon.
-+dependency_libs='$dependency_libs'
-+
-+# Names of additional weak libraries provided by this library
-+weak_library_names='$weak_libs'
-+
-+# Version information for $libname.
-+current=$current
-+age=$age
-+revision=$revision
-+
-+# Is this an already installed library?
-+installed=$installed
-+
-+# Should we warn about portability when linking against -modules?
-+shouldnotlink=$module
-+
-+# Files to dlopen/dlpreopen
-+dlopen='$dlfiles'
-+dlpreopen='$dlprefiles'
-+
-+# Directory that this library needs to be installed in:
-+libdir='$install_libdir'"
-+	  if test "$installed" = no && test "$need_relink" = yes; then
-+	    $ECHO >> $output "\
-+relink_command=\"$relink_command\""
-+	  fi
-+	done
-+      }
-+
-+      # Do a symbolic link so that the libtool archive can be found in
-+      # LD_LIBRARY_PATH before the program is installed.
-+      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
-+      ;;
-+    esac
-+    exit $EXIT_SUCCESS
-+}
-+
-+{ test "$mode" = link || test "$mode" = relink; } &&
-+    func_mode_link ${1+"$@"}
-+
-+
-+# func_mode_uninstall arg...
-+func_mode_uninstall ()
-+{
-+    $opt_debug
-+    RM="$nonopt"
-+    files=
-+    rmforce=
-+    exit_status=0
-+
-+    # This variable tells wrapper scripts just to set variables rather
-+    # than running their programs.
-+    libtool_install_magic="$magic"
-+
-+    for arg
-+    do
-+      case $arg in
-+      -f) RM="$RM $arg"; rmforce=yes ;;
-+      -*) RM="$RM $arg" ;;
-+      *) files="$files $arg" ;;
-+      esac
-+    done
-+
-+    test -z "$RM" && \
-+      func_fatal_help "you must specify an RM program"
-+
-+    rmdirs=
-+
-+    origobjdir="$objdir"
-+    for file in $files; do
-+      func_dirname "$file" "" "."
-+      dir="$func_dirname_result"
-+      if test "X$dir" = X.; then
-+	objdir="$origobjdir"
-+      else
-+	objdir="$dir/$origobjdir"
-+      fi
-+      func_basename "$file"
-+      name="$func_basename_result"
-+      test "$mode" = uninstall && objdir="$dir"
-+
-+      # Remember objdir for removal later, being careful to avoid duplicates
-+      if test "$mode" = clean; then
-+	case " $rmdirs " in
-+	  *" $objdir "*) ;;
-+	  *) rmdirs="$rmdirs $objdir" ;;
-+	esac
-+      fi
-+
-+      # Don't error if the file doesn't exist and rm -f was used.
-+      if { test -L "$file"; } >/dev/null 2>&1 ||
-+	 { test -h "$file"; } >/dev/null 2>&1 ||
-+	 test -f "$file"; then
-+	:
-+      elif test -d "$file"; then
-+	exit_status=1
-+	continue
-+      elif test "$rmforce" = yes; then
-+	continue
-+      fi
-+
-+      rmfiles="$file"
-+
-+      case $name in
-+      *.la)
-+	# Possibly a libtool archive, so verify it.
-+	if func_lalib_p "$file"; then
-+	  func_source $dir/$name
-+
-+	  # Delete the libtool libraries and symlinks.
-+	  for n in $library_names; do
-+	    rmfiles="$rmfiles $objdir/$n"
-+	  done
-+	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-+
-+	  case "$mode" in
-+	  clean)
-+	    case "  $library_names " in
-+	    # "  " in the beginning catches empty $dlname
-+	    *" $dlname "*) ;;
-+	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
-+	    esac
-+	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-+	    ;;
-+	  uninstall)
-+	    if test -n "$library_names"; then
-+	      # Do each command in the postuninstall commands.
-+	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-+	    fi
-+
-+	    if test -n "$old_library"; then
-+	      # Do each command in the old_postuninstall commands.
-+	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-+	    fi
-+	    # FIXME: should reinstall the best remaining shared library.
-+	    ;;
-+	  esac
-+	fi
-+	;;
-+
-+      *.lo)
-+	# Possibly a libtool object, so verify it.
-+	if func_lalib_p "$file"; then
-+
-+	  # Read the .lo file
-+	  func_source $dir/$name
-+
-+	  # Add PIC object to the list of files to remove.
-+	  if test -n "$pic_object" &&
-+	     test "$pic_object" != none; then
-+	    rmfiles="$rmfiles $dir/$pic_object"
-+	  fi
-+
-+	  # Add non-PIC object to the list of files to remove.
-+	  if test -n "$non_pic_object" &&
-+	     test "$non_pic_object" != none; then
-+	    rmfiles="$rmfiles $dir/$non_pic_object"
-+	  fi
-+	fi
-+	;;
-+
-+      *)
-+	if test "$mode" = clean ; then
-+	  noexename=$name
-+	  case $file in
-+	  *.exe)
-+	    func_stripname '' '.exe' "$file"
-+	    file=$func_stripname_result
-+	    func_stripname '' '.exe' "$name"
-+	    noexename=$func_stripname_result
-+	    # $file with .exe has already been added to rmfiles,
-+	    # add $file without .exe
-+	    rmfiles="$rmfiles $file"
-+	    ;;
-+	  esac
-+	  # Do a test to see if this is a libtool program.
-+	  if func_ltwrapper_p "$file"; then
-+	    if func_ltwrapper_executable_p "$file"; then
-+	      func_ltwrapper_scriptname "$file"
-+	      relink_command=
-+	      func_source $func_ltwrapper_scriptname_result
-+	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
-+	    else
-+	      relink_command=
-+	      func_source $dir/$noexename
-+	    fi
-+
-+	    # note $name still contains .exe if it was in $file originally
-+	    # as does the version of $file that was added into $rmfiles
-+	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-+	    if test "$fast_install" = yes && test -n "$relink_command"; then
-+	      rmfiles="$rmfiles $objdir/lt-$name"
-+	    fi
-+	    if test "X$noexename" != "X$name" ; then
-+	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-+	    fi
-+	  fi
-+	fi
-+	;;
-+      esac
-+      func_show_eval "$RM $rmfiles" 'exit_status=1'
-+    done
-+    objdir="$origobjdir"
-+
-+    # Try to remove the ${objdir}s in the directories where we deleted files
-+    for dir in $rmdirs; do
-+      if test -d "$dir"; then
-+	func_show_eval "rmdir $dir >/dev/null 2>&1"
-+      fi
-+    done
-+
-+    exit $exit_status
-+}
-+
-+{ test "$mode" = uninstall || test "$mode" = clean; } &&
-+    func_mode_uninstall ${1+"$@"}
-+
-+test -z "$mode" && {
-+  help="$generic_help"
-+  func_fatal_help "you must specify a MODE"
-+}
-+
-+test -z "$exec_cmd" && \
-+  func_fatal_help "invalid operation mode \`$mode'"
-+
-+if test -n "$exec_cmd"; then
-+  eval exec "$exec_cmd"
-+  exit $EXIT_FAILURE
-+fi
-+
-+exit $exit_status
-+
-+
-+# The TAGs below are defined such that we never get into a situation
-+# in which we disable both kinds of libraries.  Given conflicting
-+# choices, we go for a static library, that is the most portable,
-+# since we can't tell whether shared libraries were disabled because
-+# the user asked for that or because the platform doesn't support
-+# them.  This is particularly important on AIX, because we don't
-+# support having both static and shared libraries enabled at the same
-+# time on that platform, so we default to a shared-only configuration.
-+# If a disable-shared tag is given, we'll fallback to a static-only
-+# configuration.  But we'll never go from static-only to shared-only.
-+
-+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-+build_libtool_libs=no
-+build_old_libs=yes
-+# ### END LIBTOOL TAG CONFIG: disable-shared
-+
-+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-+# ### END LIBTOOL TAG CONFIG: disable-static
-+
-+# Local Variables:
-+# mode:shell-script
-+# sh-indentation:2
-+# End:
-+# vi:sw=2
-+
diff --git a/package/ttcp/Makefile b/package/ttcp/Makefile
index e8df1cd43..db764318a 100644
--- a/package/ttcp/Makefile
+++ b/package/ttcp/Makefile
@@ -19,9 +19,11 @@ CONFIG_STYLE:=          manual
 BUILD_STYLE:=           manual
 INSTALL_STYLE:=         manual
 
+TARGET_CFLAGS+=		-Wall
+
 do-build:
-	${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} -o ${WRKBUILD}/ttcp \
-		${WRKBUILD}/ttcp.c
+	${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
+		-o ${WRKBUILD}/ttcp ${WRKBUILD}/ttcp.c
 
 do-install:
 	${INSTALL_DIR} ${IDIR_TTCP}/usr/bin
diff --git a/package/tzdata/Makefile b/package/tzdata/Makefile
index fd496e883..e6a1bbda0 100644
--- a/package/tzdata/Makefile
+++ b/package/tzdata/Makefile
@@ -11,6 +11,8 @@ PKG_DESCR:=		Timezone data (/usr/share/zoneinfo)
 PKG_SECTION:=		utils
 PKG_URL:=		ftp://elsie.nci.nih.gov/pub/
 PKG_SITES:=		ftp://elsie.nci.nih.gov/pub/
+PKG_NOPARALLEL:=	1
+
 # Note that tzcode does NOT have the same version as tzdata does :[
 DISTFILES:=             ${PKG_NAME}${PKG_VERSION}.tar.gz tzcode2010n.tar.gz
 # both archives do not extract into subdirectories
diff --git a/package/tzdata/patches/patch-Makefile b/package/tzdata/patches/patch-Makefile
new file mode 100644
index 000000000..d8b759a8c
--- /dev/null
+++ b/package/tzdata/patches/patch-Makefile
@@ -0,0 +1,64 @@
+--- w-tzdata-2010o-1.orig/Makefile	2010-10-12 18:36:50.000000000 +0200
++++ w-tzdata-2010o-1/Makefile	2011-01-22 22:10:00.358658180 +0100
+@@ -212,13 +212,13 @@ GCC_DEBUG_FLAGS = -Dlint -g -O -fno-comm
+ # before the first Monday in January when a "%V" format is used and January 1
+ # falls on a Friday, Saturday, or Sunday.
+ 
+-CFLAGS=
++CFLAGS?=
+ 
+ # If you want zic's -s option used when installing, uncomment the next line
+ # ZFLAGS=	-s
+ 
+ zic=		./zic
+-ZIC=		$(zic) $(ZFLAGS)
++ZIC=		./zic_for_build $(ZFLAGS)
+ 
+ # The name of a Posix-compliant `awk' on your system.
+ AWK=		nawk
+@@ -279,7 +279,7 @@ ENCHILADA=	$(DOCS) $(SOURCES) $(DATA) $(
+ 
+ SHELL=		/bin/sh
+ 
+-all:		tzselect zic zdump $(LIBOBJS)
++all:		zic_for_build tzselect zic zdump $(LIBOBJS)
+ 
+ ALL:		all date
+ 
+@@ -309,6 +309,14 @@ INSTALL:	ALL install date.1
+ 		-rm -f $(MANDIR)/man1/date.1
+ 		cp date.1 $(MANDIR)/man1/.
+ 
++zic_for_build:
++		$(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) zic.c -o zic_build.o
++		$(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) localtime.c -o localtime_build.o
++		$(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) asctime.c -o asctime_build.o
++		$(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) scheck.c -o scheck_build.o
++		$(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) ialloc.c -o ialloc_build.o
++		$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ zic_build.o localtime_build.o asctime_build.o scheck_build.o ialloc_build.o 
++
+ zdump:		$(TZDOBJS)
+ 		$(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
+ 
+@@ -319,10 +327,10 @@ yearistype:	yearistype.sh
+ 		cp yearistype.sh yearistype
+ 		chmod +x yearistype
+ 
+-posix_only:	zic $(TDATA)
++posix_only:	zic_for_build $(TDATA)
+ 		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR) -L /dev/null $(TDATA)
+ 
+-right_only:	zic leapseconds $(TDATA)
++right_only:	zic_for_build leapseconds $(TDATA)
+ 		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR) -L leapseconds $(TDATA)
+ 
+ # In earlier versions of this makefile, the other two directories were
+@@ -334,7 +342,7 @@ right_only:	zic leapseconds $(TDATA)
+ # Therefore, the other two directories are now siblings of $(TZDIR).
+ # You must replace all of $(TZDIR) to switch from not using leap seconds
+ # to using them, or vice versa.
+-other_two:	zic leapseconds $(TDATA)
++other_two:	zic_for_build leapseconds $(TDATA)
+ 		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)
+ 		$(ZIC) -y $(YEARISTYPE) \
+ 			-d $(TZDIR)-leaps -L leapseconds $(TDATA)
diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile
index 3010e7a92..656f37514 100644
--- a/package/ulogd/Makefile
+++ b/package/ulogd/Makefile
@@ -34,7 +34,7 @@ $(eval $(call PKG_template,ULOGD_MOD_PGSQL,ulogd-mod-pgsql,${PKG_VERSION}-${PKG_
 $(eval $(call PKG_template,ULOGD_MOD_SQLITE,ulogd-mod-sqlite,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ULOGD_MOD_EXTRA,ulogd-mod-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-fPIC
+TARGET_CFLAGS+=		-fPIC
 
 ifneq (${ADK_PACKAGE_ULOGD_MOD_MYSQL},)
 CONFIGURE_ARGS+=	--with-mysql=${STAGING_TARGET_DIR}/usr
diff --git a/package/ussp-push/Makefile b/package/ussp-push/Makefile
index 1d0d2d7b9..962bb3050 100644
--- a/package/ussp-push/Makefile
+++ b/package/ussp-push/Makefile
@@ -17,8 +17,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,USSP_PUSH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-MAKE_FLAGS+=		OBEXINC="${TCPPFLAGS}" \
-			OBEXLIB="${TLDFLAGS} -lopenobex -lbluetooth"
+MAKE_FLAGS+=		OBEXINC="${TARGET_CPPFLAGS}" \
+			OBEXLIB="${TARGET_LDFLAGS} -lopenobex -lbluetooth"
 
 post-install:
 	${INSTALL_DIR} ${IDIR_USSP_PUSH}/usr/bin
diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile
index eb320ce05..f89023133 100644
--- a/package/util-linux-ng/Makefile
+++ b/package/util-linux-ng/Makefile
@@ -34,13 +34,13 @@ $(eval $(call PKG_template,MCOOKIE,mcookie,${PKG_VERSION}-${PKG_RELEASE},${PKG_D
 CONFIGURE_ARGS+=	--disable-use-tty-group \
 			--disable-schedutils \
 			--disable-cramfs \
+			--disable-libuuid \
 			--enable-libblkid \
 			--enable-libmount \
-			--enable-mount \
-			--enable-libuuid
-MAKE_FLAGS+=		OPT="${TCFLAGS}" ARCH="${ARCH}"
+			--enable-mount
+MAKE_FLAGS+=		OPT="${TARGET_CFLAGS}" ARCH="${ARCH}"
 FAKE_FLAGS+=		INSTALLSUID="install -m 4755"
-TCFLAGS+=		-DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK
+TARGET_CFLAGS+=		-DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK
 
 post-install:
 	${INSTALL_DIR} ${IDIR_FDISK}/usr/sbin
diff --git a/package/uvd/Makefile b/package/uvd/Makefile
index 448f9c375..da5aea972 100644
--- a/package/uvd/Makefile
+++ b/package/uvd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=		0.1
 PKG_RELEASE:=		2
 PKG_DESCR:=		udp server for version information
 PKG_SECTION:=		base
-PKG_URL:=		http://www.openadk.org/
+PKG_URL:=		http://openadk.org/
 
 NO_DISTFILES:=		1
 
@@ -20,8 +20,10 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
+TARGET_CFLAGS+=		-Wall
+
 do-build:
-	${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} \
+	${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
 		-o ${WRKBUILD}/uvd ${WRKBUILD}/uvd.c
 
 do-install:
diff --git a/package/valgrind/patches/patch-configure b/package/valgrind/patches/patch-configure
index b0167622f..8c2df9ad5 100644
--- a/package/valgrind/patches/patch-configure
+++ b/package/valgrind/patches/patch-configure
@@ -1,6 +1,46 @@
 --- valgrind-3.5.0.orig/configure	2009-08-19 15:44:07.000000000 +0200
-+++ valgrind-3.5.0/configure	2010-10-11 22:01:23.000000000 +0200
-@@ -4215,7 +4215,7 @@ echo "${ECHO_T}ok (${host_os})" >&6
++++ valgrind-3.5.0/configure	2011-01-21 23:59:05.014913852 +0100
+@@ -1819,7 +1819,6 @@ fi
+ #----------------------------------------------------------------------------
+ # Checks for various programs.
+ #----------------------------------------------------------------------------
+-CFLAGS="-Wno-long-long"
+ 
+ echo "$as_me:$LINENO: checking whether ln -s works" >&5
+ echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+@@ -2429,7 +2428,6 @@ echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&
+ GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-CFLAGS="-g"
+ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+ echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+@@ -2481,23 +2479,6 @@ ac_cv_prog_cc_g=no
+ fi
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+-if test "$ac_test_CFLAGS" = set; then
+-  CFLAGS=$ac_save_CFLAGS
+-elif test $ac_cv_prog_cc_g = yes; then
+-  if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
+-  else
+-    CFLAGS="-g"
+-  fi
+-else
+-  if test "$GCC" = yes; then
+-    CFLAGS="-O2"
+-  else
+-    CFLAGS=
+-  fi
+-fi
+ echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+ echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_stdc+set}" = set; then
+@@ -4215,7 +4196,7 @@ echo "${ECHO_T}ok (${host_os})" >&6
          echo "$as_me:$LINENO: checking for the kernel version" >&5
  echo $ECHO_N "checking for the kernel version... $ECHO_C" >&6
  
@@ -9,7 +49,7 @@
  
          case "${kernel}" in
               2.6.*)
-@@ -4841,6 +4841,27 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
+@@ -4841,6 +4822,27 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
  fi
  rm -f conftest*
  
@@ -37,7 +77,7 @@
  
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -5005,15 +5026,15 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5005,15 +5007,15 @@ cat >>conftest.$ac_ext <<_ACEOF
  
  #include <features.h>
  #ifdef __GNU_LIBRARY__
@@ -57,7 +97,7 @@
  fi
  rm -f conftest*
  
-@@ -5174,6 +5195,17 @@ _ACEOF
+@@ -5174,6 +5176,17 @@ _ACEOF
  	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
  	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
  	;;
@@ -75,7 +115,7 @@
       aix5)
  	echo "$as_me:$LINENO: result: AIX 5.1 or 5.2 or 5.3" >&5
  echo "${ECHO_T}AIX 5.1 or 5.2 or 5.3" >&6
-@@ -5198,7 +5230,7 @@ _ACEOF
+@@ -5198,7 +5211,7 @@ _ACEOF
       *)
  	echo "$as_me:$LINENO: result: unsupported version" >&5
  echo "${ECHO_T}unsupported version" >&6
diff --git a/package/vnc-reflector/Makefile b/package/vnc-reflector/Makefile
index 72aefd342..2392c9b01 100644
--- a/package/vnc-reflector/Makefile
+++ b/package/vnc-reflector/Makefile
@@ -23,10 +23,7 @@ $(eval $(call PKG_template,VNC_REFLECTOR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEAS
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
-TCPPFLAGS+=		-I.
-TLDFLAGS+=		-lz -ljpeg
-MAKE_FLAGS+=		CC="${TARGET_CC}" CFLAGS="${TCFLAGS} ${TCPPFLAGS} ${TLDFLAGS}"
-ALL_TARGET:=		default
+TARGET_LDFLAGS+=	-lz -ljpeg
 
 do-install:
 	${INSTALL_DIR} ${IDIR_VNC_REFLECTOR}/usr/sbin
diff --git a/package/vnc-reflector/patches/patch-Makefile b/package/vnc-reflector/patches/patch-Makefile
new file mode 100644
index 000000000..8a22ebd96
--- /dev/null
+++ b/package/vnc-reflector/patches/patch-Makefile
@@ -0,0 +1,55 @@
+--- vnc_reflector.orig/Makefile	2003-04-16 19:32:42.000000000 +0200
++++ vnc_reflector/Makefile	2011-01-20 14:16:58.854910770 +0100
+@@ -14,10 +14,10 @@
+ #
+ # Variables you might want to edit: CFLAGS, CONFFLAGS
+ 
+-IFLAGS =	-I.
++CPPFLAGS ?=	-I.
+ 
+ # Production
+-CFLAGS =	-O2 $(IFLAGS)
++CFLAGS ?=	-O2
+ # Debug (strict)
+ #CFLAGS =	-g -pedantic -Wall $(IFLAGS)
+ # Debug (profiling)
+@@ -26,10 +26,10 @@ CFLAGS =	-O2 $(IFLAGS)
+ #CFLAGS =	-g $(IFLAGS)
+ 
+ # Use poll(2) syscall in async I/O instead of select(2)
+-CONFFLAGS =	-DUSE_POLL
++CPPFLAGS +=	-DUSE_POLL
+ 
+ # Link with zlib and JPEG libraries
+-LDFLAGS =	-L/usr/local/lib -lz -ljpeg
++LDFLAGS ?=	-L/usr/local/lib -lz -ljpeg
+ 
+ PROG = 	vncreflector
+ 
+@@ -43,14 +43,14 @@ SRCS =	main.c logging.c active.c actions
+ 	control.c encode_tight.c decode_hextile.c decode_tight.c fbs_files.c \
+ 	region_more.c
+ 
+-CC = gcc
++CC ?= gcc
+ MAKEDEPEND = makedepend
+ MAKEDEPFLAGS = -Y
+ 
+-default: $(PROG)
++all: $(PROG)
+ 
+ $(PROG): $(OBJS)
+-	$(CC) $(CFLAGS) -o $(PROG) $(OBJS) $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIBS)
+ 
+ clean: 
+ 	rm -f $(OBJS) *core* ./*~ ./*.bak $(PROG)
+@@ -59,7 +59,7 @@ depend: $(SRCS)
+ 	$(MAKEDEPEND) $(MAKEDEPFLAGS) -I. $(SRCS) 2> /dev/null
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) $(CONFFLAGS) -c $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
+ 
+ 
+ # DO NOT DELETE
diff --git a/package/vnstat/patches/patch-src_Makefile b/package/vnstat/patches/patch-src_Makefile
new file mode 100644
index 000000000..54415ddad
--- /dev/null
+++ b/package/vnstat/patches/patch-src_Makefile
@@ -0,0 +1,9 @@
+--- vnstat-1.4.orig/src/Makefile	2004-03-26 14:25:51.000000000 +0100
++++ vnstat-1.4/src/Makefile	2011-01-22 00:05:41.408658273 +0100
+@@ -1,5 +1,5 @@
+ CC = gcc
+-CFLAGS = -O2
++CFLAGS ?= -O2
+ OBJS = proc.o db.o misc.o
+ OBJS64 = proc64.o db.o misc.o
+ 
diff --git a/package/weechat/Makefile b/package/weechat/Makefile
index 90baa2342..4ad71e773 100644
--- a/package/weechat/Makefile
+++ b/package/weechat/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		weechat
 PKG_VERSION:=		0.3.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		0c4f6e7196703c6eca12217f254612aa
 PKG_DESCR:=		Lightweight IRC client
 PKG_SECTION:=		chat
@@ -18,7 +18,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,WEECHAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-liconv
+TARGET_LDFLAGS+=	-liconv
 CONFIGURE_ARGS+=	--with-debug=0 \
 			--disable-perl \
 			--disable-python \
@@ -30,6 +30,6 @@ CONFIGURE_ARGS+=	--with-debug=0 \
 post-install:
 	${INSTALL_DIR} ${IDIR_WEECHAT}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/weechat-curses \
-		${IDIR_WEECHAT}/usr/bin/
+		${IDIR_WEECHAT}/usr/bin/weechat
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index aebb85f8d..92d03f270 100644
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -33,9 +33,9 @@ $(eval $(call PKG_template,WPA_SUPPLICANT,wpa-supplicant,${PKG_VERSION}-${PKG_RE
 CONFIG_STYLE:=          manual
 INSTALL_STYLE:=         manual
 
-MAKE_FLAGS+=		CPPFLAGS='${TCPPFLAGS}' \
-			LDFLAGS='${TLDFLAGS}' \
-			OPT_FLAGS='${TCFLAGS}' \
+MAKE_FLAGS+=		CPPFLAGS='${TARGET_CPPFLAGS}' \
+			LDFLAGS='${TARGET_LDFLAGS}' \
+			OPT_FLAGS='${TARGET_CFLAGS}' \
 			KERNEL=${LINUX_DIR}
 
 do-configure:
diff --git a/package/xbindkeys/patches/patch-Makefile_in b/package/xbindkeys/patches/patch-Makefile_in
new file mode 100644
index 000000000..b303dc7ee
--- /dev/null
+++ b/package/xbindkeys/patches/patch-Makefile_in
@@ -0,0 +1,13 @@
+--- xbindkeys-1.8.3.orig/Makefile.in	2009-01-24 14:15:39.000000000 +0100
++++ xbindkeys-1.8.3/Makefile.in	2011-01-20 21:58:00.558658336 +0100
+@@ -182,8 +182,8 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-@GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
+-@GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
++@GUILE_FALSE@AM_CFLAGS = @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
++@GUILE_TRUE@AM_CFLAGS = @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
+ @GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
+ @GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
+ xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
diff --git a/package/xf86-input-evtouch/patches/patch-configure b/package/xf86-input-evtouch/patches/patch-configure
new file mode 100644
index 000000000..8c1ab34f3
--- /dev/null
+++ b/package/xf86-input-evtouch/patches/patch-configure
@@ -0,0 +1,11 @@
+--- xf86-input-evtouch-0.8.8.orig/configure	2008-11-09 22:01:05.000000000 +0100
++++ xf86-input-evtouch-0.8.8/configure	2011-01-22 21:03:10.818658680 +0100
+@@ -12255,7 +12255,7 @@ fi
+ 
+ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+ 
+-EVTOUCH_CFLAGS="$CFLAGS $XORG_CFLAGS "
++EVTOUCH_CFLAGS="$XORG_CFLAGS "
+ 
+ 
+ # Checks for header files.
diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile
index 6afc5e705..9f5b2ee38 100644
--- a/package/xfsprogs/Makefile
+++ b/package/xfsprogs/Makefile
@@ -22,7 +22,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,XFSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 INSTALL_STYLE:=		manual
-
+TARGET_LDFLAGS+=	-lrt
 CONFIGURE_ARGS+=	--enable-gettext=no \
 			--with-gnu-ld
 CONFIGURE_ENV+=		DEBUG=" " OPTIMIZER=" "
diff --git a/package/xfsprogs/patches/patch-configure b/package/xfsprogs/patches/patch-configure
new file mode 100644
index 000000000..24d7f645e
--- /dev/null
+++ b/package/xfsprogs/patches/patch-configure
@@ -0,0 +1,352 @@
+--- xfsprogs-3.1.4.orig/configure	2010-11-11 18:38:31.000000000 +0100
++++ xfsprogs-3.1.4/configure	2011-01-22 19:33:52.458658054 +0100
+@@ -12604,349 +12604,6 @@ fi
+ 
+ 
+ 
+-for ac_header in aio.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_header_compiler=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
+-  ac_header_preproc=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-
+-fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-    if test $ac_cv_header_aio_h = no; then
+-	echo
+-	echo 'FATAL ERROR: could not find a valid <aio.h> header.'
+-	exit 1
+-    fi
+-
+-
+-for ac_func in lio_listio
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-    if test $ac_cv_func_lio_listio = yes; then
+-	librt=""
+-    else
+-
+-{ $as_echo "$as_me:$LINENO: checking for lio_listio in -lrt" >&5
+-$as_echo_n "checking for lio_listio in -lrt... " >&6; }
+-if test "${ac_cv_lib_rt_lio_listio+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lrt -lpthread $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char lio_listio ();
+-int
+-main ()
+-{
+-return lio_listio ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_lib_rt_lio_listio=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_rt_lio_listio=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_lio_listio" >&5
+-$as_echo "$ac_cv_lib_rt_lio_listio" >&6; }
+-if test "x$ac_cv_lib_rt_lio_listio" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBRT 1
+-_ACEOF
+-
+-  LIBS="-lrt $LIBS"
+-
+-else
+-
+-	    echo
+-	    echo 'FATAL ERROR: could not find a library with lio_listio.'
+-	    exit 1
+-fi
+-
+-	librt="-lrt"
+-    fi
+-
+-
+-
+-
+-
+-
+ for ac_header in uuid.h sys/uuid.h uuid/uuid.h
+ do
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/package/xfsprogs/patches/patch-copy_xfs_copy_c b/package/xfsprogs/patches/patch-copy_xfs_copy_c
new file mode 100644
index 000000000..5640d0625
--- /dev/null
+++ b/package/xfsprogs/patches/patch-copy_xfs_copy_c
@@ -0,0 +1,82 @@
+--- xfsprogs-3.1.4.orig/copy/xfs_copy.c	2010-01-29 20:46:13.000000000 +0100
++++ xfsprogs-3.1.4/copy/xfs_copy.c	2011-01-22 20:44:49.478658642 +0100
+@@ -240,6 +240,10 @@ handler(int sig)
+ {
+ 	pid_t	pid = getpid();
+ 	int	status, i;
++	struct sigaction action;
++
++	action.sa_handler = handler;
++	action.sa_flags = 0;
+ 
+ 	pid = wait(&status);
+ 
+@@ -272,7 +276,7 @@ handler(int sig)
+ 					pthread_exit(NULL);
+ 				}
+ 
+-				signal(SIGCHLD, handler);
++				sigaction(SIGCHLD, &action, NULL);
+ 				return;
+ 			} else  {
+ 				/* it just croaked it bigtime, log it */
+@@ -294,7 +298,7 @@ handler(int sig)
+ 	do_warn(_("%s: Unknown child died (should never happen!)\n"), progname);
+ 	die_perror();
+ 	pthread_exit(NULL);
+-	signal(SIGCHLD, handler);
++	sigaction(SIGCHLD, &action, NULL);
+ }
+ 
+ void
+@@ -467,6 +471,11 @@ void
+ write_wbuf(void)
+ {
+ 	int		i;
++	sigset_t        unblock, initial;
++
++	sigemptyset(&unblock);
++	sigaddset(&unblock, SIGCHLD);
++
+ 
+ 	/* verify target threads */
+ 	for (i = 0; i < num_targets; i++)
+@@ -478,9 +487,9 @@ write_wbuf(void)
+ 		if (target[i].state != INACTIVE)
+ 			pthread_mutex_unlock(&targ[i].wait);	/* wake up */
+ 
+-	sigrelse(SIGCHLD);
++	sigprocmask(SIG_UNBLOCK, &unblock, &initial);
+ 	pthread_mutex_lock(&mainwait);
+-	sighold(SIGCHLD);
++	sigprocmask(SIG_SETMASK, &initial, NULL);
+ }
+ 
+ 
+@@ -521,6 +530,12 @@ main(int argc, char **argv)
+ 	libxfs_init_t	xargs;
+ 	thread_args	*tcarg;
+ 	struct stat64	statbuf;
++	struct sigaction saction;
++	sigset_t        sigblock, initial;
++
++	saction.sa_handler = handler;
++	saction.sa_flags = 0;
++
+ 
+ 	progname = basename(argv[0]);
+ 
+@@ -846,8 +861,11 @@ main(int argc, char **argv)
+ 
+ 	/* set up sigchild signal handler */
+ 
+-	signal(SIGCHLD, handler);
+-	sighold(SIGCHLD);
++	sigaction(SIGCHLD, &saction, NULL);
++	sigemptyset(&sigblock);
++	sigaddset(&sigblock, SIGCHLD);
++	sigprocmask(SIG_BLOCK, &sigblock, &initial);
++
+ 
+ 	/* make children */
+ 
diff --git a/package/xfsprogs/patches/patch-fsr_xfs_fsr_c b/package/xfsprogs/patches/patch-fsr_xfs_fsr_c
new file mode 100644
index 000000000..5093c2924
--- /dev/null
+++ b/package/xfsprogs/patches/patch-fsr_xfs_fsr_c
@@ -0,0 +1,57 @@
+--- xfsprogs-3.1.4.orig/fsr/xfs_fsr.c	2010-10-01 19:33:38.000000000 +0200
++++ xfsprogs-3.1.4/fsr/xfs_fsr.c	2011-01-22 20:34:12.465325200 +0100
+@@ -35,7 +35,6 @@
+ #include <sys/wait.h>
+ #include <sys/vfs.h>
+ #include <sys/statvfs.h>
+-#include <sys/xattr.h>
+ 
+ 
+ #ifndef XFS_XFLAG_NODEFRAG
+@@ -1003,6 +1002,7 @@ fsr_setup_attr_fork(
+ 	 * use the old method if we have attr1 or the kernel does not yet
+ 	 * support passing the fork offset in the bulkstat data.
+ 	 */
++#if 0
+ 	if (!(fsgeom.flags & XFS_FSOP_GEOM_FLAGS_ATTR2) ||
+ 	    bstatp->bs_forkoff == 0) {
+ 		/* attr1 */
+@@ -1013,6 +1013,7 @@ fsr_setup_attr_fork(
+ 		}
+ 		goto out;
+ 	}
++#endif
+ 
+ 	/* attr2 w/ fork offsets */
+ 
+@@ -1050,6 +1051,7 @@ fsr_setup_attr_fork(
+ 		 * If there is no attribute, then we need to create one to get
+ 		 * an attribute fork at the default location.
+ 		 */
++#if 0
+ 		if (!tbstat.bs_forkoff) {
+ 			ret = fsetxattr(tfd, name, "XX", 2, XATTR_CREATE);
+ 			if (ret) {
+@@ -1058,7 +1060,7 @@ fsr_setup_attr_fork(
+ 			}
+ 			continue;
+ 		}
+-
++#endif
+ 		/*
+ 		 * make a progress check so we don't get stuck trying to extend
+ 		 * a large btree form attribute fork.
+@@ -1097,11 +1099,13 @@ fsr_setup_attr_fork(
+ 		}
+ 
+ 		/* we need to grow the attr fork, so create another attr */
++#if 0
+ 		ret = fsetxattr(tfd, name, "XX", 2, XATTR_CREATE);
+ 		if (ret) {
+ 			fsrprintf(_("could not set ATTR\n"));
+ 			return -1;
+ 		}
++#endif
+ 
+ 	} while (++i < 100); /* don't go forever */
+ 
diff --git a/package/xfsprogs/patches/patch-libxfs_linux_c b/package/xfsprogs/patches/patch-libxfs_linux_c
new file mode 100644
index 000000000..586dab521
--- /dev/null
+++ b/package/xfsprogs/patches/patch-libxfs_linux_c
@@ -0,0 +1,35 @@
+--- xfsprogs-3.1.4.orig/libxfs/linux.c	2010-01-29 20:46:13.000000000 +0100
++++ xfsprogs-3.1.4/libxfs/linux.c	2011-01-22 20:27:29.458658270 +0100
+@@ -16,12 +16,10 @@
+  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
+-#define ustat __kernel_ustat
+ #include <xfs/libxfs.h>
+ #include <mntent.h>
+ #include <sys/stat.h>
+-#undef ustat
+-#include <sys/ustat.h>
++#include <sys/statvfs.h>
+ #include <sys/mount.h>
+ #include <sys/ioctl.h>
+ #include <sys/sysinfo.h>
+@@ -49,8 +47,7 @@ static int max_block_alignment;
+ int
+ platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
+ {
+-	/* Pad ust; pre-2.6.28 linux copies out too much in 32bit compat mode */
+-	struct ustat	ust[2];
++	struct statvfs info;
+ 	struct stat64	st;
+ 
+ 	if (!s) {
+@@ -61,7 +58,7 @@ platform_check_ismounted(char *name, cha
+ 		s = &st;
+ 	}
+ 
+-	if (ustat(s->st_rdev, ust) >= 0) {
++	if (statvfs(name, &info) >= 0) {
+ 		if (verbose)
+ 			fprintf(stderr,
+ 				_("%s: %s contains a mounted filesystem\n"),
diff --git a/package/xinetd/patches/ar.patch b/package/xinetd/patches/ar.patch
deleted file mode 100644
index f0d4f0dea..000000000
--- a/package/xinetd/patches/ar.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -ruN xinetd-2.3.13-orig/libs/src/misc/Makefile.in xinetd-2.3.13-6/libs/src/misc/Makefile.in
---- xinetd-2.3.13-orig/libs/src/misc/Makefile.in	2003-02-19 18:29:27.000000000 +0100
-+++ xinetd-2.3.13-6/libs/src/misc/Makefile.in	2005-03-09 22:53:15.000000000 +0100
-@@ -62,7 +62,7 @@
- 
- 
- $(LIBNAME): $(OBJECTS)
--	ar r $@ $?
-+	$(AR) r $@ $?
- 	$(RANLIB) $@
- 
- install: $(LIBNAME)
-diff -ruN xinetd-2.3.13-orig/libs/src/portable/Makefile.in xinetd-2.3.13-6/libs/src/portable/Makefile.in
---- xinetd-2.3.13-orig/libs/src/portable/Makefile.in	2003-02-19 18:29:27.000000000 +0100
-+++ xinetd-2.3.13-6/libs/src/portable/Makefile.in	2005-03-09 22:53:15.000000000 +0100
-@@ -57,7 +57,7 @@
- 
- 
- $(LIBNAME): $(OBJECTS)
--	ar r $@ $?
-+	$(AR) r $@ $?
- 	$(RANLIB) $@
- 
- install: $(LIBNAME)
-diff -ruN xinetd-2.3.13-orig/libs/src/pset/Makefile.in xinetd-2.3.13-6/libs/src/pset/Makefile.in
---- xinetd-2.3.13-orig/libs/src/pset/Makefile.in	2003-02-19 18:29:27.000000000 +0100
-+++ xinetd-2.3.13-6/libs/src/pset/Makefile.in	2005-03-09 22:53:15.000000000 +0100
-@@ -53,7 +53,7 @@
- 	mv $(LIBNAME) $(LIBDIR)/optimized
- 
- $(LIBNAME): $(OBJECTS)
--	ar r $@ $?
-+	$(AR) r $@ $?
- 	$(RANLIB) $@
- 
- install: $(LIBNAME)
-diff -ruN xinetd-2.3.13-orig/libs/src/sio/Makefile.in xinetd-2.3.13-6/libs/src/sio/Makefile.in
---- xinetd-2.3.13-orig/libs/src/sio/Makefile.in	2003-02-19 18:29:27.000000000 +0100
-+++ xinetd-2.3.13-6/libs/src/sio/Makefile.in	2005-03-09 22:53:15.000000000 +0100
-@@ -52,7 +52,7 @@
- 	$(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)/optimized
- 
- $(LIBNAME): $(OBJECTS)
--	ar r $@ $?
-+	$(AR) r $@ $?
- 	$(RANLIB) $@
- 
- install: $(LIBNAME)
-diff -ruN xinetd-2.3.13-orig/libs/src/str/Makefile.in xinetd-2.3.13-6/libs/src/str/Makefile.in
---- xinetd-2.3.13-orig/libs/src/str/Makefile.in	2003-02-19 18:29:27.000000000 +0100
-+++ xinetd-2.3.13-6/libs/src/str/Makefile.in	2005-03-09 22:53:15.000000000 +0100
-@@ -63,7 +63,7 @@
- 	$(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)-O
- 
- $(LIBNAME): $(OBJECTS)
--	ar r $@ $?
-+	$(AR) r $@ $?
- 	$(RANLIB) $@
- 
- LINT_IGNORE=possible pointer alignment|RCSid unused
-diff -ruN xinetd-2.3.13-orig/libs/src/xlog/Makefile.in xinetd-2.3.13-6/libs/src/xlog/Makefile.in
---- xinetd-2.3.13-orig/libs/src/xlog/Makefile.in	2003-02-19 18:29:27.000000000 +0100
-+++ xinetd-2.3.13-6/libs/src/xlog/Makefile.in	2005-03-09 22:53:15.000000000 +0100
-@@ -58,7 +58,7 @@
- 	$(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)/optimized
- 
- $(LIBNAME): $(OBJECTS)
--	ar r $@ $?
-+	$(AR) r $@ $?
- 	$(RANLIB) $@
- 
- install: $(LIBNAME)
diff --git a/package/xinetd/patches/destdir.patch b/package/xinetd/patches/patch-Makefile_in
index 91fd81660..a89962c2e 100644
--- a/package/xinetd/patches/destdir.patch
+++ b/package/xinetd/patches/patch-Makefile_in
@@ -1,7 +1,15 @@
-diff -ruN xinetd-2.3.13-orig/Makefile.in xinetd-2.3.13-6/Makefile.in
---- xinetd-2.3.13-orig/Makefile.in	2003-08-15 16:00:45.000000000 +0200
-+++ xinetd-2.3.13-6/Makefile.in	2005-03-09 22:53:15.000000000 +0100
-@@ -75,15 +75,15 @@
+--- xinetd-2.3.14.orig/Makefile.in	2003-08-15 16:00:45.000000000 +0200
++++ xinetd-2.3.14/Makefile.in	2011-01-22 20:53:07.924898364 +0100
+@@ -14,7 +14,7 @@ topdir = @top_srcdir@
+ 
+ LIBS = -lsio -lstr -lmisc -lxlog -lportable -lpset @LIBS@
+ 
+-CFLAGS += @CFLAGS@ 
++CFLAGS = @CFLAGS@ 
+ DCFLAGS = -Wall -Wredundant-decls -W -Wfloat-equal -Wundef -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Wmissing-format-attribute -Wshadow -Wpointer-arith -g
+ 
+ 
+@@ -75,15 +75,15 @@ dlibxlog: dlibsio dlibstr
  
  install: build
  	for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \
diff --git a/package/xinetd/patches/patch-libs_src_misc_Makefile_in b/package/xinetd/patches/patch-libs_src_misc_Makefile_in
new file mode 100644
index 000000000..9a588ac1d
--- /dev/null
+++ b/package/xinetd/patches/patch-libs_src_misc_Makefile_in
@@ -0,0 +1,11 @@
+--- xinetd-2.3.14.orig/libs/src/misc/Makefile.in	2003-02-19 18:29:27.000000000 +0100
++++ xinetd-2.3.14/libs/src/misc/Makefile.in	2011-01-22 20:48:18.898658731 +0100
+@@ -62,7 +62,7 @@ libopt: clean
+ 
+ 
+ $(LIBNAME): $(OBJECTS)
+-	ar r $@ $?
++	$(AR) r $@ $?
+ 	$(RANLIB) $@
+ 
+ install: $(LIBNAME)
diff --git a/package/xinetd/patches/patch-libs_src_portable_Makefile_in b/package/xinetd/patches/patch-libs_src_portable_Makefile_in
new file mode 100644
index 000000000..8e4ac716d
--- /dev/null
+++ b/package/xinetd/patches/patch-libs_src_portable_Makefile_in
@@ -0,0 +1,11 @@
+--- xinetd-2.3.14.orig/libs/src/portable/Makefile.in	2003-02-19 18:29:27.000000000 +0100
++++ xinetd-2.3.14/libs/src/portable/Makefile.in	2011-01-22 20:48:18.898658731 +0100
+@@ -57,7 +57,7 @@ libopt: clean
+ 
+ 
+ $(LIBNAME): $(OBJECTS)
+-	ar r $@ $?
++	$(AR) r $@ $?
+ 	$(RANLIB) $@
+ 
+ install: $(LIBNAME)
diff --git a/package/xinetd/patches/patch-libs_src_pset_Makefile_in b/package/xinetd/patches/patch-libs_src_pset_Makefile_in
new file mode 100644
index 000000000..049e5e951
--- /dev/null
+++ b/package/xinetd/patches/patch-libs_src_pset_Makefile_in
@@ -0,0 +1,11 @@
+--- xinetd-2.3.14.orig/libs/src/pset/Makefile.in	2003-02-19 18:29:27.000000000 +0100
++++ xinetd-2.3.14/libs/src/pset/Makefile.in	2011-01-22 20:48:18.898658731 +0100
+@@ -53,7 +53,7 @@ libopt: clean
+ 	mv $(LIBNAME) $(LIBDIR)/optimized
+ 
+ $(LIBNAME): $(OBJECTS)
+-	ar r $@ $?
++	$(AR) r $@ $?
+ 	$(RANLIB) $@
+ 
+ install: $(LIBNAME)
diff --git a/package/xinetd/patches/patch-libs_src_sio_Makefile_in b/package/xinetd/patches/patch-libs_src_sio_Makefile_in
new file mode 100644
index 000000000..ea4e0628f
--- /dev/null
+++ b/package/xinetd/patches/patch-libs_src_sio_Makefile_in
@@ -0,0 +1,11 @@
+--- xinetd-2.3.14.orig/libs/src/sio/Makefile.in	2003-02-19 18:29:27.000000000 +0100
++++ xinetd-2.3.14/libs/src/sio/Makefile.in	2011-01-22 20:48:18.908649341 +0100
+@@ -52,7 +52,7 @@ libopt: clean
+ 	$(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)/optimized
+ 
+ $(LIBNAME): $(OBJECTS)
+-	ar r $@ $?
++	$(AR) r $@ $?
+ 	$(RANLIB) $@
+ 
+ install: $(LIBNAME)
diff --git a/package/xinetd/patches/patch-libs_src_str_Makefile_in b/package/xinetd/patches/patch-libs_src_str_Makefile_in
new file mode 100644
index 000000000..4eaa8e7a0
--- /dev/null
+++ b/package/xinetd/patches/patch-libs_src_str_Makefile_in
@@ -0,0 +1,11 @@
+--- xinetd-2.3.14.orig/libs/src/str/Makefile.in	2003-02-19 18:29:27.000000000 +0100
++++ xinetd-2.3.14/libs/src/str/Makefile.in	2011-01-22 20:48:18.908649341 +0100
+@@ -63,7 +63,7 @@ libopt: clean
+ 	$(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)-O
+ 
+ $(LIBNAME): $(OBJECTS)
+-	ar r $@ $?
++	$(AR) r $@ $?
+ 	$(RANLIB) $@
+ 
+ LINT_IGNORE=possible pointer alignment|RCSid unused
diff --git a/package/xinetd/patches/patch-libs_src_xlog_Makefile_in b/package/xinetd/patches/patch-libs_src_xlog_Makefile_in
new file mode 100644
index 000000000..8306793dc
--- /dev/null
+++ b/package/xinetd/patches/patch-libs_src_xlog_Makefile_in
@@ -0,0 +1,11 @@
+--- xinetd-2.3.14.orig/libs/src/xlog/Makefile.in	2003-02-19 18:29:27.000000000 +0100
++++ xinetd-2.3.14/libs/src/xlog/Makefile.in	2011-01-22 20:48:18.918658317 +0100
+@@ -58,7 +58,7 @@ libopt: clean
+ 	$(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)/optimized
+ 
+ $(LIBNAME): $(OBJECTS)
+-	ar r $@ $?
++	$(AR) r $@ $?
+ 	$(RANLIB) $@
+ 
+ install: $(LIBNAME)
diff --git a/rules.mk b/rules.mk
index 8dcf26644..85d0b1bc0 100644
--- a/rules.mk
+++ b/rules.mk
@@ -46,7 +46,8 @@ endif
 
 include $(TOPDIR)/mk/vars.mk
 
-export BASH HOSTCC HOSTCXX MAKE LANGUAGE LC_ALL OStype PATH
+# needed? 
+#export BASH MAKE LANGUAGE LC_ALL OStype PATH
 
 CPPFLAGS_FOR_BUILD?=
 CFLAGS_FOR_BUILD?=	-O2 -Wall
@@ -54,15 +55,6 @@ CXXFLAGS_FOR_BUILD?=	-O2 -Wall
 LDFLAGS_FOR_BUILD?=
 FLAGS_FOR_BUILD:=	${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD}
 
-HOSTCFLAGS?=		-O2 -Wall
-HOSTCXXFLAGS?=		-O2 -Wall
-HOSTCPPFLAGS?=
-HOSTLDFLAGS?=
-
-TARGET_CC:=		$(strip ${TARGET_CC})
-TARGET_CXX:=		$(strip ${TARGET_CXX})
-TARGET_CFLAGS:=		$(strip ${TARGET_CFLAGS} -fno-ident -fhonour-copts)
-
 ifneq (${show},)
 .DEFAULT_GOAL:=		show
 show:
diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development
index 6b6498749..bf479c1c5 100644
--- a/target/packages/pkg-available/development
+++ b/target/packages/pkg-available/development
@@ -9,7 +9,7 @@ config ADK_PKG_DEVELOPMENT
 	select ADK_PACKAGE_GAWK
 	select ADK_PACKAGE_GCC
 	select ADK_PACKAGE_GIT
-	select ADK_PACKAGE_GREP
+	#select ADK_PACKAGE_GREP
 	select ADK_PACKAGE_UCLIBC_DEV if ADK_TARGET_LIB_UCLIBC
 	select ADK_PACKAGE_EGLIBC_DEV if ADK_TARGET_LIB_EGLIBC
 	select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC
@@ -17,10 +17,11 @@ config ADK_PKG_DEVELOPMENT
 	select ADK_PACKAGE_LIBNCURSES_DEV
 	select ADK_PACKAGE_M4
 	select ADK_PACKAGE_MAKE
-	select ADK_PACKAGE_PATCH
+	#select ADK_PACKAGE_PATCH
 	select ADK_PACKAGE_PKG_CONFIG
 	select ADK_PACKAGE_MICROPERL
 	select ADK_PACKAGE_TSORT
+	select BUSYBOX_PATCH
 	select BUSYBOX_STAT
 	select BUSYBOX_FEATURE_STAT_FORMAT
 	select BUSYBOX_TR
diff --git a/target/packages/pkg-available/laptop b/target/packages/pkg-available/laptop
index 52312c9ab..41e4f5e3f 100644
--- a/target/packages/pkg-available/laptop
+++ b/target/packages/pkg-available/laptop
@@ -11,6 +11,7 @@ config ADK_PKG_LAPTOP
 	select ADK_PACKAGE_OPENSC
 	select ADK_PACKAGE_PCSC_LITE
 	select ADK_PACKAGE_CCID
+	select ADK_PACKAGE_ALSA_UTILS
 	select ADK_PACKAGE_OPENSSL_PKCS11
 	select ADK_PACKAGE_OPENSSH_CLIENT
 	select ADK_PACKAGE_OPENSSH_CLIENT_UTILS
diff --git a/target/tools/mkfimage/Makefile b/target/tools/mkfimage/Makefile
index 82e645285..a72cfdff1 100644
--- a/target/tools/mkfimage/Makefile
+++ b/target/tools/mkfimage/Makefile
@@ -1,4 +1,4 @@
 include $(TOPDIR)/rules.mk
 
-all:
-	$(HOSTCC) ${HOSTCFLAGS} -o ${STAGING_HOST_DIR}/bin/mkfimage mkfimage.c
+all: mkfimage.c
+	$(CC_FOR_BUILD) ${FLAGS_FOR_BUILD} -o ${STAGING_HOST_DIR}/bin/mkfimage mkfimage.c
diff --git a/target/tools/squashfs/Makefile b/target/tools/squashfs/Makefile
index 536a5e6ba..bcc966274 100644
--- a/target/tools/squashfs/Makefile
+++ b/target/tools/squashfs/Makefile
@@ -17,7 +17,7 @@ include ../rules.mk
 all: ${STAGING_HOST_DIR}/bin/mksquashfs
 
 $(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
-	${MAKE} -C ${WRKBUILD}/squashfs-tools CC='${HOSTCC}'
+	${MAKE} -C ${WRKBUILD}/squashfs-tools CC='${CC_FOR_BUILD}'
 	touch $@
 
 ${STAGING_HOST_DIR}/bin/mksquashfs: $(WRKBUILD)/.compiled
diff --git a/target/tools/squashfs/patches/honour-cflags.patch b/target/tools/squashfs/patches/honour-cflags.patch
index 2ee7de909..a50d94263 100644
--- a/target/tools/squashfs/patches/honour-cflags.patch
+++ b/target/tools/squashfs/patches/honour-cflags.patch
@@ -5,7 +5,7 @@
  INCLUDEDIR = .
  
 -CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2
-+CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2 ${HOSTCFLAGS}
++CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2 ${CFLAGS_FOR_BUILD}
  
  all: mksquashfs unsquashfs
  
diff --git a/target/tools/uboot-mkimage/Makefile b/target/tools/uboot-mkimage/Makefile
index c9d85a28e..e93964ff2 100644
--- a/target/tools/uboot-mkimage/Makefile
+++ b/target/tools/uboot-mkimage/Makefile
@@ -1,4 +1,4 @@
 include $(TOPDIR)/rules.mk
 
-all:
-	$(HOSTCC) ${HOSTCFLAGS} -o ${STAGING_HOST_DIR}/bin/mkimage mkimage.c crc32.c
+all: mkimage.c crc32.c
+	$(CC_FOR_BUILD) ${FLAGS_FOR_BUILD} -o ${STAGING_HOST_DIR}/bin/mkimage mkimage.c crc32.c
diff --git a/toolchain/Makefile b/toolchain/Makefile
index e3c04a85a..a32648000 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -65,7 +65,7 @@ $(STAGING_HOST_DIR):
 		    $(MAKE_TRACE); \
 	else \
 		$(MAKE) -C $(patsubst %-prepare,%,$@) prepare \
-		    CC='$(HOSTCC)' CFLAGS='$(HOSTCFLAGS)' \
+		    CC='$(CC_FOR_BUILD)' CFLAGS='$(CFLAGS_FOR_BUILD)' \
 		    $(MAKE_TRACE); \
 	fi
 
@@ -76,7 +76,7 @@ $(STAGING_HOST_DIR):
 		    $(MAKE_TRACE); \
 	else \
 		$(MAKE) -C $(patsubst %-configure,%,$@) configure \
-		    CC='$(HOSTCC)' CFLAGS='$(HOSTCFLAGS)' \
+		    CC='$(CC_FOR_BUILD)' CFLAGS='$(CFLAGS_FOR_BUILD)' \
 		    $(MAKE_TRACE); \
 	fi
 
@@ -87,7 +87,7 @@ $(STAGING_HOST_DIR):
 		    $(MAKE_TRACE); \
 	else \
 		$(MAKE) -C $(patsubst %-compile,%,$@) compile \
-		    CC='$(HOSTCC)' CFLAGS='$(HOSTCFLAGS)' \
+		    CC='$(CC_FOR_BUILD)' CFLAGS='$(CFLAGS_FOR_BUILD)' \
 		    $(MAKE_TRACE); \
 	fi
 
@@ -98,7 +98,7 @@ $(STAGING_HOST_DIR):
 		    $(MAKE_TRACE); \
 	else \
 		$(MAKE) -C $(patsubst %-install,%,$@) install \
-		    CC='$(HOSTCC)' CFLAGS='$(HOSTCFLAGS)' \
+		    CC='$(CC_FOR_BUILD)' CFLAGS='$(CFLAGS_FOR_BUILD)' \
 		    $(MAKE_TRACE); \
 	fi
 
diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile
index 2025746cf..c56ed99f9 100644
--- a/toolchain/gdb/Makefile
+++ b/toolchain/gdb/Makefile
@@ -36,7 +36,7 @@ $(WRKBUILD)/.configured:
 	touch $@
 
 $(WRKBUILD)/.compiled:
-	$(MAKE) ${GDB_MAKEOPTS} -C $(WRKBUILD) CFLAGS="-fPIC ${HOSTCFLAGS}"
+	$(MAKE) ${GDB_MAKEOPTS} -C $(WRKBUILD) CFLAGS="-fPIC ${CFLAGS_FOR_BUILD}"
 	touch $@
 
 $(WRKBUILD)/.installed:
author	Waldemar Brodkorb <wbx@openadk.org>	2011-01-22 22:37:50 +0100
committer	Waldemar Brodkorb <wbx@openadk.org>	2011-01-22 22:37:50 +0100
commit	9436a026e2e23d207fbdcb9e8bc9b076e3573700 (patch)
tree	adb1937bc90be8869a5f7c9636da84773414eb3b
parent	52b1b0100c53b1f8699955df618fcb47744e0a7e (diff)