X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autogen.sh;h=f8b7741f29255a7c68ca5ba50c80ca5f22935984;hp=d8ccf52fe4148b7258d090524632a13882f7b4f0;hb=c14e6d47b216e6dab4b8c6ed4f491e700ce19367;hpb=2ec4f8cc2c890edcd2199c92113438c8584b78b7

diff --git a/autogen.sh b/autogen.sh
index d8ccf52..f8b7741 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,98 +1,15 @@
-#!/bin/bash
+#!/bin/sh
 
-# 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
-        ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes
-        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
-}
+# NOTE: Please avoid bashisms (bash specific syntax) in this script
 
-error_msg() {
-	echo "$cmd is $1.  version $required is required to build Lustre."
+set -e
+pw="$PWD"
+for dir in libcfs lnet lustre snmp ; do
+	ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $pw/$dir/autoconf"
+done
 
-	if [ -e /usr/lib/autolustre/bin/$cmd ]; then
-		cat >&2 <<-EOF
-		You apparently already have Lustre-specific autoconf/make RPMs
-		installed on your system at /usr/lib/autolustre/share/$cmd.
-		Please set your PATH to point to those versions:
-
-		export PATH="/usr/lib/autolustre/bin:\$PATH"
-		EOF
-	else
-		cat >&2 <<-EOF
-		CFS provides RPMs which can be installed alongside your
-		existing autoconf/make RPMs, if you are nervous about
-		upgrading.  See
-
-		ftp://ftp.lustre.org/pub/other/autolustre/README.autolustre
-
-		You may be able to download newer version from:
-
-		http://ftp.gnu.org/gnu/$cmd/$cmd-$required.tar.gz
-	EOF
-	fi
-	[ "$cmd" = "autoconf" -a "$required" = "2.57" ] && cat >&2 <<EOF
-
-or for RH9 systems you can use:
-
-ftp://fr2.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/autoconf-2.57-3.noarch.rpm
-EOF
-	[ "$cmd" = "automake-1.7" -a "$required" = "1.7.8" ] && cat >&2 <<EOF
-
-or for RH9 systems you can use:
-
-ftp://fr2.rpmfind.net/linux/fedora/core/1/i386/os/Fedora/RPMS/automake-1.7.8-1.noarch.rpm
-EOF
-	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 "BEGIN { IGNORECASE=1 } /$tool \(GNU $tool\)/ { print \$4 }")
-    echo "found $version"
-    if ! compare_versions "$required" "$version" ; then
-	error_msg "too old"
-    fi
-}
-
-echo "Checking for a complete tree..."
-if ! [ -d build -a -d portals -a -d lustre ] ; then
-    cat >&2 <<EOF
-    This seems to be an incomplete checkout.  Please read
-    README.lustrecvs for details.
-EOF
-fi
-
-check_version automake automake-1.7 "1.7.8"
-check_version autoconf autoconf "2.57"
-echo "Running aclocal..."
-aclocal-1.7
-echo "Running autoheader..."
+libtoolize -q
+aclocal -I $pw/config $ACLOCAL_FLAGS
 autoheader
-echo "Running automake..."
-automake-1.7 -a -c
-echo "Running autoconf..."
+automake -a -c
 autoconf
-