This commit was manufactured by cvs2svn to create branch

'GNUPG-1-9-BRANCH'.

21 files changed, 0 insertions, 5708 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
deleted file mode 100644
index 1a6ec032b..000000000
--- a/scripts/ChangeLog
+++ /dev/null
@@ -1,285 +0,0 @@
-2002-10-17  Werner Koch  <wk@gnupg.org>
-
-	* autogen.sh: Allow env variables to override the auto* tool
-	names.  Suggested by Simon Josefsson.
-
-2002-09-11  Werner Koch  <wk@gnupg.org>
-
-	* distfiles: Include mk-w32-dist.
-
-	* mk-w32-dist: Convert the character sets on a per language base.
-
-2002-09-02  Werner Koch  <wk@gnupg.org>
-
-	* mk-w32-dist: Include more man pages and gpg split.  Changed name
-	of ZIP file to better indicate that this is a command line version.
-
-2002-08-23  Werner Koch  <wk@gnupg.org>
-
-	* autogen.sh : Don't run gettextize.
-
-2002-08-06  Stefan Bellon  <sbellon@sbellon.de>
-
-	* conf-riscos/include/config.h: Changed #define FOO to
-	#define FOO 1.
-	* conf-riscos/include/g10defs.h: Likewise.
-
-2002-08-03  Stefan Bellon  <sbellon@sbellon.de>
-
-	* conf-riscos/include/g10defs.h: Added GNUPG_LIBEXECDIR.
-	* conf-riscos/include/config.h: Changes due to dynload removal and
-	minor changes to avoid some warnings.
-	* conf-riscos/Makefile: Changes due to dynload removal.
-	* conf-riscos/cipher/*: Not needed anymore due to dynload removal.
-
-2002-07-25  David Shaw  <dshaw@jabberwocky.com>
-
-	* gnupgbug: "Warning" -> "WARNING"
-
-2002-07-01  Werner Koch  <wk@gnupg.org>
-
-	* mk-gpg-texi: New.
-
-2002-06-30  Werner Koch  <wk@gnupg.org>
-
-	* mk-w32-dist (bindir): Fixes vor VPATH builds in a subdir,
-	include gpgv.
-
-2002-06-21  Stefan Bellon  <sbellon@sbellon.de>
-
-	* conf-riscos/Makefile: Changes due to moving around RISC OS
-	specific stuff in the code.
-
-2002-06-07  Stefan Bellon  <sbellon@sbellon.de>
-
-	* conf-riscos/include/config.h [__riscos__]: Fixed macro bug.
-
-2002-05-10  Stefan Bellon  <sbellon@sbellon.de>
-
-	* conf-riscos/include/config.h [__riscos__]: Changes for later
-	Norcroft compilers.
-
-	* conf-riscos/Makefile [__riscos__]: Updated.
-
-2002-04-22  Stefan Bellon  <sbellon@sbellon.de>
-
-	* conf-riscos/include/config.h [__riscos__]: Development
-	versions automatically define DEBUG from now on.
-
-	* conf-riscos/Makefile [__riscos__]: Updated for LDAP keyserver
-	code.
-
-2002-04-19  David Shaw  <dshaw@jabberwocky.com>
-
-	* gnupg.spec.in: Removed pubring.asc and OPTIONS.  Added
-	samplekeys.asc.
-
-2002-03-31  David Shaw  <dshaw@jabberwocky.com>
-
-	* gnupg.spec.in: Added the gpgkeys_xxx keyserver helpers.  Added a
-	* to catch variations on the basic gpg man page (gpg, gpgv).  Mark
-	options.skel as a config file.  Do not include the FAQ/faq.html
-	twice (in /doc/ and /share/).
-	
-2002-01-02  Stefan Bellon  <sbellon@sbellon.de>
-
-	* build-riscos [__riscos__]: Set filetype of Makefile correctly.
-
-	* conf-riscos/include/g10defs.h [__riscos__]: Added GNU GPL
-	header and exec code defines.
-
-	* conf-riscos/include/config.h [__riscos__]: Moved parts to
-	include/util.h where they really belong to.
-
-	* conf-riscos/Makefile [__riscos__]: Updated for new keyserver,
-	exec and photo id code.
-
-2001-12-22  Werner Koch  <wk@gnupg.org>
-
-	* autogen.sh: Fixed last change.
-
-2001-12-21  Werner Koch  <wk@gnupg.org>
-
-	* distfiles: Removed those files which which automake installs by
-	default.
-
-	* autogen.sh: Replaced $() by backticks for system without a posix
-	shell.  Removed gawk specific quoting. By David Champion.
-
-2001-10-22  Werner Koch  <wk@gnupg.org>
-
-	* autogen.sh (aclocal_vers): Require automalke 1.5.
-
-2001-08-21  Stefan Bellon  <sbellon@sbellon.de>
-
-	* build-riscos [__riscos__]: New.
-	* conf-riscos [__riscos__]: Ditto.
-
-2001-08-13  Werner Koch  <wk@gnupg.org>
-
-	* autogen.sh: Test on gettext 0.10.38. By Michael Engels.
-
-2001-08-07  Werner Koch  <wk@gnupg.org>
-
-	* autogen.sh: Adjusted --build-w32 for autoconf 2.52 
-
-2001-07-09  Werner Koch  <wk@gnupg.org>
-
-	* autogen.sh (autoconf_vers): Require autoconf 2.50
-
-2001-05-06  Werner Koch  <wk@gnupg.org>
-
-	* config.guess, config.sub: Add updates from subversions.gnu.org.
-
-2001-04-19  Werner Koch  <wk@gnupg.org>
-
-	* autogen.sh: Add VPATH build support for option --build-w32. 
-
-2001-03-12  Werner Koch  <wk@gnupg.org>
-
-	* config.guess, config.sub: Replaced with the current GNU CVS ones. 
-
-2001-01-18  Werner Koch  <wk@gnupg.org>
-
-	* autogen.sh: New options --build-w32
-	* build-w32: Does now call autogen.sh
-
-2000-11-24  Werner Koch  <wk@gnupg.org>
-
-	* build-w32: New script to build the W32 version.
-	* distfiles: And put it into the distribution
-
-Thu Sep 14 17:45:11 CEST 2000  Werner Koch  <wk@openit.de>
-
-        * gnupg.spec.in: Updated.
-
-Wed Sep  6 17:55:47 CEST 2000  Werner Koch  <wk@openit.de>
-
-        * config.guess, config.sub: Replaced with the latest version from the
-        CVS archive.  Hope that does not break too much.
-
-Fri May 12 14:01:20 CEST 2000  Werner Koch  <wk@openit.de>
-
-	* gnupg.spec.in: New version from Fabio with some updated descriptions.
-
-Mon May  1 15:38:04 CEST 2000  Werner Koch  <wk@openit.de>
-
-	* gnupg.spec.in: New version from Fabio.
-
-Fri Mar 17 16:26:05 CET 2000  Werner Koch  <wk@openit.de>
-
-	* config.gues, config.sub: Support for s390-ibm-linux-gnu. Thanks
-	to Holger Smolinski.
-
-Thu Mar  2 15:37:46 CET 2000  Werner Koch  <wk@gnupg.de>
-
-	* config.guess: Add support for QNX.  By Sam Roberts.
-	* config.sub: Ditto.
-
-Thu Sep 23 09:49:25 1999  Werner Koch  (wk@gnupg.org)
-
-	* commit: Remove leading and trailing empty lines when copying
-	Changes to Changelog
-
-Wed Sep 15 16:22:17 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
-
-	* gnupg.spec: Add Portuguese description
-
-Thu Sep  2 16:40:55 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
-
-	* mkdiff: changed format of diff file name and made script more
-	general.
-
-Wed Aug  4 10:34:18 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
-
-	* config.guess: Updated from gnu/common and applied my emx patch again.
-	* config.sub: Updated from gnu/common.
-
-Wed Jul 14 19:42:08 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
-
-	* ltmain.sh, ltconfig.sh : Updated to libtool 1.3.3
-
-Mon Jul 12 14:55:34 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
-
-	* autogen.sh: Run libtoolize
-
-Sat May 22 22:47:26 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
-
-	* autogen.sh: Fixed the error message for a missing libtool.
-
-Sat May  8 19:28:08 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
-
-	* mkinstalldirs, install-sh: New from GNU repository
-	* config.sub, config.guess: Merged with rep version.
-
-Sun Mar 14 19:34:36 CET 1999  Werner Koch  <wk@isil.d.shuttle.de>
-
-	* autogen.sh: Add a check for libtool because some autoconf macros
-	are needed.
-
-Mon Feb 22 20:04:00 CET 1999  Werner Koch  <wk@isil.d.shuttle.de>
-
-	* autogen.sh: Enhanced the version testing code (Philippe Laliberte)
-
-	* mkwebpage: Edits the buglist.
-
-Sat Feb 13 12:04:43 CET 1999  Werner Koch  <wk@isil.d.shuttle.de>
-
-	* autogen.sh: Now uses gettextize
-
-Wed Feb 10 17:15:39 CET 1999  Werner Koch  <wk@isil.d.shuttle.de>
-
-	* config.sub, config.guess: Support i386-emx-os2
-
-Sun Jan 17 11:04:33 CET 1999  Werner Koch  <wk@isil.d.shuttle.de>
-
-	* autogen.sh: Now checks for installed gettext
-
-Sat Jan 16 09:27:30 CET 1999  Werner Koch  <wk@isil.d.shuttle.de>
-
-	* config.guess (m68k-atari-mint): New.
-	* config.sub: Add support for atarist-MiNT
-
-Wed Jan 13 12:49:36 CET 1999  Werner Koch  <wk@isil.d.shuttle.de>
-
-	* gnupg.spec.in: New
-	* gnupg.spec: Removed
-
-Wed Dec 23 13:18:14 CET 1998  Werner Koch  <wk@isil.d.shuttle.de>
-
-	* gnupg.spec: Updated version by Fabio Coatti
-
-Thu Dec 17 18:31:15 CET 1998  Werner Koch  <wk@isil.d.shuttle.de>
-
-	* gnupg.spec: New version by Reuben Sumner and did some more
-	changes.
-
-Fri Nov 27 12:39:29 CET 1998  Werner Koch  <wk@isil.d.shuttle.de>
-
-
-	* commit: New
-
-
-Fri Nov 20 12:01:57 1998  Werner Koch  (wk@isil.d.shuttle.de)
-
-	* mkdiff: signs the patch file
-
-Sat Oct 17 16:10:16 1998  Werner Koch  (wk@isil.d.shuttle.de)
-
-	* autogen.sh: New.
-
-Wed Oct 14 09:55:25 1998  Werner Koch  (wk@isil.d.shuttle.de)
-
-	* config.guess (FreeBSD): Changes from Jun Kuriyama to support ELF
-	* config.sub: (freebsd): Add to maybe_os
-
-
- Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-
- This file is free software; as a special exception the author gives
- unlimited permission to copy and/or distribute it, with or without
- modifications, as long as this notice is preserved.
-
- This file is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/scripts/autogen.sh b/scripts/autogen.sh
deleted file mode 100755
index 07ce852ef..000000000
--- a/scripts/autogen.sh
+++ /dev/null
@@ -1,148 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-#
-# Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-PGM=GnuPG
-lib_config_files=""
-autoconf_vers=2.52
-automake_vers=1.6
-aclocal_vers=1.6
-
-ACLOCAL=${ACLOCAL:-aclocal}
-AUTOCONF=${AUTOCONF:-autoconf}
-AUTOMAKE=${AUTOMAKE:-automake}
-AUTOHEADER=${AUTOHEADER:-autoheader}
-DIE=no
-if test "$1" = "--build-w32"; then
-    tmp=`dirname $0`
-    tsdir=`cd "$tmp"; cd ..; pwd`
-    shift
-    host=i386--mingw32
-    if [ ! -f $tsdir/scripts/config.guess ]; then
-        echo "$tsdir/scripts/config.guess not found" >&2
-        exit 1
-    fi
-    build=`$tsdir/scripts/config.guess`
-        
-    if ! mingw32 --version >/dev/null; then
-        echo "We need at least version 0.3 of MingW32/CPD" >&2
-        exit 1
-    fi
-
-    if [ -f "$tsdir/config.log" ]; then
-        if ! head $tsdir/config.log | grep i386--mingw32 >/dev/null; then
-            echo "Pease run a 'make distclean' first" >&2
-            exit 1
-        fi
-    fi
-
-    crossbindir=`mingw32 --install-dir`/bin
-    CC=`mingw32 --get-path gcc`
-    CPP=`mingw32 --get-path cpp`
-    AR=`mingw32 --get-path ar`
-    RANLIB=`mingw32 --get-path ranlib`
-    export CC CPP AR RANLIB 
-
-    disable_foo_tests=""
-    if [ -n "$lib_config_files" ]; then
-        for i in $lib_config_files; do
-            j=`echo $i | tr '[a-z-]' '[A-Z_]'`
-            eval "$j=${crossbindir}/$i"
-            export $j
-            disable_foo_tests="$disable_foo_tests --disable-`echo $i| \
-                           sed 's,-config$,,'`-test"
-            if [ ! -f "${crossbindir}/$i" ]; then                   
-                echo "$i not installed for MingW32" >&2
-                DIE=yes
-            fi
-        done
-    fi
-    [ $DIE = yes ] && exit 1
-
-    $tsdir/configure --build=${build} --host=${host} \
-                ${disable_foo_tests} $*
-    exit $?
-fi
-
-
-
-if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1 ; then
-    if ($AUTOCONF --version | awk 'NR==1 { if( $3 >= '$autoconf_vers') \
-			       exit 1; exit 0; }');
-    then
-       echo "**Error**: "\`autoconf\'" is too old."
-       echo '           (version ' $autoconf_vers ' or newer is required)'
-       DIE="yes"
-    fi
-else
-    echo
-    echo "**Error**: You must have "\`autoconf\'" installed to compile $PGM."
-    echo '           (version ' $autoconf_vers ' or newer is required)'
-    DIE="yes"
-fi
-
-if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 ; then
-  if ($AUTOMAKE --version | awk 'NR==1 { if( $4 >= '$automake_vers') \
-			     exit 1; exit 0; }');
-     then
-     echo "**Error**: "\`automake\'" is too old."
-     echo '           (version ' $automake_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_vers' ) \
-						exit 1; exit 0; }' );
-    then
-      echo "**Error**: "\`aclocal\'" is too old."
-      echo '           (version ' $aclocal_vers ' or newer is required)'
-      DIE="yes"
-    fi
-  else
-    echo
-    echo "**Error**: Missing "\`aclocal\'".  The version of "\`automake\'
-    echo "           installed doesn't appear recent enough."
-    DIE="yes"
-  fi
-else
-    echo
-    echo "**Error**: You must have "\`automake\'" installed to compile $PGM."
-    echo '           (version ' $automake_vers ' or newer is required)'
-    DIE="yes"
-fi
-
-
-if (gettext --version </dev/null 2>/dev/null | awk 'NR==1 { split($4,A,"."); \
-    X=10000*A[1]+100*A[2]+A[3]; echo X; if( X >= 1038 ) exit 1; exit 0}')
-    then
-    echo "**Error**: You must have "\`gettext\'" installed to compile $PGM."
-    echo '           (version 0.10.38 or newer is required; get'
-    echo '            ftp://alpha.gnu.org/gnu/gettext/gettext-0.10.38.tar.gz'
-    echo '            or install the latest Debian package)'
-    DIE="yes"
-fi
-
-
-if test "$DIE" = "yes"; then
-    exit 1
-fi
-
-echo "Running aclocal..."
-$ACLOCAL
-echo "Running autoheader..."
-$AUTOHEADER
-echo "Running automake --gnu ..."
-$AUTOMAKE --gnu;
-echo "Running autoconf..."
-$AUTOCONF
-
-echo "You can now run \"./configure --enable-maintainer-mode\" and then \"make\"."
-
diff --git a/scripts/build-riscos b/scripts/build-riscos
deleted file mode 100644
index c255a7827..000000000
--- a/scripts/build-riscos
+++ /dev/null
@@ -1,11 +0,0 @@
-| This is an RISC OS Obey file (filetype &feb) that copies handcrafted files
-| for the RISC OS version into the correct places.
-| It won't run on anything other than RISC OS -- I think ;-)
-
-copy <obey$dir>.conf-riscos.cipher.c.construct <obey$dir>.^.cipher.c.construct ~cf~v
-copy <obey$dir>.conf-riscos.cipher.c.constructv <obey$dir>.^.cipher.c.constructv ~cf~v
-copy <obey$dir>.conf-riscos.include.h.config <obey$dir>.^.include.h.config ~cf~v
-copy <obey$dir>.conf-riscos.include.h.g10defs <obey$dir>.^.include.h.g10defs ~cf~v
-copy <obey$dir>.conf-riscos.Makefile <obey$dir>.^.Makefile ~cf~v
-settype <obey$dir>.^.Makefile &fe1
-echo Done.
diff --git a/scripts/build-w32 b/scripts/build-w32
deleted file mode 100755
index 9995a4865..000000000
--- a/scripts/build-w32
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-exec scripts/autogen.sh --build-w32
-
-
-
diff --git a/scripts/commit b/scripts/commit
deleted file mode 100755
index 6bfa0a615..000000000
--- a/scripts/commit
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-# need a Posix shell, so we simply use bash
-
-set -e
-
-uid=`id -u`
-date=`date`
-name=$(awk -F: "\$3==$uid { print \$5 }" /etc/passwd )
-addr="<`id -un`@`hostname -d`>"
-
-for i in `find . -name Changes -print`; do
-    dir=`dirname $i`
-    if [ -s $dir/Changes ]; then
-	awk '
-	state == 0 && /^[ \t]*$/  { next }
-	state == 0  { state = 1 }
-	/^[ \t]*$/ { empty++; next }
-		   { while ( empty > 0 ) { print ""; empty--; }; print  }
-	' < $dir/Changes > $dir/Changes.tmp
-	if [ -s $dir/Changes.tmp ]; then
-	    lines=`wc -l <$dir/Changes.tmp`
-	    echo "$date  $name  $addr" >$dir/ChangeLog.new
-	    echo >>$dir/ChangeLog.new
-	    cat $dir/Changes.tmp   >>$dir/ChangeLog.new
-	    echo >>$dir/ChangeLog.new
-	    [ -f $dir/ChangeLog ] && cat $dir/ChangeLog >>$dir/ChangeLog.new
-	    echo -n > $dir/Changes
-	    [ -f $dir/ChangeLog ] && rm $dir/ChangeLog
-	    mv $dir/ChangeLog.new $dir/ChangeLog
-	    echo "$lines new lines in $dir/ChangeLog"
-	fi
-	rm $dir/Changes.tmp || true
-    fi
-done
-
-# Execute canned cvs remove commands
-for i in `find . -name cvs-remove -print`; do
-    dir=`dirname $i`
-    if [ -s $dir/cvs-remove ]; then
-	here=`pwd`
-	cd $dir
-	if cvs remove -f `cat cvs-remove`; then
-	    rm cvs-remove
-	fi
-	cd $here
-    fi
-done
-
-# Execute canned cvs add commands
-for i in `find . -name cvs-add -print`; do
-    dir=`dirname $i`
-    if [ -s $dir/cvs-add ]; then
-	here=`pwd`
-	cd $dir
-	if cvs add `cat cvs-add`; then
-	    rm cvs-add
-	fi
-	cd $here
-    fi
-done
-
-cvs -z3 commit -m "See ChangeLog: $date  $name" $*
-
diff --git a/scripts/conf-riscos/Makefile b/scripts/conf-riscos/Makefile
deleted file mode 100644
index eeb6206c6..000000000
--- a/scripts/conf-riscos/Makefile
+++ /dev/null
@@ -1,466 +0,0 @@
-# Makefile for the RISC OS version of GnuPG
-CC=cc
-LINK=link
-AS=objasm
-MAKE=amu
-DEPEND=-depend !Depend
-LIBLDAP=^.^.openldap-2/0/18
-CC_FLAGS=-Wpc -apcs 3/26bit/fpe2 -throwback -Otime -IUnix:,include,mpi,intl,zlib,$(LIBLDAP).include -JUnix: -D__riscos__ -DHAVE_CONFIG_H -DNO_ASM -UIS_MODULE -DVERSION="\"$(GnuPG$Version)\"" $(GnuPG$DevDefine)
-AS_FLAGS=-apcs 3/26bit -throwback -predefine "ARMv4 SETA 0"
-LD_FLAGS=Unix:o.unixlib
-CIPHER_OBJS=cipher.o.blowfish \
-	cipher.o.cast5 \
-	cipher.o.cipher \
-	cipher.o.des \
-	cipher.o.dsa \
-	cipher.o.dynload \
-	cipher.o.elgamal \
-	cipher.o.g10c \
-	cipher.o.md \
-	cipher.o.md5 \
-	cipher.o.primegen \
-	cipher.o.pubkey \
-	cipher.o.random \
-	cipher.o.rijndael \
-	cipher.o.rmd160 \
-	cipher.o.rndriscos \
-	cipher.o.rsa \
-	cipher.o.sha1 \
-	cipher.o.smallprime \
-	cipher.o.tiger32 \
-	cipher.o.twofish
-GETTEXT_OBJS=intl.o.bindtextdom \
-	intl.o.dcgettext \
-	intl.o.dgettext \
-	intl.o.explodename \
-	intl.o.finddomain \
-	intl.o.gettext \
-	intl.o.intl-compat \
-	intl.o.l10nflist \
-	intl.o.loadmsgcat \
-	intl.o.localealias \
-	intl.o.textdomain
-MPI_OBJS=mpi.o.mpi-add \
-	mpi.o.mpi-bit \
-	mpi.o.mpi-cmp \
-	mpi.o.mpi-div \
-	mpi.o.mpi-gcd \
-	mpi.o.mpi-inline \
-	mpi.o.mpi-inv \
-	mpi.o.mpi-mul \
-	mpi.o.mpi-pow \
-	mpi.o.mpi-mpow \
-	mpi.o.mpi-scan \
-	mpi.o.mpicoder \
-	mpi.o.mpih-div \
-	mpi.o.mpih-mul \
-	mpi.o.mpiutil \
-	mpi.o.g10m \
-	mpi.arm.o.mpih
-UTIL_OBJS=util.o.argparse \
-	util.o.dotlock \
-	util.o.errors \
-	util.o.fileutil \
-	util.o.g10u \
-	util.o.http \
-	util.o.iobuf \
-	util.o.logger \
-	util.o.memory \
-	util.o.miscutil \
-	util.o.secmem \
-	util.o.strgutil \
-	util.o.ttyio \
-	util.o.riscos
-ZLIB_OBJS=zlib.o.adler32 \
-	zlib.o.compress \
-	zlib.o.crc32 \
-	zlib.o.deflate \
-	zlib.o.infblock \
-	zlib.o.infcodes \
-	zlib.o.inffast \
-	zlib.o.inflate \
-	zlib.o.inftrees \
-	zlib.o.infutil \
-	zlib.o.trees \
-	zlib.o.uncompr \
-	zlib.o.zutil
-G10_OBJS=g10.o.armor \
-	g10.o.build-packet \
-	g10.o.cipher \
-	g10.o.comment \
-	g10.o.compress \
-	g10.o.dearmor \
-	g10.o.decrypt \
-	g10.o.delkey \
-	g10.o.encode \
-	g10.o.encr-data \
-	g10.o.exec \
-	g10.o.export \
-	g10.o.free-packet \
-	g10.o.g10 \
-	g10.o.getkey \
-	g10.o.helptext \
-	g10.o.hkp \
-	g10.o.import \
-	g10.o.kbnode \
-	g10.o.keydb \
-	g10.o.keyedit \
-	g10.o.keygen \
-	g10.o.keyid \
-	g10.o.keylist \
-	g10.o.keyring \
-	g10.o.keyserver \
-	g10.o.mainproc \
-	g10.o.mdfilter \
-	g10.o.misc \
-	g10.o.mkdtemp \
-	g10.o.openfile \
-	g10.o.parse-packet \
-	g10.o.passphrase \
-	g10.o.photoid \
-	g10.o.pipemode \
-	g10.o.pkclist \
-	g10.o.plaintext \
-	g10.o.pubkey-enc \
-	g10.o.revoke \
-	g10.o.seckey-cert \
-	g10.o.seskey \
-	g10.o.sig-check \
-	g10.o.sign \
-	g10.o.signal \
-	g10.o.skclist \
-	g10.o.status \
-	g10.o.tdbdump \
-	g10.o.tdbio \
-	g10.o.textfilter \
-	g10.o.trustdb \
-	g10.o.verify
-GPGV_OBJS=g10.o.armor \
-	g10.o.build-packet \
-	g10.o.compress \
-	g10.o.free-packet \
-	g10.o.getkey \
-	g10.o.gpgv \
-	g10.o.keydb \
-	g10.o.keylist \
-	g10.o.kbnode \
-	g10.o.keyid \
-	g10.o.keyring \
-	g10.o.mainproc \
-	g10.o.mdfilter \
-	g10.o.misc \
-	g10.o.openfile \
-	g10.o.parse-packet \
-	g10.o.plaintext \
-	g10.o.seskey \
-	g10.o.sig-check \
-	g10.o.signal \
-	g10.o.status \
-	g10.o.textfilter \
-	g10.o.verify \
-	util.o.argparse \
-	util.o.errors \
-	util.o.fileutil \
-	util.o.g10u \
-	util.o.iobuf \
-	util.o.logger \
-	util.o.memory \
-	util.o.miscutil \
-	util.o.secmem \
-	util.o.strgutil \
-	util.o.riscos \
-	cipher.o.dsa \
-	cipher.o.dynload \
-	cipher.o.elgamal \
-	cipher.o.g10c \
-	cipher.o.md \
-	cipher.o.md5 \
-	cipher.o.pubkey \
-	cipher.o.rmd160 \
-	cipher.o.rsa \
-	cipher.o.sha1 \
-	cipher.o.tiger32 \
-	mpi.mpi \
-	zlib.zlib
-GPGKEYS_OBJS=util.o.riscos \
-	util.o.strgutil \
-	util.o.memory \
-	util.o.logger \
-	util.o.secmem \
-	intl.gettext
-
-## Rule Patterns ##
-
-.SUFFIXES:	.c .o .s
-
-.c.o:
-	$(CC) $(CC_FLAGS) $(DEPEND) -c -o $@ $<
-
-.s.o:
-	$(AS) $(AS_FLAGS) $(DEPEND) $< $@
-
-# Static dependencies:
-
-all:
-	@echo Use one of the following as target:
-	@echo |  dev   to build the development version
-	@echo |  dist  to build the distribution with all archives
-	@echo All other targets are internal and shouldn't be used!
-
-cipher.cipher: $(CIPHER_OBJS)
-	$(LINK) -aof $(CIPHER_OBJS) -o cipher.cipher
-
-intl.gettext: $(GETTEXT_OBJS)
-	$(LINK) -aof $(GETTEXT_OBJS) -o intl.gettext
-
-mpi.mpi: $(MPI_OBJS)
-	$(LINK) -aof $(MPI_OBJS) -o mpi.mpi
-
-tools.gpgsplit: tools.o.gpgsplit util.util intl.gettext zlib.zlib
-	$(LINK) $(LD_FLAGS) tools.o.gpgsplit util.util intl.gettext zlib.zlib -o tools.gpgsplit
-	-squeeze tools.gpgsplit
-	-copy tools.gpgsplit ADFS::A5.$.tmp.!GnuPG.gpgsplit ~CF~V
-
-keyserver.gpgkeys_ldap: keyserver.o.gpgkeys_ldap $(GPGKEYS_OBJS) $(LIBLDAP).libraries.libldap.libldap
-	$(LINK) $(LD_FLAGS) keyserver.o.gpgkeys_ldap $(GPGKEYS_OBJS) $(LIBLDAP).libraries.libldap.libldap -o keyserver.gpgkeys_ldap
-	-squeeze keyserver.gpgkeys_ldap
-	-copy keyserver.gpgkeys_ldap ADFS::A5.$.tmp.!GnuPG.gpgkeys_ldap ~CF~V
-
-riscos.jpegview.jpegview:
-	-dir riscos.jpegview
-	-$(MAKE)
-	-back
-
-util.util: $(UTIL_OBJS)
-	$(LINK) -aof $(UTIL_OBJS) -o util.util
-
-zlib.zlib: $(ZLIB_OBJS)
-	$(LINK) -aof zlib.o.* -o zlib.zlib
-
-g10.gpg: $(G10_OBJS) cipher.o.idea cipher.cipher intl.gettext mpi.mpi util.util zlib.zlib BUILD
-	$(LINK) $(G10_OBJS) $(LD_FLAGS) cipher.o.idea cipher.cipher intl.gettext mpi.mpi util.util zlib.zlib -o g10.gpg
-	-copy g10.gpg ADFS::A5.$.tmp.!GnuPG.gpg ~CFR~V
-
-g10.gpgv: $(GPGV_OBJS) intl.gettext BUILD
-	$(LINK) $(GPGV_OBJS) intl.gettext $(LD_FLAGS) -o g10.gpgv
-	-copy g10.gpgv ADFS::A5.$.tmp.!GnuPG.gpgv ~CFR~V
-
-g10.gpgpart: $(G10_OBJS) cipher.cipher intl.gettext mpi.mpi util.util zlib.zlib BUILD
-	drlink034 -aof $(G10_OBJS) $(LD_FLAGS) cipher.cipher intl.gettext mpi.mpi util.util zlib.zlib -o g10.gpgpart
-
-select-idea-src:
-	-copy distrib.idea-addon.cipher.c.idea cipher.c.idea ~CF~NR~V
-	$(CC) $(CC_FLAGS) $(DEPEND) -c -o cipher.o.idea cipher.c.idea
-
-select-gpl-src:
-	-copy distrib.non-idea.cipher.c.idea cipher.c.idea ~CF~NR~V
-	$(CC) $(CC_FLAGS) $(DEPEND) -c -o cipher.o.idea cipher.c.idea
-
-distrib.gnupgsrc/zip: select-gpl-src
-	-zip -9@ distrib.gnupgsrc/zip < distrib.resources.distfiles
-
-distrib.gnupg/zip: distrib.gpl-bin.!GnuPG.JPEGview distrib.gpl-bin.!GnuPG.gpgsplit distrib.gpl-bin.!GnuPG.gpg distrib.gpl-bin.!GnuPG.gpgv select-gpl-src
-	-copy distrib.resources.History distrib.gpl-bin.History ~CFR~V
-	-copy distrib.resources.Upgrading distrib.gpl-bin.Upgrading ~CFR~V
-	-copy distrib.resources.ReadMe_bin distrib.gpl-bin.!ReadMe1st ~CFR~V
-	-copy distrib.resources.!GnuPG distrib.gpl-bin.!GnuPG ~CFR~V
-	-copy distrib.resources.!GnuPGUser distrib.gpl-bin.!GnuPGUser ~CFR~V
-	-copy distrib.resources.!System distrib.gpl-bin.!System ~CFR~V
-	-copy distrib.resources.orig_docs distrib.gpl-bin.orig_docs ~CFR~V
-	-dir distrib.gpl-bin
-	-zip -r9 ^.gnupg/zip *
-	-back
-
-distrib.gnupgdev/zip: distrib.private.!GnuPG.JPEGview distrib.private.!GnuPG.gpgsplit distrib.private.!GnuPG.gpgkeys_ldap distrib.private.!GnuPG.gpg distrib.private.!GnuPG.gpgv select-idea-src
-	-ifthere distrib.private.!GnuPG.locale then wipe distrib.private.!GnuPG.locale ~CFR~V
-	-copy distrib.intl.!GnuPG.locale distrib.private.!GnuPG.locale ~CFR~V
-	-copy distrib.resources.History distrib.private.History ~CFR~V
-	-copy distrib.resources.Upgrading distrib.private.Upgrading ~CFR~V
-	-copy distrib.resources.ReadMe_bin distrib.private.!ReadMe1st ~CFR~V
-	-copy distrib.resources.!GnuPG distrib.private.!GnuPG ~CFR~V
-	-copy distrib.resources.!GnuPGUser distrib.private.!GnuPGUser ~CFR~V
-	-copy distrib.resources.!System distrib.private.!System ~CFR~V
-	-copy distrib.resources.orig_docs distrib.private.orig_docs ~CFR~V
-	-dir distrib.private
-	-zip -r9 ^.gnupgdev/zip *
-	-back
-
-distrib.gnupgidea/zip: cipher.o.idea select-idea-src
-	-copy distrib.resources.ReadMe_idea distrib.idea-addon.!ReadMe ~CFR~V
-	-copy cipher.o.idea distrib.idea-addon.cipher.o.idea ~CFR~V
-	-dir distrib.idea-addon
-	-zip -r9 ^.gnupgidea/zip *
-	-back
-
-distrib.gnupgpart/zip: g10.gpgpart select-idea-src
-	-copy distrib.resources.ReadMe_part distrib.part.!ReadMe1st ~CFR~V
-	-copy g10.gpgpart distrib.part.g10.gpgpart ~CFR~V
-	-dir distrib.part
-	-zip -r9 ^.gnupgpart/zip *
-	-back
-
-distrib.gnupgldap/zip: keyserver.gpgkeys_ldap
-	-copy distrib.resources.ReadMe_ldap distrib.ldap.!ReadMe ~CFR~V
-	-copy keyserver.gpgkeys_ldap distrib.ldap.!GnuPG.gpgkeys_ldap ~CFR~V
-	-dir distrib.ldap
-	-zip -r9 ^.gnupgldap/zip *
-	-back
-
-distrib.gnupgintl/zip:
-	-dir distrib.intl
-	-zip -r9 ^.gnupgintl/zip *
-	-back
-
-distrib.gpl-bin.!GnuPG.gpg: g10.gpg
-	-copy g10.gpg distrib.gpl-bin.!GnuPG.gpg ~CFR~V
-	-squeeze distrib.gpl-bin.!GnuPG.gpg
-
-distrib.gpl-bin.!GnuPG.gpgv: g10.gpgv
-	-copy g10.gpgv distrib.gpl-bin.!GnuPG.gpgv ~CFR~V
-	-squeeze distrib.gpl-bin.!GnuPG.gpgv
-
-distrib.gpl-bin.!GnuPG.gpgsplit: tools.gpgsplit
-	-copy tools.gpgsplit distrib.gpl-bin.!GnuPG.gpgsplit ~CFR~V
-	-squeeze distrib.gpl-bin.!GnuPG.gpgsplit
-
-distrib.gpl-bin.!GnuPG.JPEGview: riscos.jpegview.jpegview
-	-copy riscos.jpegview.jpegview distrib.gpl-bin.!GnuPG.JPEGview ~CFR~V
-
-distrib.private.!GnuPG.gpg: g10.gpg
-	-copy g10.gpg distrib.private.!GnuPG.gpg ~CFR~V
-	-squeeze distrib.private.!GnuPG.gpg
-
-distrib.private.!GnuPG.gpgv: g10.gpgv
-	-copy g10.gpgv distrib.private.!GnuPG.gpgv ~CFR~V
-	-squeeze distrib.private.!GnuPG.gpgv
-
-distrib.private.!GnuPG.gpgsplit: tools.gpgsplit
-	-copy tools.gpgsplit distrib.private.!GnuPG.gpgsplit ~CFR~V
-	-squeeze distrib.private.!GnuPG.gpgsplit
-
-distrib.private.!GnuPG.gpgkeys_ldap: keyserver.gpgkeys_ldap
-	-copy keyserver.gpgkeys_ldap distrib.private.!GnuPG.gpgkeys_ldap ~CFR~V
-	-squeeze distrib.private.!GnuPG.gpgkeys_ldap
-
-distrib.private.!GnuPG.JPEGview: riscos.jpegview.jpegview
-	-copy riscos.jpegview.jpegview distrib.private.!GnuPG.JPEGview ~CFR~V
-
-clean-cipher:
-	-ifthere cipher.o.* then wipe cipher.o.* ~CFR~V
-	-ifthere cipher.cipher then wipe cipher.cipher ~CFR~V
-
-clean-intl:
-	-ifthere intl.o.* then wipe intl.o.* ~CFR~V
-	-ifthere intl.gettext then wipe intl.gettext ~CFR~V
-
-clean-mpi:
-	-ifthere mpi.o.* then wipe mpi.o.* ~CFR~V
-	-ifthere mpi.arm.o.* then wipe mpi.arm.o.* ~CFR~V
-	-ifthere mpi.mpi then wipe mpi.mpi ~CFR~V
-
-clean-util:
-	-ifthere util.o.* then wipe util.o.* ~CFR~V
-	-ifthere util.util then wipe util.util ~CFR~V
-
-clean-zlib:
-	-ifthere zlib.o.* then wipe zlib.o.* ~CFR~V
-	-ifthere zlib.zlib then wipe zlib.zlib ~CFR~V
-
-clean-dist:
-	-ifthere distrib.*/zip then wipe distrib.*/zip ~CFR~V
-
-clean-g10:
-	-ifthere g10.gpg then wipe g10.gpg ~CFR~V
-	-ifthere g10.gpgv then wipe g10.gpgv ~CFR~V
-	-ifthere g10.gpgpart then wipe g10.gpgpart ~CFR~V
-	-ifthere g10.o.* then wipe g10.o.* ~CFR~V
-
-clean-keyserver:
-	-ifthere keyserver.gpgkeys_ldap then wipe keyserver.gpgkeys_ldap ~CFR~V
-	-ifthere keyserver.o.* then wipe keyserver.o.* ~CFR~V
-
-clean-tools:
-	-ifthere tools.gpgsplit then wipe tools.gpgsplit ~CFR~V
-	-ifthere tools.o.* then wipe tools.o.* ~CFR~V
-
-clean-riscos:
-	-ifthere riscos.jpegview.jpegview then wipe riscos.jpegview.jpegview ~CFR~V
-
-clean-version:
-	-ifthere g10.o.armor then wipe g10.o.armor ~CFR~V
-	-ifthere g10.o.encode then wipe g10.o.encode ~CFR~V
-	-ifthere g10.o.g10 then wipe g10.o.g10 ~CFR~V
-	-ifthere g10.o.gpgv then wipe g10.o.gpgv ~CFR~V
-	-ifthere g10.o.keygen then wipe g10.o.keygen ~CFR~V
-	-ifthere g10.o.sign then wipe g10.o.sign ~CFR~V
-	-ifthere g10.gpg then wipe g10.gpg ~CFR~V
-	-ifthere g10.gpgv then wipe g10.gpgv ~CFR~V
-	-ifthere g10.gpgpart then wipe g10.gpgpart ~CFR~V
-
-clean: clean-dist clean-cipher clean-intl clean-mpi clean-util clean-zlib clean-g10 clean-keyserver clean-tools clean-riscos
-
-g10.o.armor: BUILD
-	$(CC) $(CC_FLAGS) $(DEPEND) -c -o g10.o.armor g10.c.armor
-
-g10.o.encode: BUILD
-	$(CC) $(CC_FLAGS) $(DEPEND) -c -o g10.o.encode g10.c.encode
-
-g10.o.g10: BUILD
-	$(CC) $(CC_FLAGS) $(DEPEND) -c -o g10.o.g10 g10.c.g10
-
-g10.o.gpgv: BUILD
-	$(CC) $(CC_FLAGS) $(DEPEND) -c -o g10.o.gpgv g10.c.gpgv
-
-g10.o.keygen: BUILD
-	$(CC) $(CC_FLAGS) $(DEPEND) -c -o g10.o.keygen g10.c.keygen
-
-g10.o.sign: BUILD
-	$(CC) $(CC_FLAGS) $(DEPEND) -c -o g10.o.sign g10.c.sign
-
-dev: clean-version
-	$(MAKE) fast-dev
-
-fast-dev: BUILD
-	setver configure/ac AC_INIT(gnupg, , dev
-	wipe distrib.private.!GnuPG.gpg* ~CFR~V
-	-$(MAKE) keyserver.gpgkeys_ldap
-	$(MAKE) tools.gpgsplit
-	$(MAKE) distrib.gnupgdev/zip
-	ifthere <WebServe$ServeRoot>.private.gnupgdev/zip then wipe <WebServe$ServeRoot>.private.gnupgdev/zip ~CFR~V
-	rename distrib.gnupgdev/zip <WebServe$ServeRoot>.private.gnupgdev/zip
-
-dist: BUILD clean-version tools.gpgsplit
-	setver configure/ac AC_INIT(gnupg, , dist
-	wipe distrib.gpl-bin.!GnuPG.gpg* ~CFR~V
-	$(MAKE) distrib.gnupg/zip
-	$(MAKE) distrib.gnupgidea/zip
-	$(MAKE) distrib.gnupgpart/zip
-	wipe distrib.private.!GnuPG.gpg* ~CFR~V
-	$(MAKE) distrib.gnupgdev/zip
-	$(MAKE) distrib.gnupgsrc/zip
-	$(MAKE) distrib.gnupgintl/zip
-	$(MAKE) distrib.gnupgldap/zip
-	$(MAKE) select-idea-src
-	ifthere <WebServe$ServeRoot>.archives.gnupg/zip then wipe <WebServe$ServeRoot>.archives.gnupg/zip ~CFR~V
-	ifthere <WebServe$ServeRoot>.private.gnupgdev/zip then wipe <WebServe$ServeRoot>.private.gnupgdev/zip ~CFR~V
-	ifthere <WebServe$ServeRoot>.archives.gnupgidea/zip then wipe <WebServe$ServeRoot>.archives.gnupgidea/zip ~CFR~V
-	ifthere <WebServe$ServeRoot>.archives.gnupgpart/zip then wipe <WebServe$ServeRoot>.archives.gnupgpart/zip ~CFR~V
-	ifthere <WebServe$ServeRoot>.archives.gnupgsrc/zip then wipe <WebServe$ServeRoot>.archives.gnupgsrc/zip ~CFR~V
-	ifthere <WebServe$ServeRoot>.archives.gnupgintl/zip then wipe <WebServe$ServeRoot>.archives.gnupgintl/zip ~CFR~V
-	ifthere <WebServe$ServeRoot>.archives.gnupgldap/zip then wipe <WebServe$ServeRoot>.archives.gnupgldap/zip ~CFR~V
-	ifthere <WebServe$ServeRoot>.gnupg_history/txt then wipe <WebServe$ServeRoot>.gnupg_history/txt ~CFR~V
-	ifthere <WebServe$ServeRoot>.gnupg_news/txt then wipe <WebServe$ServeRoot>.gnupg_news/txt ~CFR~V
-	rename distrib.gnupgdev/zip <WebServe$ServeRoot>.private.gnupgdev/zip
-	rename distrib.gnupg/zip <WebServe$ServeRoot>.archives.gnupg/zip
-	rename distrib.gnupgidea/zip <WebServe$ServeRoot>.archives.gnupgidea/zip
-	rename distrib.gnupgpart/zip <WebServe$ServeRoot>.archives.gnupgpart/zip
-	rename distrib.gnupgsrc/zip <WebServe$ServeRoot>.archives.gnupgsrc/zip
-	rename distrib.gnupgintl/zip <WebServe$ServeRoot>.archives.gnupgintl/zip
-	rename distrib.gnupgldap/zip <WebServe$ServeRoot>.archives.gnupgldap/zip
-	copy distrib.resources.History <WebServe$ServeRoot>.gnupg_history/txt ~CFR~V
-	copy distrib.resources.orig_docs.NEWS <WebServe$ServeRoot>.gnupg_news/txt ~CFR~V
-	unset GnuPG$DevDefine
-	unset GnuPG$Version
-	updatesigs <WebServe$ServeRoot>.archives --secring adfs::ap.$.secring/gpg
-
-# Dynamic dependencies:
diff --git a/scripts/conf-riscos/include/config.h b/scripts/conf-riscos/include/config.h
deleted file mode 100644
index b95bef608..000000000
--- a/scripts/conf-riscos/include/config.h
+++ /dev/null
@@ -1,390 +0,0 @@
-/* config.h - hand edited by Stefan Bellon to suit RISC OS needs
- *	Copyright (C) 2001 Free Software Foundation, Inc.
- *
- * This file is part of GNUPG.
- *
- * GNUPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GNUPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-#ifndef G10_CONFIG_H
-#define G10_CONFIG_H
-
-/* need this, because some autoconf tests rely on this (e.g. stpcpy)
- * and it should be used for new programs
- */
-#define _GNU_SOURCE  1
-
-
-/* Define if using alloca.c.  */
-#undef C_ALLOCA
-
-/* Define to empty if the keyword does not work.  */
-/* #undef const */
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-#undef CRAY_STACKSEG_END
-
-/* Define if you have alloca, as a function or macro.  */
-/* #undef HAVE_ALLOCA */
-#define HAVE_ALLOCA 1
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-/* #undef HAVE_ALLOCA_H */
-#define HAVE_ALLOCA_H 1
-
-/* #undef _LIBC */
-
-/* Define if you don't have vprintf but do have _doprnt.  */
-#undef HAVE_DOPRNT
-
-/* Define if you have the vprintf function.  */
-#define HAVE_VPRINTF 1
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-#undef off_t
-
-/* Define if you need to in order for stat and other things to work.  */
-#undef _POSIX_SOURCE
-
-/* Define as the return type of signal handlers (int or void).  */
-#define RETSIGTYPE void
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-#define size_t unsigned int
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-#undef STACK_DIRECTION
-
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
-
-/* Define if `sys_siglist' is declared by <signal.h>.  */
-#define SYS_SIGLIST_DECLARED 1
-
-#undef M_DEBUG
-#undef M_GUARD
-#define PRINTABLE_OS_NAME "RISC OS"
-
-/* Define if your locale.h file contains LC_MESSAGES.  */
-#define HAVE_LC_MESSAGES 1
-
-/* Define to 1 if NLS is requested.  */
-#define ENABLE_NLS 1
-
-/* Define as 1 if you have catgets and don't want to use GNU gettext.  */
-#undef HAVE_CATGETS
-
-/* Define as 1 if you have gettext and don't want to use GNU gettext.  */
-#undef HAVE_GETTEXT
-
-#undef BIG_ENDIAN_HOST
-#define LITTLE_ENDIAN_HOST 1
-
-#undef HAVE_BYTE_TYPEDEF
-#undef HAVE_USHORT_TYPEDEF
-#undef HAVE_ULONG_TYPEDEF
-#undef HAVE_U16_TYPEDEF
-#undef HAVE_U32_TYPEDEF
-
-#undef HAVE_BROKEN_MLOCK
-
-/* defined if we have a /dev/random and /dev/urandom */
-#undef HAVE_DEV_RANDOM
-/* and the real names of the random devices */
-#undef NAME_OF_DEV_RANDOM
-#undef NAME_OF_DEV_URANDOM
-/* Linux has an ioctl */
-#undef HAVE_DEV_RANDOM_IOCTL
-
-/* see cipher/rndegd.c */
-#undef EGD_SOCKET_NAME
-
-#undef USE_DYNAMIC_LINKING
-#undef HAVE_DL_DLOPEN
-#undef HAVE_DL_SHL_LOAD
-#undef HAVE_DLD_DLD_LINK
-
-#undef USE_SHM_COPROCESSING
-
-#undef IPC_HAVE_SHM_LOCK
-#undef IPC_RMID_DEFERRED_RELEASE
-
-/* set this to limit filenames to the 8.3 format */
-#undef USE_ONLY_8DOT3
-/* defined if we must run on a stupid file system */
-#undef HAVE_DRIVE_LETTERS
-/* defined if we run on some of the PCDOS like systems (DOS, Windoze. OS/2)
- * with special properties like no file modes */
-#undef HAVE_DOSISH_SYSTEM
-/* because the Unix gettext has to much overhead on MingW32 systems
- * and these systems lack Posix functions, we use a simplified version
- * of gettext */
-#undef USE_SIMPLE_GETTEXT
-/* At some point in the system we need to know that we use the Windows
- * random module. */
-#undef USE_STATIC_RNDW32
-
-#undef USE_CAPABILITIES
-
-/* Some systems have mkdir that takes a single argument. */
-#undef MKDIR_TAKES_ONE_ARG
-
-/* The number of bytes in a unsigned int.  */
-#define SIZEOF_UNSIGNED_INT 4
-
-/* The number of bytes in a unsigned long.  */
-#define SIZEOF_UNSIGNED_LONG 4
-
-/* The number of bytes in a unsigned long long.  */
-#define SIZEOF_UNSIGNED_LONG_LONG 0
-
-/* The number of bytes in a unsigned short.  */
-#define SIZEOF_UNSIGNED_SHORT 2
-
-/* Define if you have the __argz_count function.  */
-#undef HAVE___ARGZ_COUNT
-
-/* Define if you have the __argz_next function.  */
-#undef HAVE___ARGZ_NEXT
-
-/* Define if you have the __argz_stringify function.  */
-#undef HAVE___ARGZ_STRINGIFY
-
-/* Define if you have the atexit function.  */
-#define HAVE_ATEXIT 1
-
-/* Define if you have the clock_gettime function.  */
-#undef HAVE_CLOCK_GETTIME
-
-/* Define if you have the dcgettext function.  */
-#undef HAVE_DCGETTEXT
-
-/* Define if you have the dlopen function.  */
-#undef HAVE_DLOPEN
-
-/* Define if you have the fopen64 function.  */
-#undef HAVE_FOPEN64
-
-/* Define if you have the fstat64 function.  */
-#undef HAVE_FSTAT64
-
-/* Define if you have the getcwd function.  */
-#define HAVE_GETCWD 1
-
-/* Define if you have the gethrtime function.  */
-#undef HAVE_GETHRTIME
-
-/* Define if you have the getpagesize function.  */
-#define HAVE_GETPAGESIZE 1
-
-/* Define if you have the getrusage function.  */
-#define HAVE_GETRUSAGE 1
-
-/* Define if you have the gettimeofday function.  */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define if you have the memicmp function.  */
-#undef HAVE_MEMICMP
-
-/* Define if you have the memmove function.  */
-#define HAVE_MEMMOVE 1
-
-/* Define if you have the mlock function.  */
-#undef HAVE_MLOCK
-
-/* Define if you have the mmap function.  */
-#undef HAVE_MMAP
-
-/* Define if you have the munmap function.  */
-#undef HAVE_MUNMAP
-
-/* Define if you have the nl_langinfo function.  */
-#undef HAVE_NL_LANGINFO
-
-/* Define if you have the putenv function.  */
-#define HAVE_PUTENV 1
-
-/* Define if you have the raise function.  */
-#define HAVE_RAISE 1
-
-/* Define if you have the rand function.  */
-#define HAVE_RAND 1
-
-/* Define if you have the setenv function.  */
-#define HAVE_SETENV 1
-
-/* Define if you have the setlocale function.  */
-#define HAVE_SETLOCALE 1
-
-/* Define if you have the setrlimit function.  */
-#define HAVE_SETRLIMIT 1
-
-/* Define if you have the sigaction function.  */
-#define HAVE_SIGACTION 1
-
-/* Define if you have the sigprocmask function.  */
-#define HAVE_SIGPROCMASK 1
-
-/* Define if you have the stpcpy function.  */
-#define HAVE_STPCPY 1
-
-/* Define if you have the strcasecmp function.  */
-#define HAVE_STRCASECMP 1
-
-/* Define if you have the strchr function.  */
-#define HAVE_STRCHR 1
-
-/* Define if you have the strdup function.  */
-#define HAVE_STRDUP 1
-
-/* Define if you have the strerror function.  */
-#define HAVE_STRERROR 1
-
-/* Define if you have the strftime function.  */
-#define HAVE_STRFTIME 1
-
-/* Define if you have the stricmp function.  */
-#define HAVE_STRICMP 1
-
-/* Define if you have the strlwr function.  */
-#undef HAVE_STRLWR
-
-/* Define if you have the strtoul function.  */
-#define HAVE_STRTOUL 1
-
-/* Define if you have the tcgetattr function.  */
-#undef HAVE_TCGETATTR
-
-/* Define if you have the wait4 function.  */
-#define HAVE_WAIT4 1
-
-/* Define if you have the waitpid function.  */
-#define HAVE_WAITPID 1
-
-/* Define if you have the <argz.h> header file.  */
-#undef HAVE_ARGZ_H
-
-/* Define if you have the <direct.h> header file.  */
-#undef HAVE_DIRECT_H
-
-/* Define if you have the <gdbm.h> header file.  */
-#undef HAVE_GDBM_H
-
-/* Define if you have the <langinfo.h> header file.  */
-#undef HAVE_LANGINFO_H
-
-/* Define if you have the <limits.h> header file.  */
-#define HAVE_LIMITS_H 1
-
-/* Define if you have the <linux/random.h> header file.  */
-#undef HAVE_LINUX_RANDOM_H
-
-/* Define if you have the <locale.h> header file.  */
-#define HAVE_LOCALE_H 1
-
-/* Define if you have the <malloc.h> header file.  */
-#define HAVE_MALLOC_H 1
-
-/* Define if you have the <nl_types.h> header file.  */
-#undef HAVE_NL_TYPES_H
-
-/* Define if you have the <string.h> header file.  */
-#define HAVE_STRING_H 1
-
-/* Define if you have the <sys/capability.h> header file.  */
-#undef HAVE_SYS_CAPABILITY_H
-
-/* Define if you have the <sys/ipc.h> header file.  */
-#undef HAVE_SYS_IPC_H
-
-/* Define if you have the <sys/mman.h> header file.  */
-#define HAVE_SYS_MMAN_H 1
-
-/* Define if you have the <sys/param.h> header file.  */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define if you have the <sys/shm.h> header file.  */
-#undef HAVE_SYS_SHM_H
-
-/* Define if you have the <sys/stat.h> header file.  */
-#define HAVE_SYS_STAT_H 1
-
-/* Define if you have the <termio.h> header file.  */
-#undef HAVE_TERMIO_H
-
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
-
-/* Define if you have the <zlib.h> header file.  */
-#define HAVE_ZLIB_H 1
-
-/* Define if you have the dl library (-ldl).  */
-#undef HAVE_LIBDL
-
-/* Define if you have the dld library (-ldld).  */
-#undef HAVE_LIBDLD
-
-/* Define if you have the gdbm library (-lgdbm).  */
-#undef HAVE_LIBGDBM
-
-/* Define if you have the i library (-li).  */
-#undef HAVE_LIBI
-
-/* Define if you have the nsl library (-lnsl).  */
-#undef HAVE_LIBNSL
-
-/* Define if you have the rt library (-lrt).  */
-#undef HAVE_LIBRT
-
-/* Name of package */
-#define PACKAGE "GnuPG"
-
-
-/* define if compiled symbols have a leading underscore */
-#define WITH_SYMBOL_UNDERSCORE 1
-
-#ifdef IS_DEVELOPMENT_VERSION
-  #define DEBUG 1
-/*  #define M_DEBUG */
-  #define M_GUARD 1
-#endif
-
-#define USE_RNDRISCOS 1
-
-/* RISC OS specifica */
-#if (__CC_NORCROFT == 1) /* Norcroft */
-# undef __GNUC__
-# define __GNUC_MINOR__ 0
-# define __GLIBC__ 0
-# define __attribute__(x) 
-# if (__CC_NORCROFT_VERSION < 544) /* old version of Norcroft */
-#  define inline __inline
-#  define STR(a) #a
-#  define __func__ "[" __FILE__ ":" STR(__LINE__) "]"
-# endif
-#else /* gcc */
-#endif
-
-/* #define USE_EXTERNAL_HKP */
-
-#include "g10defs.h"
-
-#endif /*G10_CONFIG_H*/
diff --git a/scripts/conf-riscos/include/g10defs.h b/scripts/conf-riscos/include/g10defs.h
deleted file mode 100644
index 6b47a6b38..000000000
--- a/scripts/conf-riscos/include/g10defs.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* g10defs.h - hand edited by Stefan Bellon to suit RISC OS needs
- *	Copyright (C) 2001 Free Software Foundation, Inc.
- *
- * This file is part of GNUPG.
- *
- * GNUPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GNUPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-/* Path variables and filing system constants for RISC OS */
-#define G10_LOCALEDIR     "<GnuPG$Dir>.locale"
-#define GNUPG_LIBDIR      "<GnuPG$Dir>"
-#define GNUPG_LIBEXECDIR  "<GnuPG$Dir>"
-#define GNUPG_DATADIR     "<GnuPG$Dir>"
-#define GNUPG_HOMEDIR     "<GnuPGUser$Dir>"
-#define LOCALE_ALIAS_PATH "<GnuPG$Dir>.locale"
-#define GNULOCALEDIR      "<GnuPG$Dir>.locale"
-#define DIRSEP_C            '.'
-#define EXTSEP_C            '/'
-#define DIRSEP_S            "."
-#define EXTSEP_S            "/"
-
-/* This file defines some basic constants for the MPI machinery.  We
- * need to define the types on a per-CPU basis, so it is done with
- * this file here.  */
-#define BYTES_PER_MPI_LIMB  (SIZEOF_UNSIGNED_LONG)
-
-/* External process spawning mechanism */
-#if !(defined(HAVE_FORK) && defined(HAVE_PIPE) && defined(HAVE_WAITPID))
-#define EXEC_TEMPFILE_ONLY 1
-#endif
diff --git a/scripts/config.guess b/scripts/config.guess
deleted file mode 100755
index dff9e481b..000000000
--- a/scripts/config.guess
+++ /dev/null
@@ -1,1317 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
-
-timestamp='2001-09-04'
-
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script.
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c ;
-	for c in cc gcc c89 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
-	  if test $? = 0 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	rm -f $dummy.c $dummy.o $dummy.rel ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# Netbsd (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	# Determine the machine/vendor (is the vendor relevant).
-	case "${UNAME_MACHINE}" in
-	    amiga) machine=m68k-unknown ;;
-	    arm32) machine=arm-unknown ;;
-	    atari*) machine=m68k-atari ;;
-	    sun3*) machine=m68k-sun ;;
-	    mac68k) machine=m68k-apple ;;
-	    macppc) machine=powerpc-apple ;;
-	    hp3[0-9][05]) machine=m68k-hp ;;
-	    ibmrt|romp-ibm) machine=romp-ibm ;;
-	    *) machine=${UNAME_MACHINE}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE}" in
-	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	cat <<EOF >$dummy.s
-	.data
-\$Lformat:
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
-	.globl main
-	.align 4
-	.ent main
-main:
-	.frame \$30,16,\$26,0
-	ldgp \$29,0(\$27)
-	.prologue 1
-	.long 0x47e03d80 # implver \$0
-	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
-	lda \$16,\$Lformat
-	mov \$0,\$17
-	not \$1,\$18
-	jsr \$26,printf
-	ldgp \$29,0(\$26)
-	mov 0,\$16
-	jsr \$26,exit
-	.end main
-EOF
-	eval $set_cc_for_build
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		case `./$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-			2-1307)
-				UNAME_MACHINE="alphaev68"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit 0;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    arc64:OpenBSD:*:*)
-	echo mips64el-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hkmips:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:NetBSD:*)
-	echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
-    sun3*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy \
-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-		rm -f $dummy.c $dummy
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-              case "${HPUX_REV}" in
-                11.[0-9][0-9])
-                  if [ -x /usr/bin/getconf ]; then
-                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-                        esac ;;
-                    esac
-                  fi ;;
-              esac
-              if [ "${HP_ARCH}" = "" ]; then
-	      eval $set_cc_for_build
-              sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-	    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-	    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-	    rm -f $dummy.c $dummy
-	fi ;;
-	esac
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    hppa*:OpenBSD:*:*)
-	echo hppa-unknown-openbsd
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*X-MP:*:*:*)
-	echo xmp-cray-unicos
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY-2:*:*:*)
-	echo cray2-cray-unicos
-        exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i386-pc-interix
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
-	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
-	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
-	esac
-	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	ld_supported_targets=`cd /; ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;		
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	cat >$dummy.c <<EOF
-#include <features.h>
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __ELF__
-# ifdef __GLIBC__
-#  if __GLIBC__ >= 2
-    printf ("%s-pc-linux-gnu\n", argv[1]);
-#  else
-    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
-#  endif
-# else
-   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
-# endif
-#else
-  printf ("%s-pc-linux-gnuaout\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    M68*:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit 0 ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit 0 ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit 0 ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Darwin:*:*)
-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	if test "${UNAME_MACHINE}" = "x86pc"; then
-		UNAME_MACHINE=pc
-	fi
-	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-[KW]:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-    ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/scripts/config.sub b/scripts/config.sub
deleted file mode 100755
index 393f13d37..000000000
--- a/scripts/config.sub
+++ /dev/null
@@ -1,1411 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
-
-timestamp='2001-09-07'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Please send patches to <config-patches@gnu.org>.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
-	| d10v | d30v | dsp16xx \
-	| fr30 \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-	| mipsisa32 \
-	| mn10200 | mn10300 \
-	| ns16k | ns32k \
-	| openrisc \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| s390 | s390x \
-	| sh | sh[34] | sh[34]eb | shbe | shle \
-	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
-	| stormy16 | strongarm \
-	| tahoe | thumb | tic80 | tron \
-	| v850 \
-	| we32k \
-	| x86 | xscale \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alphapca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armv*-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-	| clipper-* | cray2-* | cydra-* \
-	| d10v-* | d30v-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| m32r-* \
-	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| s390-* | s390x-* \
-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
-	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
-	| v850-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
-		;;
-	[cjt]90)
-		basic_machine=${basic_machine}-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mipsel*-linux*)
-		basic_machine=mipsel-unknown
-		os=-linux-gnu
-		;;
-	mips*-linux*)
-		basic_machine=mips-unknown
-		os=-linux-gnu
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-        pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexgen)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2)
-		basic_machine=i686-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-	        ;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-	        ;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-	        ;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-	        ;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sparclite-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=t3e-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	windows32)
-		basic_machine=i386-pc
-		os=-windows32-msvcrt
-		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
-		;;
-        xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	mips)
-		if [ x$os = x-linux-gnu ]; then
-			basic_machine=mips-unknown
-		else
-			basic_machine=mips-mips
-		fi
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh3 | sh4 | sh3eb | sh4eb)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
-		basic_machine=sparc-sun
-		;;
-        cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto*)
-		os=-nto-qnx
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-ns2 )
-	        os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-	        os=-mint
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	pdp10-*)
-		os=-tops20
-		;;
-        pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-        *-gould)
-		os=-sysv
-		;;
-        *-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-        *-sgi)
-		os=-irix
-		;;
-        *-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-vxsim* | -vxworks*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/scripts/distfiles b/scripts/distfiles
deleted file mode 100644
index 0e3d55801..000000000
--- a/scripts/distfiles
+++ /dev/null
@@ -1,6 +0,0 @@
-mkdiff
-build-w32
-gnupg.spec.in
-autogen.sh
-mk-gpg-texi
-mk-w32-dist
\ No newline at end of file
diff --git a/scripts/gnupg.spec.in b/scripts/gnupg.spec.in
deleted file mode 100644
index 357f540a3..000000000
--- a/scripts/gnupg.spec.in
+++ /dev/null
@@ -1,177 +0,0 @@
-#
-# gnupg -- gnu privacy guard
-# This is a template.  The dist target uses it to create the real file.
-#
-%define version @pkg_version@
-%define name gnupg
-Summary: GNU Utility for data encryption and digital signatures
-Summary(it): Utility GNU per la sicurezza nelle comunicazioni e nell'archiviazione dei dati.
-Summary(cs): GNU nástroj pro ¹ifrovanou komunikaci a bezpeèné ukládání dat
-Summary(fr): Utilitaire GNU de chiffrement et d'authentification des communications et des données
-Summary(pl): Narzedzie GNU do szyfrowania i podpisywania danych
-Vendor: GNU Privacy Guard Project
-Name: %{name}
-Version: %{version}
-Release: 1
-Copyright: GPL
-Group: Applications/Cryptography
-Group(cs): Aplikace/©ifrování
-Group(fr): Applications/Cryptographie
-Group(it): Applicazioni/Crittografia
-Source: ftp://ftp.gnupg.org/pub/gcrypt/%{name}-%{version}.tar.gz
-URL: http://www.gnupg.org
-Provides: gpg openpgp
-BuildRoot: /tmp/rpmbuild_%{name}
-
-%changelog
-* Fri Apr 19 2002 David Shaw <dshaw@jabberwocky.com>
-- Removed OPTIONS and pubring.asc - no longer used
-- Added doc/samplekeys.asc
-* Sun Mar 31 2002 David Shaw <dshaw@jabberwocky.com>
-- Added the gpgkeys_xxx keyserver helpers.
-- Added a * to catch variations on the basic gpg man page (gpg, gpgv).
-- Mark options.skel as a config file.
-- Do not include the FAQ/faq.html twice (in /doc/ and /share/).
-
-* Wed Sep 06 2000 Fabio Coatti <cova@ferrara.linux.it>
-- Added Polish description and summary (Kindly provided by  
-  Lukasz Stelmach <stelmacl@ee.pw.edu.pl>)
-  
-* Thu Jul 13 2000 Fabio Coatti <cova@ferrara.linux.it>
-- Added a * to catch all formats for man pages (plain, gz, bz2...)    
-
-* Mon May 01 2000 Fabio Coatti <cova@ferrara.linux.it>
-- Some corrections in French description, thanks to Gaël Quéri
-  <gqueri@mail.dotcom.fr>; Some corrections to Italian descriptions.
-
-* Tue Apr 25 2000 Fabio Coatti <cova@ferrara.linux.it>
-- Removed the no longer needed patch for man page by Keith Owens
-
-* Wed Mar 1 2000 Petr Kri¹tof <Petr@Kristof.CZ> 
-- Czech descriptions added; some fixes and updates.
-
-* Sat Jan 15 2000 Keith Owens <kaos@ocs.com.au>
-- Add missing man page as separate patch instead of updating the tar file.
-
-* Mon Dec 27 1999 Fabio Coatti <cova@ferrara.linux.it> 
-- Upgraded for 1.0.1 (added missing gpg.1 man page)
-
-* Sat May 29 1999 Fabio Coatti <cova@ferrara.linux.it>
-- Some corrections in French description, thanks to Gaël Quéri <gqueri@mail.dotcom.fr>  
-
-* Mon May 17 1999 Fabio Coatti <cova@felix.unife.it>
-- Added French description, provided by 
-  Christophe Labouisse <labouiss@cybercable.fr>
-
-* Thu May 06 1999 Fabio Coatti <cova@felix.unife.it> 
-- Upgraded for 0.9.6 (removed gpgm)
-
-* Tue Jan 12 1999 Fabio Coatti <cova@felix.unife.it>
-- LINGUAS variable is now unset in configure to ensure that all languages will be built. (Thanks to Luca Olivetti <luca@luca.ddns.org>)
- 
-* Sat Jan 02 1999 Fabio Coatti <cova@felix.unife.it>
-- Added pl language file.
-- Included g10/pubring.asc in documentation files.
-
-* Sat Dec 19 1998 Fabio Coatti <cova@felix.unife.it>
-- Modified the spec file provided by Caskey L. Dickson <caskey-at-technocage.com>
-- Now it can be built also by non-root. Installation has to be done as
-  root, gpg is suid.
-- Added some changes by  Ross Golder <rossigee@bigfoot.com>
-- Updates for version 0.4.5 of GnuPG (.mo files)
-
-%description
-GnuPG (GNU Privacy Guard) is a GNU utility for encrypting data and
-creating digital signatures. GnuPG has advanced key management
-capabilities and is compliant with the proposed OpenPGP Internet
-standard described in RFC2440. Since GnuPG doesn't use any patented
-algorithm, it is not compatible with any version of PGP2 (PGP2.x uses
-only IDEA, patented worldwide, and RSA, which is patented in the US
-until 9/20/00).
-
-%description -l it
-GnuPG (GNU Privacy Guard) è una utility GNU per la cifratura di dati e
-la creazione di firme digitali. Possiede una gestione avanzata delle
-chiavi ed è conforme allo standard Internet OpenPGP, descritto nella
-RFC 2440. Non utilizzando algoritmi brevettati, non è compatibile con
-PGP2 (PGP2.x usa solo IDEA, coperto da brevetto mondiale, ed RSA,
-brevettato negli USA con scadenza 20/09/2000). Questi algoritmi sono
-utilizzabili da GnuPG tramite moduli esterni.
-
-%description -l fr
-GnuPG est un utilitaire GNU destiné à chiffrer des données et à créer
-des signatures électroniques. Il a des capacités avancées de gestion de
-clés et il est conforme à la norme proposée OpenPGP décrite dans la
-RFC2440. Comme GnuPG n'utilise pas d'algorithme breveté, il n'est
-compatible avec aucune version de PGP2 (PGP2.x ne sait utiliser que
-l'IDEA breveté dans le monde entier et RSA, breveté aux États-Unis
-jusqu'au 20 septembre 2000). 
-
-%description -l cs
-GnuPG je GNU nástroj pro bezpeènou komunikaci a ukládání dat. Mù¾e být
-pou¾it na ¹ifrování dat a vytváøení digitálních podpisù. Obsahuje
-funkce pro pokroèilou správu klíèù a vyhovuje navrhovanému OpenPGP
-Internet standardu podle RFC2440. Byl vytvoøen jako kompletní
-náhrada za PGP. Proto¾e neobsahuje ¹ifrovací algoritmy IDEA nebo RSA,
-mù¾e být pou¾íván bez omezení.
-Proto¾e GnuPG nepou¾ívá ¾ádný patentovaný algoritmus, nemù¾e být úplnì
-kompatibilní s PGP verze 2. PGP 2.x pou¾ívá algoritmy IDEA (patentováno
-celosvìtovì) a RSA (patentováno ve Spojených státech do 20. záøí
-2000). Tyto algoritmy lze zavést do GnuPG pomocí externích modulù.
-
-%description -l pl
-GnuPG (GNU Privacy Guard) jest nazedziem do szfrowania danych i tworzenia
-cyfrowych podpisów. GnuPG posiada zaawansowane mozliwosci obslugi kluczy
-i jest zgodne z OpenPGP, proponowanym standardem internetowym opisanym
-w RFC2440. Poniewaz GnuPG nie uzywa zadnych opatentowanych algorytmów
-nie jest wiec zgodne z jaka kolwiek wersja PGP2 (PGP2.x kozysta jedynie
-z algorytmów: IDEA, opatentowanego na calym swiecie, oraz RSA, którego
-patent na terenie Stanów Zjednoczonych wygasa 20 wrzesnia 2000).         
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_DIR/%{name}-%{version}
-
-%setup
-
-%build
-if test -n "$LINGUAS"; then
- unset LINGUAS
-fi    
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --enable-shared
-make
-
-%install
-make install-strip prefix=$RPM_BUILD_ROOT/usr
-
-%files
-
-%doc %attr (-,root,root) INSTALL
-%doc %attr (-,root,root) AUTHORS
-%doc %attr (-,root,root) COPYING
-%doc %attr (-,root,root) ChangeLog
-%doc %attr (-,root,root) NEWS
-%doc %attr (-,root,root) README
-%doc %attr (-,root,root) THANKS
-%doc %attr (-,root,root) TODO   
-%doc %attr (-,root,root) PROJECTS
-%doc %attr (-,root,root) doc/DETAILS
-%doc %attr (-,root,root) doc/FAQ
-%doc %attr (-,root,root) doc/faq.html
-%doc %attr (-,root,root) doc/HACKING
-%doc %attr (-,root,root) doc/OpenPGP
-%doc %attr (-,root,root) doc/samplekeys.asc
-
-%attr (-,root,root) /usr/man/man1/gpg*.1*
-%attr (4755,root,root) /usr/bin/gpg
-%attr (-,root,root) /usr/bin/gpgkeys_*
-
-%attr (-,root,root) /usr/share/locale/*/*/%{name}.mo
-
-%attr (-,root,root) /usr/lib/%{name}
-
-%config %attr (-,root,root) /usr/share/%{name}/options.skel
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_DIR/%{name}-%{version}
diff --git a/scripts/gnupgbug b/scripts/gnupgbug
deleted file mode 100644
index 52efc2ab4..000000000
--- a/scripts/gnupgbug
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/bin/sh
-
-#
-#     File a bug against the GNU Privacy Guard.
-#
-
-#
-#     Copyright (c) 2000 Thomas Roessler <roessler@guug.de>
-#
-#
-#     This program is free software; you can redistribute it and/or modify
-#     it under the terms of the GNU General Public License as published by
-#     the Free Software Foundation; either version 2 of the License, or
-#     (at your option) any later version.
-#
-#     This program is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#     GNU General Public License for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with this program; if not, write to the Free Software
-#     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-
-SUBMIT="submit@bugs.guug.de"
-DEBIAN_SUBMIT="submit@bugs.debian.org"
-
-
-include_file ()
-{
-	echo
-	echo "--- Begin $1"
-	sed -e 's/^-/- -/' $1 | egrep -v '^[    ]*(#|$)'
-	echo "--- End $1"
-	echo
-}
-
-case `echo -n` in
-"") n=-n; c=   ;;
- *) n=; c='\c' ;;
-esac
-
-
-exec > /dev/tty
-exec < /dev/tty
-
-SCRATCH=${TMPDIR-/tmp}/`basename $0`.`hostname`.$$
-
-mkdir ${SCRATCH} || \
-{
-	echo "`basename $0`: Can't create temporary directory." >& 2 ;
-	exit 1 ;
-}
-
-trap "rm -r -f ${SCRATCH} ; trap '' 0 ; exit" 0 1 2
-
-TEMPLATE=${SCRATCH}/template.txt
-
-echo "Please enter a one-line description of the problem you experience:"
-echo $n "> $c"
-read SUBJECT
-
-echo $n "Do you want to include your personal GnuPG configuration files? [Y|n]$c"
-read personal
-case "$personal" in
-[nN]*)	personal=no  ;;
-    *)	personal=yes ;;
-esac
-
-if test -f /etc/debian_version ; then
-	DEBIAN=yes
-	echo $n "Checking whether GnuPG has been installed as a package... $c"
-	GNUPGVERSION="`dpkg -l gnupg | grep ^i | awk '{print $3}'`" 2> /dev/null
-	if test "$GNUPGVERSION" ; then
-		DPKG=yes
-	else
-		DPKG=no
-	fi
-	echo "$DPKG"
-	if test "$DPKG" = "no" ; then
-		echo $n "File this bug with Debian? [Y|n]$c"
-		read $DPKG
-		case "$DPKG" in
-		[nN])	DPKG=no ;;
-		*)	DPKG=yes ;;
-		esac
-	fi
-else
-	DEBIAN=no
-	DPKG=no
-fi
-
-test "$MUTTVERSION"  || MUTTVERSION="`mutt -v | head -1 | awk '{print $2}' | tr -d i`"
-test "$DPKG" = "yes" && SUBMIT="$SUBMIT, $DEBIAN_SUBMIT"
-
-
-exec > ${TEMPLATE}
-
-echo "Subject: mutt-$MUTTVERSION: $SUBJECT"
-echo "To: $SUBMIT"
-echo "Cc: $LOGNAME"
-echo
-echo "Package: mutt"
-echo "Version: $MUTTVERSION"
-echo
-echo "-- Please type your report below this line"
-echo
-echo
-echo
-
-if test "$DEBIAN" = "yes" ; then
-	echo "Obtaining Debian-specific information..." > /dev/tty
-	bug -p -s dummy mutt |				       \
-		sed -n -e "/^-- System Information/,/^---/p" | \
-		grep -v '^---'
-fi
-
-echo
-echo "-- Mutt Version Information"
-echo
-mutt -v
-
-if test "$personal" = "yes" ; then
-	CANDIDATES=".muttrc-${MUTTVERSION} .muttrc .mutt/muttrc-${MUTTVERSION} .mutt/muttrc"
-	MATCHED="none"
-	for f in $CANDIDATES; do
-		if test -f "${HOME}/$f" ; then
-			MATCHED="${HOME}/$f"
-			break
-		fi
-	done
-
-	if test "$MATCHED" = "none" ; then
-		echo "WARNING: Can't find your personal .muttrc." >&2
-	else
-		include_file $MATCHED
-	fi
-fi
-
-if test "$global" = "yes" ; then
-	CANDIDATES="Muttrc-${MUTTVERSION} Muttrc"
-	DIRECTORIES="/etc /usr/local/share/mutt"
-	MATCHED="none"
-	for d in $DIRECTORIES ; do
-		for f in $CANDIDATES; do
-			if test -f $d/$f ; then
-				MATCHED="$d/$f"
-				break
-			fi
-		done
-		test "$MATCHED" = "none" || break
-	done
-
-	if test "$MATCHED" = "none" ; then
-		echo "WARNING: Can't find global Muttrc." >&2
-	else
-		include_file $MATCHED
-	fi
-fi
-
-exec > /dev/tty
-
-cp $TEMPLATE $SCRATCH/mutt-bug.txt
-
-input="e"
-while : ; do
-	if test "$input" = "e" ; then
-		${VISUAL-vi} $SCRATCH/mutt-bug.txt
-		if cmp $SCRATCH/mutt-bug.txt ${TEMPLATE} > /dev/null ; then
-			echo "WARNING: Bug report was not modified!"
-		fi
-	fi
-
-	echo $n "Submit, Edit, Print, Quit? [S|e|p|q]$c"
-	read _input
-	input="`echo $_input | tr EPSQ epsq`"
-	case $input in
-	e*)	;;
-	p*)	${PAGER-more} $SCRATCH/mutt-bug.txt ;;
-	s*|"")  /usr/sbin/sendmail -t < $SCRATCH/mutt-bug.txt ; exit ;;
-	q*)	exit
-	esac
-done
-
diff --git a/scripts/log_accum b/scripts/log_accum
deleted file mode 100755
index 0629abb48..000000000
--- a/scripts/log_accum
+++ /dev/null
@@ -1,595 +0,0 @@
-#! /usr/bin/perl
-# -*-Perl-*-
-#
-# Perl filter to handle the log messages from the checkin of files in
-# a directory.	This script will group the lists of files by log
-# message, and mail a single consolidated log message at the end of
-# the commit.
-#
-# This file assumes a pre-commit checking program that leaves the
-# names of the first and last commit directories in a temporary file.
-#
-# Contributed by David Hampton <hampton@cisco.com>
-#
-# hacked greatly by Greg A. Woods <woods@planix.com>
-#
-# Modified by werner.koch@guug.de to add support for
-#	automagically extraction of ChangeLog entries		1998-12-29
-
-# Usage: log_accum.pl [-d] [-s] [-M module] [[-m mailto] ...] [[-R replyto] ...] [-f logfile]
-#	-d		- turn on debugging
-#	-m mailto	- send mail to "mailto" (multiple)
-#	-R replyto	- set the "Reply-To:" to "replyto" (multiple)
-#	-M modulename	- set module name to "modulename"
-#	-f logfile	- write commit messages to logfile too
-#	-s		- *don't* run "cvs status -v" for each file
-#	-w		- show working directory with log message
-
-#
-#	Configurable options
-#
-
-# set this to something that takes a whole message on stdin
-$MAILER        = "/usr/lib/sendmail -t";
-
-#
-#	End user configurable options.
-#
-
-# Constants (don't change these!)
-#
-$STATE_NONE    = 0;
-$STATE_CHANGED = 1;
-$STATE_ADDED   = 2;
-$STATE_REMOVED = 3;
-$STATE_LOG     = 4;
-
-$LAST_FILE     = "/tmp/#cvs.lastdir";
-
-$CHANGED_FILE  = "/tmp/#cvs.files.changed";
-$ADDED_FILE    = "/tmp/#cvs.files.added";
-$REMOVED_FILE  = "/tmp/#cvs.files.removed";
-$LOG_FILE      = "/tmp/#cvs.files.log";
-
-$FILE_PREFIX   = "#cvs.files";
-
-#
-#	Subroutines
-#
-
-sub cleanup_tmpfiles {
-    local($wd, @files);
-
-    $wd = `pwd`;
-    chdir("/tmp") || die("Can't chdir('/tmp')\n");
-    opendir(DIR, ".");
-    push(@files, grep(/^$FILE_PREFIX\..*\.$id$/, readdir(DIR)));
-    closedir(DIR);
-    foreach (@files) {
-	unlink $_;
-    }
-    unlink $LAST_FILE . "." . $id;
-
-    chdir($wd);
-}
-
-sub write_logfile {
-    local($filename, @lines) = @_;
-
-    open(FILE, ">$filename") || die("Cannot open log file $filename.\n");
-    print FILE join("\n", @lines), "\n";
-    close(FILE);
-}
-
-sub append_to_logfile {
-    local($filename, @lines) = @_;
-
-    open(FILE, ">$filename") || die("Cannot open log file $filename.\n");
-    print FILE join("\n", @lines), "\n";
-    close(FILE);
-}
-
-sub format_names {
-    local($dir, @files) = @_;
-    local(@lines);
-
-    $format = "\t%-" . sprintf("%d", length($dir)) . "s%s ";
-
-    $lines[0] = sprintf($format, $dir, ":");
-
-    if ($debug) {
-	print STDERR "format_names(): dir = ", $dir, "; files = ", join(":", @files), ".\n";
-    }
-    foreach $file (@files) {
-	if (length($lines[$#lines]) + length($file) > 65) {
-	    $lines[++$#lines] = sprintf($format, " ", " ");
-	}
-	$lines[$#lines] .= $file . " ";
-    }
-
-    @lines;
-}
-
-sub format_lists {
-    local(@lines) = @_;
-    local(@text, @files, $lastdir);
-
-    if ($debug) {
-	print STDERR "format_lists(): ", join(":", @lines), "\n";
-    }
-    @text = ();
-    @files = ();
-    $lastdir = shift @lines;	# first thing is always a directory
-    if ($lastdir !~ /.*\/$/) {
-	die("Damn, $lastdir doesn't look like a directory!\n");
-    }
-    foreach $line (@lines) {
-	if ($line =~ /.*\/$/) {
-	    push(@text, &format_names($lastdir, @files));
-	    $lastdir = $line;
-	    @files = ();
-	} else {
-	    push(@files, $line);
-	}
-    }
-    push(@text, &format_names($lastdir, @files));
-
-    @text;
-}
-
-sub append_names_to_file {
-    local($filename, $dir, @files) = @_;
-
-    if (@files) {
-	open(FILE, ">>$filename") || die("Cannot open file $filename.\n");
-	print FILE $dir, "\n";
-	print FILE join("\n", @files), "\n";
-	close(FILE);
-    }
-}
-
-sub read_line {
-    local($line);
-    local($filename) = @_;
-
-    open(FILE, "<$filename") || die("Cannot open file $filename.\n");
-    $line = <FILE>;
-    close(FILE);
-    chop($line);
-    $line;
-}
-
-sub read_logfile {
-    local(@text);
-    local($filename, $leader) = @_;
-
-    open(FILE, "<$filename");
-    while (<FILE>) {
-	chop;
-	push(@text, $leader.$_);
-    }
-    close(FILE);
-    @text;
-}
-
-sub build_header {
-    local($header);
-    local($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
-    $header = sprintf("CVSROOT:\t%s\nModule name:\t%s\nRepository:\t%s\nChanges by:\t%s@%s\t%02d/%02d/%02d %02d:%02d:%02d",
-		      $cvsroot,
-		      $modulename,
-		      $dir,
-		      $login, $hostdomain,
-		      $year%100, $mon+1, $mday,
-		      $hour, $min, $sec);
-}
-
-sub mail_notification {
-    local(@text) = @_;
-
-    # if only we had strftime()...  stuff stolen from perl's ctime.pl:
-    local($[) = 0;
-
-    @DoW = ('Sun','Mon','Tue','Wed','Thu','Fri','Sat');
-    @MoY = ('Jan','Feb','Mar','Apr','May','Jun',
-	    'Jul','Aug','Sep','Oct','Nov','Dec');
-
-    # Determine what time zone is in effect.
-    # Use GMT if TZ is defined as null, local time if TZ undefined.
-    # There's no portable way to find the system default timezone.
-    #
-    $TZ = defined($ENV{'TZ'}) ? ( $ENV{'TZ'} ? $ENV{'TZ'} : 'GMT' ) : '';
-
-    # Hack to deal with 'PST8PDT' format of TZ
-    # Note that this can't deal with all the esoteric forms, but it
-    # does recognize the most common: [:]STDoff[DST[off][,rule]]
-    #
-    if ($TZ =~ /^([^:\d+\-,]{3,})([+-]?\d{1,2}(:\d{1,2}){0,2})([^\d+\-,]{3,})?/) {
-	$TZ = $isdst ? $4 : $1;
-	$tzoff = sprintf("%05d", -($2) * 100);
-    }
-
-    # perl-4.036 doesn't have the $zone or $gmtoff...
-    ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst, $zone, $gmtoff) =
-	($TZ eq 'GMT') ? gmtime(time) : localtime(time);
-
-    $year += ($year < 70) ? 2000 : 1900;
-
-    if ($gmtoff != 0) {
-	$tzoff = sprintf("%05d", ($gmtoff / 60) * 100);
-    }
-    if ($zone ne '') {
-	$TZ = $zone;
-    }
-
-    # ok, let's try....
-    $rfc822date = sprintf("%s, %2d %s %4d %2d:%02d:%02d %s (%s)",
-			  $DoW[$wday], $mday, $MoY[$mon], $year,
-			  $hour, $min, $sec, $tzoff, $TZ);
-
-    open(MAIL, "| $MAILER");
-    print MAIL "Date:     " . $rfc822date . "\n";
-    print MAIL "Subject:  CVS Update: " . $modulename . "\n";
-    print MAIL "To:       " . $mailto . "\n";
-    print MAIL "Reply-To: " . $replyto . "\n";
-    print MAIL "\n";
-    print MAIL join("\n", @text), "\n";
-    close(MAIL);
-}
-
-sub write_commitlog {
-    local($logfile, @text) = @_;
-
-    open(FILE, ">>$logfile");
-    print FILE join("\n", @text), "\n";
-    close(FILE);
-}
-
-#
-#	Main Body
-#
-
-# Initialize basic variables
-#
-$debug = 0;
-$id = getpgrp();		# note, you *must* use a shell which does setpgrp()
-$state = $STATE_NONE;
-$login = getlogin || (getpwuid($<))[0] || "nobody";
-chop($hostname = `hostname`);
-chop($domainname = `domainname`);
-if ($domainname !~ '^\..*') {
-    $domainname = '.' . $domainname;
-}
-$hostdomain = $hostname . $domainname;
-$cvsroot = $ENV{'CVSROOT'};
-$do_status = 1; 		# moderately useful
-$show_wd = 0;			# useless in client/server
-$modulename = "";
-
-# parse command line arguments (file list is seen as one arg)
-#
-while (@ARGV) {
-    $arg = shift @ARGV;
-
-    if ($arg eq '-d') {
-	$debug = 1;
-	print STDERR "Debug turned on...\n";
-    } elsif ($arg eq '-m') {
-	if ($mailto eq '') {
-	    $mailto = shift @ARGV;
-	} else {
-	    $mailto = $mailto . ", " . shift @ARGV;
-	}
-    } elsif ($arg eq '-R') {
-	if ($replyto eq '') {
-	    $replyto = shift @ARGV;
-	} else {
-	    $replyto = $replyto . ", " . shift @ARGV;
-	}
-    } elsif ($arg eq '-M') {
-	$modulename = shift @ARGV;
-    } elsif ($arg eq '-s') {
-	$do_status = 0;
-    } elsif ($arg eq '-w') {
-	$show_wd = 1;
-    } elsif ($arg eq '-f') {
-	($commitlog) && die("Too many '-f' args\n");
-	$commitlog = shift @ARGV;
-    } else {
-	($donefiles) && die("Too many arguments!  Check usage.\n");
-	$donefiles = 1;
-	@files = split(/ /, $arg);
-    }
-}
-($mailto) || die("No mail recipient specified (use -m)\n");
-if ($replyto eq '') {
-    $replyto = $login;
-}
-
-# for now, the first "file" is the repository directory being committed,
-# relative to the $CVSROOT location
-#
-@path = split('/', $files[0]);
-
-# XXX There are some ugly assumptions in here about module names and
-# XXX directories relative to the $CVSROOT location -- really should
-# XXX read $CVSROOT/CVSROOT/modules, but that's not so easy to do, since
-# XXX we have to parse it backwards.
-# XXX
-# XXX Fortunately it's relatively easy for the user to specify the
-# XXX module name as appropriate with a '-M' via the directory
-# XXX matching in loginfo.
-#
-if ($modulename eq "") {
-    $modulename = $path[0];	# I.e. the module name == top-level dir
-}
-if ($#path == 0) {
-    $dir = ".";
-} else {
-    $dir = join('/', @path);
-}
-$dir = $dir . "/";
-
-if ($debug) {
-    print STDERR "module - ", $modulename, "\n";
-    print STDERR "dir    - ", $dir, "\n";
-    print STDERR "path   - ", join(":", @path), "\n";
-    print STDERR "files  - ", join(":", @files), "\n";
-    print STDERR "id     - ", $id, "\n";
-}
-
-# Check for a new directory first.  This appears with files set as follows:
-#
-#    files[0] - "path/name/newdir"
-#    files[1] - "-"
-#    files[2] - "New"
-#    files[3] - "directory"
-#
-if ($files[2] =~ /New/ && $files[3] =~ /directory/) {
-    local(@text);
-
-    @text = ();
-    push(@text, &build_header());
-    push(@text, "");
-    push(@text, $files[0]);
-    push(@text, "");
-
-    while (<STDIN>) {
-	chop;			# Drop the newline
-	push(@text, $_);
-    }
-
-    &mail_notification($mailto, @text);
-
-    exit 0;
-}
-
-# Check for an import command.	This appears with files set as follows:
-#
-#    files[0] - "path/name"
-#    files[1] - "-"
-#    files[2] - "Imported"
-#    files[3] - "sources"
-#
-if ($files[2] =~ /Imported/ && $files[3] =~ /sources/) {
-    local(@text);
-
-    @text = ();
-    push(@text, &build_header());
-    push(@text, "");
-    push(@text, $files[0]);
-    push(@text, "");
-
-    while (<STDIN>) {
-	chop;			# Drop the newline
-	push(@text, $_);
-    }
-
-    &mail_notification(@text);
-
-    exit 0;
-}
-
-# Iterate over the body of the message collecting information.
-#
-while (<STDIN>) {
-    chop;			# Drop the newline
-
-    if (/^In directory/) {
-	if ($show_wd) { 	# useless in client/server mode
-	    push(@log_lines, $_);
-	    push(@log_lines, "");
-	}
-	next;
-    }
-
-    if (/^Modified Files/) { $state = $STATE_CHANGED; next; }
-    if (/^Added Files/)    { $state = $STATE_ADDED;   next; }
-    if (/^Removed Files/)  { $state = $STATE_REMOVED; next; }
-    if (/^Log Message/)    { $state = $STATE_LOG;     next; }
-
-    s/^[ \t\n]+//;		# delete leading whitespace
-    s/[ \t\n]+$//;		# delete trailing whitespace
-
-    if ($state == $STATE_CHANGED) { push(@changed_files, split); }
-    if ($state == $STATE_ADDED)   { push(@added_files,	 split); }
-    if ($state == $STATE_REMOVED) { push(@removed_files, split); }
-    if ($state == $STATE_LOG)	  {
-	if( /^See[ ]ChangeLog:[ ](.*)/ ) {
-	    $changelog = $1;
-	    $okay = false;
-	    open(RCS, "-|") || exec 'cvs', '-Qn', 'update', '-p', 'ChangeLog';
-	    while (<RCS>) {
-		if( /^$changelog .*/ ) {
-		    $okay = true;
-		    push(@log_lines,	 $_);
-		}
-		elsif( $okay ) {
-		    last if( /^[A-Z]+.*/ );
-		    push(@log_lines,	 $_);
-		}
-	    }
-	    while (<RCS>) { ; }
-	    close(RCS);
-	}
-	else {
-	    push(@log_lines, $_);
-	}
-    }
-}
-
-# Strip leading and trailing blank lines from the log message.	Also
-# compress multiple blank lines in the body of the message down to a
-# single blank line.
-#
-while ($#log_lines > -1) {
-    last if ($log_lines[0] ne "");
-    shift(@log_lines);
-}
-while ($#log_lines > -1) {
-    last if ($log_lines[$#log_lines] ne "");
-    pop(@log_lines);
-}
-for ($i = $#log_lines; $i > 0; $i--) {
-    if (($log_lines[$i - 1] eq "") && ($log_lines[$i] eq "")) {
-	splice(@log_lines, $i, 1);
-    }
-}
-
-if ($debug) {
-    print STDERR "Searching for log file index...";
-}
-# Find an index to a log file that matches this log message
-#
-for ($i = 0; ; $i++) {
-    local(@text);
-
-    last if (! -e "$LOG_FILE.$i.$id"); # the next available one
-    @text = &read_logfile("$LOG_FILE.$i.$id", "");
-    last if ($#text == -1);	# nothing in this file, use it
-    last if (join(" ", @log_lines) eq join(" ", @text)); # it's the same log message as another
-}
-if ($debug) {
-    print STDERR " found log file at $i.$id, now writing tmp files.\n";
-}
-
-# Spit out the information gathered in this pass.
-#
-&append_names_to_file("$CHANGED_FILE.$i.$id", $dir, @changed_files);
-&append_names_to_file("$ADDED_FILE.$i.$id",   $dir, @added_files);
-&append_names_to_file("$REMOVED_FILE.$i.$id", $dir, @removed_files);
-&write_logfile("$LOG_FILE.$i.$id", @log_lines);
-
-# Check whether this is the last directory.  If not, quit.
-#
-if ($debug) {
-    print STDERR "Checking current dir against last dir.\n";
-}
-$_ = &read_line("$LAST_FILE.$id");
-
-if ($_ ne $cvsroot . "/" . $files[0]) {
-    if ($debug) {
-	print STDERR sprintf("Current directory %s is not last directory %s.\n", $cvsroot . "/" .$files[0], $_);
-    }
-    exit 0;
-}
-if ($debug) {
-    print STDERR sprintf("Current directory %s is last directory %s -- all commits done.\n", $files[0], $_);
-}
-
-#
-#	End Of Commits!
-#
-
-# This is it.  The commits are all finished.  Lump everything together
-# into a single message, fire a copy off to the mailing list, and drop
-# it on the end of the Changes file.
-#
-
-#
-# Produce the final compilation of the log messages
-#
-@text = ();
-@status_txt = ();
-push(@text, &build_header());
-push(@text, "");
-
-for ($i = 0; ; $i++) {
-    last if (! -e "$LOG_FILE.$i.$id"); # we're done them all!
-    @lines = &read_logfile("$CHANGED_FILE.$i.$id", "");
-    if ($#lines >= 0) {
-	push(@text, "Modified files:");
-	push(@text, &format_lists(@lines));
-    }
-    @lines = &read_logfile("$ADDED_FILE.$i.$id", "");
-    if ($#lines >= 0) {
-	push(@text, "Added files:");
-	push(@text, &format_lists(@lines));
-    }
-    @lines = &read_logfile("$REMOVED_FILE.$i.$id", "");
-    if ($#lines >= 0) {
-	push(@text, "Removed files:");
-	push(@text, &format_lists(@lines));
-    }
-    if ($#text >= 0) {
-	push(@text, "");
-    }
-    @lines = &read_logfile("$LOG_FILE.$i.$id", "\t");
-    if ($#lines >= 0) {
-	push(@text, "Log message:");
-	push(@text, @lines);
-	push(@text, "");
-    }
-    if ($do_status) {
-	local(@changed_files);
-
-	@changed_files = ();
-	push(@changed_files, &read_logfile("$CHANGED_FILE.$i.$id", ""));
-	push(@changed_files, &read_logfile("$ADDED_FILE.$i.$id", ""));
-	push(@changed_files, &read_logfile("$REMOVED_FILE.$i.$id", ""));
-
-	if ($debug) {
-	    print STDERR "main: pre-sort changed_files = ", join(":", @changed_files), ".\n";
-	}
-	sort(@changed_files);
-	if ($debug) {
-	    print STDERR "main: post-sort changed_files = ", join(":", @changed_files), ".\n";
-	}
-
-	foreach $dofile (@changed_files) {
-	    if ($dofile =~ /\/$/) {
-		next;		# ignore the silly "dir" entries
-	    }
-	    if ($debug) {
-		print STDERR "main(): doing 'cvs -nQq status -v $dofile'\n";
-	    }
-	    open(STATUS, "-|") || exec 'cvs', '-nQq', 'status', '-v', $dofile;
-	    while (<STATUS>) {
-		chop;
-		push(@status_txt, $_);
-	    }
-	}
-    }
-}
-
-# Write to the commitlog file
-#
-if ($commitlog) {
-    &write_commitlog($commitlog, @text);
-}
-
-if ($#status_txt >= 0) {
-    push(@text, @status_txt);
-}
-
-# Mailout the notification.
-#
-&mail_notification(@text);
-
-# cleanup
-#
-if (! $debug) {
-    &cleanup_tmpfiles();
-}
-
-exit 0;
diff --git a/scripts/mail-to-translators b/scripts/mail-to-translators
deleted file mode 100755
index 10210a73f..000000000
--- a/scripts/mail-to-translators
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-# mail a compressed version of the current translation to the Last-Translator
-#
-
-# remove the colon to armor this script.
-SENDMAIL=": /usr/sbin/sendmail"
-
-for file in *.po; do
-    addr=$(awk '/Last-Translator:/ { printf "%s", $0; exit 0}' $file | sed 's/.*\(<.*>\).*/\1/')
-    ll=$(basename $file .po)    
-
-    if ! msgfmt -vc $file 2>&1| egrep -q 'fuzzy|untranslated|error'; then
-        echo "$file: okay" >&2
-        continue;
-    fi    
-
-    if ! echo "$addr" | grep -q @ ; then
-        echo "$file: no translator known" >&2
-        continue;
-    fi
-
-    echo "$file: sending to $addr"
-    ( cat <<EOF
-From: translations@gnupg.org
-To: $addr
-Subject: GnuPG translation ($ll)
-Mime-Version: 1.0
-Content-Type: multipart/mixed; boundary="=-=-="
-
---=-=-=
-
-Hi!
-
-Please find attached the latest version of the PO file for your GnuPG
-translation ($file).  I would appreciate if you can fix any remaining
-fuzzy or untranslated entries.  If you need access to the code
-please use http://cvs.gnupg.org or get the latest snapshot at
-ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-1.1.92.tar.gz
-
-IMHO it is important to have a basic understanding of GnuPG's
-functionality to do a correct translation.  A false translation might
-need to security problems.  This is the reason why I prefer to contact
-you directly and not to work only with the TP Robot.
-
-Output of msgfmt is:
-$(msgfmt --check --statistics $file 2>&1 | head)
-
-If you are not able to continue the translation work, I suggest to
-pass this message on to another translator and drop me a short note.
-
-Thanks,
-
-  Werner
-
-
---=-=-=
-Content-Type: application/octet-stream
-Content-Disposition: attachment; filename=gnupg-${file}.gz
-Content-Transfer-Encoding: base64
-
-EOF
-
-gzip <$file | mimencode 
-
-echo ""
-echo "--=-=-=--"
-echo ""
-    ) | $SENDMAIL -oi "$addr"
-
-done
diff --git a/scripts/mk-gpg-texi b/scripts/mk-gpg-texi
deleted file mode 100755
index 45a811742..000000000
--- a/scripts/mk-gpg-texi
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-# Helper to create the texinfo versions from gpg.sgml
-#
-# Copyright (C) 2002 Free Software Foundation, Inc.
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-set -e
-
-for file in gpg gpgv; do
-  sgml2xml -x lower ${file}.sgml >${file}.xml
-  docbook2texi ${file}.xml | sed 's,--,---,' | (
-  case "$file" in
-    *gpgv)
-        sed '/@setfilename/a \
-@dircategory GnuPG\
-@direntry\
-* gpgv: (gpgv).                       GnuPG signature verification tool.\
-@end direntry
-'
-         ;;
-
-    gpg)
-        sed '/@setfilename/a \
-@dircategory GnuPG\
-@direntry\
-* gpg: (gpg).                         GnuPG encryption and signing tool.\
-@end direntry
-'
-        ;;
-
-    *)
-    cat
-        ;;
-  esac
-  ) >${file}.texi 
-done
-
-
-
diff --git a/scripts/mk-w32-dist b/scripts/mk-w32-dist
deleted file mode 100755
index 378278a99..000000000
--- a/scripts/mk-w32-dist
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-
-set -e
-
-cd dist-w32
-
-bindir=..
-
-if [ -f ../README ]; then
-    srcdir=..
-elif [ -f ../../README ]; then
-    srcdir=../..
-    bindir=..
-elif [ -f ../../gnupg-stable/README ]; then
-    srcdir=../../gnupg-stable
-elif [ -f ../../../gnupg-stable/README ]; then
-    srcdir=../../../gnupg-stable
-else
-    echo "cannot figure out the source dir" >&2
-    exit 1
-fi
-
-version=$(sed -n 's/^#[ ]*define[ ][ ]*VERSION[ ][ ]*\"\([0-9.]*\)\"/\1/p' $bindir/config.h)
-echo "building version $version"
-
-rm * || true
-
-cp ${bindir}/g10/gpg.exe gpg.exe
-mingw32 strip gpg.exe
-cp ${bindir}/g10/gpgv.exe gpgv.exe
-mingw32 strip gpgv.exe
-cp ${bindir}/tools/gpgsplit.exe gpgsplit.exe
-mingw32 strip gpgsplit.exe
-
-for i in FAQ; do
-  cp ${bindir}/doc/$i .
-  todos $i
-done
-man -Tlatin1 -l ${srcdir}/doc/gpg.1 | sed `printf "s/\b.//g"`  >gpg.man
-todos gpg.man
-man -Tlatin1 -l ${srcdir}/doc/gpgv.1 | sed `printf "s/\b.//g"`  >gpgv.man
-todos gpgv.man
-man -Tlatin1 -l ${srcdir}/doc/gnupg.7 | sed `printf "s/\b.//g"`  >gnupg.man
-todos gnupg.man
-for i in README COPYING; do
-  cp ${srcdir}/$i .
-  todos $i
-done
-for i in README.W32 gnupg-w32.reg; do
-  cp ${srcdir}/doc/$i .
-  todos $i
-done
-
-
-for i in ${srcdir}/po/*.po; do
-   lang=$(basename $i .po)
-   fromset=`sed -n '/^"Content-Type:/ s/.*charset=\([a-zA-Z0-9_-]*\).*/\1/p' $i`
-   case $lang in 
-     cs|pl) toset="CP1250" ;;
-     tr) toset="CP1254" ;;   # DOS: CP857
-     el) toset="CP1253" ;;   # same as latin-7?
-     el|eo|et|ja) toset="" ;;
-      *) toset="CP850" ;;
-   esac
-   if [ -n "$toset" ]; then
-       echo "$lang: converting from $fromset to $toset" >&2 
-       iconv --silent --from-code=$fromset --to-code=$toset < $i | \
-         sed "/^\"Content-Type:/ s/charset=[a-zA-Z0-9_-]*/charset=$toset/" | \
-         msgfmt --output-file=$lang.mo -
-   else
-       echo "$lang: keeping $fromset" >&2 
-       msgfmt --output-file=$lang.mo $i
-   fi
-done
-zip -9 "gnupg-w32cli-${version}.zip" *
-
-
-
-
diff --git a/scripts/mkdiff b/scripts/mkdiff
deleted file mode 100755
index f17979383..000000000
--- a/scripts/mkdiff
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/sh
-# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# Please note that this script is now maintained outside of GNUPG.
-# To get the most up to date version use
-# cvs -d :pserver:anoncvs@cvs.gnupg.org:/cvs/wk checkout misc-scripts/mkdiff
-
-if [ $# != 1 ] ; then
-    echo "usage: mkdiff package-name" >&2
-    exit 1
-fi
-
-pack="$1"
-
-set -e
-
-curr_ver=$(ls $pack-*.tar.gz 2>/dev/null | sed "s/^$pack-\(.*\)\.tar\.gz/\1/"\
-	   | sort -r -t '.' -n +0 -1 +1 -2 +2 | head -1 )
-if [ ! -f $pack-$curr_ver.tar.gz ]; then
-    echo "mkdiff: no current version of package $pack found" >&2
-    exit 1
-fi
-prev_ver=$(ls $pack-*.tar.gz 2>/dev/null | sed "s/^$pack-\(.*\)\.tar\.gz/\1/"\
-	   | sort -r -t '.' -n +0 -1 +1 -2 +2 | head -2 | tail -1 )
-if [ "$prev_ver" = "$curr_ver"  ]; then
-    echo "mkdiff: no previous version of package $pack found" >&2
-    exit 1
-fi
-
-echo "Current  is: $pack-$curr_ver"
-echo "Previous is: $pack-$prev_ver"
-
-
-echo "Removing old directories"
-[ -d "$pack-$curr_ver" ] && rm -rf "$pack-$curr_ver"
-[ -d "$pack-$prev_ver" ] && rm -rf "$pack-$prev_ver"
-
-echo "Unpacking previous and current tar"
-tar xzf "$pack-$curr_ver.tar.gz"
-rm -f $pack-${curr_ver}/po/*.gmo
-tar xzf "$pack-$prev_ver.tar.gz"
-rm -f $pack-${prev_ver}/po/*.gmo
-
-
-echo "Diffing"
-tmp_name="$pack-$prev_ver-$curr_ver.diff.tmp"
-diff_name="$pack-$prev_ver-$curr_ver.diff"
-
-diff -urN "$pack-$prev_ver/" "$pack-$curr_ver/"  > $tmp_name || true
-
-echo "Making patch file"
-
-cat <<EOF > $diff_name
-
-This is a patch file to create version $curr_ver from $prev_ver.
-
-Please check the signature of this patch file:
-
-    zcat somepath/$pack-$prev_ver-$curr_ver.diff.gz | gpg --verify
-
-Change to directory $pack-$prev_ver (or however you renamed it)
-and give this command:
-
-     zcat somepath/$pack-$prev_ver-$curr_ver.diff.gz | patch -p1
-
-It is a good idea to rename your current directory to $pack-$curr_ver now.
-
-
-
-Prereq: $prev_ver
-
-EOF
-
-sed -ne '/^diff.*VERSION/,/^+[0-9][0-9]*/ p' $tmp_name >> $diff_name
-echo  >> $diff_name
-sed -e '/^diff.*VERSION/,/^+[0-9][0-9]*/ d'  $tmp_name >> $diff_name
-
-rm $tmp_name
-
-echo "Signing and compressing patch file"
-gpg --clearsign --not-dash-escaped -u 57548DCD \
-    < $diff_name | gzip --best > $diff_name.gz
-rm $diff_name
-
-echo "Checking patch file"
-cd $pack-$prev_ver
-zcat ../$diff_name.gz | patch -s -p1
-rm $(find . -name "*.orig") 2>/dev/null || true
-cd ..
-
-if ! diff -urN "$pack-$prev_ver/" "$pack-$curr_ver/" >/dev/null ; then
-   echo "compare failed"
-   exit 1
-fi
-
-if ! zcat $diff_name.gz | gpg --batch --verify ; then
-    exit 1
-fi
-
-
-echo "cleaning up"
-
-rm -rf "$pack-$curr_ver"
-rm -rf "$pack-$prev_ver"
-
-echo "Patch file $diff_name.gz is good."
-
diff --git a/scripts/mkinstalldirs b/scripts/mkinstalldirs
deleted file mode 100755
index 994d71ce7..000000000
--- a/scripts/mkinstalldirs
+++ /dev/null
@@ -1,101 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-# $Id$
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
-   case "${1}" in
-     -h | --help | --h* )			# -h for help
-	echo "${usage}" 1>&2; exit 0 ;;
-     -m )					# -m PERM arg
-	shift
-	test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
-	dirmode="${1}"
-	shift ;;
-     -- ) shift; break ;;			# stop option processing
-     -* ) echo "${usage}" 1>&2; exit 1 ;;	# unknown option
-     * )  break ;;				# first non-opt arg
-   esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-0) exit 0 ;;
-esac
-
-case $dirmode in
-'')
-  if mkdir -p -- . 2>/dev/null; then
-    echo "mkdir -p -- $*"
-    exec mkdir -p -- "$@"
-  fi ;;
-*)
-  if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-    echo "mkdir -m $dirmode -p -- $*"
-    exec mkdir -m "$dirmode" -p -- "$@"
-  fi ;;
-esac
-
-for file
-do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-	echo "mkdir $pathcomp"
-
-	mkdir "$pathcomp" || lasterr=$?
-
-	if test ! -d "$pathcomp"; then
-	  errstatus=$lasterr
-	else
-	  if test ! -z "$dirmode"; then
-	     echo "chmod $dirmode $pathcomp"
-
-	     lasterr=""
-	     chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-	     if test ! -z "$lasterr"; then
-	       errstatus=$lasterr
-	     fi
-	  fi
-	fi
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 3
-# End:
-# mkinstalldirs ends here
diff --git a/scripts/mksnapshot b/scripts/mksnapshot
deleted file mode 100755
index cca19d98d..000000000
--- a/scripts/mksnapshot
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-# Make a snapshot of the CVS head revision
-
-exec >>/home/koch/mksnapshot.log 2>&1
-
-echo "Started at `date`."
-set -e
-
-ftp_dir=$1
-
-cd $HOME/pub
-PATH="$HOME/bin:$PATH"
-
-fix_version () {
-    version=$(cat $1/VERSION)
-    echo "$version-snap$(date +%Y-%m-%d)" >$1/VERSION
-    cat <<EOF >$1/SNAPSHOT
-		  WARNING!
-
-This is a snapshot of the current CVS head branch!
-
-It may not compile or not work.  Please don't report
-bugs about this snapshot release it is just for your
-convenience and to reduce the load of out CVS server.
-
-Thanks,
-
-   Werner
-EOF
-}
-
-build_dist () {
-    set +e
-    nice scripts/autogen.sh && nice ./configure && nice make dist
-    if ! awk '
-/^diff gnupg-snapshot\/VERSION/  { getline; getline; getline; getline; next }
-/^Common subdirectories:/   { next }
-/~$/	{ next }
-{ exit 1 }
-'      ; then
-	# Okay, we have some changes and it is not only the version number
-	rm $ftp_dir/gnupg-*snap*-*-*.tar.gz
-	mv gnupg-*.tar.gz $ftp_dir/
-    fi
-    make distclean
-    set -e
-}
-
-
-
-do_export () {
-    pgm=$1
-    mod=$2
-
-    rm -rf $pgm.new || true
-    rm -rf $pgm.old || true
-    cvs -Q export -r HEAD -d $pgm.new $mod
-    fix_version $pgm.new
-    if [ -n "$ftp_dir" ]; then
-      here=$(pwd)
-      cd $pgm.new
-      build_dist
-      cd $here
-    fi
-    [ -d $pgm ] && mv $pgm $pgm.old
-    if ! mv $pgm.new $pgm ; then
-	echo "rename failed - restoring" >&2
-	mv $pgm.old $pgm
-	exit 1
-    fi
-    rm -rf $pgm.old || true
-}
-
-
-do_export gnupg-snapshot gnupg
-
-echo "Ended at `date`."
-exit 0
-
diff --git a/scripts/mkwebpage b/scripts/mkwebpage
deleted file mode 100755
index b39feb176..000000000
--- a/scripts/mkwebpage
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-# Make a snapshot of the CVS head revision for the gnupg webpages
-
-
-set -e
-
-cd $HOME/pub
-
-extract_date () {
-    # This strange construct is to speed up things.  Grouping a "s" and a "q"
-    # does not work. Anyway we should use awk instead.
-    # Have to quote the I from $Id so that CVS does not expand it
-    sed '/^.*\$[I]d:.*\$.*$/q' $1 |
-    sed -n 's!^.*\$[I]d: [^ ]\+ [^ ]\+ \([0-9]*\)/\([0-9]*\)/\([0-9]*\) [^ ]\+ \([^ ]\+\).*$!\1-\2-\3 \4!p'
-}
-
-# We have to edit most files
-sed_it () {
-    src=$1
-    dst=$2
-
-    for srcdir in `find $src -type d -print` ; do
-	dstdir=`echo "$srcdir" | sed "s/^$src/$dst/g"`
-	mkdir $dstdir || true
-	for sf in `find $srcdir -type f -maxdepth 1 -print`; do
-	    updated=`extract_date $sf`
-	    df="$dstdir/`basename $sf`"
-	    case "$df" in
-		*.html)
-		    sed "/@FOOTER@/ {
-			r $src/footer.html.inc
-			d
-			}
-			/^<body>$/ {
-			r $src/body-tag.html.inc
-			d
-			}
-			/@UPDATED@/c\\
-Updated: $updated \\
-<hr>
-			/@INSERT_BUGLIST_HERE@/ {
-			r $src/BUGS
-			d
-			}
-			/@HOSTEDBY@/ {
-			r $src/hostedby.html.inc
-			d
-			}
-		     " $sf > $df
-		    ;;
-		*.html.inc | *~ | *.tmp | */BUGS )
-		    :
-		    ;;
-		*)
-		    cat $sf > $df
-		    ;;
-	    esac
-	done
-    done
-}
-
-
-do_export () {
-    pgm=$1
-    mod=$2
-
-    rm -rf $pgm.tmp 2>/dev/null || true
-    rm -rf $pgm.new || true
-    rm -rf $pgm.old || true
-    cvs -Q export -r HEAD -d $pgm.tmp $mod
-    cat <<EOF >$pgm.tmp/NEWS
-[ This is a snapshot of the NEWS file from the CVS head revision.
-  You will find the NEWS for the latest revision below the line
-  "Noteworthy changes in version 0.x.y".
-						     (wk $(date +%Y-%m-%d)) ]
-
-
-EOF
-    cvs -Q checkout -p gnupg/NEWS >>$pgm.tmp/NEWS
-    cvs -Q checkout -p gnupg/BUGS | sed  '1,/^~~~~~~~~~~~/ d' > $pgm.tmp/BUGS
-    echo "(List generated from CVS: " $(date +%Y-%m-%d) ")"  >> $pgm.tmp/BUGS
-    sed_it $pgm.tmp $pgm.new
-    rm -rf $pgm.tmp || true
-    ln -sf gnupg.html $pgm.new/index.html
-
-    rm -rf $pgm.old || true
-    [ -d $pgm ] && mv $pgm $pgm.old
-    if ! mv $pgm.new $pgm ; then
-	echo "rename failed - restoring" >&2
-	mv $pgm.old $pgm
-	exit 1
-    fi
-    rm -rf $pgm.old || true
-}
-
-
-do_export gnupg-www gnupg-www
-
-#cd gnupg-www
-#tar czf /home/ftp/pub/gcrypt/.old/webpages.tmp *
-#mv /home/ftp/pub/gcrypt/old/webpages.tmp /home/ftp/pub/gcrypt/old/webpages.tar.gz
-
-
-exit 0
-