From: David Sterba <dsterba@suse.cz>
Date: Wed, 28 Jan 2015 18:01:25 +0000 (+0100)
Subject: btrfs-progs: build, make autogen.sh work on older systems
X-Git-Tag: upstream/4.16.1~2402
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1fabba7ef735b2387ad144abe4e22b81269ec30c;p=platform%2Fupstream%2Fbtrfs-progs.git

btrfs-progs: build, make autogen.sh work on older systems

Try harder to find the support scipts, look into libtool or automake
dirs directly.

Signed-off-by: David Sterba <dsterba@suse.cz>
---

diff --git a/autogen.sh b/autogen.sh
index 8d996cf..b74e793 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -61,11 +61,27 @@ autoheader $AH_OPTS
 
 # it's better to use helper files from automake installation than
 # maintain copies in git tree
-HELPER_DIR=$(automake --print-libdir)
+find_autofile() {
+	if [ -f "$1" ]; then
+		return
+	fi
+	for HELPER_DIR in $(automake --print-libdir 2>/dev/null) \
+			/usr/share/libtool \
+			/usr/share/automake-* ; do
+		f="$HELPER_DIR/$1"
+		if [ -f "$f" ]; then
+			cp "$f" config/
+			return
+		fi
+	done
+	echo "Cannot find "$1" in known locations"
+	exit 1
+}
+
 mkdir -p config/
-cp $HELPER_DIR/config.guess config/
-cp $HELPER_DIR/config.sub config/
-cp $HELPER_DIR/install-sh config/
+find_autofile config.guess
+find_autofile config.sub
+find_autofile install-sh
 
 cd $THEDIR