X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=ldiskfs%2Fautogen.sh;h=feb9f479c1d33fcc06f6463d2180e3c11616c702;hp=908ec1103525a465c0485d2c060350a331512a98;hb=1ec95b2b5410286c46b95c624e1d382b1e86535a;hpb=39f87f91ee26fc617b97b8c90c1f9bb585a15391

diff --git a/ldiskfs/autogen.sh b/ldiskfs/autogen.sh
index 908ec11..feb9f47 100644
--- a/ldiskfs/autogen.sh
+++ b/ldiskfs/autogen.sh
@@ -2,115 +2,17 @@
 
 # NOTE: Please avoid bashisms (bash specific syntax) in this script
 
-# taken from gnome-common/macros2/autogen.sh
-compare_versions() {
-	ch_min_version=$1
-	ch_actual_version=$2
-	ch_status=0
-	IFS="${IFS= 	}"; ch_save_IFS="$IFS"; IFS="."
-	set $ch_actual_version
-	for ch_min in $ch_min_version; do
-		# remove letter suffixes
-		ch_cur=$(echo $1 | sed 's/[^0-9].*$//'); shift
-		if [ -z "$ch_min" ]; then break; fi
-		if [ -z "$ch_cur" ]; then ch_status=1; break; fi
-		if [ $ch_cur -gt $ch_min ]; then break; fi
-		if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi
-	done
-	IFS="$ch_save_IFS"
-	return $ch_status
-}
-
-error_msg() {
-	echo "$cmd is $1.  Version $required (or higher) is"\
-	     " required to build Lustre."
-
-	if [ ! -x /usr/bin/lsb_release ]; then
-		echo "lsb_release could not be found.  "\
-		     "If it were available more help on how to resolve this"
-		echo "situation would be available."
-                exit 1
-	fi
-
-	local dist_id="$(lsb_release -is)"
-	local howto=""
-	howto() {
-		echo -e "To install $cmd, you can use the command:\n# $1"
-	}
-	case $dist_id in
-		 Ubuntu|Debian) howto "apt-get install $cmd" ;;
-	CentOS|RedHat*|Fedora*) howto "yum install $cmd" ;;
-	                 SUSE*) howto "yast -i $cmd" ;;
-	                     *) cat <<EOF
-Installation instructions for the package $cmd on $dist_id are not known.
-If you know how to install the required package, please file a bug at
-http://bugs.whamcloud.com/ and include your distribution and the output from:
-"lsb_release -is" is: "$dist_id"
-EOF
-			;;
-	esac
-
-	exit 1
-}
-
-check_version() {
-	local tool
-	local cmd
-	local required
-	local version
-
-	tool=$1
-	cmd=$2
-	required=$3
-	echo -n "checking for $cmd >= $required... "
-	if ! $cmd --version >/dev/null ; then
-		error_msg "missing"
-	fi
-	version=$($cmd --version | awk "/$tool \(GNU/ { print \$4 }")
-	echo "found $version"
-	if ! compare_versions "$required" "$version" ; then
-		error_msg "too old"
-	fi
-}
-
-found=false
-for AMVER in 1.9 1.10 1.11; do
-	if which automake-$AMVER 2> /dev/null; then
-		found=true
-		break
-	fi
-done
-
-if ! $found; then
-	cmd=automake required="1.9" error_msg "not found"
-	exit 1
-fi
-
-[ "${AMVER#1.}" -ge "10" ] && AMOPT="-W no-portability"
+# enable execution tracing
+set -x
 
-check_version automake automake-$AMVER "1.9"
-check_version autoconf autoconf "2.57"
-
-run_cmd()
+error()
 {
-	cmd="$@"
-	echo -n "Running $cmd"
-	eval $cmd
-	res=$?
-	if [ $res -ne 0 ]; then
-		echo " failed: $res"
-		echo "Aborting"
-		exit 1
-	fi
-	echo
+	rc=$?
+	echo "$1 failed (rc=$rc).  Aborting."
+	exit 1
 }
 
-ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/build/autoconf"
-
-export ACLOCAL="aclocal-$AMVER"
-export AUTOMAKE="automake-$AMVER"
-
-run_cmd "$ACLOCAL $ACLOCAL_FLAGS"
-run_cmd "autoheader"
-run_cmd "$AUTOMAKE -a -c $AMOPT"
-run_cmd autoconf
+aclocal -I $PWD/config || error "aclocal"
+autoheader || error "autoheader"
+automake -a -c -W no-portability || error "automake"
+autoconf || error "autoconf"