diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2019-04-30 09:44:38 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-04-30 09:45:08 -0700 |
| commit | 46b434a62cea06bdcb3c8d9ee18284ab59e9b012 (patch) | |
| tree | b14b9963adc009ecbf2f380630bf443a57f2ee87 /build-aux | |
| parent | 826f1e260121edc5185e0ed3fa20a781fbddc9a2 (diff) | |
| download | emacs-46b434a62cea06bdcb3c8d9ee18284ab59e9b012.tar.gz | |
Update from Gnulib
* build-aux/config.guess, doc/misc/texinfo.tex:
* lib/mktime-internal.h, lib/mktime.c, lib/timegm.c:
Copy from Gnulib.
* lib/gnulib.mk.in: Regenerate.
Diffstat (limited to 'build-aux')
| -rwxr-xr-x | build-aux/config.guess | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/build-aux/config.guess b/build-aux/config.guess index 79d1317f52b..4cd9454b35c 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2019 Free Software Foundation, Inc. -timestamp='2019-03-04' +timestamp='2019-04-28' # 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 @@ -1468,6 +1468,14 @@ cat > "$dummy.c" <<EOF #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) @@ -1555,18 +1563,23 @@ main () 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__) -#include <signal.h> -#if defined(_SIZE_T_) /* >= ULTRIX4 */ - printf ("mips-dec-ultrix4\n"); exit (0); +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname *un; + uname (&un); + printf ("mips-dec-ultrix%s\n", un.release); exit (0); #else -#if defined(ULTRIX3) || defined(ultrix3) || defined(SIGLOST) - printf ("mips-dec-ultrix3\n"); exit (0); -#endif + printf ("mips-dec-ultrix\n"); exit (0); #endif #endif #endif |