[cairo-commit] cairo autogen.sh,1.4,1.5

[Dave Beckett]

Committed by: dajobe

Update of /cvs/cairo/cairo
In directory pdx:/tmp/cvs-serv20528

Modified Files:
	autogen.sh 
Log Message:
Report versions of commands on failure.  Try to get version numbers from newer GNU --version formats.

Index: autogen.sh
===================================================================
RCS file: /cvs/cairo/cairo/autogen.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** autogen.sh	9 Jul 2004 16:16:47 -0000	1.4
--- autogen.sh	9 Jul 2004 19:47:06 -0000	1.5
***************
*** 25,38 ****
  
  if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1 ; then
!     if ($AUTOCONF --version | awk 'NR==1 { if( $3 >= '$autoconf_min_vers') \
  			       exit 1; exit 0; }');
      then
         echo "$ARGV0: ERROR: \`$AUTOCONF' is too old."
         echo "           (version $autoconf_min_vers or newer is required)"
         DIE="yes"
      fi
  else
      echo
!     echo "$ARGV0: ERROR: You must have \`$AUTOCONF' installed to compile $PACKAGE."
      echo "           (version $autoconf_min_vers or newer is required)"
      DIE="yes"
--- 25,40 ----
  
  if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1 ; then
!     if ($AUTOCONF --version | head -1 | awk 'NR==1 { if( $(NF) >= '$autoconf_min_vers') \
  			       exit 1; exit 0; }');
      then
         echo "$ARGV0: ERROR: \`$AUTOCONF' is too old."
+        $AUTOCONF --version
         echo "           (version $autoconf_min_vers or newer is required)"
         DIE="yes"
      fi
  else
+     echo $AUTOCONF: command not found
      echo
!     echo "$ARGV0: ERROR: You must have \`autoconf' installed to compile $PACKAGE."
      echo "           (version $autoconf_min_vers or newer is required)"
      DIE="yes"
***************
*** 40,59 ****
  
  if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 ; then
!   if ($AUTOMAKE --version | awk 'NR==1 { if( $4 >= '$automake_min_vers') \
  			     exit 1; exit 0; }');
       then
       echo "$ARGV0: ERROR: \`$AUTOMAKE' is too old."
       echo "           (version $automake_min_vers or newer is required)"
       DIE="yes"
    fi
    if ($ACLOCAL --version) < /dev/null > /dev/null 2>&1; then
!     if ($ACLOCAL --version | awk 'NR==1 { if( $4 >= '$aclocal_min_vers' ) \
  						exit 1; exit 0; }' );
      then
        echo "$ARGV0: ERROR: \`$ACLOCAL' is too old."
        echo "           (version $aclocal_min_vers or newer is required)"
        DIE="yes"
      fi
    else
      echo
      echo "$ARGV0: ERROR: Missing \`$ACLOCAL'"
--- 42,64 ----
  
  if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 ; then
!   if ($AUTOMAKE --version | head -1 | awk 'NR==1 { if( $(NF) >= '$automake_min_vers') \
  			     exit 1; exit 0; }');
       then
       echo "$ARGV0: ERROR: \`$AUTOMAKE' is too old."
+      $AUTOMAKE --version
       echo "           (version $automake_min_vers or newer is required)"
       DIE="yes"
    fi
    if ($ACLOCAL --version) < /dev/null > /dev/null 2>&1; then
!     if ($ACLOCAL --version | head -1 | awk 'NR==1 { if( $(NF) >= '$aclocal_min_vers' ) \
  						exit 1; exit 0; }' );
      then
        echo "$ARGV0: ERROR: \`$ACLOCAL' is too old."
+       $ACLOCAL --version
        echo "           (version $aclocal_min_vers or newer is required)"
        DIE="yes"
      fi
    else
+     echo $ACLOCAL: command not found
      echo
      echo "$ARGV0: ERROR: Missing \`$ACLOCAL'"
***************
*** 62,80 ****
    fi
  else
      echo
!     echo "$ARGV0: ERROR: You must have \`$AUTOMAKE' installed to compile $PACKAGE."
      echo "           (version $automake_min_vers or newer is required)"
      DIE="yes"
  fi
  
! if (libtoolize --version) < /dev/null > /dev/null 2>&1 ; then
!     if (libtoolize --version | awk 'NR==1 { if( $4 >= '$libtoolize_min_vers') \
  			       exit 1; exit 0; }');
      then
!        echo "$ARGV0: ERROR: \`libtoolize' is too old."
         echo "           (version $libtoolize_min_vers or newer is required)"
         DIE="yes"
      fi
  else
      echo
      echo "$ARGV0: ERROR: You must have \`libtoolize' installed to compile $PACKAGE."
--- 67,87 ----
    fi
  else
+     echo $AUTOMAKE: command not found
      echo
!     echo "$ARGV0: ERROR: You must have \`automake' installed to compile $PACKAGE."
      echo "           (version $automake_min_vers or newer is required)"
      DIE="yes"
  fi
  
! if ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 ; then
!     if ($LIBTOOLIZE --version | awk 'NR==1 { if( $4 >= '$libtoolize_min_vers') \
  			       exit 1; exit 0; }');
      then
!        echo "$ARGV0: ERROR: \`$LIBTOOLIZE' is too old."
         echo "           (version $libtoolize_min_vers or newer is required)"
         DIE="yes"
      fi
  else
+     echo $LIBTOOLIZE: command not found
      echo
      echo "$ARGV0: ERROR: You must have \`libtoolize' installed to compile $PACKAGE."