[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

gEDA-cvs: CVS update: ChangeLog



  User: cnieves 
  Date: 07/02/10 13:02:43

  Modified:    .        ChangeLog autogen.sh
  Log:
  * autogen.sh: Added automake version number check.
  
  
  
  
  Revision  Changes    Path
  1.372     +4 -0      eda/geda/gaf/libgeda/ChangeLog
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/ChangeLog,v
  retrieving revision 1.371
  retrieving revision 1.372
  diff -u -b -r1.371 -r1.372
  --- ChangeLog	10 Feb 2007 17:41:44 -0000	1.371
  +++ ChangeLog	10 Feb 2007 18:02:42 -0000	1.372
  @@ -1,3 +1,7 @@
  +2007-02-10 Carlos Nieves Onega <cnieves@xxxxxxxxxx>
  +
  +	* autogen.sh: Added automake version number check.
  +
   2007-02-10  Mike Jarabek  <mjarabek@xxxxxxxxx>
   
   	* src/f_print.c: Applied Wojciech Kazubski's patch for offset
  
  
  
  1.5       +41 -0     eda/geda/gaf/libgeda/autogen.sh
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: autogen.sh
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/autogen.sh,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- autogen.sh	22 Jan 2006 13:55:33 -0000	1.4
  +++ autogen.sh	10 Feb 2007 18:02:43 -0000	1.5
  @@ -8,6 +8,11 @@
   test -z "$srcdir" && srcdir=.
   configure_script=configure.ac
   
  +# Automake required version
  +AM_1=1  # Major number
  +AM_2=6
  +AM_3=0  # Minor number
  +
   DIE=0
   
   (test -f $srcdir/$configure_script) || {
  @@ -51,6 +56,42 @@
     NO_AUTOMAKE=yes
   }
   
  +# check automake version. Test came from gpsd version 2.34. cnieves 2007-02-10
  +if [ -z "$NO_AUTOMAKE" ]; then
  +  echo Checking automake version...
  +  AM_VERSION=`automake --version | sed -n -e 's#[^0-9]* \([0-9]*\)\.\([0-9]*\)\.*\([0-9]*\).*$#\1 \2 \3#p'`
  +  AM_V1=`echo $AM_VERSION | awk '{print $1}'`
  +  AM_V2=`echo $AM_VERSION | awk '{print $2}'`
  +  AM_V3=`echo $AM_VERSION | awk '{print $3}'`
  +
  +  if [ "$AM_1" -gt "$AM_V1" ]; then
  +    AM_ERROR=1 
  +  else
  +    if [ "$AM_1" -eq "$AM_V1" ]; then
  +      if [ "$AM_2" -gt "$AM_V2" ]; then
  +	echo "version 2 of automake failed"
  +        AM_ERROR=1 
  +      else
  +        if [ "$AM_2" -eq "$AM_V2" ]; then
  +          if [ -n "$AM_V3" -a "$AM_3" -gt "$AM_V3" ]; then
  +   	    echo "version 3 of automake failed"
  +            AM_ERROR=1 
  +          fi
  +        fi
  +      fi
  +    fi
  +  fi
  +
  +  if [ -n "$AM_ERROR" ]; then
  +    echo
  +    echo "**Error**: Found automake version $AM_V1.$AM_V2.$AM_V3"
  +    echo "You must have \`automake' version $AM_1.$AM_2.$AM_3 or greater installed."
  +    echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/";
  +    DIE=1
  +  fi 
  +fi
  +
  +
   
   # if no automake, don't bother testing for aclocal
   test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
  
  
  


_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs