texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo update (Tue Sep 7 09:22:01 EDT 2004)


From: Karl Berry
Subject: texinfo update (Tue Sep 7 09:22:01 EDT 2004)
Date: Tue, 07 Sep 2004 09:22:13 -0400

Index: config.guess
===================================================================
RCS file: /cvsroot/texinfo/texinfo/config.guess,v
retrieving revision 1.37
retrieving revision 1.38
diff -c -r1.37 -r1.38
*** config.guess        31 Aug 2004 12:37:28 -0000      1.37
--- config.guess        7 Sep 2004 12:51:40 -0000       1.38
***************
*** 3,9 ****
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  #   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
  
! timestamp='2004-08-29'
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
--- 3,9 ----
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  #   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
  
! timestamp='2004-09-07'
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
***************
*** 827,832 ****
--- 827,835 ----
      crisv32:Linux:*:*)
        echo crisv32-axis-linux-gnu
        exit 0 ;;
+     frv:Linux:*:*)
+       echo frv-unknown-linux-gnu
+       exit 0 ;;
      ia64:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit 0 ;;
Index: missing
===================================================================
RCS file: /cvsroot/texinfo/texinfo/missing,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** missing     9 Sep 2003 13:54:54 -0000       1.3
--- missing     7 Sep 2004 12:51:40 -0000       1.4
***************
*** 1,9 ****
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
  
! scriptversion=2003-09-02.23
  
! # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 
  #   Free Software Foundation, Inc.
  # Originally by Fran,cois Pinard <address@hidden>, 1996.
  
--- 1,9 ----
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
  
! scriptversion=2004-09-07.08
  
! # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
  #   Free Software Foundation, Inc.
  # Originally by Fran,cois Pinard <address@hidden>, 1996.
  
***************
*** 60,70 ****
      msg="probably too old"
    fi
    ;;
- esac
- 
- # If it does not exist, or fails to run (possibly an outdated version),
- # try to emulate it.
- case "$1" in
  
    -h|--h|--he|--hel|--help)
      echo "\
--- 60,65 ----
***************
*** 92,101 ****
--- 87,98 ----
    yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
  
  Send bug reports to <address@hidden>."
+     exit 0
      ;;
  
    -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
      echo "missing $scriptversion (GNU Automake)"
+     exit 0
      ;;
  
    -*)
***************
*** 104,115 ****
      exit 1
      ;;
  
!   aclocal*)
      if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
         # We have it, but it failed.
         exit 1
      fi
  
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
           you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
--- 101,142 ----
      exit 1
      ;;
  
! esac
! 
! # Now exit if we have it, but it failed.  Also exit now if we
! # don't have it and --version was passed (most likely to detect
! # the program).
! case "$1" in
!   lex|yacc)
!     # Not GNU programs, they don't have --version.
!     ;;
! 
!   tar)
!     if test -n "$run"; then
!        echo 1>&2 "ERROR: \`tar' requires --run"
!        exit 1
!     elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
!        exit 1
!     fi
!     ;;
! 
!   *)
      if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
         # We have it, but it failed.
         exit 1
+     elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+        # Could not run --version or --help.  This is probably someone
+        # running `$TOOL --version' or `$TOOL --help' to check whether
+        # $TOOL exists and not knowing $TOOL uses missing.
+        exit 1
      fi
+     ;;
+ esac
  
+ # If it does not exist, or fails to run (possibly an outdated version),
+ # try to emulate it.
+ case "$1" in
+   aclocal*)
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
           you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
***************
*** 119,129 ****
      ;;
  
    autoconf)
-     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-        # We have it, but it failed.
-        exit 1
-     fi
- 
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
           you modified \`${configure_ac}'.  You might want to install the
--- 146,151 ----
***************
*** 133,143 ****
      ;;
  
    autoheader)
-     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-        # We have it, but it failed.
-        exit 1
-     fi
- 
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
           you modified \`acconfig.h' or \`${configure_ac}'.  You might want
--- 155,160 ----
***************
*** 157,167 ****
      ;;
  
    automake*)
-     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-        # We have it, but it failed.
-        exit 1
-     fi
- 
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
           you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
--- 174,179 ----
***************
*** 173,183 ****
      ;;
  
    autom4te)
-     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-        # We have it, but it failed.
-        exit 1
-     fi
- 
      echo 1>&2 "\
  WARNING: \`$1' is needed, but is $msg.
           You might have modified some files without having the
--- 185,190 ----
***************
*** 254,264 ****
      ;;
  
    help2man)
-     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-        # We have it, but it failed.
-        exit 1
-     fi
- 
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
         you modified a dependency of a manual page.  You may need the
--- 261,266 ----
***************
*** 279,289 ****
      ;;
  
    makeinfo)
-     if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-        # We have makeinfo, but it failed.
-        exit 1
-     fi
- 
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
           you modified a \`.texi' or \`.texinfo' file, or any other file
--- 281,286 ----
***************
*** 301,310 ****
  
    tar)
      shift
-     if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-     fi
  
      # We have already tried tar in the generic part.
      # Look for gnutar/gtar before invocation to avoid ugly error
--- 298,303 ----
P config.guess
P missing


reply via email to

[Prev in Thread] Current Thread [Next in Thread]