From db123b357f3fdd080f846712800c737f2d22cd6a Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Mon, 9 Feb 2015 08:31:50 -0800
Subject: [PATCH] distscript.csh: no need to get config.sub|guess from upstream

It used to be important to get the latest config.sub and config.guess
from upstream because architectures were changing rapidly, and the GNU
Autotools released super-slowly.

However, architectures have not been changing nearly as fast -- the
versions of config.guess and config.sub that ship in the GNU Autotools
are fine.  So let's stop getting upstream config.guess|sub from
upstream as part of "make dist".
---
 config/distscript.csh | 78 +------------------------------------------
 1 file changed, 1 insertion(+), 77 deletions(-)

diff --git a/config/distscript.csh b/config/distscript.csh
index daabb3894c..c34525bec2 100644
--- a/config/distscript.csh
+++ b/config/distscript.csh
@@ -10,7 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2015      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
@@ -83,82 +83,6 @@ echo "*** Updated VERSION file with repo rev number"
 cd "$distdir"
 echo "*** Now in distdir: $distdir"
 
-#
-# Get the latest config.guess and config.sub from ftp.gnu.org
-#
-
-echo "*** Downloading latest config.sub/config.guess from ftp.gnu.org..."
-cd config
-set configdir="`pwd`"
-mkdir tmp.$$
-cd tmp.$$
-# Official HTTP git mirrors for config.guess / config.sub
-wget -t 1 -T 10 -O config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=master'
-wget -t 1 -T 10 -O config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=master'
-chmod +x config.guess config.sub
-
-# Recently, ftp.gnu.org has had zero-legnth config.guess / config.sub
-# files, which causes the automated nightly SVN snapshot tarball to
-# fail to be made correctly.  This is a primitive attempt to fix that.
-# If we got zero-length files from wget, use a config.guess /
-# config.sub from a known location that is more recent than what ships
-# in the current generation of auto* tools.  Also check to ensure that
-# the resulting scripts are runnable (Jan 2009: there are un-runnable
-# scripts available right now because of some git vulnerability).
-
-# Before you complain about this too loudly, remember that we're using
-# unreleased software...
-
-set happy=0
-if (! -f config.guess || `test -s config.guess;echo $status`) then
-    echo " - WARNING: Got bad config.guess from ftp.gnu.org (non-existent or empty)"
-else
-    ./config.guess >& /dev/null
-    if ($status != 0) then
-        echo " - WARNING: Got bad config.guess from ftp.gnu.org (not executable)"
-    else
-        if (! -f config.sub || `test -s config.sub;echo $status`) then
-            echo " - WARNING: Got bad config.sub from ftp.gnu.org (non-existent or empty)"
-        else
-            ./config.sub `./config.guess` >& /dev/null
-            if ($status != 0) then
-                echo " - WARNING: Got bad config.sub from ftp.gnu.org (not executable)"
-            else
-                echo " - Got good config.guess and config.sub from ftp.gnu.org"
-                cp -f config.sub config.guess ..
-                set happy=1
-            endif
-        endif
-    endif
-endif
-
-if ("$happy" == "0") then
-    echo " - WARNING: using included versions for both config.sub and config.guess"
-endif
-cd ..
-rm -rf tmp.$$
-cd ..
-
-
-#
-# Find all the config.guess/config.sub files, and replace them with
-# the ones that we've downloaded
-#
-
-echo "*** Now in: `pwd`"
-echo "*** Replacing config.sub/config.guess with latest from ftp.gnu.org..."
-foreach file (config.guess config.sub)
-    foreach dir (opal orte ompi)
-        if (-d $dir) then
-            find $dir -name $file \
-                -exec chmod +w {} \; \
-                -exec cp -f $configdir/$file {} \; \
-                -print
-        endif
-    end
-end
-
-
 #
 # Put the release version number in the README and INSTALL files
 #