Changeset 583 for trunk

Timestamp:

Nov 13, 2024, 2:47:31 PM (9 days ago)

Author:

katerina

Message:

Fix for ticket #471 (autoreconf throws warnings/errors).

Location:

trunk

Files:

• Makefile.in (modified) (4 diffs)
• acconfig.h (deleted)
• acinclude.m4 (added)
• aclocal.m4 (deleted)
• compile (added)
• config.guess (modified) (37 diffs)
• config.h.in (deleted)
• config.sub (modified) (7 diffs)
• configure.ac (modified) (102 diffs)
• docs/Changelog (modified) (1 diff)
• include/sh_trace.h (modified) (1 diff)
• include/sh_unix.h (modified) (1 diff)
• include/slib.h (modified) (2 diffs)
• src/minilzo.c (modified) (1 diff)
• src/samhain.c (modified) (1 diff)
• src/sh_entropy.c (modified) (1 diff)
• src/sh_extern.c (modified) (1 diff)
• src/sh_getopt.c (modified) (2 diffs)
• src/sh_hash.c (modified) (1 diff)
• src/sh_html.c (modified) (1 diff)
• src/sh_login_track.c (modified) (1 diff)
• src/sh_mail.c (modified) (1 diff)
• src/sh_prelude.c (modified) (1 diff)
• src/sh_schedule.c (modified) (1 diff)
• src/sh_socket.c (modified) (1 diff)
• src/sh_srp.c (modified) (1 diff)
• src/sh_suidchk.c (modified) (1 diff)
• src/sh_unix.c (modified) (1 diff)
• src/sh_utils.c (modified) (1 diff)
• src/sh_xfer_client.c (modified) (1 diff)
• src/sh_xfer_server.c (modified) (1 diff)
• src/sh_xfer_syslog.c (modified) (1 diff)
• src/slib.c (modified) (1 diff)
• stamp-h.in (added)

trunk/Makefile.in

@@ -63 +63 @@
 INSTALL_DSYS = @INSTALL@ -m 755
 
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
+PACKAGE = @PACKAGE_NAME@
+VERSION = @PACKAGE_VERSION@
 BUILD_NUM = 1
 
@@ -91 +91 @@
 LIBS_TRY = @LIBS@
 LIBS_SOCK = @sh_libsocket@
-LIBS_KVM = @sh_libkvm@
+
 CFLAGS = @CFLAGS@
 CUTEST =
@@ -222 +222 @@
 stealth_template.jpg \
 config.guess config.h.in stamp-h.in config.sub configure \
-configure.ac acconfig.h aclocal.m4 install-sh missing mkinstalldirs \
+configure.ac aclocal.m4 acinclude.m4 compile install-sh missing mkinstalldirs \
 c_random.sh c_bits.sh depend.sum depend.dep stamp-hdep
 
@@ -261 +261 @@
         touch config.h
 
-stamp-h: $(top_srcdir)/config.h.in config.status
-        ./config.status
+#stamp-h: $(top_srcdir)/config.h.in config.status
+#       ./config.status
 
 Makefile: $(top_srcdir)/Makefile.in config.status

trunk/config.guess

@@ -1 +1 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
-
-timestamp='2018-02-24'
+#   Copyright 1992-2022 Free Software Foundation, Inc.
+
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2022-01-09'
 
 # 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 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
@@ -28 +30 @@
 #
 # You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 #
 # Please send patches to <config-patches@gnu.org>.
+
+
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX.  However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
 
 
@@ -51 +61 @@
 
 Originally written by Per Bothner.
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright 1992-2022 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -85 +95 @@
 fi
 
-trap 'exit 1' 1 2 15
+# Just in case it came from the environment.
+GUESS=
 
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
@@ -97 +108 @@
 # Portable tmp directory creation inspired by the Autoconf team.
 
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > "$dummy.c" ;
-        for c in cc gcc c89 c99 ; do
-          if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
-             CC_FOR_BUILD="$c"; break ;
-          fi ;
-        done ;
-        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 ; set_cc_for_build= ;'
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
+
+set_cc_for_build() {
+    # prevent multiple calls if $tmp is already set
+    test "$tmp" && return 0
+    : "${TMPDIR=/tmp}"
+    # shellcheck disable=SC2039,SC3028
+    { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+        { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
+        { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+        { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+    dummy=$tmp/dummy
+    case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+        ,,)    echo "int x;" > "$dummy.c"
+               for driver in cc gcc c89 c99 ; do
+                   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+                       CC_FOR_BUILD=$driver
+                       break
+                   fi
+               done
+               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
+if test -f /.attbin/uname ; then
         PATH=$PATH:/.attbin ; export PATH
 fi
@@ -130 +147 @@
 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_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "$UNAME_SYSTEM" in
+case $UNAME_SYSTEM in
 Linux|GNU|GNU/*)
-        # If the system lacks a compiler, then just pick glibc.
-        # We could probably try harder.
-        LIBC=gnu
-
-        eval "$set_cc_for_build"
+        LIBC=unknown
+
+        set_cc_for_build
         cat <<-EOF > "$dummy.c"
         #include <features.h>
@@ -146 +161 @@
         #elif defined(__dietlibc__)
         LIBC=dietlibc
+        #elif defined(__GLIBC__)
+        LIBC=gnu
         #else
-        LIBC=gnu
+        #include <stdarg.h>
+        /* First heuristic to detect musl libc.  */
+        #ifdef __DEFINED_va_list
+        LIBC=musl
+        #endif
         #endif
         EOF
-        eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
-
-        # If ldd exists, use it to detect musl libc.
-        if command -v ldd >/dev/null && \
-                ldd --version 2>&1 | grep -q ^musl
-        then
-            LIBC=musl
+        cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+        eval "$cc_set_libc"
+
+        # Second heuristic to detect musl libc.
+        if [ "$LIBC" = unknown ] &&
+           command -v ldd >/dev/null &&
+           ldd --version 2>&1 | grep -q ^musl; then
+                LIBC=musl
+        fi
+
+        # If the system lacks a compiler, then just pick glibc.
+        # We could probably try harder.
+        if [ "$LIBC" = unknown ]; then
+                LIBC=gnu
         fi
         ;;
@@ -163 +191 @@
 # Note: order is significant - the case branches are not exclusive.
 
-case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
+case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
     *:NetBSD:*:*)
         # NetBSD (nbsd) targets should (where applicable) match one or
@@ -175 +203 @@
         # Note: NetBSD doesn't particularly care about the vendor
         # portion of the name.  We always set it to "unknown".
-        sysctl="sysctl -n hw.machine_arch"
         UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-            "/sbin/$sysctl" 2>/dev/null || \
-            "/usr/sbin/$sysctl" 2>/dev/null || \
+            /sbin/sysctl -n hw.machine_arch 2>/dev/null || \
+            /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \
             echo unknown)`
-        case "$UNAME_MACHINE_ARCH" in
+        case $UNAME_MACHINE_ARCH in
+            aarch64eb) machine=aarch64_be-unknown ;;
             armeb) machine=armeb-unknown ;;
             arm*) machine=arm-unknown ;;
@@ -189 +217 @@
                 arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
                 endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
-                machine="${arch}${endian}"-unknown
+                machine=${arch}${endian}-unknown
                 ;;
-            *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
+            *) machine=$UNAME_MACHINE_ARCH-unknown ;;
         esac
         # The Operating System including object format, if it has switched
         # to ELF recently (or will in the future) and ABI.
-        case "$UNAME_MACHINE_ARCH" in
+        case $UNAME_MACHINE_ARCH in
             earm*)
                 os=netbsdelf
                 ;;
             arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-                eval "$set_cc_for_build"
+                set_cc_for_build
                 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
                         | grep -q __ELF__
@@ -216 +244 @@
         esac
         # Determine ABI tags.
-        case "$UNAME_MACHINE_ARCH" in
+        case $UNAME_MACHINE_ARCH in
             earm*)
                 expr='s/^earmv[0-9]/-eabi/;s/eb$//'
@@ -227 +255 @@
         # kernel version information, so it can be replaced with a
         # suitable tag, in the style of linux-gnu.
-        case "$UNAME_VERSION" in
+        case $UNAME_VERSION in
             Debian*)
                 release='-gnu'
@@ -238 +266 @@
         # contains redundant information, the shorter form:
         # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-        echo "$machine-${os}${release}${abi}"
-        exit ;;
+        GUESS=$machine-${os}${release}${abi-}
+        ;;
     *:Bitrig:*:*)
         UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-        echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
-        exit ;;
+        GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE
+        ;;
     *:OpenBSD:*:*)
         UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-        echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
-        exit ;;
+        GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE
+        ;;
+    *:SecBSD:*:*)
+        UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'`
+        GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE
+        ;;
     *:LibertyBSD:*:*)
         UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-        echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
-        exit ;;
+        GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE
+        ;;
     *:MidnightBSD:*:*)
-        echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE
+        ;;
     *:ekkoBSD:*:*)
-        echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE
+        ;;
     *:SolidBSD:*:*)
-        echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE
+        ;;
+    *:OS108:*:*)
+        GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE
+        ;;
     macppc:MirBSD:*:*)
-        echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
-        exit ;;
+        GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE
+        ;;
     *:MirBSD:*:*)
-        echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE
+        ;;
     *:Sortix:*:*)
-        echo "$UNAME_MACHINE"-unknown-sortix
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-sortix
+        ;;
+    *:Twizzler:*:*)
+        GUESS=$UNAME_MACHINE-unknown-twizzler
+        ;;
     *:Redox:*:*)
-        echo "$UNAME_MACHINE"-unknown-redox
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-redox
+        ;;
     mips:OSF1:*.*)
-        echo mips-dec-osf1
-        exit ;;
+        GUESS=mips-dec-osf1
+        ;;
     alpha:OSF1:*:*)
+        # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+        trap '' 0
         case $UNAME_RELEASE in
         *4.0)
@@ -290 +330 @@
         # types through head -n 1, so we only detect the type of CPU 0.
         ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-        case "$ALPHA_CPU_TYPE" in
+        case $ALPHA_CPU_TYPE in
             "EV4 (21064)")
                 UNAME_MACHINE=alpha ;;
@@ -327 +367 @@
         # A Xn.n version is an unreleased experimental baselevel.
         # 1.2 uses "1.2" for uname -r.
-        echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
-        # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-        exitcode=$?
-        trap '' 0
-        exit $exitcode ;;
+        OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+        GUESS=$UNAME_MACHINE-dec-osf$OSF_REL
+        ;;
     Amiga*:UNIX_System_V:4.0:*)
-        echo m68k-unknown-sysv4
-        exit ;;
+        GUESS=m68k-unknown-sysv4
+        ;;
     *:[Aa]miga[Oo][Ss]:*:*)
-        echo "$UNAME_MACHINE"-unknown-amigaos
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-amigaos
+        ;;
     *:[Mm]orph[Oo][Ss]:*:*)
-        echo "$UNAME_MACHINE"-unknown-morphos
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-morphos
+        ;;
     *:OS/390:*:*)
-        echo i370-ibm-openedition
-        exit ;;
+        GUESS=i370-ibm-openedition
+        ;;
     *:z/VM:*:*)
-        echo s390-ibm-zvmoe
-        exit ;;
+        GUESS=s390-ibm-zvmoe
+        ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
-        exit ;;
+        GUESS=powerpc-ibm-os400
+        ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-        echo arm-acorn-riscix"$UNAME_RELEASE"
-        exit ;;
+        GUESS=arm-acorn-riscix$UNAME_RELEASE
+        ;;
     arm*:riscos:*:*|arm*:RISCOS:*:*)
-        echo arm-unknown-riscos
-        exit ;;
+        GUESS=arm-unknown-riscos
+        ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-        echo hppa1.1-hitachi-hiuxmpp
-        exit ;;
+        GUESS=hppa1.1-hitachi-hiuxmpp
+        ;;
     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 ;;
+        case `(/bin/universe) 2>/dev/null` in
+            att) GUESS=pyramid-pyramid-sysv3 ;;
+            *)   GUESS=pyramid-pyramid-bsd   ;;
+        esac
+        ;;
     NILE*:*:*:dcosx)
-        echo pyramid-pyramid-svr4
-        exit ;;
+        GUESS=pyramid-pyramid-svr4
+        ;;
     DRS?6000:unix:4.0:6*)
-        echo sparc-icl-nx6
-        exit ;;
+        GUESS=sparc-icl-nx6
+        ;;
     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
         case `/usr/bin/uname -p` in
-            sparc) echo sparc-icl-nx7; exit ;;
-        esac ;;
+            sparc) GUESS=sparc-icl-nx7 ;;
+        esac
+        ;;
     s390x:SunOS:*:*)
-        echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
-        exit ;;
+        SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+        GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL
+        ;;
     sun4H:SunOS:5.*:*)
-        echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
-        exit ;;
+        SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+        GUESS=sparc-hal-solaris2$SUN_REL
+        ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-        echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
-        exit ;;
+        SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+        GUESS=sparc-sun-solaris2$SUN_REL
+        ;;
     i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-        echo i386-pc-auroraux"$UNAME_RELEASE"
-        exit ;;
+        GUESS=i386-pc-auroraux$UNAME_RELEASE
+        ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-        eval "$set_cc_for_build"
+        set_cc_for_build
         SUN_ARCH=i386
         # If there is a compiler, see if it is configured for 64-bit objects.
         # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
         # This test works for both compilers.
-        if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+        if test "$CC_FOR_BUILD" != no_compiler_found; then
             if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-                (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+                (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \
                 grep IS_64BIT_ARCH >/dev/null
             then
@@ -403 +444 @@
             fi
         fi
-        echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
-        exit ;;
+        SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+        GUESS=$SUN_ARCH-pc-solaris2$SUN_REL
+        ;;
     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 ;;
+        SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+        GUESS=sparc-sun-solaris3$SUN_REL
+        ;;
     sun4*:SunOS:*:*)
-        case "`/usr/bin/arch -k`" in
+        case `/usr/bin/arch -k` in
             Series*|S4*)
                 UNAME_RELEASE=`uname -v`
@@ -418 +461 @@
         esac
         # Japanese Language versions have a version number like `4.1.3-JL'.
-        echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
-        exit ;;
+        SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
+        GUESS=sparc-sun-sunos$SUN_REL
+        ;;
     sun3*:SunOS:*:*)
-        echo m68k-sun-sunos"$UNAME_RELEASE"
-        exit ;;
+        GUESS=m68k-sun-sunos$UNAME_RELEASE
+        ;;
     sun*:*:4.2BSD:*)
         UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
         test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
-        case "`/bin/arch`" in
+        case `/bin/arch` in
             sun3)
-                echo m68k-sun-sunos"$UNAME_RELEASE"
+                GUESS=m68k-sun-sunos$UNAME_RELEASE
                 ;;
             sun4)
-                echo sparc-sun-sunos"$UNAME_RELEASE"
+                GUESS=sparc-sun-sunos$UNAME_RELEASE
                 ;;
         esac
-        exit ;;
+        ;;
     aushp:SunOS:*:*)
-        echo sparc-auspex-sunos"$UNAME_RELEASE"
-        exit ;;
+        GUESS=sparc-auspex-sunos$UNAME_RELEASE
+        ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
@@ -447 +491 @@
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint"$UNAME_RELEASE"
-        exit ;;
+        GUESS=m68k-atari-mint$UNAME_RELEASE
+        ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint"$UNAME_RELEASE"
-        exit ;;
+        GUESS=m68k-atari-mint$UNAME_RELEASE
+        ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint"$UNAME_RELEASE"
-        exit ;;
+        GUESS=m68k-atari-mint$UNAME_RELEASE
+        ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint"$UNAME_RELEASE"
-        exit ;;
+        GUESS=m68k-milan-mint$UNAME_RELEASE
+        ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint"$UNAME_RELEASE"
-        exit ;;
+        GUESS=m68k-hades-mint$UNAME_RELEASE
+        ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint"$UNAME_RELEASE"
-        exit ;;
+        GUESS=m68k-unknown-mint$UNAME_RELEASE
+        ;;
     m68k:machten:*:*)
-        echo m68k-apple-machten"$UNAME_RELEASE"
-        exit ;;
+        GUESS=m68k-apple-machten$UNAME_RELEASE
+        ;;
     powerpc:machten:*:*)
-        echo powerpc-apple-machten"$UNAME_RELEASE"
-        exit ;;
+        GUESS=powerpc-apple-machten$UNAME_RELEASE
+        ;;
     RISC*:Mach:*:*)
-        echo mips-dec-mach_bsd4.3
-        exit ;;
+        GUESS=mips-dec-mach_bsd4.3
+        ;;
     RISC*:ULTRIX:*:*)
-        echo mips-dec-ultrix"$UNAME_RELEASE"
-        exit ;;
+        GUESS=mips-dec-ultrix$UNAME_RELEASE
+        ;;
     VAX*:ULTRIX*:*:*)
-        echo vax-dec-ultrix"$UNAME_RELEASE"
-        exit ;;
+        GUESS=vax-dec-ultrix$UNAME_RELEASE
+        ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
-        echo clipper-intergraph-clix"$UNAME_RELEASE"
-        exit ;;
+        GUESS=clipper-intergraph-clix$UNAME_RELEASE
+        ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-        eval "$set_cc_for_build"
+        set_cc_for_build
         sed 's/^        //' << EOF > "$dummy.c"
 #ifdef __cplusplus
@@ -509 +553 @@
           SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
             { echo "$SYSTEM_NAME"; exit; }
-        echo mips-mips-riscos"$UNAME_RELEASE"
-        exit ;;
+        GUESS=mips-mips-riscos$UNAME_RELEASE
+        ;;
     Motorola:PowerMAX_OS:*:*)
-        echo powerpc-motorola-powermax
-        exit ;;
+        GUESS=powerpc-motorola-powermax
+        ;;
     Motorola:*:4.3:PL8-*)
-        echo powerpc-harris-powermax
-        exit ;;
+        GUESS=powerpc-harris-powermax
+        ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-        echo powerpc-harris-powermax
-        exit ;;
+        GUESS=powerpc-harris-powermax
+        ;;
     Night_Hawk:Power_UNIX:*:*)
-        echo powerpc-harris-powerunix
-        exit ;;
+        GUESS=powerpc-harris-powerunix
+        ;;
     m88k:CX/UX:7*:*)
-        echo m88k-harris-cxux7
-        exit ;;
+        GUESS=m88k-harris-cxux7
+        ;;
     m88k:*:4*:R4*)
-        echo m88k-motorola-sysv4
-        exit ;;
+        GUESS=m88k-motorola-sysv4
+        ;;
     m88k:*:3*:R3*)
-        echo m88k-motorola-sysv3
-        exit ;;
+        GUESS=m88k-motorola-sysv3
+        ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
-        if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
+        if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110
         then
-            if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
-               [ "$TARGET_BINARY_INTERFACE"x = x ]
+            if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \
+               test "$TARGET_BINARY_INTERFACE"x = x
             then
-                echo m88k-dg-dgux"$UNAME_RELEASE"
+                GUESS=m88k-dg-dgux$UNAME_RELEASE
             else
-                echo m88k-dg-dguxbcs"$UNAME_RELEASE"
+                GUESS=m88k-dg-dguxbcs$UNAME_RELEASE
             fi
         else
-            echo i586-dg-dgux"$UNAME_RELEASE"
-        fi
-        exit ;;
+            GUESS=i586-dg-dgux$UNAME_RELEASE
+        fi
+        ;;
     M88*:DolphinOS:*:*) # DolphinOS (SVR3)
-        echo m88k-dolphin-sysv3
-        exit ;;
+        GUESS=m88k-dolphin-sysv3
+        ;;
     M88*:*:R3*:*)
         # Delta 88k system running SVR3
-        echo m88k-motorola-sysv3
-        exit ;;
+        GUESS=m88k-motorola-sysv3
+        ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-        echo m88k-tektronix-sysv3
-        exit ;;
+        GUESS=m88k-tektronix-sysv3
+        ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-        echo m68k-tektronix-bsd
-        exit ;;
+        GUESS=m68k-tektronix-bsd
+        ;;
     *:IRIX*:*:*)
-        echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
-        exit ;;
+        IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'`
+        GUESS=mips-sgi-irix$IRIX_REL
+        ;;
     ????????: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 ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+        GUESS=romp-ibm-aix    # uname -m gives an 8 hex-code CPU id
+        ;;                    # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
-        echo i386-ibm-aix
-        exit ;;
+        GUESS=i386-ibm-aix
+        ;;
     ia64:AIX:*:*)
-        if [ -x /usr/bin/oslevel ] ; then
+        if test -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 ;;
+                IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
+        fi
+        GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV
+        ;;
     *:AIX:2:3)
         if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-                eval "$set_cc_for_build"
+                set_cc_for_build
                 sed 's/^                //' << EOF > "$dummy.c"
                 #include <sys/systemcfg.h>
@@ -594 +639 @@
                 if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
                 then
-                        echo "$SYSTEM_NAME"
+                        GUESS=$SYSTEM_NAME
                 else
-                        echo rs6000-ibm-aix3.2.5
+                        GUESS=rs6000-ibm-aix3.2.5
                 fi
         elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-                echo rs6000-ibm-aix3.2.4
+                GUESS=rs6000-ibm-aix3.2.4
         else
-                echo rs6000-ibm-aix3.2
-        fi
-        exit ;;
+                GUESS=rs6000-ibm-aix3.2
+        fi
+        ;;
     *:AIX:*:[4567])
         IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
@@ -611 +656 @@
                 IBM_ARCH=powerpc
         fi
-        if [ -x /usr/bin/lslpp ] ; then
-                IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+        if test -x /usr/bin/lslpp ; then
+                IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \
                            awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
         else
-                IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
-        fi
-        echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
-        exit ;;
+                IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
+        fi
+        GUESS=$IBM_ARCH-ibm-aix$IBM_REV
+        ;;
     *:AIX:*:*)
-        echo rs6000-ibm-aix
-        exit ;;
+        GUESS=rs6000-ibm-aix
+        ;;
     ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
-        echo romp-ibm-bsd4.4
-        exit ;;
+        GUESS=romp-ibm-bsd4.4
+        ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-        echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to
-        exit ;;                             # report: romp-ibm BSD 4.3
+        GUESS=romp-ibm-bsd$UNAME_RELEASE    # 4.3 with uname added to
+        ;;                                  # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
-        echo rs6000-bull-bosx
-        exit ;;
+        GUESS=rs6000-bull-bosx
+        ;;
     DPX/2?00:B.O.S.:*:*)
-        echo m68k-bull-sysv3
-        exit ;;
+        GUESS=m68k-bull-sysv3
+        ;;
     9000/[34]??:4.3bsd:1.*:*)
-        echo m68k-hp-bsd
-        exit ;;
+        GUESS=m68k-hp-bsd
+        ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-        echo m68k-hp-bsd4.4
-        exit ;;
+        GUESS=m68k-hp-bsd4.4
+        ;;
     9000/[34678]??:HP-UX:*:*)
-        HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
-        case "$UNAME_MACHINE" in
+        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])
-                if [ -x /usr/bin/getconf ]; then
+                if test -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
+                    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
+                        case $sc_kernel_bits in
                           32) HP_ARCH=hppa2.0n ;;
                           64) HP_ARCH=hppa2.0w ;;
@@ -660 +705 @@
                     esac
                 fi
-                if [ "$HP_ARCH" = "" ]; then
-                    eval "$set_cc_for_build"
+                if test "$HP_ARCH" = ""; then
+                    set_cc_for_build
                     sed 's/^            //' << EOF > "$dummy.c"
 
@@ -699 +744 @@
                 fi ;;
         esac
-        if [ "$HP_ARCH" = hppa2.0w ]
+        if test "$HP_ARCH" = hppa2.0w
         then
-            eval "$set_cc_for_build"
+            set_cc_for_build
 
             # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
@@ -720 +765 @@
             fi
         fi
-        echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
-        exit ;;
+        GUESS=$HP_ARCH-hp-hpux$HPUX_REV
+        ;;
     ia64:HP-UX:*:*)
-        HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
-        echo ia64-hp-hpux"$HPUX_REV"
-        exit ;;
+        HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'`
+        GUESS=ia64-hp-hpux$HPUX_REV
+        ;;
     3050*:HI-UX:*:*)
-        eval "$set_cc_for_build"
+        set_cc_for_build
         sed 's/^        //' << EOF > "$dummy.c"
         #include <unistd.h>
@@ -755 +800 @@
         $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
                 { echo "$SYSTEM_NAME"; exit; }
-        echo unknown-hitachi-hiuxwe2
-        exit ;;
+        GUESS=unknown-hitachi-hiuxwe2
+        ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
-        echo hppa1.1-hp-bsd
-        exit ;;
+        GUESS=hppa1.1-hp-bsd
+        ;;
     9000/8??:4.3bsd:*:*)
-        echo hppa1.0-hp-bsd
-        exit ;;
+        GUESS=hppa1.0-hp-bsd
+        ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-        echo hppa1.0-hp-mpeix
-        exit ;;
+        GUESS=hppa1.0-hp-mpeix
+        ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
-        echo hppa1.1-hp-osf
-        exit ;;
+        GUESS=hppa1.1-hp-osf
+        ;;
     hp8??:OSF1:*:*)
-        echo hppa1.0-hp-osf
-        exit ;;
+        GUESS=hppa1.0-hp-osf
+        ;;
     i*86:OSF1:*:*)
-        if [ -x /usr/sbin/sysversion ] ; then
-            echo "$UNAME_MACHINE"-unknown-osf1mk
+        if test -x /usr/sbin/sysversion ; then
+            GUESS=$UNAME_MACHINE-unknown-osf1mk
         else
-            echo "$UNAME_MACHINE"-unknown-osf1
-        fi
-        exit ;;
+            GUESS=$UNAME_MACHINE-unknown-osf1
+        fi
+        ;;
     parisc*:Lites*:*:*)
-        echo hppa1.1-hp-lites
-        exit ;;
+        GUESS=hppa1.1-hp-lites
+        ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-        echo c1-convex-bsd
-        exit ;;
+        GUESS=c1-convex-bsd
+        ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
         if getsysinfo -f scalar_acc
@@ -792 +837 @@
         exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-        echo c34-convex-bsd
-        exit ;;
+        GUESS=c34-convex-bsd
+        ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-        echo c38-convex-bsd
-        exit ;;
+        GUESS=c38-convex-bsd
+        ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-        echo c4-convex-bsd
-        exit ;;
+        GUESS=c4-convex-bsd
+        ;;
     CRAY*Y-MP:*:*:*)
-        echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
-        exit ;;
+        CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+        GUESS=ymp-cray-unicos$CRAY_REL
+        ;;
     CRAY*[A-Z]90:*:*:*)
         echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
@@ -810 +856 @@
         exit ;;
     CRAY*TS:*:*:*)
-        echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
-        exit ;;
+        CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+        GUESS=t90-cray-unicos$CRAY_REL
+        ;;
     CRAY*T3E:*:*:*)
-        echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
-        exit ;;
+        CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+        GUESS=alphaev5-cray-unicosmk$CRAY_REL
+        ;;
     CRAY*SV1:*:*:*)
-        echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
-        exit ;;
+        CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+        GUESS=sv1-cray-unicos$CRAY_REL
+        ;;
     *:UNICOS/mp:*:*)
-        echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
-        exit ;;
+        CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+        GUESS=craynv-cray-unicosmp$CRAY_REL
+        ;;
     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 ;;
+        GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
+        ;;
     5000:UNIX_System_V:4.*:*)
         FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
         FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+        GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
+        ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-        echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
-        exit ;;
+        GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE
+        ;;
     sparc*:BSD/OS:*:*)
-        echo sparc-unknown-bsdi"$UNAME_RELEASE"
-        exit ;;
+        GUESS=sparc-unknown-bsdi$UNAME_RELEASE
+        ;;
     *:BSD/OS:*:*)
-        echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE
+        ;;
+    arm:FreeBSD:*:*)
+        UNAME_PROCESSOR=`uname -p`
+        set_cc_for_build
+        if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+            | grep -q __ARM_PCS_VFP
+        then
+            FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+            GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi
+        else
+            FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+            GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf
+        fi
+        ;;
     *:FreeBSD:*:*)
         UNAME_PROCESSOR=`/usr/bin/uname -p`
-        case "$UNAME_PROCESSOR" in
+        case $UNAME_PROCESSOR in
             amd64)
                 UNAME_PROCESSOR=x86_64 ;;
@@ -849 +912 @@
                 UNAME_PROCESSOR=i586 ;;
         esac
-        echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
-        exit ;;
+        FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+        GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL
+        ;;
     i*:CYGWIN*:*)
-        echo "$UNAME_MACHINE"-pc-cygwin
-        exit ;;
+        GUESS=$UNAME_MACHINE-pc-cygwin
+        ;;
     *:MINGW64*:*)
-        echo "$UNAME_MACHINE"-pc-mingw64
-        exit ;;
+        GUESS=$UNAME_MACHINE-pc-mingw64
+        ;;
     *:MINGW*:*)
-        echo "$UNAME_MACHINE"-pc-mingw32
-        exit ;;
+        GUESS=$UNAME_MACHINE-pc-mingw32
+        ;;
     *:MSYS*:*)
-        echo "$UNAME_MACHINE"-pc-msys
-        exit ;;
+        GUESS=$UNAME_MACHINE-pc-msys
+        ;;
     i*:PW*:*)
-        echo "$UNAME_MACHINE"-pc-pw32
-        exit ;;
+        GUESS=$UNAME_MACHINE-pc-pw32
+        ;;
+    *:SerenityOS:*:*)
+        GUESS=$UNAME_MACHINE-pc-serenity
+        ;;
     *:Interix*:*)
-        case "$UNAME_MACHINE" in
+        case $UNAME_MACHINE in
             x86)
-                echo i586-pc-interix"$UNAME_RELEASE"
-                exit ;;
+                GUESS=i586-pc-interix$UNAME_RELEASE
+                ;;
             authenticamd | genuineintel | EM64T)
-                echo x86_64-unknown-interix"$UNAME_RELEASE"
-                exit ;;
+                GUESS=x86_64-unknown-interix$UNAME_RELEASE
+                ;;
             IA64)
-                echo ia64-unknown-interix"$UNAME_RELEASE"
-                exit ;;
+                GUESS=ia64-unknown-interix$UNAME_RELEASE
+                ;;
         esac ;;
     i*:UWIN*:*)
-        echo "$UNAME_MACHINE"-pc-uwin
-        exit ;;
+        GUESS=$UNAME_MACHINE-pc-uwin
+        ;;
     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-        echo x86_64-unknown-cygwin
-        exit ;;
+        GUESS=x86_64-pc-cygwin
+        ;;
     prep*:SunOS:5.*:*)
-        echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
-        exit ;;
+        SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+        GUESS=powerpcle-unknown-solaris2$SUN_REL
+        ;;
     *:GNU:*:*)
         # the GNU system
-        echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
-        exit ;;
+        GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'`
+        GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'`
+        GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL
+        ;;
     *:GNU/*:*:*)
         # other systems with GNU libc and userland
-        echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
-        exit ;;
-    i*86:Minix:*:*)
-        echo "$UNAME_MACHINE"-pc-minix
-        exit ;;
+        GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"`
+        GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+        GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
+        ;;
+    *:Minix:*:*)
+        GUESS=$UNAME_MACHINE-unknown-minix
+        ;;
     aarch64:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+        ;;
     aarch64_be:Linux:*:*)
         UNAME_MACHINE=aarch64_be
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+        ;;
     alpha:Linux:*:*)
-        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in
           EV5)   UNAME_MACHINE=alphaev5 ;;
           EV56)  UNAME_MACHINE=alphaev56 ;;
@@ -917 +989 @@
         objdump --private-headers /bin/sh | grep -q ld.so.1
         if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
-    arc:Linux:*:* | arceb:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+        ;;
+    arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*)
+        GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+        ;;
     arm*:Linux:*:*)
-        eval "$set_cc_for_build"
+        set_cc_for_build
         if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
             | grep -q __ARM_EABI__
         then
-            echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+            GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
         else
             if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
                 | grep -q __ARM_PCS_VFP
             then
-                echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
+                GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi
             else
-                echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
+                GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf
             fi
         fi
-        exit ;;
+        ;;
     avr32*:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+        ;;
     cris:Linux:*:*)
-        echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-axis-linux-$LIBC
+        ;;
     crisv32:Linux:*:*)
-        echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-axis-linux-$LIBC
+        ;;
     e2k:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+        ;;
     frv:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+        ;;
     hexagon:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+        ;;
     i*86:Linux:*:*)
-        echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-pc-linux-$LIBC
+        ;;
     ia64:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+        ;;
     k1om:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+        ;;
+    loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
+        GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+        ;;
     m32r*:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+        ;;
     m68*:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+        ;;
     mips:Linux:*:* | mips64:Linux:*:*)
-        eval "$set_cc_for_build"
+        set_cc_for_build
+        IS_GLIBC=0
+        test x"${LIBC}" = xgnu && IS_GLIBC=1
         sed 's/^        //' << EOF > "$dummy.c"
         #undef CPU
-        #undef ${UNAME_MACHINE}
-        #undef ${UNAME_MACHINE}el
+        #undef mips
+        #undef mipsel
+        #undef mips64
+        #undef mips64el
+        #if ${IS_GLIBC} && defined(_ABI64)
+        LIBCABI=gnuabi64
+        #else
+        #if ${IS_GLIBC} && defined(_ABIN32)
+        LIBCABI=gnuabin32
+        #else
+        LIBCABI=${LIBC}
+        #endif
+        #endif
+
+        #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+        CPU=mipsisa64r6
+        #else
+        #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+        CPU=mipsisa32r6
+        #else
+        #if defined(__mips64)
+        CPU=mips64
+        #else
+        CPU=mips
+        #endif
+        #endif
+        #endif
+
         #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-        CPU=${UNAME_MACHINE}el
+        MIPS_ENDIAN=el
         #else
         #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-        CPU=${UNAME_MACHINE}
+        MIPS_ENDIAN=
         #else
-        CPU=
+        MIPS_ENDIAN=
         #endif
         #endif
 EOF
-        eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
-        test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
+        cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`
+        eval "$cc_set_vars"
+        test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
         ;;
     mips64el:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+        ;;
     openrisc*:Linux:*:*)
-        echo or1k-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=or1k-unknown-linux-$LIBC
+        ;;
     or32:Linux:*:* | or1k*:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+        ;;
     padre:Linux:*:*)
-        echo sparc-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=sparc-unknown-linux-$LIBC
+        ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-        echo hppa64-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=hppa64-unknown-linux-$LIBC
+        ;;
     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-"$LIBC" ;;
-          PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
-          *)    echo hppa-unknown-linux-"$LIBC" ;;
+          PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;;
+          PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;;
+          *)    GUESS=hppa-unknown-linux-$LIBC ;;
         esac
-        exit ;;
+        ;;
     ppc64:Linux:*:*)
-        echo powerpc64-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=powerpc64-unknown-linux-$LIBC
+        ;;
     ppc:Linux:*:*)
-        echo powerpc-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=powerpc-unknown-linux-$LIBC
+        ;;
     ppc64le:Linux:*:*)
-        echo powerpc64le-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=powerpc64le-unknown-linux-$LIBC
+        ;;
     ppcle:Linux:*:*)
-        echo powerpcle-unknown-linux-"$LIBC"
-        exit ;;
-    riscv32:Linux:*:* | riscv64:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=powerpcle-unknown-linux-$LIBC
+        ;;
+    riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*)
+        GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+        ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-        echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-ibm-linux-$LIBC
+        ;;
     sh64*:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+        ;;
     sh*:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+        ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+        ;;
     tile*:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+        ;;
     vax:Linux:*:*)
-        echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-dec-linux-$LIBC
+        ;;
     x86_64:Linux:*:*)
-        if objdump -f /bin/sh | grep -q elf32-x86-64; then
-            echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
-        else
-            echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
-        fi
-        exit ;;
+        set_cc_for_build
+        LIBCABI=$LIBC
+        if test "$CC_FOR_BUILD" != no_compiler_found; then
+            if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
+                (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+                grep IS_X32 >/dev/null
+            then
+                LIBCABI=${LIBC}x32
+            fi
+        fi
+        GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
+        ;;
     xtensa*:Linux:*:*)
-        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+        ;;
     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 ;;
+        GUESS=i386-sequent-sysv4
+        ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
@@ -1068 +1178 @@
         # I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
-        echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
-        exit ;;
+        GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
+        ;;
     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 ;;
+        GUESS=$UNAME_MACHINE-pc-os2-emx
+        ;;
     i*86:XTS-300:*:STOP)
-        echo "$UNAME_MACHINE"-unknown-stop
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-stop
+        ;;
     i*86:atheos:*:*)
-        echo "$UNAME_MACHINE"-unknown-atheos
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-atheos
+        ;;
     i*86:syllable:*:*)
-        echo "$UNAME_MACHINE"-pc-syllable
-        exit ;;
+        GUESS=$UNAME_MACHINE-pc-syllable
+        ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-        echo i386-unknown-lynxos"$UNAME_RELEASE"
-        exit ;;
+        GUESS=i386-unknown-lynxos$UNAME_RELEASE
+        ;;
     i*86:*DOS:*:*)
-        echo "$UNAME_MACHINE"-pc-msdosdjgpp
-        exit ;;
+        GUESS=$UNAME_MACHINE-pc-msdosdjgpp
+        ;;
     i*86:*: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"
+                GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL
         else
-                echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
-        fi
-        exit ;;
+                GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL
+        fi
+        ;;
     i*86:*:5:[678]*)
         # UnixWare 7.x, OpenUNIX and OpenServer 6.
@@ -1105 +1215 @@
             *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
         esac
-        echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+        ;;
     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"
+                GUESS=$UNAME_MACHINE-pc-isc$UNAME_REL
         elif /bin/uname -X 2>/dev/null >/dev/null ; then
                 UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
@@ -1120 +1230 @@
                 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
                         && UNAME_MACHINE=i686
-                echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
+                GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL
         else
-                echo "$UNAME_MACHINE"-pc-sysv32
-        fi
-        exit ;;
+                GUESS=$UNAME_MACHINE-pc-sysv32
+        fi
+        ;;
     pc:*:*:*)
         # Left here for compatibility:
@@ -1132 +1242 @@
         # prints for the "djgpp" host, or else GDB configure will decide that
         # this is a cross-build.
-        echo i586-pc-msdosdjgpp
-        exit ;;
+        GUESS=i586-pc-msdosdjgpp
+        ;;
     Intel:Mach:3*:*)
-        echo i386-pc-mach3
-        exit ;;
+        GUESS=i386-pc-mach3
+        ;;
     paragon:*:*:*)
-        echo i860-intel-osf1
-        exit ;;
+        GUESS=i860-intel-osf1
+        ;;
     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
+          GUESS=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 ;;
+          GUESS=i860-unknown-sysv$UNAME_RELEASE     # Unknown i860-SVR4
+        fi
+        ;;
     mini*:CTIX:SYS*5:*)
         # "miniframe"
-        echo m68010-convergent-sysv
-        exit ;;
+        GUESS=m68010-convergent-sysv
+        ;;
     mc68k:UNIX:SYSTEM5:3.51m)
-        echo m68k-convergent-sysv
-        exit ;;
+        GUESS=m68k-convergent-sysv
+        ;;
     M680?0:D-NIX:5.3:*)
-        echo m68k-diab-dnix
-        exit ;;
+        GUESS=m68k-diab-dnix
+        ;;
     M68*:*:R3V[5678]*:*)
         test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
@@ -1181 +1291 @@
             && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-        echo m68k-unknown-lynxos"$UNAME_RELEASE"
-        exit ;;
+        GUESS=m68k-unknown-lynxos$UNAME_RELEASE
+        ;;
     mc68030:UNIX_System_V:4.*:*)
-        echo m68k-atari-sysv4
-        exit ;;
+        GUESS=m68k-atari-sysv4
+        ;;
     TSUNAMI:LynxOS:2.*:*)
-        echo sparc-unknown-lynxos"$UNAME_RELEASE"
-        exit ;;
+        GUESS=sparc-unknown-lynxos$UNAME_RELEASE
+        ;;
     rs6000:LynxOS:2.*:*)
-        echo rs6000-unknown-lynxos"$UNAME_RELEASE"
-        exit ;;
+        GUESS=rs6000-unknown-lynxos$UNAME_RELEASE
+        ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-        echo powerpc-unknown-lynxos"$UNAME_RELEASE"
-        exit ;;
+        GUESS=powerpc-unknown-lynxos$UNAME_RELEASE
+        ;;
     SM[BE]S:UNIX_SV:*:*)
-        echo mips-dde-sysv"$UNAME_RELEASE"
-        exit ;;
+        GUESS=mips-dde-sysv$UNAME_RELEASE
+        ;;
     RM*:ReliantUNIX-*:*:*)
-        echo mips-sni-sysv4
-        exit ;;
+        GUESS=mips-sni-sysv4
+        ;;
     RM*:SINIX-*:*:*)
-        echo mips-sni-sysv4
-        exit ;;
+        GUESS=mips-sni-sysv4
+        ;;
     *:SINIX-*:*:*)
         if uname -p 2>/dev/null >/dev/null ; then
                 UNAME_MACHINE=`(uname -p) 2>/dev/null`
-                echo "$UNAME_MACHINE"-sni-sysv4
+                GUESS=$UNAME_MACHINE-sni-sysv4
         else
-                echo ns32k-sni-sysv
-        fi
-        exit ;;
+                GUESS=ns32k-sni-sysv
+        fi
+        ;;
     PENTIUM:*:4.0*:*)   # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                         # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+        GUESS=i586-unisys-sysv4
+        ;;
     *:UNIX_System_V:4*:FTX*)
         # From Gerald Hewes <hewes@openmarket.com>.
         # How about differentiating between stratus architectures? -djm
-        echo hppa1.1-stratus-sysv4
-        exit ;;
+        GUESS=hppa1.1-stratus-sysv4
+        ;;
     *:*:*:FTX*)
         # From seanf@swdc.stratus.com.
-        echo i860-stratus-sysv4
-        exit ;;
+        GUESS=i860-stratus-sysv4
+        ;;
     i*86:VOS:*:*)
         # From Paul.Green@stratus.com.
-        echo "$UNAME_MACHINE"-stratus-vos
-        exit ;;
+        GUESS=$UNAME_MACHINE-stratus-vos
+        ;;
     *:VOS:*:*)
         # From Paul.Green@stratus.com.
-        echo hppa1.1-stratus-vos
-        exit ;;
+        GUESS=hppa1.1-stratus-vos
+        ;;
     mc68*:A/UX:*:*)
-        echo m68k-apple-aux"$UNAME_RELEASE"
-        exit ;;
+        GUESS=m68k-apple-aux$UNAME_RELEASE
+        ;;
     news*:NEWS-OS:6*:*)
-        echo mips-sony-newsos6
-        exit ;;
+        GUESS=mips-sony-newsos6
+        ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-        if [ -d /usr/nec ]; then
-                echo mips-nec-sysv"$UNAME_RELEASE"
+        if test -d /usr/nec; then
+                GUESS=mips-nec-sysv$UNAME_RELEASE
         else
-                echo mips-unknown-sysv"$UNAME_RELEASE"
-        fi
-        exit ;;
+                GUESS=mips-unknown-sysv$UNAME_RELEASE
+        fi
+        ;;
     BeBox:BeOS:*:*)     # BeOS running on hardware made by Be, PPC only.
-        echo powerpc-be-beos
-        exit ;;
+        GUESS=powerpc-be-beos
+        ;;
     BeMac:BeOS:*:*)     # BeOS running on Mac or Mac clone, PPC only.
-        echo powerpc-apple-beos
-        exit ;;
+        GUESS=powerpc-apple-beos
+        ;;
     BePC:BeOS:*:*)      # BeOS running on Intel PC compatible.
-        echo i586-pc-beos
-        exit ;;
+        GUESS=i586-pc-beos
+        ;;
     BePC:Haiku:*:*)     # Haiku running on Intel PC compatible.
-        echo i586-pc-haiku
-        exit ;;
+        GUESS=i586-pc-haiku
+        ;;
     x86_64:Haiku:*:*)
-        echo x86_64-unknown-haiku
-        exit ;;
+        GUESS=x86_64-unknown-haiku
+        ;;
     SX-4:SUPER-UX:*:*)
-        echo sx4-nec-superux"$UNAME_RELEASE"
-        exit ;;
+        GUESS=sx4-nec-superux$UNAME_RELEASE
+        ;;
     SX-5:SUPER-UX:*:*)
-        echo sx5-nec-superux"$UNAME_RELEASE"
-        exit ;;
+        GUESS=sx5-nec-superux$UNAME_RELEASE
+        ;;
     SX-6:SUPER-UX:*:*)
-        echo sx6-nec-superux"$UNAME_RELEASE"
-        exit ;;
+        GUESS=sx6-nec-superux$UNAME_RELEASE
+        ;;
     SX-7:SUPER-UX:*:*)
-        echo sx7-nec-superux"$UNAME_RELEASE"
-        exit ;;
+        GUESS=sx7-nec-superux$UNAME_RELEASE
+        ;;
     SX-8:SUPER-UX:*:*)
-        echo sx8-nec-superux"$UNAME_RELEASE"
-        exit ;;
+        GUESS=sx8-nec-superux$UNAME_RELEASE
+        ;;
     SX-8R:SUPER-UX:*:*)
-        echo sx8r-nec-superux"$UNAME_RELEASE"
-        exit ;;
+        GUESS=sx8r-nec-superux$UNAME_RELEASE
+        ;;
     SX-ACE:SUPER-UX:*:*)
-        echo sxace-nec-superux"$UNAME_RELEASE"
-        exit ;;
+        GUESS=sxace-nec-superux$UNAME_RELEASE
+        ;;
     Power*:Rhapsody:*:*)
-        echo powerpc-apple-rhapsody"$UNAME_RELEASE"
-        exit ;;
+        GUESS=powerpc-apple-rhapsody$UNAME_RELEASE
+        ;;
     *:Rhapsody:*:*)
-        echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
-        exit ;;
+        GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE
+        ;;
+    arm64:Darwin:*:*)
+        GUESS=aarch64-apple-darwin$UNAME_RELEASE
+        ;;
     *:Darwin:*:*)
-        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-        eval "$set_cc_for_build"
-        if test "$UNAME_PROCESSOR" = unknown ; then
-            UNAME_PROCESSOR=powerpc
-        fi
-        if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
-            if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-                if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-                       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-                       grep IS_64BIT_ARCH >/dev/null
-                then
-                    case $UNAME_PROCESSOR in
-                        i386) UNAME_PROCESSOR=x86_64 ;;
-                        powerpc) UNAME_PROCESSOR=powerpc64 ;;
-                    esac
-                fi
-                # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
-                if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
-                       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-                       grep IS_PPC >/dev/null
-                then
-                    UNAME_PROCESSOR=powerpc
-                fi
+        UNAME_PROCESSOR=`uname -p`
+        case $UNAME_PROCESSOR in
+            unknown) UNAME_PROCESSOR=powerpc ;;
+        esac
+        if command -v xcode-select > /dev/null 2> /dev/null && \
+                ! xcode-select --print-path > /dev/null 2> /dev/null ; then
+            # Avoid executing cc if there is no toolchain installed as
+            # cc will be a stub that puts up a graphical alert
+            # prompting the user to install developer tools.
+            CC_FOR_BUILD=no_compiler_found
+        else
+            set_cc_for_build
+        fi
+        if test "$CC_FOR_BUILD" != no_compiler_found; then
+            if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+                   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+                   grep IS_64BIT_ARCH >/dev/null
+            then
+                case $UNAME_PROCESSOR in
+                    i386) UNAME_PROCESSOR=x86_64 ;;
+                    powerpc) UNAME_PROCESSOR=powerpc64 ;;
+                esac
+            fi
+            # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+            if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+                   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+                   grep IS_PPC >/dev/null
+            then
+                UNAME_PROCESSOR=powerpc
             fi
         elif test "$UNAME_PROCESSOR" = i386 ; then
-            # Avoid executing cc on OS X 10.9, as it ships with a stub
-            # that puts up a graphical alert prompting to install
-            # developer tools.  Any system running Mac OS X 10.7 or
-            # later (Darwin 11 and later) is required to have a 64-bit
-            # processor. This is not true of the ARM version of Darwin
-            # that Apple uses in portable devices.
-            UNAME_PROCESSOR=x86_64
-        fi
-        echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
-        exit ;;
+            # uname -m returns i386 or x86_64
+            UNAME_PROCESSOR=$UNAME_MACHINE
+        fi
+        GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE
+        ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
         UNAME_PROCESSOR=`uname -p`
@@ -1330 +1444 @@
                 UNAME_MACHINE=pc
         fi
-        echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
-        exit ;;
+        GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE
+        ;;
     *:QNX:*:4*)
-        echo i386-pc-qnx
-        exit ;;
+        GUESS=i386-pc-qnx
+        ;;
     NEO-*:NONSTOP_KERNEL:*:*)
-        echo neo-tandem-nsk"$UNAME_RELEASE"
-        exit ;;
+        GUESS=neo-tandem-nsk$UNAME_RELEASE
+        ;;
     NSE-*:NONSTOP_KERNEL:*:*)
-        echo nse-tandem-nsk"$UNAME_RELEASE"
-        exit ;;
+        GUESS=nse-tandem-nsk$UNAME_RELEASE
+        ;;
     NSR-*:NONSTOP_KERNEL:*:*)
-        echo nsr-tandem-nsk"$UNAME_RELEASE"
-        exit ;;
+        GUESS=nsr-tandem-nsk$UNAME_RELEASE
+        ;;
     NSV-*:NONSTOP_KERNEL:*:*)
-        echo nsv-tandem-nsk"$UNAME_RELEASE"
-        exit ;;
+        GUESS=nsv-tandem-nsk$UNAME_RELEASE
+        ;;
     NSX-*:NONSTOP_KERNEL:*:*)
-        echo nsx-tandem-nsk"$UNAME_RELEASE"
-        exit ;;
+        GUESS=nsx-tandem-nsk$UNAME_RELEASE
+        ;;
     *:NonStop-UX:*:*)
-        echo mips-compaq-nonstopux
-        exit ;;
+        GUESS=mips-compaq-nonstopux
+        ;;
     BS2000:POSIX*:*:*)
-        echo bs2000-siemens-sysv
-        exit ;;
+        GUESS=bs2000-siemens-sysv
+        ;;
     DS/*:UNIX_System_V:*:*)
-        echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
-        exit ;;
+        GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE
+        ;;
     *: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
+        if test "${cputype-}" = 386; then
             UNAME_MACHINE=i386
-        else
-            UNAME_MACHINE="$cputype"
-        fi
-        echo "$UNAME_MACHINE"-unknown-plan9
-        exit ;;
+        elif test "x${cputype-}" != x; then
+            UNAME_MACHINE=$cputype
+        fi
+        GUESS=$UNAME_MACHINE-unknown-plan9
+        ;;
     *:TOPS-10:*:*)
-        echo pdp10-unknown-tops10
-        exit ;;
+        GUESS=pdp10-unknown-tops10
+        ;;
     *:TENEX:*:*)
-        echo pdp10-unknown-tenex
-        exit ;;
+        GUESS=pdp10-unknown-tenex
+        ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-        echo pdp10-dec-tops20
-        exit ;;
+        GUESS=pdp10-dec-tops20
+        ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-        echo pdp10-xkl-tops20
-        exit ;;
+        GUESS=pdp10-xkl-tops20
+        ;;
     *:TOPS-20:*:*)
-        echo pdp10-unknown-tops20
-        exit ;;
+        GUESS=pdp10-unknown-tops20
+        ;;
     *:ITS:*:*)
-        echo pdp10-unknown-its
-        exit ;;
+        GUESS=pdp10-unknown-its
+        ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux"$UNAME_RELEASE"
-        exit ;;
+        GUESS=mips-sei-seiux$UNAME_RELEASE
+        ;;
     *:DragonFly:*:*)
-        echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
-        exit ;;
+        DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+        GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL
+        ;;
     *:*VMS:*:*)
         UNAME_MACHINE=`(uname -p) 2>/dev/null`
-        case "$UNAME_MACHINE" in
-            A*) echo alpha-dec-vms ; exit ;;
-            I*) echo ia64-dec-vms ; exit ;;
-            V*) echo vax-dec-vms ; exit ;;
+        case $UNAME_MACHINE in
+            A*) GUESS=alpha-dec-vms ;;
+            I*) GUESS=ia64-dec-vms ;;
+            V*) GUESS=vax-dec-vms ;;
         esac ;;
     *:XENIX:*:SysV)
-        echo i386-pc-xenix
-        exit ;;
+        GUESS=i386-pc-xenix
+        ;;
     i*86:skyos:*:*)
-        echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
-        exit ;;
+        SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`
+        GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL
+        ;;
     i*86:rdos:*:*)
-        echo "$UNAME_MACHINE"-pc-rdos
-        exit ;;
-    i*86:AROS:*:*)
-        echo "$UNAME_MACHINE"-pc-aros
-        exit ;;
+        GUESS=$UNAME_MACHINE-pc-rdos
+        ;;
+    i*86:Fiwix:*:*)
+        GUESS=$UNAME_MACHINE-pc-fiwix
+        ;;
+    *:AROS:*:*)
+        GUESS=$UNAME_MACHINE-unknown-aros
+        ;;
     x86_64:VMkernel:*:*)
-        echo "$UNAME_MACHINE"-unknown-esx
-        exit ;;
+        GUESS=$UNAME_MACHINE-unknown-esx
+        ;;
     amd64:Isilon\ OneFS:*:*)
-        echo x86_64-unknown-onefs
-        exit ;;
+        GUESS=x86_64-unknown-onefs
+        ;;
+    *:Unleashed:*:*)
+        GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
+        ;;
 esac
 
+# Do we have a guess based on uname results?
+if test "x$GUESS" != x; then
+    echo "$GUESS"
+    exit
+fi
+
+# No uname command or uname output not recognized.
+set_cc_for_build
+cat > "$dummy.c" <<EOF
+#ifdef _SEQUENT_
+#include <sys/types.h>
+#include <sys/utsname.h>
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#include <signal.h>
+#if defined(_SIZE_T_) || defined(SIGLOST)
+#include <sys/utsname.h>
+#endif
+#endif
+#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 (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
+#if defined(_SIZE_T_) || defined(SIGLOST)
+  struct utsname un;
+  uname (&un);
+  printf ("vax-dec-ultrix%s\n", un.release); exit (0);
+#else
+  printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#if defined(_SIZE_T_) || defined(SIGLOST)
+  struct utsname *un;
+  uname (&un);
+  printf ("mips-dec-ultrix%s\n", un.release); exit (0);
+#else
+  printf ("mips-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` &&
+        { echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
+
 echo "$0: unable to guess system type" >&2
 
-case "$UNAME_MACHINE:$UNAME_SYSTEM" in
+case $UNAME_MACHINE:$UNAME_SYSTEM in
     mips:Linux | mips64:Linux)
         # If we got here on MIPS GNU/Linux, output extra information.
@@ -1440 +1705 @@
 copies of config.guess and config.sub with the latest versions from:
 
-  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+  https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 and
-  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+  https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+EOF
+
+our_year=`echo $timestamp | sed 's,-.*,,'`
+thisyear=`date +%Y`
+# shellcheck disable=SC2003
+script_age=`expr "$thisyear" - "$our_year"`
+if test "$script_age" -lt 3 ; then
+   cat >&2 <<EOF
 
 If $0 has already been updated, send the following data and any
@@ -1470 +1743 @@
 UNAME_VERSION = "$UNAME_VERSION"
 EOF
+fi
 
 exit 1
 
 # Local variables:
-# eval: (add-hook 'write-file-functions 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"

trunk/config.sub

@@ -1 +1 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
-
-timestamp='2018-02-22'
+#   Copyright 1992-2022 Free Software Foundation, Inc.
+
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2022-01-03'
 
 # 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 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
@@ -34 +36 @@
 
 # You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
 
 # This file is supposed to be the same for all GNU packages
@@ -51 +53 @@
 # It is wrong to echo any other type of specification.
 
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX.  However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
+
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -68 +77 @@
 GNU config.sub ($timestamp)
 
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright 1992-2022 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -90 +99 @@
        break ;;
     -* )
-       echo "$me: invalid option $1$help"
+       echo "$me: invalid option $1$help" >&2
        exit 1 ;;
 
@@ -111 +120 @@
 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* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | cloudabi*-eabi* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
-  *)
-    basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
-    if [ "$basic_machine" != "$1" ]
-    then os=`echo "$1" | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
+# Split fields of configuration type
+# shellcheck disable=SC2162
+saved_IFS=$IFS
+IFS="-" read field1 field2 field3 field4 <<EOF
+$1
+EOF
+IFS=$saved_IFS
+
+# Separate into logical components for further validation
+case $1 in
+        *-*-*-*-*)
+                echo Invalid configuration \`"$1"\': more than four components >&2
+                exit 1
+                ;;
+        *-*-*-*)
+                basic_machine=$field1-$field2
+                basic_os=$field3-$field4
+                ;;
+        *-*-*)
+                # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
+                # parts
+                maybe_os=$field2-$field3
+                case $maybe_os in
+                        nto-qnx* | linux-* | uclinux-uclibc* \
+                        | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
+                        | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+                        | storm-chaos* | os2-emx* | rtmk-nova*)
+                                basic_machine=$field1
+                                basic_os=$maybe_os
+                                ;;
+                        android-linux)
+                                basic_machine=$field1-unknown
+                                basic_os=linux-android
+                                ;;
+                        *)
+                                basic_machine=$field1-$field2
+                                basic_os=$field3
+                                ;;
+                esac
+                ;;
+        *-*)
+                # A lone config we happen to match not fitting any pattern
+                case $field1-$field2 in
+                        decstation-3100)
+                                basic_machine=mips-dec
+                                basic_os=
+                                ;;
+                        *-*)
+                                # Second component is usually, but not always the OS
+                                case $field2 in
+                                        # Prevent following clause from handling this valid os
+                                        sun*os*)
+                                                basic_machine=$field1
+                                                basic_os=$field2
+                                                ;;
+                                        zephyr*)
+                                                basic_machine=$field1-unknown
+                                                basic_os=$field2
+                                                ;;
+                                        # Manufacturers
+                                        dec* | mips* | sequent* | encore* | pc533* | 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 | knuth | cray \
+                                        | microblaze* | sim | cisco \
+                                        | oki | wec | wrs | winbond)
+                                                basic_machine=$field1-$field2
+                                                basic_os=
+                                                ;;
+                                        *)
+                                                basic_machine=$field1
+                                                basic_os=$field2
+                                                ;;
+                                esac
+                        ;;
+                esac
+                ;;
+        *)
+                # Convert single-component short-hands not valid as part of
+                # multi-component configurations.
+                case $field1 in
+                        386bsd)
+                                basic_machine=i386-pc
+                                basic_os=bsd
+                                ;;
+                        a29khif)
+                                basic_machine=a29k-amd
+                                basic_os=udi
+                                ;;
+                        adobe68k)
+                                basic_machine=m68010-adobe
+                                basic_os=scout
+                                ;;
+                        alliant)
+                                basic_machine=fx80-alliant
+                                basic_os=
+                                ;;
+                        altos | altos3068)
+                                basic_machine=m68k-altos
+                                basic_os=
+                                ;;
+                        am29k)
+                                basic_machine=a29k-none
+                                basic_os=bsd
+                                ;;
+                        amdahl)
+                                basic_machine=580-amdahl
+                                basic_os=sysv
+                                ;;
+                        amiga)
+                                basic_machine=m68k-unknown
+                                basic_os=
+                                ;;
+                        amigaos | amigados)
+                                basic_machine=m68k-unknown
+                                basic_os=amigaos
+                                ;;
+                        amigaunix | amix)
+                                basic_machine=m68k-unknown
+                                basic_os=sysv4
+                                ;;
+                        apollo68)
+                                basic_machine=m68k-apollo
+                                basic_os=sysv
+                                ;;
+                        apollo68bsd)
+                                basic_machine=m68k-apollo
+                                basic_os=bsd
+                                ;;
+                        aros)
+                                basic_machine=i386-pc
+                                basic_os=aros
+                                ;;
+                        aux)
+                                basic_machine=m68k-apple
+                                basic_os=aux
+                                ;;
+                        balance)
+                                basic_machine=ns32k-sequent
+                                basic_os=dynix
+                                ;;
+                        blackfin)
+                                basic_machine=bfin-unknown
+                                basic_os=linux
+                                ;;
+                        cegcc)
+                                basic_machine=arm-unknown
+                                basic_os=cegcc
+                                ;;
+                        convex-c1)
+                                basic_machine=c1-convex
+                                basic_os=bsd
+                                ;;
+                        convex-c2)
+                                basic_machine=c2-convex
+                                basic_os=bsd
+                                ;;
+                        convex-c32)
+                                basic_machine=c32-convex
+                                basic_os=bsd
+                                ;;
+                        convex-c34)
+                                basic_machine=c34-convex
+                                basic_os=bsd
+                                ;;
+                        convex-c38)
+                                basic_machine=c38-convex
+                                basic_os=bsd
+                                ;;
+                        cray)
+                                basic_machine=j90-cray
+                                basic_os=unicos
+                                ;;
+                        crds | unos)
+                                basic_machine=m68k-crds
+                                basic_os=
+                                ;;
+                        da30)
+                                basic_machine=m68k-da30
+                                basic_os=
+                                ;;
+                        decstation | pmax | pmin | dec3100 | decstatn)
+                                basic_machine=mips-dec
+                                basic_os=
+                                ;;
+                        delta88)
+                                basic_machine=m88k-motorola
+                                basic_os=sysv3
+                                ;;
+                        dicos)
+                                basic_machine=i686-pc
+                                basic_os=dicos
+                                ;;
+                        djgpp)
+                                basic_machine=i586-pc
+                                basic_os=msdosdjgpp
+                                ;;
+                        ebmon29k)
+                                basic_machine=a29k-amd
+                                basic_os=ebmon
+                                ;;
+                        es1800 | OSE68k | ose68k | ose | OSE)
+                                basic_machine=m68k-ericsson
+                                basic_os=ose
+                                ;;
+                        gmicro)
+                                basic_machine=tron-gmicro
+                                basic_os=sysv
+                                ;;
+                        go32)
+                                basic_machine=i386-pc
+                                basic_os=go32
+                                ;;
+                        h8300hms)
+                                basic_machine=h8300-hitachi
+                                basic_os=hms
+                                ;;
+                        h8300xray)
+                                basic_machine=h8300-hitachi
+                                basic_os=xray
+                                ;;
+                        h8500hms)
+                                basic_machine=h8500-hitachi
+                                basic_os=hms
+                                ;;
+                        harris)
+                                basic_machine=m88k-harris
+                                basic_os=sysv3
+                                ;;
+                        hp300 | hp300hpux)
+                                basic_machine=m68k-hp
+                                basic_os=hpux
+                                ;;
+                        hp300bsd)
+                                basic_machine=m68k-hp
+                                basic_os=bsd
+                                ;;
+                        hppaosf)
+                                basic_machine=hppa1.1-hp
+                                basic_os=osf
+                                ;;
+                        hppro)
+                                basic_machine=hppa1.1-hp
+                                basic_os=proelf
+                                ;;
+                        i386mach)
+                                basic_machine=i386-mach
+                                basic_os=mach
+                                ;;
+                        isi68 | isi)
+                                basic_machine=m68k-isi
+                                basic_os=sysv
+                                ;;
+                        m68knommu)
+                                basic_machine=m68k-unknown
+                                basic_os=linux
+                                ;;
+                        magnum | m3230)
+                                basic_machine=mips-mips
+                                basic_os=sysv
+                                ;;
+                        merlin)
+                                basic_machine=ns32k-utek
+                                basic_os=sysv
+                                ;;
+                        mingw64)
+                                basic_machine=x86_64-pc
+                                basic_os=mingw64
+                                ;;
+                        mingw32)
+                                basic_machine=i686-pc
+                                basic_os=mingw32
+                                ;;
+                        mingw32ce)
+                                basic_machine=arm-unknown
+                                basic_os=mingw32ce
+                                ;;
+                        monitor)
+                                basic_machine=m68k-rom68k
+                                basic_os=coff
+                                ;;
+                        morphos)
+                                basic_machine=powerpc-unknown
+                                basic_os=morphos
+                                ;;
+                        moxiebox)
+                                basic_machine=moxie-unknown
+                                basic_os=moxiebox
+                                ;;
+                        msdos)
+                                basic_machine=i386-pc
+                                basic_os=msdos
+                                ;;
+                        msys)
+                                basic_machine=i686-pc
+                                basic_os=msys
+                                ;;
+                        mvs)
+                                basic_machine=i370-ibm
+                                basic_os=mvs
+                                ;;
+                        nacl)
+                                basic_machine=le32-unknown
+                                basic_os=nacl
+                                ;;
+                        ncr3000)
+                                basic_machine=i486-ncr
+                                basic_os=sysv4
+                                ;;
+                        netbsd386)
+                                basic_machine=i386-pc
+                                basic_os=netbsd
+                                ;;
+                        netwinder)
+                                basic_machine=armv4l-rebel
+                                basic_os=linux
+                                ;;
+                        news | news700 | news800 | news900)
+                                basic_machine=m68k-sony
+                                basic_os=newsos
+                                ;;
+                        news1000)
+                                basic_machine=m68030-sony
+                                basic_os=newsos
+                                ;;
+                        necv70)
+                                basic_machine=v70-nec
+                                basic_os=sysv
+                                ;;
+                        nh3000)
+                                basic_machine=m68k-harris
+                                basic_os=cxux
+                                ;;
+                        nh[45]000)
+                                basic_machine=m88k-harris
+                                basic_os=cxux
+                                ;;
+                        nindy960)
+                                basic_machine=i960-intel
+                                basic_os=nindy
+                                ;;
+                        mon960)
+                                basic_machine=i960-intel
+                                basic_os=mon960
+                                ;;
+                        nonstopux)
+                                basic_machine=mips-compaq
+                                basic_os=nonstopux
+                                ;;
+                        os400)
+                                basic_machine=powerpc-ibm
+                                basic_os=os400
+                                ;;
+                        OSE68000 | ose68000)
+                                basic_machine=m68000-ericsson
+                                basic_os=ose
+                                ;;
+                        os68k)
+                                basic_machine=m68k-none
+                                basic_os=os68k
+                                ;;
+                        paragon)
+                                basic_machine=i860-intel
+                                basic_os=osf
+                                ;;
+                        parisc)
+                                basic_machine=hppa-unknown
+                                basic_os=linux
+                                ;;
+                        psp)
+                                basic_machine=mipsallegrexel-sony
+                                basic_os=psp
+                                ;;
+                        pw32)
+                                basic_machine=i586-unknown
+                                basic_os=pw32
+                                ;;
+                        rdos | rdos64)
+                                basic_machine=x86_64-pc
+                                basic_os=rdos
+                                ;;
+                        rdos32)
+                                basic_machine=i386-pc
+                                basic_os=rdos
+                                ;;
+                        rom68k)
+                                basic_machine=m68k-rom68k
+                                basic_os=coff
+                                ;;
+                        sa29200)
+                                basic_machine=a29k-amd
+                                basic_os=udi
+                                ;;
+                        sei)
+                                basic_machine=mips-sei
+                                basic_os=seiux
+                                ;;
+                        sequent)
+                                basic_machine=i386-sequent
+                                basic_os=
+                                ;;
+                        sps7)
+                                basic_machine=m68k-bull
+                                basic_os=sysv2
+                                ;;
+                        st2000)
+                                basic_machine=m68k-tandem
+                                basic_os=
+                                ;;
+                        stratus)
+                                basic_machine=i860-stratus
+                                basic_os=sysv4
+                                ;;
+                        sun2)
+                                basic_machine=m68000-sun
+                                basic_os=
+                                ;;
+                        sun2os3)
+                                basic_machine=m68000-sun
+                                basic_os=sunos3
+                                ;;
+                        sun2os4)
+                                basic_machine=m68000-sun
+                                basic_os=sunos4
+                                ;;
+                        sun3)
+                                basic_machine=m68k-sun
+                                basic_os=
+                                ;;
+                        sun3os3)
+                                basic_machine=m68k-sun
+                                basic_os=sunos3
+                                ;;
+                        sun3os4)
+                                basic_machine=m68k-sun
+                                basic_os=sunos4
+                                ;;
+                        sun4)
+                                basic_machine=sparc-sun
+                                basic_os=
+                                ;;
+                        sun4os3)
+                                basic_machine=sparc-sun
+                                basic_os=sunos3
+                                ;;
+                        sun4os4)
+                                basic_machine=sparc-sun
+                                basic_os=sunos4
+                                ;;
+                        sun4sol2)
+                                basic_machine=sparc-sun
+                                basic_os=solaris2
+                                ;;
+                        sun386 | sun386i | roadrunner)
+                                basic_machine=i386-sun
+                                basic_os=
+                                ;;
+                        sv1)
+                                basic_machine=sv1-cray
+                                basic_os=unicos
+                                ;;
+                        symmetry)
+                                basic_machine=i386-sequent
+                                basic_os=dynix
+                                ;;
+                        t3e)
+                                basic_machine=alphaev5-cray
+                                basic_os=unicos
+                                ;;
+                        t90)
+                                basic_machine=t90-cray
+                                basic_os=unicos
+                                ;;
+                        toad1)
+                                basic_machine=pdp10-xkl
+                                basic_os=tops20
+                                ;;
+                        tpf)
+                                basic_machine=s390x-ibm
+                                basic_os=tpf
+                                ;;
+                        udi29k)
+                                basic_machine=a29k-amd
+                                basic_os=udi
+                                ;;
+                        ultra3)
+                                basic_machine=a29k-nyu
+                                basic_os=sym1
+                                ;;
+                        v810 | necv810)
+                                basic_machine=v810-nec
+                                basic_os=none
+                                ;;
+                        vaxv)
+                                basic_machine=vax-dec
+                                basic_os=sysv
+                                ;;
+                        vms)
+                                basic_machine=vax-dec
+                                basic_os=vms
+                                ;;
+                        vsta)
+                                basic_machine=i386-pc
+                                basic_os=vsta
+                                ;;
+                        vxworks960)
+                                basic_machine=i960-wrs
+                                basic_os=vxworks
+                                ;;
+                        vxworks68)
+                                basic_machine=m68k-wrs
+                                basic_os=vxworks
+                                ;;
+                        vxworks29k)
+                                basic_machine=a29k-wrs
+                                basic_os=vxworks
+                                ;;
+                        xbox)
+                                basic_machine=i686-pc
+                                basic_os=mingw32
+                                ;;
+                        ymp)
+                                basic_machine=ymp-cray
+                                basic_os=unicos
+                                ;;
+                        *)
+                                basic_machine=$1
+                                basic_os=
+                                ;;
+                esac
+                ;;
 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 | -knuth | -cray | -microblaze*)
-                os=
-                basic_machine=$1
-                ;;
-        -bluegene*)
-                os=-cnk
-                ;;
-        -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
-                ;;
-        -sco6)
-                os=-sco5v6
-                basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-                ;;
-        -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/'`
-                ;;
-        -sco5v6*)
-                # 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*178)
-                os=-lynxos178
-                ;;
-        -lynx*5)
-                os=-lynxos5
-                ;;
-        -lynx*)
-                os=-lynxos
-                ;;
-        -ptx*)
-                basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
-                ;;
-        -psos*)
-                os=-psos
-                ;;
-        -mint | -mint[0-9]*)
-                basic_machine=m68k-atari
-                os=-mint
-                ;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
+# Decode 1-component or ad-hoc basic machines
 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 \
-        | aarch64 | aarch64_be \
-        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-        | am33_2.0 \
-        | arc | arceb \
-        | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-        | avr | avr32 \
-        | ba \
-        | be32 | be64 \
-        | bfin \
-        | c4x | c8051 | clipper \
-        | d10v | d30v | dlx | dsp16xx \
-        | e2k | epiphany \
-        | fido | fr30 | frv | ft32 \
-        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-        | hexagon \
-        | i370 | i860 | i960 | ia16 | ia64 \
-        | ip2k | iq2000 \
-        | k1om \
-        | le32 | le64 \
-        | lm32 \
-        | m32c | m32r | m32rle | m68000 | m68k | m88k \
-        | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
-        | mips | mipsbe | mipseb | mipsel | mipsle \
-        | mips16 \
-        | mips64 | mips64el \
-        | mips64octeon | mips64octeonel \
-        | mips64orion | mips64orionel \
-        | mips64r5900 | mips64r5900el \
-        | mips64vr | mips64vrel \
-        | mips64vr4100 | mips64vr4100el \
-        | mips64vr4300 | mips64vr4300el \
-        | mips64vr5000 | mips64vr5000el \
-        | mips64vr5900 | mips64vr5900el \
-        | mipsisa32 | mipsisa32el \
-        | mipsisa32r2 | mipsisa32r2el \
-        | mipsisa32r6 | mipsisa32r6el \
-        | mipsisa64 | mipsisa64el \
-        | mipsisa64r2 | mipsisa64r2el \
-        | mipsisa64r6 | mipsisa64r6el \
-        | mipsisa64sb1 | mipsisa64sb1el \
-        | mipsisa64sr71k | mipsisa64sr71kel \
-        | mipsr5900 | mipsr5900el \
-        | mipstx39 | mipstx39el \
-        | mn10200 | mn10300 \
-        | moxie \
-        | mt \
-        | msp430 \
-        | nds32 | nds32le | nds32be \
-        | nios | nios2 | nios2eb | nios2el \
-        | ns16k | ns32k \
-        | open8 | or1k | or1knd | or32 \
-        | pdp10 | pj | pjl \
-        | powerpc | powerpc64 | powerpc64le | powerpcle \
-        | pru \
-        | pyramid \
-        | riscv32 | riscv64 \
-        | rl78 | rx \
-        | score \
-        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-        | sh64 | sh64le \
-        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-        | spu \
-        | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-        | ubicom32 \
-        | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-        | visium \
-        | wasm32 \
-        | x86 | xc16x | xstormy16 | xtensa \
-        | z8k | z80)
-                basic_machine=$basic_machine-unknown
-                ;;
-        c54x)
-                basic_machine=tic54x-unknown
-                ;;
-        c55x)
-                basic_machine=tic55x-unknown
-                ;;
-        c6x)
-                basic_machine=tic6x-unknown
+        # 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)
+                cpu=hppa1.1
+                vendor=winbond
+                ;;
+        op50n)
+                cpu=hppa1.1
+                vendor=oki
+                ;;
+        op60c)
+                cpu=hppa1.1
+                vendor=oki
+                ;;
+        ibm*)
+                cpu=i370
+                vendor=ibm
+                ;;
+        orion105)
+                cpu=clipper
+                vendor=highlevel
+                ;;
+        mac | mpw | mac-mpw)
+                cpu=m68k
+                vendor=apple
+                ;;
+        pmac | pmac-mpw)
+                cpu=powerpc
+                vendor=apple
+                ;;
+
+        # Recognize the various machine names and aliases which stand
+        # for a CPU type and a company and sometimes even an OS.
+        3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+                cpu=m68000
+                vendor=att
+                ;;
+        3b*)
+                cpu=we32k
+                vendor=att
+                ;;
+        bluegene*)
+                cpu=powerpc
+                vendor=ibm
+                basic_os=cnk
+                ;;
+        decsystem10* | dec10*)
+                cpu=pdp10
+                vendor=dec
+                basic_os=tops10
+                ;;
+        decsystem20* | dec20*)
+                cpu=pdp10
+                vendor=dec
+                basic_os=tops20
+                ;;
+        delta | 3300 | motorola-3300 | motorola-delta \
+              | 3300-motorola | delta-motorola)
+                cpu=m68k
+                vendor=motorola
+                ;;
+        dpx2*)
+                cpu=m68k
+                vendor=bull
+                basic_os=sysv3
+                ;;
+        encore | umax | mmax)
+                cpu=ns32k
+                vendor=encore
+                ;;
+        elxsi)
+                cpu=elxsi
+                vendor=elxsi
+                basic_os=${basic_os:-bsd}
+                ;;
+        fx2800)
+                cpu=i860
+                vendor=alliant
+                ;;
+        genix)
+                cpu=ns32k
+                vendor=ns
+                ;;
+        h3050r* | hiux*)
+                cpu=hppa1.1
+                vendor=hitachi
+                basic_os=hiuxwe2
+                ;;
+        hp3k9[0-9][0-9] | hp9[0-9][0-9])
+                cpu=hppa1.0
+                vendor=hp
+                ;;
+        hp9k2[0-9][0-9] | hp9k31[0-9])
+                cpu=m68000
+                vendor=hp
+                ;;
+        hp9k3[2-9][0-9])
+                cpu=m68k
+                vendor=hp
+                ;;
+        hp9k6[0-9][0-9] | hp6[0-9][0-9])
+                cpu=hppa1.0
+                vendor=hp
+                ;;
+        hp9k7[0-79][0-9] | hp7[0-79][0-9])
+                cpu=hppa1.1
+                vendor=hp
+                ;;
+        hp9k78[0-9] | hp78[0-9])
+                # FIXME: really hppa2.0-hp
+                cpu=hppa1.1
+                vendor=hp
+                ;;
+        hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+                # FIXME: really hppa2.0-hp
+                cpu=hppa1.1
+                vendor=hp
+                ;;
+        hp9k8[0-9][13679] | hp8[0-9][13679])
+                cpu=hppa1.1
+                vendor=hp
+                ;;
+        hp9k8[0-9][0-9] | hp8[0-9][0-9])
+                cpu=hppa1.0
+                vendor=hp
+                ;;
+        i*86v32)
+                cpu=`echo "$1" | sed -e 's/86.*/86/'`
+                vendor=pc
+                basic_os=sysv32
+                ;;
+        i*86v4*)
+                cpu=`echo "$1" | sed -e 's/86.*/86/'`
+                vendor=pc
+                basic_os=sysv4
+                ;;
+        i*86v)
+                cpu=`echo "$1" | sed -e 's/86.*/86/'`
+                vendor=pc
+                basic_os=sysv
+                ;;
+        i*86sol2)
+                cpu=`echo "$1" | sed -e 's/86.*/86/'`
+                vendor=pc
+                basic_os=solaris2
+                ;;
+        j90 | j90-cray)
+                cpu=j90
+                vendor=cray
+                basic_os=${basic_os:-unicos}
+                ;;
+        iris | iris4d)
+                cpu=mips
+                vendor=sgi
+                case $basic_os in
+                    irix*)
+                        ;;
+                    *)
+                        basic_os=irix4
+                        ;;
+                esac
+                ;;
+        miniframe)
+                cpu=m68000
+                vendor=convergent
+                ;;
+        *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
+                cpu=m68k
+                vendor=atari
+                basic_os=mint
+                ;;
+        news-3600 | risc-news)
+                cpu=mips
+                vendor=sony
+                basic_os=newsos
+                ;;
+        next | m*-next)
+                cpu=m68k
+                vendor=next
+                case $basic_os in
+                    openstep*)
+                        ;;
+                    nextstep*)
+                        ;;
+                    ns2*)
+                      basic_os=nextstep2
+                        ;;
+                    *)
+                      basic_os=nextstep3
+                        ;;
+                esac
+                ;;
+        np1)
+                cpu=np1
+                vendor=gould
+                ;;
+        op50n-* | op60c-*)
+                cpu=hppa1.1
+                vendor=oki
+                basic_os=proelf
+                ;;
+        pa-hitachi)
+                cpu=hppa1.1
+                vendor=hitachi
+                basic_os=hiuxwe2
+                ;;
+        pbd)
+                cpu=sparc
+                vendor=tti
+                ;;
+        pbb)
+                cpu=m68k
+                vendor=tti
+                ;;
+        pc532)
+                cpu=ns32k
+                vendor=pc532
+                ;;
+        pn)
+                cpu=pn
+                vendor=gould
+                ;;
+        power)
+                cpu=power
+                vendor=ibm
+                ;;
+        ps2)
+                cpu=i386
+                vendor=ibm
+                ;;
+        rm[46]00)
+                cpu=mips
+                vendor=siemens
+                ;;
+        rtpc | rtpc-*)
+                cpu=romp
+                vendor=ibm
+                ;;
+        sde)
+                cpu=mipsisa32
+                vendor=sde
+                basic_os=${basic_os:-elf}
+                ;;
+        simso-wrs)
+                cpu=sparclite
+                vendor=wrs
+                basic_os=vxworks
+                ;;
+        tower | tower-32)
+                cpu=m68k
+                vendor=ncr
+                ;;
+        vpp*|vx|vx-*)
+                cpu=f301
+                vendor=fujitsu
+                ;;
+        w65)
+                cpu=w65
+                vendor=wdc
+                ;;
+        w89k-*)
+                cpu=hppa1.1
+                vendor=winbond
+                basic_os=proelf
+                ;;
+        none)
+                cpu=none
+                vendor=none
                 ;;
         leon|leon[3-9])
-                basic_machine=sparc-$basic_machine
-                ;;
-        m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
-                basic_machine=$basic_machine-unknown
-                os=-none
-                ;;
-        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
-                ;;
-        ms1)
-                basic_machine=mt-unknown
-                ;;
-
-        strongarm | thumb | xscale)
-                basic_machine=arm-unknown
-                ;;
-        xgate)
-                basic_machine=$basic_machine-unknown
-                os=-none
-                ;;
-        xscaleeb)
-                basic_machine=armeb-unknown
-                ;;
-
-        xscaleel)
-                basic_machine=armel-unknown
-                ;;
-
+                cpu=sparc
+                vendor=$basic_machine
+                ;;
+        leon-*|leon[3-9]-*)
+                cpu=sparc
+                vendor=`echo "$basic_machine" | sed 's/-.*//'`
+                ;;
+
+        *-*)
+                # shellcheck disable=SC2162
+                saved_IFS=$IFS
+                IFS="-" read cpu vendor <<EOF
+$basic_machine
+EOF
+                IFS=$saved_IFS
+                ;;
         # 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-* \
-        | aarch64-* | aarch64_be-* \
-        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
-        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-        | avr-* | avr32-* \
-        | ba-* \
-        | be32-* | be64-* \
-        | bfin-* | bs2000-* \
-        | c[123]* | c30-* | [cjt]90-* | c4x-* \
-        | c8051-* | clipper-* | craynv-* | cydra-* \
-        | d10v-* | d30v-* | dlx-* \
-        | e2k-* | elxsi-* \
-        | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-        | h8300-* | h8500-* \
-        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-        | hexagon-* \
-        | i*86-* | i860-* | i960-* | ia16-* | ia64-* \
-        | ip2k-* | iq2000-* \
-        | k1om-* \
-        | le32-* | le64-* \
-        | lm32-* \
-        | m32c-* | m32r-* | m32rle-* \
-        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-        | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-        | microblaze-* | microblazeel-* \
-        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-        | mips16-* \
-        | mips64-* | mips64el-* \
-        | mips64octeon-* | mips64octeonel-* \
-        | mips64orion-* | mips64orionel-* \
-        | mips64r5900-* | mips64r5900el-* \
-        | mips64vr-* | mips64vrel-* \
-        | mips64vr4100-* | mips64vr4100el-* \
-        | mips64vr4300-* | mips64vr4300el-* \
-        | mips64vr5000-* | mips64vr5000el-* \
-        | mips64vr5900-* | mips64vr5900el-* \
-        | mipsisa32-* | mipsisa32el-* \
-        | mipsisa32r2-* | mipsisa32r2el-* \
-        | mipsisa32r6-* | mipsisa32r6el-* \
-        | mipsisa64-* | mipsisa64el-* \
-        | mipsisa64r2-* | mipsisa64r2el-* \
-        | mipsisa64r6-* | mipsisa64r6el-* \
-        | mipsisa64sb1-* | mipsisa64sb1el-* \
-        | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-        | mipsr5900-* | mipsr5900el-* \
-        | mipstx39-* | mipstx39el-* \
-        | mmix-* \
-        | mt-* \
-        | msp430-* \
-        | nds32-* | nds32le-* | nds32be-* \
-        | nios-* | nios2-* | nios2eb-* | nios2el-* \
-        | none-* | np1-* | ns16k-* | ns32k-* \
-        | open8-* \
-        | or1k*-* \
-        | orion-* \
-        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-        | pru-* \
-        | pyramid-* \
-        | riscv32-* | riscv64-* \
-        | rl78-* | romp-* | rs6000-* | rx-* \
-        | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-        | sparclite-* \
-        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
-        | tahoe-* \
-        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-        | tile*-* \
-        | tron-* \
-        | ubicom32-* \
-        | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-        | vax-* \
-        | visium-* \
-        | wasm32-* \
-        | we32k-* \
-        | x86-* | x86_64-* | xc16x-* | xps100-* \
-        | xstormy16-* | xtensa*-* \
-        | ymp-* \
-        | z8k-* | z80-*)
-                ;;
-        # Recognize the basic CPU types without company name, with glob match.
-        xtensa*)
-                basic_machine=$basic_machine-unknown
-                ;;
-        # 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-pc
-                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
-                ;;
-        abacus)
-                basic_machine=abacus-unknown
-                ;;
-        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
-                ;;
-        amd64)
-                basic_machine=x86_64-pc
-                ;;
+                cpu=$basic_machine
+                vendor=pc
+                ;;
+        # These rules are duplicated from below for sake of the special case above;
+        # i.e. things that normalized to x86 arches should also default to "pc"
+        pc98)
+                cpu=i386
+                vendor=pc
+                ;;
+        x64 | amd64)
+                cpu=x86_64
+                vendor=pc
+                ;;
+        # Recognize the basic CPU types without company name.
+        *)
+                cpu=$basic_machine
+                vendor=unknown
+                ;;
+esac
+
+unset -v basic_machine
+
+# Decode basic machines in the full and proper CPU-Company form.
+case $cpu-$vendor in
+        # Here we handle the default manufacturer of certain CPU types in canonical form. It is in
+        # some cases the only manufacturer, in others, it is the most popular.
+        craynv-unknown)
+                vendor=cray
+                basic_os=${basic_os:-unicosmp}
+                ;;
+        c90-unknown | c90-cray)
+                vendor=cray
+                basic_os=${Basic_os:-unicos}
+                ;;
+        fx80-unknown)
+                vendor=alliant
+                ;;
+        romp-unknown)
+                vendor=ibm
+                ;;
+        mmix-unknown)
+                vendor=knuth
+                ;;
+        microblaze-unknown | microblazeel-unknown)
+                vendor=xilinx
+                ;;
+        rs6000-unknown)
+                vendor=ibm
+                ;;
+        vax-unknown)
+                vendor=dec
+                ;;
+        pdp11-unknown)
+                vendor=dec
+                ;;
+        we32k-unknown)
+                vendor=att
+                ;;
+        cydra-unknown)
+                vendor=cydrome
+                ;;
+        i370-ibm*)
+                vendor=ibm
+                ;;
+        orion-unknown)
+                vendor=highlevel
+                ;;
+        xps-unknown | xps100-unknown)
+                cpu=xps100
+                vendor=honeywell
+                ;;
+
+        # Here we normalize CPU types with a missing or matching vendor
+        armh-unknown | armh-alt)
+                cpu=armv7l
+                vendor=alt
+                basic_os=${basic_os:-linux-gnueabihf}
+                ;;
+        dpx20-unknown | dpx20-bull)
+                cpu=rs6000
+                vendor=bull
+                basic_os=${basic_os:-bosx}
+                ;;
+
+        # Here we normalize CPU types irrespective of the vendor
         amd64-*)
-                basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-                ;;
-        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
-                ;;
-        aros)
-                basic_machine=i386-pc
-                os=-aros
-                ;;
-        asmjs)
-                basic_machine=asmjs-unknown
-                ;;
-        aux)
-                basic_machine=m68k-apple
-                os=-aux
-                ;;
-        balance)
-                basic_machine=ns32k-sequent
-                os=-dynix
-                ;;
-        blackfin)
-                basic_machine=bfin-unknown
-                os=-linux
+                cpu=x86_64
                 ;;
         blackfin-*)
-                basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-                os=-linux
-                ;;
-        bluegene*)
-                basic_machine=powerpc-ibm
-                os=-cnk
+                cpu=bfin
+                basic_os=linux
                 ;;
         c54x-*)
-                basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+                cpu=tic54x
                 ;;
         c55x-*)
-                basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+                cpu=tic55x
                 ;;
         c6x-*)
-                basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-                ;;
-        c90)
-                basic_machine=c90-cray
-                os=-unicos
-                ;;
-        cegcc)
-                basic_machine=arm-unknown
-                os=-cegcc
-                ;;
-        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 | j90)
-                basic_machine=j90-cray
-                os=-unicos
-                ;;
-        craynv)
-                basic_machine=craynv-cray
-                os=-unicosmp
-                ;;
-        cr16 | cr16-*)
-                basic_machine=cr16-unknown
-                os=-elf
-                ;;
-        crds | unos)
-                basic_machine=m68k-crds
-                ;;
-        crisv32 | crisv32-* | etraxfs*)
-                basic_machine=crisv32-axis
-                ;;
-        cris | cris-* | etrax*)
-                basic_machine=cris-axis
-                ;;
-        crx)
-                basic_machine=crx-unknown
-                os=-elf
-                ;;
-        da30 | da30-*)
-                basic_machine=m68k-da30
-                ;;
-        decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-                basic_machine=mips-dec
-                ;;
-        decsystem10* | dec10*)
-                basic_machine=pdp10-dec
-                os=-tops10
-                ;;
-        decsystem20* | dec20*)
-                basic_machine=pdp10-dec
-                os=-tops20
-                ;;
-        delta | 3300 | motorola-3300 | motorola-delta \
-              | 3300-motorola | delta-motorola)
-                basic_machine=m68k-motorola
-                ;;
-        delta88)
-                basic_machine=m88k-motorola
-                os=-sysv3
-                ;;
-        dicos)
-                basic_machine=i686-pc
-                os=-dicos
-                ;;
-        djgpp)
-                basic_machine=i586-pc
-                os=-msdosdjgpp
-                ;;
-        dpx20 | dpx20-*)
-                basic_machine=rs6000-bull
-                os=-bosx
-                ;;
-        dpx2*)
-                basic_machine=m68k-bull
-                os=-sysv3
-                ;;
-        e500v[12])
-                basic_machine=powerpc-unknown
-                os=$os"spe"
+                cpu=tic6x
                 ;;
         e500v[12]-*)
-                basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-                os=$os"spe"
-                ;;
-        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
-                ;;
-        hppaosf)
-                basic_machine=hppa1.1-hp
-                os=-osf
-                ;;
-        hppro)
-                basic_machine=hppa1.1-hp
-                os=-proelf
-                ;;
-        i370-ibm* | ibm*)
-                basic_machine=i370-ibm
-                ;;
-        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
-                ;;
-        vsta)
-                basic_machine=i386-unknown
-                os=-vsta
-                ;;
-        iris | iris4d)
-                basic_machine=mips-sgi
-                case $os in
-                    -irix*)
-                        ;;
-                    *)
-                        os=-irix4
-                        ;;
+                cpu=powerpc
+                basic_os=${basic_os}"spe"
+                ;;
+        mips3*-*)
+                cpu=mips64
+                ;;
+        ms1-*)
+                cpu=mt
+                ;;
+        m68knommu-*)
+                cpu=m68k
+                basic_os=linux
+                ;;
+        m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
+                cpu=s12z
+                ;;
+        openrisc-*)
+                cpu=or32
+                ;;
+        parisc-*)
+                cpu=hppa
+                basic_os=linux
+                ;;
+        pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+                cpu=i586
+                ;;
+        pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+                cpu=i686
+                ;;
+        pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+                cpu=i686
+                ;;
+        pentium4-*)
+                cpu=i786
+                ;;
+        pc98-*)
+                cpu=i386
+                ;;
+        ppc-* | ppcbe-*)
+                cpu=powerpc
+                ;;
+        ppcle-* | powerpclittle-*)
+                cpu=powerpcle
+                ;;
+        ppc64-*)
+                cpu=powerpc64
+                ;;
+        ppc64le-* | powerpc64little-*)
+                cpu=powerpc64le
+                ;;
+        sb1-*)
+                cpu=mipsisa64sb1
+                ;;
+        sb1el-*)
+                cpu=mipsisa64sb1el
+                ;;
+        sh5e[lb]-*)
+                cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
+                ;;
+        spur-*)
+                cpu=spur
+                ;;
+        strongarm-* | thumb-*)
+                cpu=arm
+                ;;
+        tx39-*)
+                cpu=mipstx39
+                ;;
+        tx39el-*)
+                cpu=mipstx39el
+                ;;
+        x64-*)
+                cpu=x86_64
+                ;;
+        xscale-* | xscalee[bl]-*)
+                cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
+                ;;
+        arm64-* | aarch64le-*)
+                cpu=aarch64
+                ;;
+
+        # Recognize the canonical CPU Types that limit and/or modify the
+        # company names they are paired with.
+        cr16-*)
+                basic_os=${basic_os:-elf}
+                ;;
+        crisv32-* | etraxfs*-*)
+                cpu=crisv32
+                vendor=axis
+                ;;
+        cris-* | etrax*-*)
+                cpu=cris
+                vendor=axis
+                ;;
+        crx-*)
+                basic_os=${basic_os:-elf}
+                ;;
+        neo-tandem)
+                cpu=neo
+                vendor=tandem
+                ;;
+        nse-tandem)
+                cpu=nse
+                vendor=tandem
+                ;;
+        nsr-tandem)
+                cpu=nsr
+                vendor=tandem
+                ;;
+        nsv-tandem)
+                cpu=nsv
+                vendor=tandem
+                ;;
+        nsx-tandem)
+                cpu=nsx
+                vendor=tandem
+                ;;
+        mipsallegrexel-sony)
+                cpu=mipsallegrexel
+                vendor=sony
+                ;;
+        tile*-*)
+                basic_os=${basic_os:-linux-gnu}
+                ;;
+
+        *)
+                # Recognize the canonical CPU types that are allowed with any
+                # company name.
+                case $cpu in
+                        1750a | 580 \
+                        | a29k \
+                        | aarch64 | aarch64_be \
+                        | abacus \
+                        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
+                        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
+                        | alphapca5[67] | alpha64pca5[67] \
+                        | am33_2.0 \
+                        | amdgcn \
+                        | arc | arceb | arc32 | arc64 \
+                        | arm | arm[lb]e | arme[lb] | armv* \
+                        | avr | avr32 \
+                        | asmjs \
+                        | ba \
+                        | be32 | be64 \
+                        | bfin | bpf | bs2000 \
+                        | c[123]* | c30 | [cjt]90 | c4x \
+                        | c8051 | clipper | craynv | csky | cydra \
+                        | d10v | d30v | dlx | dsp16xx \
+                        | e2k | elxsi | epiphany \
+                        | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
+                        | h8300 | h8500 \
+                        | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+                        | hexagon \
+                        | i370 | i*86 | i860 | i960 | ia16 | ia64 \
+                        | ip2k | iq2000 \
+                        | k1om \
+                        | le32 | le64 \
+                        | lm32 \
+                        | loongarch32 | loongarch64 | loongarchx32 \
+                        | m32c | m32r | m32rle \
+                        | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
+                        | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
+                        | m88110 | m88k | maxq | mb | mcore | mep | metag \
+                        | microblaze | microblazeel \
+                        | mips | mipsbe | mipseb | mipsel | mipsle \
+                        | mips16 \
+                        | mips64 | mips64eb | mips64el \
+                        | mips64octeon | mips64octeonel \
+                        | mips64orion | mips64orionel \
+                        | mips64r5900 | mips64r5900el \
+                        | mips64vr | mips64vrel \
+                        | mips64vr4100 | mips64vr4100el \
+                        | mips64vr4300 | mips64vr4300el \
+                        | mips64vr5000 | mips64vr5000el \
+                        | mips64vr5900 | mips64vr5900el \
+                        | mipsisa32 | mipsisa32el \
+                        | mipsisa32r2 | mipsisa32r2el \
+                        | mipsisa32r3 | mipsisa32r3el \
+                        | mipsisa32r5 | mipsisa32r5el \
+                        | mipsisa32r6 | mipsisa32r6el \
+                        | mipsisa64 | mipsisa64el \
+                        | mipsisa64r2 | mipsisa64r2el \
+                        | mipsisa64r3 | mipsisa64r3el \
+                        | mipsisa64r5 | mipsisa64r5el \
+                        | mipsisa64r6 | mipsisa64r6el \
+                        | mipsisa64sb1 | mipsisa64sb1el \
+                        | mipsisa64sr71k | mipsisa64sr71kel \
+                        | mipsr5900 | mipsr5900el \
+                        | mipstx39 | mipstx39el \
+                        | mmix \
+                        | mn10200 | mn10300 \
+                        | moxie \
+                        | mt \
+                        | msp430 \
+                        | nds32 | nds32le | nds32be \
+                        | nfp \
+                        | nios | nios2 | nios2eb | nios2el \
+                        | none | np1 | ns16k | ns32k | nvptx \
+                        | open8 \
+                        | or1k* \
+                        | or32 \
+                        | orion \
+                        | picochip \
+                        | pdp10 | pdp11 | pj | pjl | pn | power \
+                        | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+                        | pru \
+                        | pyramid \
+                        | riscv | riscv32 | riscv32be | riscv64 | riscv64be \
+                        | rl78 | romp | rs6000 | rx \
+                        | s390 | s390x \
+                        | score \
+                        | sh | shl \
+                        | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
+                        | sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
+                        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
+                        | sparclite \
+                        | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
+                        | spu \
+                        | tahoe \
+                        | thumbv7* \
+                        | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
+                        | tron \
+                        | ubicom32 \
+                        | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
+                        | vax \
+                        | visium \
+                        | w65 \
+                        | wasm32 | wasm64 \
+                        | we32k \
+                        | x86 | x86_64 | xc16x | xgate | xps100 \
+                        | xstormy16 | xtensa* \
+                        | ymp \
+                        | z8k | z80)
+                                ;;
+
+                        *)
+                                echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+                                exit 1
+                                ;;
                 esac
                 ;;
-        isi68 | isi)
-                basic_machine=m68k-isi
-                os=-sysv
-                ;;
-        leon-*|leon[3-9]-*)
-                basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
-                ;;
-        m68knommu)
-                basic_machine=m68k-unknown
-                os=-linux
-                ;;
-        m68knommu-*)
-                basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-                os=-linux
-                ;;
-        magnum | m3230)
-                basic_machine=mips-mips
-                os=-sysv
-                ;;
-        merlin)
-                basic_machine=ns32k-utek
-                os=-sysv
-                ;;
-        microblaze*)
-                basic_machine=microblaze-xilinx
-                ;;
-        mingw64)
-                basic_machine=x86_64-pc
-                os=-mingw64
-                ;;
-        mingw32)
-                basic_machine=i686-pc
-                os=-mingw32
-                ;;
-        mingw32ce)
-                basic_machine=arm-unknown
-                os=-mingw32ce
-                ;;
-        miniframe)
-                basic_machine=m68000-convergent
-                ;;
-        *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-                basic_machine=m68k-atari
-                os=-mint
-                ;;
-        mips3*-*)
-                basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
-                ;;
-        mips3*)
-                basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
-                ;;
-        monitor)
-                basic_machine=m68k-rom68k
-                os=-coff
-                ;;
-        morphos)
-                basic_machine=powerpc-unknown
-                os=-morphos
-                ;;
-        moxiebox)
-                basic_machine=moxie-unknown
-                os=-moxiebox
-                ;;
-        msdos)
-                basic_machine=i386-pc
-                os=-msdos
-                ;;
-        ms1-*)
-                basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
-                ;;
-        msys)
-                basic_machine=i686-pc
-                os=-msys
-                ;;
-        mvs)
-                basic_machine=i370-ibm
-                os=-mvs
-                ;;
-        nacl)
-                basic_machine=le32-unknown
-                os=-nacl
-                ;;
-        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
-                ;;
-        neo-tandem)
-                basic_machine=neo-tandem
-                ;;
-        nse-tandem)
-                basic_machine=nse-tandem
-                ;;
-        nsr-tandem)
-                basic_machine=nsr-tandem
-                ;;
-        nsv-tandem)
-                basic_machine=nsv-tandem
-                ;;
-        nsx-tandem)
-                basic_machine=nsx-tandem
-                ;;
-        op50n-* | op60c-*)
-                basic_machine=hppa1.1-oki
-                os=-proelf
-                ;;
-        openrisc | openrisc-*)
-                basic_machine=or32-unknown
-                ;;
-        os400)
-                basic_machine=powerpc-ibm
-                os=-os400
-                ;;
-        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
-                ;;
-        parisc)
-                basic_machine=hppa-unknown
-                os=-linux
-                ;;
-        parisc-*)
-                basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-                os=-linux
-                ;;
-        pbd)
-                basic_machine=sparc-tti
-                ;;
-        pbb)
-                basic_machine=m68k-tti
-                ;;
-        pc532 | pc532-*)
-                basic_machine=ns32k-pc532
-                ;;
-        pc98)
-                basic_machine=i386-pc
-                ;;
-        pc98-*)
-                basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-                ;;
-        pentium | p5 | k5 | k6 | nexgen | viac3)
-                basic_machine=i586-pc
-                ;;
-        pentiumpro | p6 | 6x86 | athlon | athlon_*)
-                basic_machine=i686-pc
-                ;;
-        pentiumii | pentium2 | pentiumiii | pentium3)
-                basic_machine=i686-pc
-                ;;
-        pentium4)
-                basic_machine=i786-pc
-                ;;
-        pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-                basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-                ;;
-        pentiumpro-* | p6-* | 6x86-* | athlon-*)
-                basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-                ;;
-        pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-                basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-                ;;
-        pentium4-*)
-                basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-                ;;
-        pn)
-                basic_machine=pn-gould
-                ;;
-        power)  basic_machine=power-ibm
-                ;;
-        ppc | ppcbe)    basic_machine=powerpc-unknown
-                ;;
-        ppc-* | ppcbe-*)
-                basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-                ;;
-        ppcle | powerpclittle)
-                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)
-                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
-                ;;
-        rdos | rdos64)
-                basic_machine=x86_64-pc
-                os=-rdos
-                ;;
-        rdos32)
-                basic_machine=i386-pc
-                os=-rdos
-                ;;
-        rom68k)
-                basic_machine=m68k-rom68k
-                os=-coff
-                ;;
-        rm[46]00)
-                basic_machine=mips-siemens
-                ;;
-        rtpc | rtpc-*)
-                basic_machine=romp-ibm
-                ;;
-        s390 | s390-*)
-                basic_machine=s390-ibm
-                ;;
-        s390x | s390x-*)
-                basic_machine=s390x-ibm
-                ;;
-        sa29200)
-                basic_machine=a29k-amd
-                os=-udi
-                ;;
-        sb1)
-                basic_machine=mipsisa64sb1-unknown
-                ;;
-        sb1el)
-                basic_machine=mipsisa64sb1el-unknown
-                ;;
-        sde)
-                basic_machine=mipsisa32-sde
-                os=-elf
-                ;;
-        sei)
-                basic_machine=mips-sei
-                os=-seiux
-                ;;
-        sequent)
-                basic_machine=i386-sequent
-                ;;
-        sh5el)
-                basic_machine=sh5le-unknown
-                ;;
-        simso-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
-                ;;
-        strongarm-* | thumb-*)
-                basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-                ;;
-        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=alphaev5-cray
-                os=-unicos
-                ;;
-        t90)
-                basic_machine=t90-cray
-                os=-unicos
-                ;;
-        tile*)
-                basic_machine=$basic_machine-unknown
-                os=-linux-gnu
-                ;;
-        tx39)
-                basic_machine=mipstx39-unknown
-                ;;
-        tx39el)
-                basic_machine=mipstx39el-unknown
-                ;;
-        toad1)
-                basic_machine=pdp10-xkl
-                os=-tops20
-                ;;
-        tower | tower-32)
-                basic_machine=m68k-ncr
-                ;;
-        tpf)
-                basic_machine=s390x-ibm
-                os=-tpf
-                ;;
-        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
-                ;;
-        x64)
-                basic_machine=x86_64-pc
-                ;;
-        xbox)
-                basic_machine=i686-pc
-                os=-mingw32
-                ;;
-        xps | xps100)
-                basic_machine=xps100-honeywell
-                ;;
-        xscale-* | xscalee[bl]-*)
-                basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
-                ;;
-        ymp)
-                basic_machine=ymp-cray
-                os=-unicos
-                ;;
-        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
-                ;;
-        romp)
-                basic_machine=romp-ibm
-                ;;
-        mmix)
-                basic_machine=mmix-knuth
-                ;;
-        rs6000)
-                basic_machine=rs6000-ibm
-                ;;
-        vax)
-                basic_machine=vax-dec
-                ;;
-        pdp11)
-                basic_machine=pdp11-dec
-                ;;
-        we32k)
-                basic_machine=we32k-att
-                ;;
-        sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-                basic_machine=sh-unknown
-                ;;
-        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
-                ;;
-        *-unknown)
-                # Make sure to match an already-canonicalized machine name.
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $vendor in
+        digital*)
+                vendor=dec
+                ;;
+        commodore*)
+                vendor=cbm
                 ;;
         *)
-                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/'`
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if test x$basic_os != x
+then
+
+# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
+# set os.
+case $basic_os in
+        gnu/linux*)
+                kernel=linux
+                os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'`
+                ;;
+        os2-emx)
+                kernel=os2
+                os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'`
+                ;;
+        nto-qnx*)
+                kernel=nto
+                os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'`
+                ;;
+        *-*)
+                # shellcheck disable=SC2162
+                saved_IFS=$IFS
+                IFS="-" read kernel os <<EOF
+$basic_os
+EOF
+                IFS=$saved_IFS
+                ;;
+        # Default OS when just kernel was specified
+        nto*)
+                kernel=nto
+                os=`echo "$basic_os" | sed -e 's|nto|qnx|'`
+                ;;
+        linux*)
+                kernel=linux
+                os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
                 ;;
         *)
+                kernel=
+                os=$basic_os
                 ;;
 esac
 
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
+# Now, normalize the OS (knowing we just have one component, it's not a kernel,
+# etc.)
 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.
-        -auroraux)
-                os=-auroraux
-                ;;
-        -solaris1 | -solaris1.*)
-                os=`echo $os | sed -e 's|solaris1|sunos4|'`
-                ;;
-        -solaris)
-                os=-solaris2
-                ;;
-        -unixware*)
-                os=-sysv4.2uw
-                ;;
-        -gnu/linux*)
-                os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+        # solaris* is a basic system type, with this one exception.
+        auroraux)
+                os=auroraux
+                ;;
+        bluegene*)
+                os=cnk
+                ;;
+        solaris1 | solaris1.*)
+                os=`echo "$os" | sed -e 's|solaris1|sunos4|'`
+                ;;
+        solaris)
+                os=solaris2
+                ;;
+        unixware*)
+                os=sysv4.2uw
                 ;;
         # es1800 is here to avoid being matched by es* (a different OS)
-        -es1800*)
-                os=-ose
-                ;;
-        # Now 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* | -cnk* | -sunos | -sunos[34]*\
-              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-              | -sym* | -kopensolaris* | -plan9* \
-              | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-              | -aos* | -aros* | -cloudabi* | -sortix* \
-              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-              | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
-              | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
-              | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-              | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-              | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
-              | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-              | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-              | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-              | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
-              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-              | -morphos* | -superux* | -rtmk* | -windiss* \
-              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-              | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-              | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
-              | -midnightbsd*)
-        # Remember, each alternative MUST END IN *, to match a version number.
-                ;;
-        -qnx*)
-                case $basic_machine in
-                    x86-* | i*86-*)
-                        ;;
-                    *)
-                        os=-nto$os
-                        ;;
-                esac
-                ;;
-        -nto-qnx*)
-                ;;
-        -nto*)
-                os=`echo $os | sed -e 's|nto|nto-qnx|'`
-                ;;
-        -sim | -xray | -os68k* | -v88r* \
-              | -windows* | -osx | -abug | -netware* | -os9* \
-              | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-                ;;
-        -mac*)
+        es1800*)
+                os=ose
+                ;;
+        # Some version numbers need modification
+        chorusos*)
+                os=chorusos
+                ;;
+        isc)
+                os=isc2.2
+                ;;
+        sco6)
+                os=sco5v6
+                ;;
+        sco5)
+                os=sco3.2v5
+                ;;
+        sco4)
+                os=sco3.2v4
+                ;;
+        sco3.2.[4-9]*)
+                os=`echo "$os" | sed -e 's/sco3.2./sco3.2v/'`
+                ;;
+        sco*v* | scout)
+                # Don't match below
+                ;;
+        sco*)
+                os=sco3.2v2
+                ;;
+        psos*)
+                os=psos
+                ;;
+        qnx*)
+                os=qnx
+                ;;
+        hiux*)
+                os=hiuxwe2
+                ;;
+        lynx*178)
+                os=lynxos178
+                ;;
+        lynx*5)
+                os=lynxos5
+                ;;
+        lynxos*)
+                # don't get caught up in next wildcard
+                ;;
+        lynx*)
+                os=lynxos
+                ;;
+        mac[0-9]*)
                 os=`echo "$os" | sed -e 's|mac|macos|'`
                 ;;
-        -linux-dietlibc)
-                os=-linux-dietlibc
-                ;;
-        -linux*)
-                os=`echo $os | sed -e 's|linux|linux-gnu|'`
-                ;;
-        -sunos5*)
+        opened*)
+                os=openedition
+                ;;
+        os400*)
+                os=os400
+                ;;
+        sunos5*)
                 os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
                 ;;
-        -sunos6*)
+        sunos6*)
                 os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
                 ;;
-        -opened*)
-                os=-openedition
-                ;;
-        -os400*)
-                os=-os400
-                ;;
-        -wince*)
-                os=-wince
-                ;;
-        -utek*)
-                os=-bsd
-                ;;
-        -dynix*)
-                os=-bsd
-                ;;
-        -acis*)
-                os=-aos
-                ;;
-        -atheos*)
-                os=-atheos
-                ;;
-        -syllable*)
-                os=-syllable
-                ;;
-        -386bsd)
-                os=-bsd
-                ;;
-        -ctix* | -uts*)
-                os=-sysv
-                ;;
-        -nova*)
-                os=-rtmk-nova
-                ;;
-        -ns2)
-                os=-nextstep2
-                ;;
-        -nsk*)
-                os=-nsk
+        wince*)
+                os=wince
+                ;;
+        utek*)
+                os=bsd
+                ;;
+        dynix*)
+                os=bsd
+                ;;
+        acis*)
+                os=aos
+                ;;
+        atheos*)
+                os=atheos
+                ;;
+        syllable*)
+                os=syllable
+                ;;
+        386bsd)
+                os=bsd
+                ;;
+        ctix* | uts*)
+                os=sysv
+                ;;
+        nova*)
+                os=rtmk-nova
+                ;;
+        ns2)
+                os=nextstep2
                 ;;
         # Preserve the version number of sinix5.
-        -sinix5.*)
-                os=`echo $os | sed -e 's|sinix|sysv|'`
-                ;;
-        -sinix*)
-                os=-sysv4
-                ;;
-        -tpf*)
-                os=-tpf
-                ;;
-        -triton*)
-                os=-sysv3
-                ;;
-        -oss*)
-                os=-sysv3
-                ;;
-        -svr4*)
-                os=-sysv4
-                ;;
-        -svr3)
-                os=-sysv3
-                ;;
-        -sysvr4)
-                os=-sysv4
-                ;;
-        # This must come after -sysvr4.
-        -sysv*)
-                ;;
-        -ose*)
-                os=-ose
-                ;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-                os=-mint
-                ;;
-        -zvmoe)
-                os=-zvmoe
-                ;;
-        -dicos*)
-                os=-dicos
-                ;;
-        -pikeos*)
+        sinix5.*)
+                os=`echo "$os" | sed -e 's|sinix|sysv|'`
+                ;;
+        sinix*)
+                os=sysv4
+                ;;
+        tpf*)
+                os=tpf
+                ;;
+        triton*)
+                os=sysv3
+                ;;
+        oss*)
+                os=sysv3
+                ;;
+        svr4*)
+                os=sysv4
+                ;;
+        svr3)
+                os=sysv3
+                ;;
+        sysvr4)
+                os=sysv4
+                ;;
+        ose*)
+                os=ose
+                ;;
+        *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
+                os=mint
+                ;;
+        dicos*)
+                os=dicos
+                ;;
+        pikeos*)
                 # Until real need of OS specific support for
                 # particular features comes up, bare metal
                 # configurations are quite functional.
-                case $basic_machine in
+                case $cpu in
                     arm*)
-                        os=-eabi
+                        os=eabi
                         ;;
                     *)
-                        os=-elf
+                        os=elf
                         ;;
                 esac
                 ;;
-        -nacl*)
-                ;;
-        -ios)
-                ;;
-        -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
+                # No normalization, but not necessarily accepted, that comes below.
                 ;;
 esac
+
 else
 
@@ -1544 +1528 @@
 # system, and we'll never get to this point.
 
-case $basic_machine in
+kernel=
+case $cpu-$vendor in
         score-*)
-                os=-elf
+                os=elf
                 ;;
         spu-*)
-                os=-elf
+                os=elf
                 ;;
         *-acorn)
-                os=-riscix1.2
+                os=riscix1.2
                 ;;
         arm*-rebel)
-                os=-linux
+                kernel=linux
+                os=gnu
                 ;;
         arm*-semi)
-                os=-aout
+                os=aout
                 ;;
         c4x-* | tic4x-*)
-                os=-coff
+                os=coff
                 ;;
         c8051-*)
-                os=-elf
+                os=elf
+                ;;
+        clipper-intergraph)
+                os=clix
                 ;;
         hexagon-*)
-                os=-elf
+                os=elf
                 ;;
         tic54x-*)
-                os=-coff
+                os=coff
                 ;;
         tic55x-*)
-                os=-coff
+                os=coff
                 ;;
         tic6x-*)
-                os=-coff
+                os=coff
                 ;;
         # This must come before the *-dec entry.
         pdp10-*)
-                os=-tops20
+                os=tops20
                 ;;
         pdp11-*)
-                os=-none
+                os=none
                 ;;
         *-dec | vax-*)
-                os=-ultrix4.2
+                os=ultrix4.2
                 ;;
         m68*-apollo)
-                os=-domain
+                os=domain
                 ;;
         i386-sun)
-                os=-sunos4.0.2
+                os=sunos4.0.2
                 ;;
         m68000-sun)
-                os=-sunos3
+                os=sunos3
                 ;;
         m68*-cisco)
-                os=-aout
+                os=aout
                 ;;
         mep-*)
-                os=-elf
+                os=elf
                 ;;
         mips*-cisco)
-                os=-elf
+                os=elf
                 ;;
         mips*-*)
-                os=-elf
+                os=elf
                 ;;
         or32-*)
-                os=-coff
+                os=coff
                 ;;
         *-tti)  # must be before sparc entry or we get the wrong os.
-                os=-sysv3
+                os=sysv3
                 ;;
         sparc-* | *-sun)
-                os=-sunos4.1.1
+                os=sunos4.1.1
                 ;;
         pru-*)
-                os=-elf
+                os=elf
                 ;;
         *-be)
-                os=-beos
+                os=beos
                 ;;
         *-ibm)
-                os=-aix
+                os=aix
                 ;;
         *-knuth)
-                os=-mmixware
+                os=mmixware
                 ;;
         *-wec)
-                os=-proelf
+                os=proelf
                 ;;
         *-winbond)
-                os=-proelf
+                os=proelf
                 ;;
         *-oki)
-                os=-proelf
+                os=proelf
                 ;;
         *-hp)
-                os=-hpux
+                os=hpux
                 ;;
         *-hitachi)
-                os=-hiux
+                os=hiux
                 ;;
         i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-                os=-sysv
+                os=sysv
                 ;;
         *-cbm)
-                os=-amigaos
+                os=amigaos
                 ;;
         *-dg)
-                os=-dgux
+                os=dgux
                 ;;
         *-dolphin)
-                os=-sysv3
+                os=sysv3
                 ;;
         m68k-ccur)
-                os=-rtu
+                os=rtu
                 ;;
         m88k-omron*)
-                os=-luna
+                os=luna
                 ;;
         *-next)
-                os=-nextstep
+                os=nextstep
                 ;;
         *-sequent)
-                os=-ptx
+                os=ptx
                 ;;
         *-crds)
-                os=-unos
+                os=unos
                 ;;
         *-ns)
-                os=-genix
+                os=genix
                 ;;
         i370-*)
-                os=-mvs
+                os=mvs
                 ;;
         *-gould)
-                os=-sysv
+                os=sysv
                 ;;
         *-highlevel)
-                os=-bsd
+                os=bsd
                 ;;
         *-encore)
-                os=-bsd
+                os=bsd
                 ;;
         *-sgi)
-                os=-irix
+                os=irix
                 ;;
         *-siemens)
-                os=-sysv4
+                os=sysv4
                 ;;
         *-masscomp)
-                os=-rtu
+                os=rtu
                 ;;
         f30[01]-fujitsu | f700-fujitsu)
-                os=-uxpv
+                os=uxpv
                 ;;
         *-rom68k)
-                os=-coff
+                os=coff
                 ;;
         *-*bug)
-                os=-coff
+                os=coff
                 ;;
         *-apple)
-                os=-macos
+                os=macos
                 ;;
         *-atari*)
-                os=-mint
+                os=mint
+                ;;
+        *-wrs)
+                os=vxworks
                 ;;
         *)
-                os=-none
+                os=none
                 ;;
 esac
+
 fi
+
+# Now, validate our (potentially fixed-up) OS.
+case $os in
+        # Sometimes we do "kernel-libc", so those need to count as OSes.
+        musl* | newlib* | relibc* | uclibc*)
+                ;;
+        # Likewise for "kernel-abi"
+        eabi* | gnueabi*)
+                ;;
+        # VxWorks passes extra cpu info in the 4th filed.
+        simlinux | simwindows | spe)
+                ;;
+        # Now accept the basic system types.
+        # The portable systems comes first.
+        # Each alternative MUST end in a * to match a version number.
+        gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+             | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
+             | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+             | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
+             | hiux* | abug | nacl* | netware* | windows* \
+             | os9* | macos* | osx* | ios* \
+             | mpw* | magic* | mmixware* | mon960* | lnews* \
+             | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+             | aos* | aros* | cloudabi* | sortix* | twizzler* \
+             | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
+             | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
+             | mirbsd* | netbsd* | dicos* | openedition* | ose* \
+             | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
+             | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
+             | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
+             | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+             | udi* | lites* | ieee* | go32* | aux* | hcos* \
+             | chorusrdb* | cegcc* | glidix* | serenity* \
+             | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+             | midipix* | mingw32* | mingw64* | mint* \
+             | uxpv* | beos* | mpeix* | udk* | moxiebox* \
+             | interix* | uwin* | mks* | rhapsody* | darwin* \
+             | openstep* | oskit* | conix* | pw32* | nonstopux* \
+             | storm-chaos* | tops10* | tenex* | tops20* | its* \
+             | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \
+             | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
+             | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+             | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+             | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+             | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
+             | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
+             | fiwix* )
+                ;;
+        # This one is extra strict with allowed versions
+        sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
+                # Don't forget version if it is 3.2v4 or newer.
+                ;;
+        none)
+                ;;
+        *)
+                echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
+                exit 1
+                ;;
+esac
+
+# As a final step for OS-related things, validate the OS-kernel combination
+# (given a valid OS), if there is a kernel.
+case $kernel-$os in
+        linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
+                   | linux-musl* | linux-relibc* | linux-uclibc* )
+                ;;
+        uclinux-uclibc* )
+                ;;
+        -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* )
+                # These are just libc implementations, not actual OSes, and thus
+                # require a kernel.
+                echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
+                exit 1
+                ;;
+        kfreebsd*-gnu* | kopensolaris*-gnu*)
+                ;;
+        vxworks-simlinux | vxworks-simwindows | vxworks-spe)
+                ;;
+        nto-qnx*)
+                ;;
+        os2-emx)
+                ;;
+        *-eabi* | *-gnueabi*)
+                ;;
+        -*)
+                # Blank kernel with real OS is always fine.
+                ;;
+        *-*)
+                echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
+                exit 1
+                ;;
+esac
 
 # 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*)
+case $vendor in
+        unknown)
+                case $cpu-$os in
+                        *-riscix*)
                                 vendor=acorn
                                 ;;
-                        -sunos*)
+                        *-sunos*)
                                 vendor=sun
                                 ;;
-                        -cnk*|-aix*)
+                        *-cnk* | *-aix*)
                                 vendor=ibm
                                 ;;
-                        -beos*)
+                        *-beos*)
                                 vendor=be
                                 ;;
-                        -hpux*)
+                        *-hpux*)
                                 vendor=hp
                                 ;;
-                        -mpeix*)
+                        *-mpeix*)
                                 vendor=hp
                                 ;;
-                        -hiux*)
+                        *-hiux*)
                                 vendor=hitachi
                                 ;;
-                        -unos*)
+                        *-unos*)
                                 vendor=crds
                                 ;;
-                        -dgux*)
+                        *-dgux*)
                                 vendor=dg
                                 ;;
-                        -luna*)
+                        *-luna*)
                                 vendor=omron
                                 ;;
-                        -genix*)
+                        *-genix*)
                                 vendor=ns
                                 ;;
-                        -mvs* | -opened*)
+                        *-clix*)
+                                vendor=intergraph
+                                ;;
+                        *-mvs* | *-opened*)
                                 vendor=ibm
                                 ;;
-                        -os400*)
+                        *-os400*)
                                 vendor=ibm
                                 ;;
-                        -ptx*)
+                        s390-* | s390x-*)
+                                vendor=ibm
+                                ;;
+                        *-ptx*)
                                 vendor=sequent
                                 ;;
-                        -tpf*)
+                        *-tpf*)
                                 vendor=ibm
                                 ;;
-                        -vxsim* | -vxworks* | -windiss*)
+                        *-vxsim* | *-vxworks* | *-windiss*)
                                 vendor=wrs
                                 ;;
-                        -aux*)
+                        *-aux*)
                                 vendor=apple
                                 ;;
-                        -hms*)
+                        *-hms*)
                                 vendor=hitachi
                                 ;;
-                        -mpw* | -macos*)
+                        *-mpw* | *-macos*)
                                 vendor=apple
                                 ;;
-                        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+                        *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*)
                                 vendor=atari
                                 ;;
-                        -vos*)
+                        *-vos*)
                                 vendor=stratus
                                 ;;
                 esac
-                basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
                 ;;
 esac
 
-echo "$basic_machine$os"
+echo "$cpu-$vendor-${kernel:+$kernel-}$os"
 exit
 
 # Local variables:
-# eval: (add-hook 'write-file-functions 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"

trunk/configure.ac

@@ -1 +1 @@
 dnl We want to override the standard _AC_INIT_PARSE_ARGS
 dnl
-AU_ALIAS([_AC_INIT_PARSE_ARGS], [SH_INIT_PARSE_ARGS])
-AU_ALIAS([_AC_INIT_help], [SH_INIT_HELP])
-
-AC_INIT(src/samhain.c)
-
+AU_ALIAS([_AC_INIT_PARSE_ARGS], [SH_INIT_PARSE_ARGS], [], [silent])
+dnl AU_ALIAS([_AC_INIT_help], [SH_INIT_HELP])
+
+AC_INIT([samhain],[4.5.2])
+AC_CONFIG_SRCDIR(src/samhain.c)
 
 AC_ARG_VAR([LIBS], [libraries to link against, e.g. -lintl])
@@ -12 +12 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 4.5.1)
+dnl AM_INIT_AUTOMAKE
+m4_pattern_allow([AC_DEFINE])
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
+AC_DEFINE_UNQUOTED([VERSION], [_("${PACKAGE_VERSION}")], [Current version] )
+AC_DEFINE_UNQUOTED([PACKAGE], [_("${PACKAGE_NAME}")], [Application name] )
 AC_CANONICAL_HOST
 
@@ -34 +37 @@
 AC_SUBST(cmd_hostname)
 AC_SUBST(BUILD_CC)
+
 
 if test "x$GCC" = "xyes"; then
@@ -55 +59 @@
 
 
-AC_HEADER_STDC
-
 AC_CHECK_HEADERS([sys/ipc.h sys/sem.h sys/msg.h sys/uio.h fcntl.h])
 
@@ -74 +76 @@
         *linux*)
         sh_use_lcaps="yes"
-        AC_DEFINE(HOST_IS_LINUX)
-        AC_DEFINE(HAVE_EXT2_IOCTLS)
+        AC_DEFINE([HOST_IS_LINUX], [1], [] )
+        AC_DEFINE([HAVE_EXT2_IOCTLS], [1], [] )
         AC_MSG_RESULT([use ioctl to get e2fs flags])
         case "$host_cpu" in 
            i*86*)
-           AC_DEFINE(HOST_IS_I86LINUX)
+           AC_DEFINE([HOST_IS_I86LINUX], [1], [] )
            ;;
            x86_64)
-           AC_DEFINE([HOST_IS_64LINUX], 1, [Define if host OS is 64bit Linux])
+           AC_DEFINE([HOST_IS_64LINUX], [1], [Define if host OS is 64bit Linux])
            ;;
            *)
@@ -103 +105 @@
         
         *cygwin*) 
-        AC_DEFINE(HOST_IS_CYGWIN)
+        AC_DEFINE([HOST_IS_CYGWIN], [1], [] )
         AC_DEFINE([USE_REGISTRY_CHECK], 1, [Define for registry check])
         dnmalloc_ok=no
@@ -111 +113 @@
 
         *darwin*|*apple*) 
-        AC_DEFINE(HOST_IS_DARWIN)
+        AC_DEFINE([HOST_IS_DARWIN], [1], [] )
         dnmalloc_ok=no
         AC_MSG_RESULT([check resource forks, no dnmalloc])
         ;;
 
-        *freebsd8*|*freebsd9*)
-        AC_DEFINE(HOST_IS_FREEBSD)
-        selectconfig=freebsd
-        case "$host_cpu" in
-                amd64|x86_64)
-                dnmalloc_ok=no
-                AC_MSG_RESULT([no dnmalloc])
-                ;;
-                *)
-                AC_MSG_RESULT([none])
-                ;;
-        esac
-        ;;
-        
         *freebsd7*)
-        AC_DEFINE(HOST_IS_FREEBSD)
+        AC_DEFINE([HOST_IS_FREEBSD], [1], [] )
         selectconfig=freebsd
         case "$host_cpu" in
@@ -146 +134 @@
         
         *freebsd*)
-        AC_DEFINE(HOST_IS_FREEBSD)
+        AC_DEFINE([HOST_IS_FREEBSD], [1], [] )
         selectconfig=freebsd
+        case "$host_cpu" in
+                amd64|x86_64)
+                dnmalloc_ok=no
+                AC_MSG_RESULT([no dnmalloc])
+                ;;
+                *)
+                AC_MSG_RESULT([none])
+                ;;
+        esac
         AC_MSG_RESULT([none])
         ;;
@@ -166 +163 @@
         *solaris*)
         selectconfig=solaris
-        AC_DEFINE(HOST_IS_SOLARIS)
+        AC_DEFINE([HOST_IS_SOLARIS], [1], [] )
         case "$host_cpu" in
                 i*86)
-                AC_DEFINE(HOST_IS_I86SOLARIS)
+                AC_DEFINE([HOST_IS_I86SOLARIS], [1], [] )
                 AC_MSG_RESULT([vsnprintf prototype])
                 ;;
@@ -193 +190 @@
         *sun*)
         selectconfig=solaris
-        AC_DEFINE(HOST_IS_SOLARIS)
+        AC_DEFINE([HOST_IS_SOLARIS], [1], [])
         AC_MSG_RESULT([none])
         ;;
 
         *aix*)
-        AC_DEFINE(HOST_IS_AIX)
+        AC_DEFINE([HOST_IS_AIX], [1], [aix])
         selectconfig=aix5.2.0
         uid_cast="unsigned long"
@@ -219 +216 @@
         *hpux*)
         AC_MSG_RESULT([HPUX need _XOPEN_SOURCE_EXTENDED for h_errno])
-        AC_DEFINE(HOST_IS_HPUX)
+        AC_DEFINE([HOST_IS_HPUX], [1], [hpux])
         if test "x$GCC" != "xyes"; then
           if test ! -z "`echo "$CFLAGS" | grep "\-g" 2> /dev/null`" ; then
@@ -232 +229 @@
         *ultrix*)
         AC_MSG_RESULT([ULTRIX getcwd uses popen])
-        AC_DEFINE(HAVE_BROKEN_GETCWD)
+        AC_DEFINE([HAVE_BROKEN_GETCWD], [1], [bad implementation of getcwd])
         ;;
 
@@ -241 +238 @@
 
 AC_SUBST(selectconfig)
-AC_DEFINE_UNQUOTED(UID_CAST, ${uid_cast})
+AC_DEFINE_UNQUOTED([UID_CAST], [${uid_cast}], [basic type to which we can cast a uid])
 
 
@@ -253 +250 @@
 AC_HEADER_DIRENT
 AC_HEADER_MAJOR
-AC_HEADER_TIME
+AC_CHECK_HEADERS([sys/time.h])
 dnl used in minilzo.c
 AC_HEADER_STAT
-AC_DECL_SYS_SIGLIST 
+
+AC_CHECK_DECLS([sys_siglist], [], [],
+[#include <signal.h>
+/* NetBSD declares sys_siglist in unistd.h.  */
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+])
 
 AC_CHECK_HEADERS(stddef.h libgen.h sched.h malloc.h sys/uio.h \
@@ -275 +279 @@
 AC_CHECK_HEADER(utmpx.h, sh_utmpx="yes", sh_utmpx="no")
 if test "x$sh_utmpx" = "xyes"; then
-  AC_DEFINE(HAVE_UTMPX_H)
-  AC_EGREP_HEADER(ut_host, utmpx.h, AC_DEFINE(HAVE_UTHOST) )
-  AC_EGREP_HEADER(ut_addr, utmpx.h, AC_DEFINE(HAVE_UTADDR) )
-  AC_EGREP_HEADER(ut_addr_v6, utmpx.h, AC_DEFINE(HAVE_UTADDR_V6) )
-  AC_EGREP_HEADER(ut_xtime,utmpx.h, AC_DEFINE(HAVE_UTXTIME) )
-  AC_EGREP_HEADER(ut_type, utmpx.h, AC_DEFINE(HAVE_UTTYPE) )
+  AC_DEFINE([HAVE_UTMPX_H], [1], [whether we have utmpx.h])
+  AC_EGREP_HEADER(ut_host, utmpx.h, AC_DEFINE([HAVE_UTHOST], [1], [] ))
+  AC_EGREP_HEADER(ut_addr, utmpx.h, AC_DEFINE([HAVE_UTADDR], [1], [] ))
+  AC_EGREP_HEADER(ut_addr_v6, utmpx.h, AC_DEFINE([HAVE_UTADDR_V6], [1], [] ))
+  AC_EGREP_HEADER(ut_xtime,utmpx.h, AC_DEFINE([HAVE_UTXTIME], [1], [] ))
+  AC_EGREP_HEADER(ut_type, utmpx.h, AC_DEFINE([HAVE_UTTYPE], [1], [] ))
 else
-  AC_EGREP_HEADER(ut_addr, utmp.h, AC_DEFINE(HAVE_UTADDR) )
-  AC_EGREP_HEADER(ut_host, utmp.h, AC_DEFINE(HAVE_UTHOST) )
-  AC_EGREP_HEADER(ut_type, utmp.h, AC_DEFINE(HAVE_UTTYPE) )
+  AC_EGREP_HEADER(ut_addr, utmp.h, AC_DEFINE([HAVE_UTADDR], [1], [] ))
+  AC_EGREP_HEADER(ut_host, utmp.h, AC_DEFINE([HAVE_UTHOST], [1], [] ))
+  AC_EGREP_HEADER(ut_type, utmp.h, AC_DEFINE([HAVE_UTTYPE], [1], [] ))
 fi
 
@@ -301 +305 @@
                 AC_DEFINE(HAVE_SYS_ACCT_H, ,
                           [Define if you have the <sys/acct.h> header file.])
-                AC_HEADER_EGREP(ac_utime, sys/acct.h,
+                AC_EGREP_HEADER(ac_utime, sys/acct.h,
                                 AC_DEFINE(HAVE_ACUTIME, ,
                                           [Define if <sys/acct.h> has the AC_UTIME field.])
-                                AC_HEADER_EGREP(comp_t.*ac_utime, sys/acct.h,
+                                AC_EGREP_HEADER(comp_t.*ac_utime, sys/acct.h,
                                                 AC_DEFINE(ACUTIME_COMPT, ,
                                                           [Define if <sys/acct.h>'s AC_UTIME field is a COMP_T.]))
                 )
-                AC_HEADER_EGREP(ac_stime, sys/acct.h,
+                AC_EGREP_HEADER(ac_stime, sys/acct.h,
                                 AC_DEFINE(HAVE_ACSTIME, ,
                                           [Define if <sys/acct.h> has the AC_STIME field.])
-                                AC_HEADER_EGREP(comp_t.*ac_stime, sys/acct.h,
+                                AC_EGREP_HEADER(comp_t.*ac_stime, sys/acct.h,
                                                 AC_DEFINE(ACSTIME_COMPT, ,
                                                           [Define if <sys/acct.h>'s AC_STIME field is a COMP_T.]))
                 )
-                AC_HEADER_EGREP(ac_etime, sys/acct.h,
+                AC_EGREP_HEADER(ac_etime, sys/acct.h,
                                 AC_DEFINE(HAVE_ACETIME, ,
                                           [Define if <sys/acct.h> has the AC_ETIME field.])
-                                AC_HEADER_EGREP(comp_t.*ac_etime, sys/acct.h,
+                                AC_EGREP_HEADER(comp_t.*ac_etime, sys/acct.h,
                                                 AC_DEFINE(ACETIME_COMPT, ,
                                                           [Define if <sys/acct.h>'s AC_ETIME field is a COMP_T.]))
                 )
-                AC_HEADER_EGREP(ac_io,    sys/acct.h,
+                AC_EGREP_HEADER(ac_io,    sys/acct.h,
                                 AC_DEFINE(HAVE_ACIO, ,
                                           [Define if <sys/acct.h> has the AC_IO field.])
-                                AC_HEADER_EGREP(comp_t.*ac_io,    sys/acct.h,
+                                AC_EGREP_HEADER(comp_t.*ac_io,    sys/acct.h,
                                                 AC_DEFINE(ACIO_COMPT, ,
                                                           [Define if <sys/acct.h>'s AC_IO field is a COMP_T.]))
                 )
-                AC_HEADER_EGREP(ac_mem,   sys/acct.h,
+                AC_EGREP_HEADER(ac_mem,   sys/acct.h,
                                 AC_DEFINE(HAVE_ACMEM, ,
                                           [Define if <sys/acct.h> has the AC_MEM field.])
-                                AC_HEADER_EGREP(comp_t.*ac_mem,   sys/acct.h,
+                                AC_EGREP_HEADER(comp_t.*ac_mem,   sys/acct.h,
                                                 AC_DEFINE(ACMEM_COMPT, ,
                                                           [Define if <sys/acct.h>'s AC_MEM field is a COMP_T.]))
                 )
-                AC_HEADER_EGREP(ac_minflt,   sys/acct.h,
-                                AC_HEADER_EGREP(ac_majflt,   sys/acct.h,
-                                                AC_HEADER_EGREP(ac_swaps,   sys/acct.h,
+                AC_EGREP_HEADER(ac_minflt,   sys/acct.h,
+                                AC_EGREP_HEADER(ac_majflt,   sys/acct.h,
+                                                AC_EGREP_HEADER(ac_swaps,   sys/acct.h,
                                                                 AC_DEFINE(HAVE_PAGING, ,
                                                                           [Define if <sys/acct.h> has the AC_MINFLT, AC_MAJFLT and AC_SWAPS fields.])
-                                                                AC_HEADER_EGREP(comp_t.*ac_minflt, sys/acct.h,
+                                                                AC_EGREP_HEADER(comp_t.*ac_minflt, sys/acct.h,
                                                                                 AC_DEFINE(ACMINFLT_COMPT, ,
                                                                                           [Define if <sys/acct.h>'s AC_MINFLT field is a COMP_T.]))
-                                                                AC_HEADER_EGREP(comp_t.*ac_mayflt, sys/acct.h,
+                                                                AC_EGREP_HEADER(comp_t.*ac_mayflt, sys/acct.h,
                                                                                 AC_DEFINE(ACMAJFLT_COMPT, ,
                                                                                           [Define if <sys/acct.h>'s AC_MAJFLT field is a COMP_T.]))
-                                                                AC_HEADER_EGREP(comp_t.*ac_swaps, sys/acct.h,
+                                                                AC_EGREP_HEADER(comp_t.*ac_swaps, sys/acct.h,
                                                                                 AC_DEFINE(ACSWAPS_COMPT, ,
                                                                                           [Define if <sys/acct.h>'s AC_SWAPS field is a COMP_T.]))
@@ -353 +357 @@
                                 )
                 )
-                AC_HEADER_EGREP(comp_t,   sys/acct.h, AC_DEFINE(HAVE_COMP_T, ,
+                AC_EGREP_HEADER(comp_t,   sys/acct.h, AC_DEFINE(HAVE_COMP_T, ,
                                                                 [Define if <sys/acct.h> uses the COMP_T type.]))
-                AC_HEADER_EGREP([struct acct_v3],   sys/acct.h, AC_DEFINE(HAVE_ACCT_V3, ,
+                AC_EGREP_HEADER([struct acct_v3],   sys/acct.h, AC_DEFINE(HAVE_ACCT_V3, ,
                                                                 [Define if <sys/acct.h> has struct acct_v3.]))
-                AC_HEADER_EGREP([struct acctv2],    sys/acct.h, AC_DEFINE(HAVE_ACCTV2, ,
+                AC_EGREP_HEADER([struct acctv2],    sys/acct.h, AC_DEFINE(HAVE_ACCTV2, ,
                                                                 [Define if <sys/acct.h> has struct acctv2.]))
 
  )
-
 
 dnl need to check because AIX 4.2 does not have it
@@ -408 +411 @@
         mincore posix_fadvise inotify_init1 scandir
 )
-AC_CHECK_FUNC(statfs, AC_DEFINE(HAVE_STATFS) statfs="yes",  statfs="no")
+AC_CHECK_FUNC([statfs], [
+                        AC_DEFINE([HAVE_STATFS], [1], [have statfs func])
+                        statfs="yes"
+                        ], [statfs="no"])
 SL_CHECK_VA_COPY
 AC_CHECK_FUNCS(vsnprintf, [SL_CHECK_VSNPRINTF])
@@ -417 +423 @@
 fstype=no
 # The order of these tests is important.
-AC_TRY_CPP([#include <sys/statvfs.h>
-#include <sys/fstyp.h>], AC_DEFINE(FSTYPE_STATVFS) fstype=SVR4)
+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sys/statvfs.h>
+#include <sys/fstyp.h>
+]])], [
+      AC_DEFINE([FSTYPE_STATVFS], [1], [statvfs])
+      fstype=SVR4])
+
 if test $fstype = no; then
-AC_TRY_CPP([#include <sys/statfs.h>
-#include <sys/fstyp.h>], AC_DEFINE(FSTYPE_USG_STATFS) fstype=SVR3)
-fi
+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sys/statfs.h>
+#include <sys/fstyp.h>
+]])], [
+      AC_DEFINE([FSTYPE_USG_STATFS], [1], [usg])
+      fstype=SVR3])
+fi
+
 if test $fstype = no; then
-AC_TRY_CPP([#include <sys/statfs.h>
-#include <sys/vmount.h>], AC_DEFINE(FSTYPE_AIX_STATFS) fstype=AIX)
-fi
+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sys/statfs.h>
+#include <sys/vmount.h>
+]])], AC_DEFINE([FSTYPE_AIX_STATFS], [1], [aix]) fstype=AIX)
+fi
+
 if test $fstype = no; then
-AC_TRY_CPP([#include <mntent.h>], AC_DEFINE(FSTYPE_MNTENT) fstype=4.3BSD)
-fi
+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <mntent.h>
+]])], AC_DEFINE([FSTYPE_MNTENT], [1], [mtent]) fstype=4.3BSD)
+fi
+
 if test $fstype = no; then
-AC_EGREP_HEADER(f_type;, sys/mount.h, AC_DEFINE(FSTYPE_STATFS) fstype=4.4BSD/OSF)
-fi
+AC_EGREP_HEADER(f_type;, sys/mount.h, AC_DEFINE([FSTYPE_STATFS], [1], [statfs]) fstype=4.4BSD/OSF)
+fi
+
 if test $fstype = no; then
-AC_TRY_CPP([#include <sys/mount.h>
-#include <sys/fs_types.h>], AC_DEFINE(FSTYPE_GETMNT) fstype=Ultrix)
+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sys/mount.h>
+#include <sys/fs_types.h>
+]])], AC_DEFINE([FSTYPE_GETMNT], [1], [getmnt]) fstype=Ultrix)
 fi
 AC_MSG_RESULT($fstype)
 
 sh_libsocket=
-
 dnl Solaris needs -lsocket and -lnsl. Unisys system includes
 dnl gethostbyname in libsocket but needs libnsl for socket.
@@ -485 +504 @@
                          LIBS="$LIBS -lauparse"
                          sh_auparse=yes
-                         AC_DEFINE(HAVE_AUPARSE_LIB, 1, [Define if you have the auparse lib])
+                         AC_DEFINE([HAVE_AUPARSE_LIB], [1], [Define if you have the auparse lib])
                          ])
 fi
@@ -500 +519 @@
 
 AC_MSG_CHECKING(for socklen_t)
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE(
+[AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -508 +528 @@
 #endif
   socklen_t x;
-], [],[
+]], [[]])],
+[
   AC_MSG_RESULT(yes)
   AC_DEFINE_UNQUOTED([ACCEPT_TYPE_ARG3],[socklen_t], [type of arg3 of accept])
   AC_DEFINE([HAVE_SOCKLEN_T], 1, [Define if you have socklen_t])
 ],[
-  AC_TRY_COMPILE([
+  AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -521 +543 @@
 #endif
     int accept (int, struct sockaddr *, size_t *);
-    ],[],[
+    ]],[[]])],
+    [
       AC_MSG_RESULT(size_t)
       AC_DEFINE_UNQUOTED([ACCEPT_TYPE_ARG3],[size_t], [type of arg3 of accept])
@@ -556 +579 @@
 dnl *****************************************
 
-AC_C_LONG_DOUBLE
+AC_TYPE_LONG_DOUBLE
 SH_CHECK_TYPEDEF(long long, HAVE_LONG_LONG)
 SH_CHECK_TYPEDEF(uint16_t, HAVE_UINT16_T)
@@ -565 +588 @@
    sh_sizeof_unsigned_long_long=`echo "$ac_cv_sizeof_unsigned_long_long" | sed 's%[^0-9]%%g'`
    if test "$sh_sizeof_unsigned_long_long" = "8"; then
-      AC_DEFINE(HAVE_LONG_LONG_64, 1, [Define if you have 64bit long long])
+      AC_DEFINE([HAVE_LONG_LONG_64], [1], [Define if you have 64bit long long])
    fi
 fi
@@ -581 +604 @@
 sh_sizeof_unsigned_long=`echo "$ac_cv_sizeof_unsigned_long" | sed 's%[^0-9]%%g'`
 if test "$sh_sizeof_unsigned_long"  = "4"; then
-        AC_DEFINE(HAVE_LONG_32)
+        AC_DEFINE([HAVE_LONG_32], [1], [long32])
 fi
 if test "$sh_sizeof_unsigned_long"  = "8"; then
-        AC_DEFINE(HAVE_LONG_64)
+        AC_DEFINE([HAVE_LONG_64], [1], [long64])
 fi
 sh_sizeof_unsigned_int=`echo "$ac_cv_sizeof_unsigned_int" | sed 's%[^0-9]%%g'`
 if test "$sh_sizeof_unsigned_int"   = "4"; then
-        AC_DEFINE(HAVE_INT_32)
+        AC_DEFINE([HAVE_INT_32], [1], [int32])
 fi
 sh_sizeof_unsigned_short=`echo "$ac_cv_sizeof_unsigned_short" | sed 's%[^0-9]%%g'`
 if test "$sh_sizeof_unsigned_short" = "4"; then
-        AC_DEFINE(HAVE_SHORT_32)
+        AC_DEFINE([HAVE_SHORT_32], [1], [short32])
 fi
 
@@ -612 +635 @@
 AC_MSG_CHECKING(whether struct stat has a st_flags field)
 AC_CACHE_VAL(e2fsprogs_cv_struct_st_flags,
-        AC_TRY_COMPILE([#include <sys/stat.h>],
-                [struct stat stat; stat.st_flags = 0;],
+        AC_COMPILE_IFELSE(
+                [AC_LANG_PROGRAM([[
+#include <sys/stat.h>
+]],
+                [[struct stat stat; stat.st_flags = 0;]])],
                 [e2fsprogs_cv_struct_st_flags=yes],
-                [e2fsprogs_cv_struct_st_flags=no]))
+                [e2fsprogs_cv_struct_st_flags=no]
+                ))
 AC_MSG_RESULT($e2fsprogs_cv_struct_st_flags)
+
 if test "$e2fsprogs_cv_struct_st_flags" = yes; then
   AC_MSG_CHECKING(whether st_flags field is useful)
   AC_CACHE_VAL(e2fsprogs_cv_struct_st_flags_immut,
-        AC_TRY_COMPILE([#include <sys/stat.h>],
-                [struct stat stat; stat.st_flags |= UF_IMMUTABLE;],
+        AC_COMPILE_IFELSE(
+                [AC_LANG_PROGRAM([[
+#include <sys/stat.h>
+]],
+                [[struct stat stat; stat.st_flags |= UF_IMMUTABLE;]])],
                 [e2fsprogs_cv_struct_st_flags_immut=yes],
-                [e2fsprogs_cv_struct_st_flags_immut=no]))
+                [e2fsprogs_cv_struct_st_flags_immut=no]
+                ))
   AC_MSG_RESULT($e2fsprogs_cv_struct_st_flags_immut)
   if test "$e2fsprogs_cv_struct_st_flags_immut" = yes; then
-          AC_DEFINE(HAVE_STAT_FLAGS)
+          AC_DEFINE([HAVE_STAT_FLAGS], [1], [Have stat flags])
   fi
 fi
@@ -634 +666 @@
 dnl
 AC_MSG_CHECKING(for struct cmsgcred)
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE(
+  [AC_LANG_PROGRAM([[
 #include <sys/types.h>
 #include <sys/socket.h>
-],[
+]],[[
 struct cmsgcred cred;
 
 cred.cmcred_pid = 0;
-],sh_have_struct_cmsgcred=yes,sh_have_struct_cmsgcred=no)
+]])],sh_have_struct_cmsgcred=yes,sh_have_struct_cmsgcred=no)
 AC_MSG_RESULT($sh_have_struct_cmsgcred)
 
 if test x$sh_have_struct_cmsgcred = xyes; then
-    AC_DEFINE(HAVE_STRUCT_CMSGCRED,1,[Have cmsgcred structure])
+    AC_DEFINE([HAVE_STRUCT_CMSGCRED], [1], [Have cmsgcred structure])
 fi
 
 AC_MSG_CHECKING(for struct fcred)
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE(
+  [AC_LANG_PROGRAM([[
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/ucred.h>
-],[
+]],[[
 struct fcred sockcred;
-],sh_have_struct_fcred=yes,sh_have_struct_fcred=no)
+]])],sh_have_struct_fcred=yes,sh_have_struct_fcred=no)
 AC_MSG_RESULT($sh_have_struct_fcred)
 
 if test x$sh_have_struct_fcred = xyes; then
-    AC_DEFINE(HAVE_STRUCT_FCRED,1,[Have fcred structure])
+    AC_DEFINE([HAVE_STRUCT_FCRED], [1], [Have fcred structure])
 fi
 
 AC_MSG_CHECKING(for struct sockcred)
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE(
+  [AC_LANG_PROGRAM([[
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/ucred.h>
-],[
+]],[[
 struct sockcred sockcred;
-],sh_have_struct_sockcred=yes,sh_have_struct_sockcred=no)
+]])],sh_have_struct_sockcred=yes,sh_have_struct_sockcred=no)
 AC_MSG_RESULT($sh_have_struct_sockcred)
 
 if test x$sh_have_struct_sockcred = xyes; then
-    AC_DEFINE(HAVE_STRUCT_SOCKCRED,1,[Have sockcred structure])
+    AC_DEFINE([HAVE_STRUCT_SOCKCRED], [1], [Have sockcred structure])
 fi
 
 AC_MSG_CHECKING(for SO_PEERCRED)
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE(
+  [AC_LANG_PROGRAM([[
 #include <sys/types.h>
 #include <sys/socket.h>
-],[
+]],[[
 int test = SO_PEERCRED;
-],sh_have_SO_PEERCRED=yes,sh_have_SO_PEERCRED=no)
+]])],sh_have_SO_PEERCRED=yes,sh_have_SO_PEERCRED=no)
 AC_MSG_RESULT($sh_have_SO_PEERCRED)
 
 if test x$sh_have_SO_PEERCRED = xyes; then
-    AC_DEFINE(HAVE_SO_PEERCRED,1,[Have SO_PEERCRED define])
+    AC_DEFINE([HAVE_SO_PEERCRED], [1], [Have SO_PEERCRED define])
 fi
 
 AC_MSG_CHECKING(for union semun)
-AC_TRY_COMPILE([#include <sys/types.h>
+AC_COMPILE_IFELSE(
+  [AC_LANG_PROGRAM([[
+#include <sys/types.h>
 #include <sys/ipc.h>
-#include <sys/sem.h>],[union semun foo;], [sh_have_semun=yes], [sh_have_semun=no])
+#include <sys/sem.h>
+]],[[
+union semun foo;
+]])], [sh_have_semun=yes], [sh_have_semun=no])
 AC_MSG_RESULT($sh_have_semun)
 if test x$sh_have_semun = xyes
 then
-  AC_DEFINE(HAVE_UNION_SEMUN, 1, [union semun already defined in sys/ipc.h or sys/sem.h])
+  AC_DEFINE([HAVE_UNION_SEMUN], [1], [union semun already defined in sys/ipc.h or sys/sem.h])
 fi
 
@@ -741 +782 @@
 if test -d "/proc/$$"
 then
-        AC_DEFINE([HAVE_PROCFS],[1],[Define if you have a proc fs])
+        AC_DEFINE([HAVE_PROCFS], [1], [Define if you have a proc fs])
 fi
 
@@ -755 +796 @@
 then
         # LIBS="-lgmp $LIBS"
-        AC_DEFINE(HAVE_LIBGMP, 1, [Have GNU gmp library])
+        AC_DEFINE([HAVE_LIBGMP], [1], [Have GNU gmp library])
 fi
 AC_CHECK_HEADERS(gmp.h)
@@ -773 +814 @@
         AC_MSG_ERROR([Cannot find ps in any of /usr/ucb /bin /usr/bin])
 fi
-AC_DEFINE_UNQUOTED([PSPATH], _("$PS"), [Path to ps])
+AC_DEFINE_UNQUOTED([PSPATH], [_("$PS")], [Path to ps executable])
 
 AC_MSG_CHECKING([how to use ps])
@@ -808 +849 @@
         PSARG="-e"
 fi
-AC_DEFINE_UNQUOTED([PSARG], _("$PSARG"), [Argument for ps])
+AC_DEFINE_UNQUOTED([PSARG], [_("$PSARG")], [Argument for ps])
 AC_MSG_RESULT([$PS $PSARG])
 
@@ -821 +862 @@
         [
         if test "x${enable_db_reload}" = xyes; then
-                AC_DEFINE(RELOAD_DATABASE)
+                AC_DEFINE([RELOAD_DATABASE], [1], [database reload on SIGHUP])
         fi
         ]
@@ -830 +871 @@
         [
         if test "x${enable_xml_log}" = xyes; then
-                AC_DEFINE(SH_USE_XML)
+                AC_DEFINE([SH_USE_XML], [1], [logfile in XML format])
         fi
         ]
@@ -842 +883 @@
                 :
         else
-                AC_DEFINE(SH_WITH_MAIL)
+                AC_DEFINE([SH_WITH_MAIL], [1], [internal SMTP mailer])
         fi
         ],
-        [AC_DEFINE(SH_WITH_MAIL)]
+        [AC_DEFINE([SH_WITH_MAIL], [1], [internal SMTP mailer])]
 )
 
@@ -875 +916 @@
                 :
         else
-                AC_DEFINE(WITH_EXTERNAL)
+                AC_DEFINE([WITH_EXTERNAL], [1], [can use external scripts])
         fi
         ],
-        [AC_DEFINE(WITH_EXTERNAL)]
+        [AC_DEFINE([WITH_EXTERNAL], [1], [can use external scripts])]
 )
 
@@ -886 +927 @@
        if test "x${ac_cv_header_sys_msg_h}" = "xyes"; then
            if test "x${enable_message_queue}" = xyes; then
-               AC_DEFINE(WITH_MESSAGE_QUEUE)
-               AC_DEFINE_UNQUOTED(MESSAGE_QUEUE_MODE, 0700)
+               AC_DEFINE([WITH_MESSAGE_QUEUE], [1], [SysV message queue])
+               AC_DEFINE_UNQUOTED([MESSAGE_QUEUE_MODE], [0700], [mode of message queue])
            elif test "x${enable_message_queue}" != xno; then
                echo "${enableval}" | grep ['[^0123456789]'] >/dev/null 2>&1 &&
@@ -894 +935 @@
                    grep ['0[0123456789][0123456789][0123456789]'] >/dev/null 2>&1 ||
                    AC_MSG_ERROR([With --enable-message-queue=MODE, MODE must be an octal (0nnn) number])
-               AC_DEFINE(WITH_MESSAGE_QUEUE)
-               AC_DEFINE_UNQUOTED(MESSAGE_QUEUE_MODE, ${enable_message_queue})
+               AC_DEFINE([WITH_MESSAGE_QUEUE], [1], [SysV message queue])
+               AC_DEFINE_UNQUOTED([MESSAGE_QUEUE_MODE], [${enable_message_queue}], [mode of message queue])
            fi
        else
@@ -966 +1007 @@
                      [],
                      [ AC_MSG_ERROR([Could not find tcpd.h for libwrap. You need to install tcp_wrappers.]) ])
-     AC_TRY_LINK([ #include <tcpd.h>
-                   int allow_severity; int deny_severity; ],
-                 [ hosts_access((struct request_info *) 0); ],
-                 [ AC_DEFINE(SH_USE_LIBWRAP,1,[Build with tcp wrapper support]) ],
-                 [ AC_MSG_ERROR([Could not find the libwrap library.]) ])
+     AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM([[
+#include <tcpd.h>
+]],[[
+int allow_severity;
+int deny_severity; 
+hosts_access((struct request_info *) 0); ]])],
+        [ AC_DEFINE([SH_USE_LIBWRAP], [1], [Build with tcp wrapper support]) ],
+        [ AC_MSG_ERROR([Could not find the libwrap library.]) ]
+        )
   fi ],
   AC_MSG_RESULT(no)
@@ -1072 +1118 @@
                         
                         *)
-                                AC_DEFINE(SH_COMPILE_STATIC, 1, [Define if compiling static])
+                                AC_DEFINE([SH_COMPILE_STATIC], [1], [Define if compiling static])
                                 sh_no_gcc_static=no
                                 LDFLAGS="$LDFLAGS -static"
@@ -1078 +1124 @@
                     esac
                 else
-                   AC_DEFINE(SH_COMPILE_STATIC, 1, [Define if compiling static])
+                   AC_DEFINE([SH_COMPILE_STATIC], [1], [Define if compiling static])
                    sh_no_gcc_static=yes
                    case "$host_os" in
@@ -1149 +1195 @@
 fi
 AC_CHECK_FUNC(pmap_getmaps, 
-        AC_DEFINE([HAVE_PMAP_GETMAPS], [], [Define if pmap_getmaps available]), [],[])
+        AC_DEFINE([HAVE_PMAP_GETMAPS], [1], [Define if pmap_getmaps available]), [],[])
 
         
@@ -1203 +1249 @@
                AM_PATH_LIBPRELUDE([0.9.6],
                [
-                AC_DEFINE(HAVE_LIBPRELUDE,1,[Have libprelude])
+                AC_DEFINE([HAVE_LIBPRELUDE], [1], [Have libprelude])
                 CFLAGS="$CFLAGS $LIBPRELUDE_PTHREAD_CFLAGS"
                 LDFLAGS="$LDFLAGS $LIBPRELUDE_LDFLAGS"
@@ -1313 +1359 @@
                 CPPFLAGS="$CPPFLAGS -I${MYSQL_INC_DIR}"
           fi  
-          AC_DEFINE(WITH_MYSQL)
-          AC_DEFINE(WITH_DATABASE)
+          AC_DEFINE([WITH_MYSQL], [1], [Use mysql as database])
+          AC_DEFINE([WITH_DATABASE], [1], [Use a database])
           if test "x$zlib_found" = "xyes"
           then
@@ -1343 +1389 @@
           AC_CHECK_HEADERS(mysql/mysql.h)
         elif test "x${withval}" = "xpostgresql"; then
-          AC_DEFINE(WITH_POSTGRES)
-          AC_DEFINE(WITH_DATABASE)
+          AC_DEFINE([WITH_POSTGRES], [1], [Use postgres as database])
+          AC_DEFINE([WITH_DATABASE], [1], [Use a database])
           #
           PGCONF="no"
@@ -1489 +1535 @@
           CPPFLAGS="${CPPFLAGS} -I${ODBC_INC_DIR}"
           LIBS="${LIBS} -L${ODBC_LIB_DIR} -l$ODBC_LIB"
-          AC_DEFINE(WITH_ODBC)
-          AC_DEFINE(WITH_DATABASE)
+          AC_DEFINE([WITH_ODBC], [1], [Use odbc as database])
+          AC_DEFINE([WITH_DATABASE], [1], [Use a database])
 
         elif test "x${withval}" = "xoracle"; then
@@ -1555 +1601 @@
             fi
           fi
-          AC_DEFINE(WITH_ORACLE)
-          AC_DEFINE(WITH_DATABASE)
+          AC_DEFINE([WITH_ORACLE], [1], [Use oracle as database])
+          AC_DEFINE([WITH_DATABASE], [1], [Use a database])
 
         else
@@ -1569 +1615 @@
         if test "x${withval}" != xno; then
                 mycons="$withval"
-                AC_DEFINE_UNQUOTED(DEFAULT_CONSOLE, _("${mycons}") )
+                AC_DEFINE_UNQUOTED([DEFAULT_CONSOLE], [_("${mycons}")], [] )
         fi
         ])
@@ -1583 +1629 @@
         ],
         [myaltcons="NULL"])
-AC_DEFINE_UNQUOTED(ALT_CONSOLE, _("${myaltcons}") )
+AC_DEFINE_UNQUOTED([ALT_CONSOLE], [_("${myaltcons}")], [] )
 
 AC_ARG_WITH(timeserver,
@@ -1590 +1636 @@
         if test "x${withval}" != xno; then
                 mytimeserv="$withval"
-                AC_DEFINE(HAVE_NTIME)
+                AC_DEFINE([HAVE_NTIME], [1], [use time server])
         else
                 mytimeserv="NULL"
@@ -1596 +1642 @@
         ],
         mytimeserv="NULL")
-AC_DEFINE_UNQUOTED(DEFAULT_TIMESERVER, _("${mytimeserv}") )
+AC_DEFINE_UNQUOTED([DEFAULT_TIMESERVER], [_("${mytimeserv}")], []  )
 
 AC_ARG_WITH(alttimeserver,
@@ -1603 +1649 @@
         if test "x${withval}" != xno; then
                 myalttimeserv="$withval"
-                AC_DEFINE(HAVE_NTIME)
+                AC_DEFINE([HAVE_NTIME], [1], [use time server])
         else
                 myalttimeserv="NULL"
@@ -1609 +1655 @@
         ],
         myalttimeserv="NULL")
-AC_DEFINE_UNQUOTED(ALT_TIMESERVER, _("${myalttimeserv}") )
+AC_DEFINE_UNQUOTED([ALT_TIMESERVER], [_("${myalttimeserv}")], []  )
 
 AC_ARG_ENABLE(login-watch,
@@ -1615 +1661 @@
         [
         if test "x${enable_login_watch}" = xyes; then
-                AC_DEFINE(SH_USE_UTMP)
+                AC_DEFINE([SH_USE_UTMP], [1], [watch for login/logout])
         fi
         ]
@@ -1624 +1670 @@
         [
         if test "x${enable_mounts_check}" = xyes; then
-                AC_DEFINE(SH_USE_MOUNTS)
+                AC_DEFINE([SH_USE_MOUNTS], [1], [check mount options])
         fi
         ]
@@ -1635 +1681 @@
            AC_CHECK_HEADER(pcre.h,
                            [ 
-                           AC_DEFINE(USE_LOGFILE_MONITOR, 1, [Define if you want the logfile monitor module.])
+                           AC_DEFINE([USE_LOGFILE_MONITOR], [1], [Define if you want the logfile monitor module.])
                            LIBS="-lpcre $LIBS"
                            ],
@@ -1641 +1687 @@
                                 AC_CHECK_HEADER(pcre/pcre.h,
                                 [
-                                AC_DEFINE(USE_LOGFILE_MONITOR, 1, [Define if you want the logfile monitor module.])
-                                AC_DEFINE(HAVE_PCRE_PCRE_H, 1, [Define if you have pcre/pcre.h.])
+                                AC_DEFINE([USE_LOGFILE_MONITOR], [1], [Define if you want the logfile monitor module.])
+                                AC_DEFINE([HAVE_PCRE_PCRE_H], [1], [Define if you have pcre/pcre.h.])
                                 LIBS="-lpcre $LIBS"
                                 ],
-                                AC_MSG_ERROR([The --enable-logfile-monitor option requires libpcre. For compiling the pcre development package is needed.])
+                                [AC_MSG_ERROR([The --enable-logfile-monitor option requires libpcre. For compiling the pcre development package is needed.])]
                                 )
                           ]
            )
            AC_CHECK_LIB(pcre, pcre_dfa_exec, [
-                              AC_DEFINE([HAVE_PCRE_DFA_EXEC], 1, [Define if you have pcre_dfa_exec])
+                              AC_DEFINE([HAVE_PCRE_DFA_EXEC], [1], [Define if you have pcre_dfa_exec])
                               ], [
                               AC_MSG_WARN([pcre_dfa_exec not available])
@@ -1670 +1716 @@
                 fi
                 LIBS="$LIBS $LIBRT"
-                AC_DEFINE(SH_USE_PROCESSCHECK, [1], [Define if you want to check processes])
+                AC_DEFINE([SH_USE_PROCESSCHECK], [1], [Define if you want to check processes])
         fi
         ]
@@ -1679 +1725 @@
         [
         if test "x${enable_port_check}" = xyes; then
-                AC_DEFINE(SH_USE_PORTCHECK, [1], [Define if you want to check ports])
+                AC_DEFINE([SH_USE_PORTCHECK], [1], [Define if you want to check ports])
         fi
         ]
@@ -1688 +1734 @@
        [
        if test "x${enableval}" = "xyes"; then
-               AC_DEFINE(SH_USE_USERFILES)
+               AC_DEFINE([SH_USE_USERFILES], [1], [check user files])
        fi
        ]
@@ -1698 +1744 @@
         if test "x${enable_debug}" = "xyes"; then
                 if test "x${mydebugflag}" != "xyes"; then
-                        AC_DEFINE(MEM_DEBUG)
+                        AC_DEFINE([MEM_DEBUG], [1], [] )
                 fi
-                AC_DEFINE(WITH_TPT)
-                AC_DEFINE(SL_DEBUG)
-                AC_DEFINE(DNMALLOC_CHECKS, 1, [Debug dnmalloc])
-                AC_DEFINE(PARANOIA, 0, [Paranoia level for dnmalloc])
-                AC_DEFINE(SL_FAIL_ON_ERROR)
+                AC_DEFINE([WITH_TPT], [1], [] )
+                AC_DEFINE([SL_DEBUG], [1], [] )
+                AC_DEFINE([DNMALLOC_CHECKS], [1], [Debug dnmalloc])
+                AC_DEFINE([PARANOIA], [0], [Paranoia level for dnmalloc])
+                AC_DEFINE([SL_FAIL_ON_ERROR], [1], [] )
                 if test "x${myneedg3}" = "xyes"; then
                         mydebugdef="-g3"
@@ -1712 +1758 @@
                 mydebugit="yes"
         elif test "x${enable_debug}" = "xmem"; then
-                AC_DEFINE(MEM_DEBUG)
-                AC_DEFINE(SH_ABORT_ON_ERROR, 1, [Use abort])
+                AC_DEFINE([MEM_DEBUG], [1], [] )
+                AC_DEFINE([SH_ABORT_ON_ERROR], [1], [Use abort])
                 if test "x${myneedg3}" = "xyes"; then
                         mydebugdef="-g3"
@@ -1721 +1767 @@
                 mydebugit="yes"
         elif test "x${enable_debug}" = "xgdb"; then
-                AC_DEFINE(SH_ABORT_ON_ERROR, 1, [Use abort])
+                AC_DEFINE([SH_ABORT_ON_ERROR], [1], [Use abort])
                 if test "x${myneedg3}" = "xyes"; then
                         mydebugdef="-g3"
@@ -1749 +1795 @@
 if test "x${samhain_64_asm}" = xyes; then
         if test "x${sh_enable_asm}" = xyes; then
-           AC_DEFINE([TIGER_OPT_ASM],1,[Define to use tiger x86_64 optimized assembly])
+           AC_DEFINE([TIGER_OPT_ASM], [1], [Define to use tiger x86_64 optimized assembly])
         fi
 fi
@@ -1757 +1803 @@
         [
         if test "x${enable_ipv6}" = xno; then
-                AC_DEFINE(USE_IPV4,1,[Define if you do not want IPv6])
+                AC_DEFINE([USE_IPV4], [1], [Define if you do not want IPv6])
         fi
         ]
@@ -1797 +1843 @@
 
 if test "x${sh_dnmalloc_enabled}" = xno; then
-   AC_DEFINE(USE_SYSTEM_MALLOC,1,[Define if you want to use the system malloc])
+   AC_DEFINE([USE_SYSTEM_MALLOC], [1], [Define if you want to use the system malloc])
 fi
 
@@ -1805 +1851 @@
         if test "x${enable_ptrace}" = xyes; then
                 if test "x$mydebugit" != "xyes"; then
-                        AC_DEFINE(SCREW_IT_UP)
+                        AC_DEFINE([SCREW_IT_UP], [1], [anti debug])
                 fi
         fi
@@ -1878 +1924 @@
 esac
 
+dnl for entropy gathering daemon
 AC_ARG_WITH(egd-socket,
     [  --with-egd-socket=NAME   EGD socket name],
             egd_socket_name="$withval", egd_socket_name="" )
-AC_DEFINE_UNQUOTED(EGD_SOCKET_NAME, _("$egd_socket_name") )
+AC_DEFINE_UNQUOTED([EGD_SOCKET_NAME], [_("$egd_socket_name")], []  )
 
 dnl
@@ -1893 +1940 @@
   ;;
 egd)
-  AC_DEFINE(HAVE_EGD_RANDOM)
+  AC_DEFINE([HAVE_EGD_RANDOM], [1], [entropy gathering daemon])
   try_dev_random=no
   ;;
 unix)
-  AC_DEFINE(HAVE_UNIX_RANDOM)
+  AC_DEFINE([HAVE_UNIX_RANDOM], [1], [unix entropy gathering])
   try_dev_random=no
   ;;
@@ -1906 +1953 @@
   AC_MSG_CHECKING(whether /dev/random exists)
     if test -r "/dev/srandom" && test -c "/dev/srandom"; then
-        AC_DEFINE(HAVE_URANDOM)
-        AC_DEFINE_UNQUOTED(NAME_OF_DEV_RANDOM, _("/dev/srandom") )
+        AC_DEFINE([HAVE_URANDOM], [1], [] )
+        AC_DEFINE_UNQUOTED([NAME_OF_DEV_RANDOM], [_("/dev/srandom")], []  )
         AC_MSG_RESULT(yes)
         if test -r "/dev/urandom" && test -c "/dev/urandom"; then
-          AC_DEFINE_UNQUOTED(NAME_OF_DEV_URANDOM, _("/dev/urandom") )
+          AC_DEFINE_UNQUOTED([NAME_OF_DEV_URANDOM], [_("/dev/urandom")], []  )
         fi
     else
         if test -r "/dev/random" && test -c "/dev/random"; then
-                AC_DEFINE(HAVE_URANDOM)
-                AC_DEFINE_UNQUOTED(NAME_OF_DEV_RANDOM, _("/dev/random") )
+                AC_DEFINE([HAVE_URANDOM], [1], [] )
+                AC_DEFINE_UNQUOTED([NAME_OF_DEV_RANDOM], [_("/dev/random")], []  )
                 AC_MSG_RESULT(yes)
                 if test -r "/dev/urandom" && test -c "/dev/urandom"; then
-                   AC_DEFINE_UNQUOTED(NAME_OF_DEV_URANDOM, _("/dev/urandom") )
+                   AC_DEFINE_UNQUOTED([NAME_OF_DEV_URANDOM], [_("/dev/urandom")], []  )
                 fi
         else
                 AC_MSG_RESULT(no)
-                AC_DEFINE(HAVE_UNIX_RANDOM)
+                AC_DEFINE([HAVE_UNIX_RANDOM], [1], [unix entropy gathering])
         fi
     fi
@@ -1932 +1979 @@
         [
         if test "x${enable_udp}" = xyes; then
-                AC_DEFINE(INET_SYSLOG)
+                AC_DEFINE([INET_SYSLOG], [1], [server may listen on 514/udp for syslog reports])
         fi
         ]
@@ -1947 +1994 @@
 )
 if test "x${myencrypt}" = "xyes"; then
-        AC_DEFINE(SH_ENCRYPT)
-        AC_DEFINE(SH_ENCRYPT_2)
+        AC_DEFINE([SH_ENCRYPT], [1], [client/server encryption])
+        AC_DEFINE([SH_ENCRYPT_2], [1], [client/server encryption v2])
 fi
 
@@ -1961 +2008 @@
 )
 if test "x${sh_use_srp_proto}" = xyes; then
-        AC_DEFINE(USE_SRP_PROTOCOL)
+        AC_DEFINE([USE_SRP_PROTOCOL], [1], [auth with SRP])
 fi
 
@@ -1972 +2019 @@
         ],
         [myport="49777"])
-AC_DEFINE_UNQUOTED(SH_DEFAULT_PORT, ${myport})
+AC_DEFINE_UNQUOTED([SH_DEFAULT_PORT], [${myport}], [TCP port for client/server connection])
 AC_SUBST(myport)
 
@@ -1988 +2035 @@
         ],
         [mylogsrv="NULL"])
-AC_DEFINE_UNQUOTED(DEFAULT_LOGSERVER, _("${mylogsrv}") )
+AC_DEFINE_UNQUOTED([DEFAULT_LOGSERVER], [_("${mylogsrv}")], []  )
 AC_SUBST(mylogsrv)
 
@@ -2004 +2051 @@
         ],
         [myaltlogsrv="NULL"])
-AC_DEFINE_UNQUOTED(ALT_LOGSERVER, _("${myaltlogsrv}"))
+AC_DEFINE_UNQUOTED([ALT_LOGSERVER], [_("${myaltlogsrv}")], [] )
 
 
@@ -2017 +2064 @@
         [
         if test "x${enableval}" != "x"; then
-                AC_DEFINE(SH_STEALTH_NOCL)
+                AC_DEFINE([SH_STEALTH_NOCL], [1], [restrict CL parsing])
         fi
         if test "x${enableval}" = "xstop" || test "x${enableval}" = "xstart"; then
@@ -2034 +2081 @@
         ]
 )
-AC_DEFINE_UNQUOTED(NOCL_CODE, _("${nocl_code}") )
+AC_DEFINE_UNQUOTED([NOCL_CODE], [_("${nocl_code}")], [code to enable CL parsing] )
 AC_SUBST(nocl_code)
 AC_ARG_ENABLE(stealth,
         [  --enable-stealth=XOR_VAL     enable stealth mode [[no]]],
-        [AC_DEFINE(SH_STEALTH)
+        [
+        AC_DEFINE([SH_STEALTH], [1], [enable stealth mode])
         if test "x${enableval}" != "xyes"; then
                 echo "${enableval}" | grep ['[^0123456789]'] >/dev/null 2>&1 &&
@@ -2063 +2111 @@
         [  --enable-micro-stealth=XOR_VAL       enable micro stealth mode [[no]]],
         [
-        AC_DEFINE(SH_STEALTH)
-        AC_DEFINE(SH_STEALTH_MICRO)
+        AC_DEFINE([SH_STEALTH], [1], [enable stealth mode])
+        AC_DEFINE([SH_STEALTH_MICRO], [1], [enable micro stealth mode])
         if test "x${enableval}" != "xyes"; then
                 echo "${enableval}" | grep ['[^0123456789]'] >/dev/null 2>&1 &&
@@ -2139 +2187 @@
         fi
         ])
-AC_DEFINE_UNQUOTED(DEFAULT_IDENT, _("${myident}") )
+AC_DEFINE_UNQUOTED([DEFAULT_IDENT], [_("${myident}")], [use this as install name] )
 AC_SUBST(myident)
 AC_SUBST(need_user_install)
@@ -2148 +2196 @@
 AC_SUBST(xor_code)
 
-AC_DEFINE_UNQUOTED(XOR_CODE, ${xor_code})
-AC_DEFINE_UNQUOTED(SH_SYSCALLTABLE, ${sh_syscalltable})
+AC_DEFINE_UNQUOTED([XOR_CODE], [${xor_code}], [] )
 
 
@@ -2156 +2203 @@
 exepack_state2=`${srcdir}/c_random.sh 2>/dev/null`
 
-AC_DEFINE_UNQUOTED(EXEPACK_STATE_0, ${exepack_state0})
-AC_DEFINE_UNQUOTED(EXEPACK_STATE_1, ${exepack_state1})
-AC_DEFINE_UNQUOTED(EXEPACK_STATE_2, ${exepack_state2})
+AC_DEFINE_UNQUOTED([EXEPACK_STATE_0], [${exepack_state0}], [exepack init key p1])
+AC_DEFINE_UNQUOTED([EXEPACK_STATE_1], [${exepack_state1}], [exepack init key p2])
+AC_DEFINE_UNQUOTED([EXEPACK_STATE_2], [${exepack_state2}], [exepack init key p3])
 
 
@@ -2165 +2212 @@
         [
         if test "x${enableval}" = "xyes"; then 
-                AC_DEFINE(SH_USE_SUIDCHK)
+                AC_DEFINE([SH_USE_SUIDCHK], [1], [check for suid/sgid files])
         fi
         ]
@@ -2236 +2283 @@
 pos_tf=`expr $pos_tf_2 + 1`
 AC_MSG_RESULT(${pos_tf})
-AC_DEFINE_UNQUOTED(POS_TF, ${pos_tf} )
+AC_DEFINE_UNQUOTED([POS_TF], [${pos_tf}], []  )
 
 mykeybase=`echo ${my_key_A},${my_key_B}`
-AC_DEFINE_UNQUOTED(DEFKEY, ${mykeybase} )
+AC_DEFINE_UNQUOTED([DEFKEY], [${mykeybase}], []  )
 AC_SUBST(mykeybase)
 
@@ -2307 +2354 @@
                 fi
           fi
-          AC_DEFINE([WITH_SIG], 1, [Define if signature checking is supported.])
-          AC_DEFINE([WITH_SIGNIFY], 1, [Define if using OpenBSD signify for signature checking.])
-          AC_DEFINE_UNQUOTED([DEFAULT_SIG_PATH], _("${mysignify}"), [Define as path to signing binary])
+          AC_DEFINE([WITH_SIG], [1], [Define if signature checking is supported.])
+          AC_DEFINE([WITH_SIGNIFY], [1], [Define if using OpenBSD signify for signature checking.])
+          AC_DEFINE_UNQUOTED([DEFAULT_SIG_PATH], [_("${mysignify}")], [Define as path to signing binary])
           AC_SUBST(mysignify)
         fi
@@ -2326 +2373 @@
                         fi
                 fi
-                AC_DEFINE([HAVE_SIG_KEY_HASH], 1, [Define if signing binary checksum available.])
-                AC_DEFINE_UNQUOTED([SIG_KEY_HASH], _("${withval}"), [Define as the signify public key checksum.] )
+                AC_DEFINE([HAVE_SIG_KEY_HASH], [1], [Define if signing binary checksum available.])
+                AC_DEFINE_UNQUOTED([SIG_KEY_HASH], [_("${withval}")], [Define as the signify public key checksum.] )
         fi
         ]
@@ -2397 +2444 @@
                 fi
           fi
-          AC_DEFINE([WITH_SIG], 1, [Define if signature checking is supported.])
-          AC_DEFINE(WITH_GPG)
-          AC_DEFINE_UNQUOTED([DEFAULT_SIG_PATH], _("${mygpg}"), [Define as path to signing binary])
+          AC_DEFINE([WITH_SIG], [1], [Define if signature checking is supported.])
+          AC_DEFINE([WITH_GPG], [1], [] )
+          AC_DEFINE_UNQUOTED([DEFAULT_SIG_PATH], [_("${mygpg}")], [Define as path to signing binary])
           AC_SUBST(mygpg)
         fi
@@ -2444 +2491 @@
                         fi
                 fi
-                AC_DEFINE([HAVE_SIG_CHECKSUM], 1, [Define if signing binary checksum available.])
-                AC_DEFINE_UNQUOTED([SIG_HASH], _("${mychk}"), [Define as the signing binary TIGER192 checksum.] )
+                AC_DEFINE([HAVE_SIG_CHECKSUM], [1], [Define if signing binary checksum available.])
+                AC_DEFINE_UNQUOTED([SIG_HASH], [_("${mychk}")], [Define as the signing binary TIGER192 checksum.] )
                 echo "${mychk}" | sed 's,.*:,,g' | sed 's, ,,g' | sed 's,\(.\),\1:,g' | awk '{ split($0, arr, ":"); m = length($1)/2; print "#ifndef CHKSUM_H"; print "#define CHKSUM_H"; print "char sigchk[50];"; for (i=1; i <= m; i++) printf "sigchk[%d] = %c%s%c;\n", i-1, 39, arr[i], 39; printf "sigchk[48] = %c%c0%c;\n", 39, 92, 39; print "#endif"; }' > sh_sig_chksum.h 
         fi
@@ -2453 +2500 @@
         then
                 if test "x${mychk}" != "x"; then
-                        AC_DEFINE([HAVE_SIG_CHECKSUM], 1, [Define if signing binary checksum available.])
-                        AC_DEFINE_UNQUOTED([SIG_HASH], _("${mychk}"), [Define as the signing binary TIGER192 checksum.] )
+                        AC_DEFINE([HAVE_SIG_CHECKSUM], [1], [Define if signing binary checksum available.])
+                        AC_DEFINE_UNQUOTED([SIG_HASH], [_("${mychk}")], [Define as the signing binary TIGER192 checksum.] )
                         echo "${mychk}" | sed 's,.*:,,g' | sed 's, ,,g' | sed 's,\(.\),\1:,g' | awk '{ split($0, arr, ":"); m = length($1)/2; print "#ifndef CHKSUM_H"; print "#define CHKSUM_H"; print "char sigchk[50];"; for (i=1; i <= m; i++) printf "sigchk[%d] = %c%s%c;\n", i-1, 39, arr[i], 39; printf "sigchk[48] = %c%c0%c;\n", 39, 92, 39; print "#endif"; }' > sh_sig_chksum.h 
                 fi
@@ -2475 +2522 @@
                         then
                                 myfp="${withval0}"
-                                AC_DEFINE(USE_FINGERPRINT)
-                                AC_DEFINE_UNQUOTED(SH_GPG_FP, _("${myfp}") )
+                                AC_DEFINE([USE_FINGERPRINT], [1], [] )
+                                AC_DEFINE_UNQUOTED([SH_GPG_FP], [_("${myfp}")], []  )
                                 echo "${myfp}" | sed 's,.*:,,g' | sed 's, ,,g' | sed 's,\(.\),\1:,g' | awk '{ split($0, arr, ":"); m = length($1)/2; print "#ifndef FINGERPRINT_H"; print "#define FINGERPRINT_H"; printf "char gpgfp[%d];\n", m+1; for (i=1; i <= m; i++) printf "gpgfp[%d] = %c%s%c;\n", i-1, 39, arr[i], 39; printf "gpgfp[%d] = %c%c0%c;\n", m, 39, 92, 39; print "#endif"; }' > sh_gpg_fp.h 
                         else
@@ -2516 +2563 @@
         ],
         [myrcp="NULL"])
-AC_DEFINE_UNQUOTED(DEFAULT_MAILADDRESS, _("${myrcp}") )
+AC_DEFINE_UNQUOTED([DEFAULT_MAILADDRESS], [_("${myrcp}")], []  )
 
 
@@ -2527 +2574 @@
         mysender="daemon"
         ])
-AC_DEFINE_UNQUOTED(DEFAULT_SENDER, _("${mysender}") )
+AC_DEFINE_UNQUOTED([DEFAULT_SENDER], [_("${mysender}")], []  )
 
 
@@ -2555 +2602 @@
         ],
         [mytrust="0"] )
-AC_DEFINE_UNQUOTED(SL_ALWAYS_TRUSTED, ${mytrust} )
+AC_DEFINE_UNQUOTED([SL_ALWAYS_TRUSTED], [${mytrust}], [UIDs of trusted users] )
 AC_SUBST(mytrust)
 
@@ -2565 +2612 @@
         if test "x${cross_compiling}" = xyes; then
                 mytmpdir="$withval"
-                AC_DEFINE_UNQUOTED(SH_TMPDIR, _("${mytmpdir}") )
+                AC_DEFINE_UNQUOTED([SH_TMPDIR], [_("${mytmpdir}")], []  )
         else
                 if test -d "${withval}"; then
                         mytmpdir="$withval"
-                        AC_DEFINE_UNQUOTED(SH_TMPDIR, _("${mytmpdir}") )
+                        AC_DEFINE_UNQUOTED([SH_TMPDIR], [_("${mytmpdir}")], []  )
                 else
                         mytmpdir="$withval"
-                        AC_DEFINE_UNQUOTED(SH_TMPDIR, _("${mytmpdir}") )
+                        AC_DEFINE_UNQUOTED([SH_TMPDIR], [_("${mytmpdir}")], []  )
                         AC_MSG_WARN([--with-tmp-dir: tmp directory ${withval} does not exist])
                 fi
@@ -2672 +2719 @@
         ]
 )
-AC_DEFINE_UNQUOTED(DEFAULT_CONFIGFILE, _("${myconffile}") )
+AC_DEFINE_UNQUOTED([DEFAULT_CONFIGFILE], [_("${myconffile}")], []  )
 AC_SUBST(myconffile)
 AC_SUBST(myrpmconffile)
@@ -2694 +2741 @@
         ]
 )
-AC_DEFINE_UNQUOTED(DEFAULT_ERRFILE, _("${mylogfile}") )
-AC_DEFINE_UNQUOTED(DEFAULT_LOGDIR, _("${mylogdir}") )
+AC_DEFINE_UNQUOTED([DEFAULT_ERRFILE], [_("${mylogfile}")], []  )
+AC_DEFINE_UNQUOTED([DEFAULT_LOGDIR], [_("${mylogdir}")], []  )
 AC_SUBST(mylogfile)
 AC_SUBST(mylogdir)
@@ -2717 +2764 @@
         ]
 )
-AC_DEFINE_UNQUOTED(DEFAULT_ERRLOCK, _("${mylockfile}") )
-AC_DEFINE_UNQUOTED(DEFAULT_PIDDIR, _("${mylockdir}") )
+AC_DEFINE_UNQUOTED([DEFAULT_ERRLOCK], [_("${mylockfile}")], []  )
+AC_DEFINE_UNQUOTED([DEFAULT_PIDDIR], [_("${mylockdir}")], []  )
 AC_SUBST(mylockfile)
 AC_SUBST(mylockdir)
@@ -2755 +2802 @@
         myrpmdatafile="${mydatafile}"
         ])
-AC_DEFINE_UNQUOTED(DEFAULT_DATA_FILE, _("${mydatafile}") )
+AC_DEFINE_UNQUOTED([DEFAULT_DATA_FILE], [_("${mydatafile}")], []  )
 AC_SUBST(mydatafile)
 AC_SUBST(myrpmdatafile)
 
-AC_DEFINE_UNQUOTED(DEFAULT_DATAROOT, _("${mydataroot}") )
+AC_DEFINE_UNQUOTED([DEFAULT_DATAROOT], [_("${mydataroot}")], []  )
 AC_SUBST(mydataroot)
 
-AC_DEFINE_UNQUOTED(DEFAULT_QDIR, _("${mydataroot}/.quarantine") )
+AC_DEFINE_UNQUOTED([DEFAULT_QDIR], [_("${mydataroot}/.quarantine")], []  )
 AC_SUBST(myqdir)
 
@@ -2774 +2821 @@
         myhtmlfile="${mylogdir}/${install_name}.html"
         ])
-AC_DEFINE_UNQUOTED(DEFAULT_HTML_FILE, _("${myhtmlfile}") )
+AC_DEFINE_UNQUOTED([DEFAULT_HTML_FILE], [_("${myhtmlfile}")], []  )
 AC_SUBST(myhtmlfile)
 
@@ -2790 +2837 @@
 
 
-AC_DEFINE_UNQUOTED(SH_INSTALL_DIR,  _("${sbindir}"))
-AC_DEFINE_UNQUOTED(SH_INSTALL_PATH, _("${sbindir}/${install_name}"))
-AC_DEFINE_UNQUOTED(SH_INSTALL_NAME, _("${install_name}"))
-
-AC_CONFIG_HEADER(config.h)
-
-AC_OUTPUT(
-[
+AC_DEFINE_UNQUOTED([SH_INSTALL_DIR],  [_("${sbindir}")], [] )
+AC_DEFINE_UNQUOTED([SH_INSTALL_PATH], [_("${sbindir}/${install_name}")], [] )
+AC_DEFINE_UNQUOTED([SH_INSTALL_NAME], [_("${install_name}")], [] )
+
+AH_TOP([
+#ifndef SH_CONFIG_H
+#define SH_CONFIG_H
+])
+AH_BOTTOM([
+#ifdef SH_STEALTH
+char * globber(const char * string);
+#define _(string) globber(string) 
+#define N_(string) string
+#else
+#define _(string)  string 
+#define N_(string) string
+#endif
+
+#endif
+])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_FILES([
 Makefile
 samhain-install.sh
@@ -2823 +2884 @@
 scripts/check_samhain.pl
 deploy.sh
-],
-[
+])
+AC_CONFIG_COMMANDS([stamp-h],[
 echo timestamp > stamp-h
 chmod +x samhain-install.sh
@@ -2833 +2894 @@
 ]
 )
+AC_OUTPUT
 
 chmod +x deploy.sh

trunk/docs/Changelog

@@ -1 +1 @@
 4.5.2
+        * fix autoreconf (problem reported by Pascal de Bruijn)
         * add missing items to distclean Makefile target (problem
         reported by Pascal de Bruijn)

trunk/include/sh_trace.h

@@ -5 +5 @@
 /* This file should be included via samhain.h only.
  */
+#ifdef SL_DEBUG
+#define SDG_0RETU _("return.\n")
+#define SDG_TERRO _("ERROR: file=<%s>, line=<%d>, reason=<%s>\n")
+#define SDG_AERRO _("ERROR: file=<%s>, line=<%d>, failed_assertion=<%s>\n")
+#define SDG_AFAIL _("FAILED: file=<%s>, line=<%d>, assertion=<%s>\n")
+#define SDG_ENTER _("enter=<%s>\n")
+#define SDG_RETUR _("return=<%s>.\n")
+#define SDG_ERROR _("error=<%ld>.\n")
+#endif
 
 #ifdef SL_DEBUG

trunk/include/sh_unix.h

@@ -391 +391 @@
 
 #ifdef HAVE_GETTIMEOFDAY
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
 #endif
 

trunk/include/slib.h

@@ -533 +533 @@
     /*@i@*/ if (assertion) ;                           \
     else {                                             \
-        dlog(0, FIL__, __LINE__, SDG_AFAIL,            \
+        dlog(0, FIL__, __LINE__, _("FAILED: file=<%s>, line=<%d>, assertion=<%s>\n"),            \
                  FIL__, __LINE__, astext);             \
         _exit(EXIT_FAILURE);                           \
@@ -621 +621 @@
 do {                                                                \
    if((long)(x) < 0) {                                              \
-      TPT((0,    FIL__, __LINE__, SDG_ERROR, (long)(x)))            \
+      TPT((0,    FIL__, __LINE__, _("error=<%ld>.\n"), (long)(x)))            \
       sl_errno=(x);                                                 \
     }                                                               \

trunk/src/minilzo.c

@@ -82 +82 @@
 #else
 #  include <sys/types.h>
-#  if defined(STDC_HEADERS)
+#  if defined(__STDC__)
 #    include <string.h>
 #    include <stdlib.h>
-#  endif
-#  if defined(HAVE_STDDEF_H)
 #    include <stddef.h>
-#  endif
-#  if defined(HAVE_MEMORY_H)
 #    include <memory.h>
 #  endif

trunk/src/samhain.c

@@ -34 +34 @@
 #include <errno.h>
 
-
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
 
 #ifdef HAVE_MEMORY_H

trunk/src/sh_entropy.c

@@ -30 +30 @@
 #endif
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
-
 
 #include <stdlib.h>

trunk/src/sh_extern.c

@@ -74 +74 @@
 #include <sys/wait.h>
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
-
 
 #include "samhain.h"

trunk/src/sh_getopt.c

@@ -624 +624 @@
   fprintf (stdout,
            _("This is samhain (%s), "\
-             "(c) 1999-2008 Rainer Wichmann (http://la-samhna.de).\n"),
+             "(c) 1999-2024 Rainer Wichmann (http://la-samhna.de).\n"),
            VERSION);
   fprintf (stdout, "%s",_("This software comes with ABSOLUTELY NO WARRANTY. "));
@@ -714 +714 @@
   fprintf (stdout,
            _("This is samhain (%s), "\
-             "(c) 1999-2006 Rainer Wichmann (http://la-samhna.de).\n"),
+             "(c) 1999-2024 Rainer Wichmann (http://la-samhna.de).\n"),
            VERSION);
   fprintf (stdout, "%s",_("This software comes with ABSOLUTELY NO WARRANTY. "));

trunk/src/sh_hash.c

@@ -2882 +2882 @@
 } 
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
 
 static int ListFullDetail    = S_FALSE;

trunk/src/sh_html.c

@@ -24 +24 @@
 #include <stdlib.h>
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
+
 #include <unistd.h>
 

trunk/src/sh_login_track.c

@@ -58 +58 @@
 
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
-
 
 #define SH_LTRACK_VERSION 1

trunk/src/sh_mail.c

@@ -34 +34 @@
 #if defined(SH_WITH_MAIL)
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
-
 
 #ifdef HAVE_MEMORY_H

trunk/src/sh_prelude.c

@@ -41 +41 @@
 #include <sys/types.h>
 
-#if TIME_WITH_SYS_TIME
-
-# include <sys/time.h>
-# include <time.h>
-
-#else
-
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-
-#endif
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <time.h>
 
 #include <unistd.h>

trunk/src/sh_schedule.c

@@ -42 +42 @@
 #endif
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
 
 #include "samhain.h"

trunk/src/sh_socket.c

@@ -33 +33 @@
 #include <string.h>
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
 
 #include "samhain.h"

trunk/src/sh_srp.c

@@ -28 +28 @@
 
 #ifdef USE_SRP_PROTOCOL
+
+/* dont modify this, unless you know what you do
+ */
+#define SRP_GENERATOR_1024      "2"
+#define SRP_MODULUS_1024_1        \
+_("f488fd584e49dbcd20b49de49107366b336c380d451d0f7c88b31c7c5b2d8ef6") 
+#define SRP_MODULUS_1024_2        \
+_("f3c923c043f0a55b188d8ebb558cb85d38d334fd7c175743a31d186cde33212c") 
+#define SRP_MODULUS_1024_3        \
+_("b52aff3ce1b1294018118d7c84a70a72d686c40319c807297aca950cd9969fab")
+#define SRP_MODULUS_1024_4        \
+_("d00a509b0246d3083d66a45d419f9c7cbd894b221926baaba25ec355e92f78c7")
+
 
 #if (defined (SH_WITH_CLIENT) || defined (SH_WITH_SERVER))

trunk/src/sh_suidchk.c

@@ -42 +42 @@
 #if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) 
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
 
 #ifdef HAVE_DIRENT_H

trunk/src/sh_unix.c

@@ -58 +58 @@
 #endif
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
 
 #ifdef HAVE_SYS_SELECT_H

trunk/src/sh_utils.c

@@ -27 +27 @@
 #include <unistd.h>
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
-
 
 #include "samhain.h"

trunk/src/sh_xfer_client.c

@@ -59 +59 @@
 #endif
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
 
 #ifdef HAVE_SYS_SELECT_H

trunk/src/sh_xfer_server.c

@@ -59 +59 @@
 #endif
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
-
-/*
-#ifdef TM_IN_SYS_TIME
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-*/
 
 #ifdef HAVE_SYS_SELECT_H

trunk/src/sh_xfer_syslog.c

@@ -32 +32 @@
 #include <netinet/in.h>
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
 
 #include <unistd.h>

trunk/src/slib.c

@@ -35 +35 @@
 #endif
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
 
 #ifdef HAVE_MEMORY_H