[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Changes to m4/bootstrap,v [branch-1_4]
From: |
Eric Blake |
Subject: |
Changes to m4/bootstrap,v [branch-1_4] |
Date: |
Thu, 21 Sep 2006 13:07:02 +0000 |
CVSROOT: /sources/m4
Module name: m4
Branch: branch-1_4
Changes by: Eric Blake <ericb> 06/09/21 13:07:02
Index: bootstrap
===================================================================
RCS file: /sources/m4/m4/bootstrap,v
retrieving revision 1.31.2.3
retrieving revision 1.31.2.4
diff -u -b -r1.31.2.3 -r1.31.2.4
--- bootstrap 15 Jul 2006 21:32:50 -0000 1.31.2.3
+++ bootstrap 21 Sep 2006 13:07:02 -0000 1.31.2.4
@@ -1,6 +1,6 @@
#! /bin/sh
-# bootstrap (GNU M4) version 2006-07-15
+# bootstrap (GNU M4) version 2006-09-21
# Written by Gary V. Vaughan <address@hidden>
# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -25,6 +25,7 @@
# Usage: $progname [options]
+# -f --force bootstrap even when sources are not from CVS
# -v --version print version information
# -h,-? --help print short or long help message
@@ -58,6 +59,9 @@
progname=`echo "$progpath" | $SED "$basename"`
PROGRAM=bootstrap
+# Detect whether this is a CVS checkout or a tarball
+CVS_only_file=HACKING
+
# func_echo arg...
# Echo program name prefixed message.
func_echo ()
@@ -180,6 +184,7 @@
shift
case $opt in
# Separate optargs to short options:
+ -f|--force) CVS_only_file= ;;
-\?|-h) func_usage ;;
--help) func_help ;;
--version) func_version ;;
@@ -191,6 +196,10 @@
# Bail if the options were screwed
$exit_cmd $EXIT_FAILURE
+
+ if test -n "$CVS_only_file" && test ! -r "$CVS_only_file"; then
+ func_fatal_error "Bootstrapping from a non-CVS distribution is risky."
+ fi
}
## ---------------------------- ##
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Changes to m4/bootstrap,v [branch-1_4],
Eric Blake <=