From 444176e8aa3a958f147f15542793678b619be262 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 28 Oct 2013 16:33:41 +0100
Subject: fix host build stuff and update-patches, convert cifs-utils and
 libaudiofile to new autotool infrastructure

---
 scripts/scan-pkgs.sh   | 33 ---------------------------------
 scripts/scan-tools.sh  |  6 +++---
 scripts/update-patches | 11 +++++++++++
 3 files changed, 14 insertions(+), 36 deletions(-)

(limited to 'scripts')

diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 757ae4256..74e13ddf0 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -140,22 +140,10 @@ if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then
 	NEED_XKBCOMP="$NEED_XKBCOMP xkeyboard-config"
 fi
 
-if [[ -n $ADK_COMPILE_AUTOCONF ]]; then
-	NEED_M4="$NEED_M4 autoconf"
-fi
-
-if [[ -n $ADK_COMPILE_AUTOMAKE ]]; then
-	NEED_AUTOCONF="$NEED_AUTOCONF automake"
-fi
-
 if [[ -n $ADK_COMPILE_COROSYNC ]]; then
 	NEED_GROFF="$NEED_GROFF corosync"
 fi
 
-if [[ -n $ADK_COMPILE_LIBTOOL ]]; then
-	NEED_AUTOMAKE="$NEED_AUTOMAKE libtool"
-fi
-
 if [[ -n $ADK_PACKAGE_SQUID ]]; then
 	NEED_GXX="$NEED_GXX squid"
 fi
@@ -342,27 +330,6 @@ if [[ -n $NEED_MKFONTDIR ]]; then
 	fi
 fi
 
-if [[ -n $NEED_M4 ]]; then
-	if ! which m4 >/dev/null 2>&1; then
-		echo >&2 You need GNU m4 to build $NEED_M4
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_AUTOCONF ]]; then
-	if ! which autoconf >/dev/null 2>&1; then
-		echo >&2 You need autoconf to build $NEED_AUTOCONF
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_AUTOMAKE ]]; then
-	if ! which automake >/dev/null 2>&1; then
-		echo >&2 You need automake to build $NEED_AUTOMAKE
-		out=1
-	fi
-fi
-
 if [[ -n $NEED_INTL ]]; then
 	if ! which intltool-update >/dev/null 2>&1; then
 		echo >&2 You need intltool to build $NEED_INTL
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index 7b1446b76..a587e5ad3 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -226,9 +226,9 @@ if ! which perl >/dev/null 2>&1; then
 fi
 
 if ! which m4 >/dev/null 2>&1; then
-	echo "You must install m4 (macro processor) to continue."
-	echo
-	out=1
+       echo "You must install m4 (macro processor) to continue."
+       echo
+       out=1
 fi
 
 if ! which pkg-config >/dev/null 2>&1; then
diff --git a/scripts/update-patches b/scripts/update-patches
index d38a8fdf4..a180b96be 100644
--- a/scripts/update-patches
+++ b/scripts/update-patches
@@ -77,11 +77,22 @@ else
 	patch_newfiles=0
 fi
 
+if [[ -e $WRKDIST/../.autoreconf_done ]]; then
+	touch $ORGDIST/.autoreconf_done
+	ignore_autoconf=1
+else
+	ignore_autoconf=0
+fi
+
 DIFF_FLAGS="-adu -I \"^--- $(echo $D_SUBP.orig/ | $TRANSFORM)@@	.*\""
 DIFF_FLAGS="$DIFF_FLAGS -I \"^\+\+\+ $(echo $D_SUBP/ | $TRANSFORM)@@	.*\""
 
 for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do
+	echo "DEBUG: $file" >> /tmp/debug
 	[[ ! -e $ORGDIST/$file && $patch_newfiles = 0 ]] && continue
+	[[ $file = configure && $ignore_autoconf = 1 ]] && continue	
+	[[ $file = config.h.in && $ignore_autoconf = 1 ]] && continue	
+	[[ $(basename $file) = Makefile.in && $ignore_autoconf = 1 ]] && continue	
 	cmp -s "$ORGDIST/$file" "$WRKDIST/$file" && continue
 	echo "Processing ${file}..." >&2
 	# look in patchdir for an existing patchfile matching this
-- 
cgit v1.2.3