From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21550 invoked by alias); 17 Jun 2009 11:28:20 -0000 Received: (qmail 21544 invoked by alias); 17 Jun 2009 11:28:19 -0000 X-SWARE-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_92,SPF_HELO_PASS X-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_92,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: master - build: cleanup autogen and stop warnings on configure To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 7955e22fd2d8b5f99fa033ff12c182a03c9a1b25 X-Git-Newrev: 758510c1bafc929fa1a3e210484c311a215d277e From: "Fabio M. Di Nitto" Message-Id: <20090617112748.66C191201EA@lists.fedorahosted.org> Date: Wed, 17 Jun 2009 11:28:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00540.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=758510c1bafc929fa1a3e210484c311a215d277e Commit: 758510c1bafc929fa1a3e210484c311a215d277e Parent: 7955e22fd2d8b5f99fa033ff12c182a03c9a1b25 Author: Fabio M. Di Nitto AuthorDate: Wed Jun 17 13:27:26 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Wed Jun 17 13:27:26 2009 +0200 build: cleanup autogen and stop warnings on configure Signed-off-by: Fabio M. Di Nitto --- autogen.sh | 151 +--------------------------------------------------------- configure.ac | 2 +- 2 files changed, 2 insertions(+), 151 deletions(-) diff --git a/autogen.sh b/autogen.sh index 647ec5e..7f0f2eb 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,153 +1,4 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. -testProgram() -{ - cmd=$1 - - if [ -z "$cmd" ]; then - return 1; - fi - - arch=`uname -s` - - # Make sure the which is in an if-block... on some platforms it throws exceptions - # - # The ERR trap is not executed if the failed command is part - # of an until or while loop, part of an if statement, part of a && - # or || list. - if - which $cmd /dev/null 2>&1 - then - : - else - return 1 - fi - - # The GNU standard is --version - if - $cmd --version /dev/null 2>&1 - then - return 0 - fi - - # Maybe it suppports -V instead - if - $cmd -V /dev/null 2>&1 - then - return 0 - fi - - # Nope, the program seems broken - return 1 -} - -arch=`uname -s` -# Disable the errors on FreeBSD until a fix can be found. -if [ ! "$arch" = "FreeBSD" ]; then -set -e -# -# All errors are fatal from here on out... -# The shell will complain and exit on any "uncaught" error code. -# -# -# And the trap will ensure sure some kind of error message comes out. -# -trap 'echo ""; echo "$0 exiting due to error (sorry!)." >&2' 0 -fi - -RC=0 - -gnu="ftp://ftp.gnu.org/pub/gnu" - -# Check for Autoconf -for command in autoconf autoconf213 autoconf253 autoconf259 -do - if - testProgram $command == 1 - then - autoconf=$command - autoheader=`echo "$autoconf" | sed -e 's/autoconf/autoheader/'` - autom4te=`echo "$autoconf" | sed -e 's/autoconf/autmo4te/'` - autoreconf=`echo "$autoconf" | sed -e 's/autoconf/autoreconf/'` - autoscan=`echo "$autoconf" | sed -e 's/autoconf/autoscan/'` - autoupdate=`echo "$autoconf" | sed -e 's/autoconf/autoupdate/'` - ifnames=`echo "$autoconf" | sed -e 's/autoconf/ifnames/'` - fi -done - -# Check for automake -for command in automake19 automake-1.9 automake -do - if - testProgram $command - then - automake=$command - aclocal=`echo "$automake" | sed -e 's/automake/aclocal/'` - - fi -done - -# Check for libtool -for command in libtoolize -do - if - testProgram $command - then - libtoolize=$command - fi -done - -if [ -z $autoconf ]; then - echo You must have autoconf installed to compile this package. - echo Download the appropriate package for your system, - echo or get the source tarball at: $gnu/autoconf/ - exit 1 - -elif [ -z $automake ]; then - echo You must have automake installed to compile this package. - echo Download the appropriate package for your system, - echo or get the source tarball at: $gnu/automake/ - exit 1 - -elif [ -z $libtoolize ]; then - echo You must have libtool installed to compile this package. - echo Download the appropriate package for your system, - echo or get the source tarball at: $gnu/libtool/ - exit 1 - -fi - -# Create local copies so that the incremental updates will work. -rm -f ./autoconf ./automake ./autoheader ./libtoolize -ln -s `which $autoconf` ./autoconf -ln -s `which $automake` ./automake -ln -s `which $autoheader` ./autoheader -ln -s `which $libtoolize` ./libtoolize - -printf "$autoconf:\t" -$autoconf --version | head -n 1 - -printf "$automake:\t" -$automake --version | head -n 1 - -printf "$libtoolize:\t" -$libtoolize --version | head -n 1 - -echo $libtoolize --copy --install -$libtoolize --copy --install - -echo $aclocal $ACLOCAL_FLAGS -$aclocal $ACLOCAL_FLAGS - -echo $autoheader -$autoheader - -echo $automake --add-missing --include-deps --copy -$automake --add-missing --include-deps --copy - -echo $autoconf -$autoconf - -echo Now run ./configure -trap '' 0 +autoreconf -i -v && echo Now run ./configure and make diff --git a/configure.ac b/configure.ac index d2cd861..1ca7d28 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.63b]) AC_INIT([cluster], [master], [linux-cluster@redhat.com]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([-Wno-portability]) LT_PREREQ([2.2.7]) LT_INIT