X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=autogen.sh;h=80442c5b37dd09d10a543019f477e8741439a236;hb=ea5052e51f1a284b34a2550b67b465927348fac8;hp=8d996cf433345a034a3b7ac3e737798ccf2f64e2;hpb=48e728d1120c9e5482b5e4aa4dd91f071acfd6bb;p=platform%2Fupstream%2Fbtrfs-progs.git

diff --git a/autogen.sh b/autogen.sh
index 8d996cf..80442c5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -37,10 +37,19 @@ test -f btrfs.c || {
 (automake --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have automake installed to generate btrfs-progs build system."
-	echo 
+	echo
 	DIE=1
 }
 
+(pkg-config --version) < /dev/null > /dev/null 2>&1 || {
+	echo
+	echo "You must have pkg-config installed to use btrfs-progs build system."
+	echo "The pkg-config utility was not found in the standard location, set"
+	echo "the PKG_CONFIG/PKG_CONFIG_PATH/PKG_CONFIG_LIBDIR variables at the"
+	echo "configure time."
+	echo
+}
+
 if test "$DIE" -eq 1; then
 	exit 1
 fi
@@ -55,19 +64,36 @@ echo "   automake:   $(automake --version | head -1)"
 chmod +x version.sh
 rm -rf autom4te.cache
 
-aclocal $AL_OPTS
-autoconf $AC_OPTS
-autoheader $AH_OPTS
+aclocal -I m4 $AL_OPTS &&
+autoconf -I m4 $AC_OPTS &&
+autoheader -I m4 $AH_OPTS ||
+exit 1
 
 # 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
+cd "$THEDIR"
 
 echo
 echo "Now type '$srcdir/configure' and 'make' to compile."