--- elwix/config/rc.3thparty_helper	2014/09/15 19:06:42	1.2
+++ elwix/config/rc.3thparty_helper	2017/02/13 16:52:46	1.3
@@ -4,7 +4,7 @@
 #
 # ./rc.3thparty_helper [package] [make_tool] [prefix_dir] [build_arch_str]
 #
-# $Id: rc.3thparty_helper,v 1.2 2014/09/15 19:06:42 misho Exp $
+# $Id: rc.3thparty_helper,v 1.3 2017/02/13 16:52:46 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -25,7 +25,7 @@ shift; shift; shift; shift;
 echo ">>> Working script ${MK} into ${PFX}"
 
 if [ -n "${B}" ]; then
-	PFX="${PFX} --build ${B}"
+	PFX="${PFX} --host ${B}"
 fi
 
 TOP=$(pwd)
@@ -55,6 +55,10 @@ fi
 find ${ADDSRC} -name .deps -type d -exec rm -rf {} \;
 
 case $CMD in
+	automake)
+		cd ${ADDSRC}/automake
+		echo ">>> Now rebuild elwix $CMD program ..."
+		;;
 	sudo)
 		cd ${ADDSRC}/sudo
 		./configure --sysconfdir=/etc --libexecdir=/usr/local/libexec --with-ignore-dot \
@@ -81,12 +85,20 @@ case $CMD in
 		;;
 	readline)
 		cd ${ADDSRC}/readline
-		./configure ${PFX} || exit 1
+		${CEXEC} INSTALL="/usr/bin/install" ./configure ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
 		${MK} install || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
+	confuse)
+		cd ${ADDSRC}/confuse
+		${CEXEC} INSTALL="/usr/bin/install" ./configure --disable-nls --enable-shared ${PFX} || exit 1
+		${MK} clean || exit 1
+		${MK} || exit 1
+		${MK} install || exit 1
+		echo ">>> Now rebuild elwix $CMD program ..."
+		;;
 	mpd)
 #		cd ${ADDSRC}/libpdel
 #		${MK} clean || exit 1
@@ -94,8 +106,9 @@ case $CMD in
 #		find . -name \*.so\* -type f -exec install {} ${P}/lib \;
 #		cd ..
 		cd ${ADDSRC}/mpd/src
-		${MK} clean || exit 1
-		${MK} || exit 1
+		${CEXEC} INSTALL="/usr/bin/install" DESTDIR=${WORLD} ./configure
+		${MK} DESTDIR=${WORLD} clean || exit 1
+		${MK} DESTDIR=${WORLD} || exit 1
 		install mpd5 ${P}/sbin || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
@@ -128,6 +141,14 @@ case $CMD in
 		install ttcp ${P}/bin || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
+	iperf)
+		cd ${ADDSRC}/iperf
+		./configure --disable-silent-rules ${PFX} || exit 1
+		${MK} clean || exit 1
+		${MK} || exit 1
+		${MK} install || exit 1
+		echo ">>> Now rebuild elwix $CMD program ..."
+		;;
 	trafshow)
 		cd ${ADDSRC}/trafshow
 		./configure --sysconfdir=/etc ${PFX} || exit 1
@@ -138,7 +159,7 @@ case $CMD in
 		;;
 	ipsec-tools)
 		cd ${ADDSRC}/ipsec-tools
-		./configure --enable-shared --sysconfdir=/etc/racoon --localstatedir=/var/run --with-pkgversion=elwix-0.8.1 \
+		./configure --enable-shared --sysconfdir=/etc/racoon --localstatedir=/var/run --with-pkgversion=elwix-0.8.2 \
 				 --enable-debug --enable-ipv6 --enable-adminport --enable-stats \
 				 --enable-dpd --enable-natt=yes --enable-frag --enable-hybrid \
 				 --without-libpam --disable-gssapi --with-libradius --without-libldap \
@@ -179,7 +200,7 @@ case $CMD in
 		;;
 	igmpproxy)
 		cd ${ADDSRC}/igmpproxy
-		./configure ${PFX} || exit 1
+		${CEXEC} INSTALL="/usr/bin/install" ./configure ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
 		${MK} install || exit 1
@@ -187,7 +208,7 @@ case $CMD in
 		;;
 	bmon)
 		cd ${ADDSRC}/bmon
-		./configure ${PFX} || exit 1
+		LDFLAGS="-L${PKG}/lib" CFLAGS="-I${PKG}/include" ${CEXEC} INSTALL="/usr/bin/install" ./configure ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
 		${MK} install || exit 1
@@ -201,17 +222,18 @@ case $CMD in
 		${MK} install || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
-	arping)
-		echo ">>> Building libnet ..."
+	libnet)
 		cd ${ADDSRC}/libnet
-		./configure ${PFX} || exit 1
+		${CEXEC} INSTALL="/usr/bin/install" ./configure ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
 		${MK} install || exit 1
-		echo ">>> Building arping ..."
+		echo ">>> Now rebuild elwix $CMD program ..."
+		;;
+	arping)
 		cd ${ADDSRC}/arping
-		env LDFLAGS=-L${ADDSRC}/libnet/src CFLAGS=-I${ADDSRC}/libnet/include \
-			./configure ${PFX} || exit 1
+#		${CEXEC} LDFLAGS=-L${ADDSRC}/libnet/src CFLAGS=-I${ADDSRC}/libnet/include \
+		LDFLAGS="-L${PKG}/lib" CFLAGS="-I${PKG}/include" ${CEXEC} INSTALL="/usr/bin/install" ./configure ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
 		${MK} install || exit 1
@@ -219,15 +241,23 @@ case $CMD in
 		;;
 	hping2)
 		cd ${ADDSRC}/hping2
-		./configure ${PFX} || exit 1
+		${CEXEC} INSTALL="/usr/bin/install" ./configure ${PFX} || exit 1
 		${MK} clean || exit 1
-		${MK} || exit 1
+		case ${TARGET_ARCH} in
+			i386|amd64)
+				CROSSCOMPILE="-D__LITTLE_ENDIAN_BITFIELD" ${MK} || exit 1
+				;;
+			*)
+				CROSSCOMPILE="-D__BIG_ENDIAN_BITFIELD" ${MK} || exit 1
+				;;
+		esac
+		${MK} strip
 		install hping2 ${P}/sbin || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	mtr)
 		cd ${ADDSRC}/mtr
-		./configure --enable-ipv6 --without-gtk --without-glib ${PFX} || exit 1
+		${CEXEC} INSTALL="/usr/bin/install" ./configure --enable-ipv6 --without-gtk ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
 		${MK} install || exit 1
@@ -236,7 +266,7 @@ case $CMD in
 	ipguard)
 		cd ${ADDSRC}/ipguard
 		${MK} clean || exit 1
-		${MK} || exit 1
+		${MK} PREFIX="${PKG}" LOCALBASE="${PKG}" || exit 1
 		install ipguard ${P}/sbin || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
@@ -275,7 +305,7 @@ case $CMD in
 		;;
 	quagga)
 		cd ${ADDSRC}/quagga
-		./configure --enable-user=quagga --enable-group=quagga \
+		${CEXEC} INSTALL="/usr/bin/install" ./configure --enable-user=quagga --enable-group=quagga --disable-snmp \
 				--sysconfdir=/etc/quagga --localstatedir=/var/run/quagga \
 				--enable-vtysh --enable-opaque-lsa --enable-rtadv ${PFX} || exit 1
 		${MK} clean || exit 1
@@ -328,7 +358,7 @@ case $CMD in
 		;;
 	rsync)
 		cd ${ADDSRC}/rsync
-		./configure.sh --disable-debug --enable-ipv6 --with-rsyncd-conf=/etc/rsyncd.conf \
+		${CEXEC} INSTALL="/usr/bin/install" ./configure.sh --disable-debug --enable-ipv6 --with-rsyncd-conf=/etc/rsyncd.conf \
 			--disable-iconv --with-included-popt ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
@@ -387,7 +417,9 @@ case $CMD in
 		;;
 	lighttpd)
 		cd ${ADDSRC}/lighttpd
-		./configure --enable-static --with-openssl --without-mysql ${PFX} || exit 1
+		./configure --libdir=/usr/local/lib/lighttpd --without-attr --without-bzip2 \
+			--without-gdbm --without-libev --without-lua --without-memcached --with-openssl \
+			--without-valgrind --enable-static ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
 		${MK} install || exit 1