Browse code

Autojunk'd

Micah Snyder authored on 2019/11/05 07:44:13
Showing 45 changed files
... ...
@@ -1,7 +1,7 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
 
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -37,7 +37,17 @@
37 37
 
38 38
 
39 39
 VPATH = @srcdir@
40
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
40
+am__is_gnu_make = { \
41
+  if test -z '$(MAKELEVEL)'; then \
42
+    false; \
43
+  elif test -n '$(MAKE_HOST)'; then \
44
+    true; \
45
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
46
+    true; \
47
+  else \
48
+    false; \
49
+  fi; \
50
+}
41 51
 am__make_running_with_option = \
42 52
   case $${target_option-} in \
43 53
       ?) ;; \
... ...
@@ -105,34 +115,6 @@ target_triplet = @target@
105 105
 @ENABLE_LIBFRESHCLAM_TRUE@am__append_2 = libfreshclam
106 106
 @ENABLE_FUZZ_TRUE@am__append_3 = fuzz
107 107
 subdir = .
108
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
109
-	$(top_srcdir)/configure $(am__configure_deps) \
110
-	$(srcdir)/clamav-config.h.in \
111
-	$(top_srcdir)/libclammspack/config.h.in \
112
-	$(srcdir)/clamav-config.in $(srcdir)/libclamav.pc.in \
113
-	$(srcdir)/platform.h.in \
114
-	$(top_srcdir)/docs/man/clamav-milter.8.in \
115
-	$(top_srcdir)/docs/man/clamav-milter.conf.5.in \
116
-	$(top_srcdir)/docs/man/clambc.1.in \
117
-	$(top_srcdir)/docs/man/clamconf.1.in \
118
-	$(top_srcdir)/docs/man/clamd.8.in \
119
-	$(top_srcdir)/docs/man/clamd.conf.5.in \
120
-	$(top_srcdir)/docs/man/clamdscan.1.in \
121
-	$(top_srcdir)/docs/man/clamscan.1.in \
122
-	$(top_srcdir)/docs/man/freshclam.1.in \
123
-	$(top_srcdir)/docs/man/freshclam.conf.5.in \
124
-	$(top_srcdir)/docs/man/sigtool.1.in \
125
-	$(top_srcdir)/docs/man/clamdtop.1.in \
126
-	$(top_srcdir)/docs/man/clamsubmit.1.in \
127
-	$(srcdir)/clamav-types.h.in COPYING config/ar-lib \
128
-	config/compile config/config.guess config/config.rpath \
129
-	config/config.sub config/install-sh config/missing \
130
-	config/ylwrap config/ltmain.sh $(top_srcdir)/config/ar-lib \
131
-	$(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \
132
-	$(top_srcdir)/config/config.rpath \
133
-	$(top_srcdir)/config/config.sub \
134
-	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
135
-	$(top_srcdir)/config/missing
136 108
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
137 109
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
138 110
 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \
... ...
@@ -213,6 +195,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
213 213
 	$(top_srcdir)/configure.ac
214 214
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
215 215
 	$(ACLOCAL_M4)
216
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
217
+	$(am__configure_deps) $(am__DIST_COMMON)
216 218
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
217 219
  configure.lineno config.status.lineno
218 220
 mkinstalldirs = $(install_sh) -d
... ...
@@ -316,6 +300,32 @@ CSCOPE = cscope
316 316
 DIST_SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam \
317 317
 	sigtool clamconf database docs etc clamav-milter test clamdtop \
318 318
 	clambc unit_tests clamsubmit libfreshclam fuzz
319
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/clamav-config.h.in \
320
+	$(srcdir)/clamav-config.in $(srcdir)/clamav-types.h.in \
321
+	$(srcdir)/libclamav.pc.in $(srcdir)/platform.h.in \
322
+	$(top_srcdir)/config/ar-lib $(top_srcdir)/config/compile \
323
+	$(top_srcdir)/config/config.guess \
324
+	$(top_srcdir)/config/config.rpath \
325
+	$(top_srcdir)/config/config.sub \
326
+	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
327
+	$(top_srcdir)/config/missing \
328
+	$(top_srcdir)/docs/man/clamav-milter.8.in \
329
+	$(top_srcdir)/docs/man/clamav-milter.conf.5.in \
330
+	$(top_srcdir)/docs/man/clambc.1.in \
331
+	$(top_srcdir)/docs/man/clamconf.1.in \
332
+	$(top_srcdir)/docs/man/clamd.8.in \
333
+	$(top_srcdir)/docs/man/clamd.conf.5.in \
334
+	$(top_srcdir)/docs/man/clamdscan.1.in \
335
+	$(top_srcdir)/docs/man/clamdtop.1.in \
336
+	$(top_srcdir)/docs/man/clamscan.1.in \
337
+	$(top_srcdir)/docs/man/clamsubmit.1.in \
338
+	$(top_srcdir)/docs/man/freshclam.1.in \
339
+	$(top_srcdir)/docs/man/freshclam.conf.5.in \
340
+	$(top_srcdir)/docs/man/sigtool.1.in \
341
+	$(top_srcdir)/libclammspack/config.h.in COPYING config/ar-lib \
342
+	config/compile config/config.guess config/config.rpath \
343
+	config/config.sub config/install-sh config/ltmain.sh \
344
+	config/missing config/ylwrap
319 345
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
320 346
 distdir = $(PACKAGE)-$(VERSION)
321 347
 top_distdir = $(distdir)
... ...
@@ -581,6 +591,7 @@ pdfdir = @pdfdir@
581 581
 prefix = @prefix@
582 582
 program_transform_name = @program_transform_name@
583 583
 psdir = @psdir@
584
+runstatedir = @runstatedir@
584 585
 sbindir = @sbindir@
585 586
 sharedstatedir = @sharedstatedir@
586 587
 srcdir = @srcdir@
... ...
@@ -629,7 +640,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
629 629
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
630 630
 	$(am__cd) $(top_srcdir) && \
631 631
 	  $(AUTOMAKE) --foreign Makefile
632
-.PRECIOUS: Makefile
633 632
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
634 633
 	@case '$?' in \
635 634
 	  *config.status*) \
... ...
@@ -981,7 +991,7 @@ distdir: $(DISTFILES)
981 981
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
982 982
 	|| chmod -R a+r "$(distdir)"
983 983
 dist-gzip: distdir
984
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
984
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
985 985
 	$(am__post_remove_distdir)
986 986
 dist-bzip2: distdir
987 987
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
... ...
@@ -996,17 +1006,17 @@ dist-xz: distdir
996 996
 	$(am__post_remove_distdir)
997 997
 
998 998
 dist-tarZ: distdir
999
-	@echo WARNING: "Support for shar distribution archives is" \
1000
-	               "deprecated." >&2
999
+	@echo WARNING: "Support for distribution archives compressed with" \
1000
+		       "legacy program 'compress' is deprecated." >&2
1001 1001
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
1002 1002
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
1003 1003
 	$(am__post_remove_distdir)
1004 1004
 
1005 1005
 dist-shar: distdir
1006
-	@echo WARNING: "Support for distribution archives compressed with" \
1007
-		       "legacy program 'compress' is deprecated." >&2
1006
+	@echo WARNING: "Support for shar distribution archives is" \
1007
+	               "deprecated." >&2
1008 1008
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
1009
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
1009
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
1010 1010
 	$(am__post_remove_distdir)
1011 1011
 
1012 1012
 dist-zip: distdir
... ...
@@ -1024,7 +1034,7 @@ dist dist-all:
1024 1024
 distcheck: dist
1025 1025
 	case '$(DIST_ARCHIVES)' in \
1026 1026
 	*.tar.gz*) \
1027
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
1027
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
1028 1028
 	*.tar.bz2*) \
1029 1029
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
1030 1030
 	*.tar.lz*) \
... ...
@@ -1034,23 +1044,23 @@ distcheck: dist
1034 1034
 	*.tar.Z*) \
1035 1035
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
1036 1036
 	*.shar.gz*) \
1037
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
1037
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
1038 1038
 	*.zip*) \
1039 1039
 	  unzip $(distdir).zip ;;\
1040 1040
 	esac
1041 1041
 	chmod -R a-w $(distdir)
1042 1042
 	chmod u+w $(distdir)
1043
-	mkdir $(distdir)/_build $(distdir)/_inst
1043
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
1044 1044
 	chmod a-w $(distdir)
1045 1045
 	test -d $(distdir)/_build || exit 0; \
1046 1046
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
1047 1047
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
1048 1048
 	  && am__cwd=`pwd` \
1049
-	  && $(am__cd) $(distdir)/_build \
1050
-	  && ../configure \
1049
+	  && $(am__cd) $(distdir)/_build/sub \
1050
+	  && ../../configure \
1051 1051
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
1052 1052
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
1053
-	    --srcdir=.. --prefix="$$dc_install_base" \
1053
+	    --srcdir=../.. --prefix="$$dc_install_base" \
1054 1054
 	  && $(MAKE) $(AM_MAKEFLAGS) \
1055 1055
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
1056 1056
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
... ...
@@ -1235,6 +1245,8 @@ uninstall-am: uninstall-binSCRIPTS uninstall-nodist_includeHEADERS \
1235 1235
 	uninstall-am uninstall-binSCRIPTS \
1236 1236
 	uninstall-nodist_includeHEADERS uninstall-pkgconfigDATA
1237 1237
 
1238
+.PRECIOUS: Makefile
1239
+
1238 1240
 lcov:
1239 1241
 	($(MAKE); cd unit_tests; $(MAKE) lcov)
1240 1242
 quick-check:
... ...
@@ -1,6 +1,6 @@
1
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
1
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
2 2
 
3
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
3
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
4 4
 
5 5
 # This file is free software; the Free Software Foundation
6 6
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -20,32 +20,63 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
20 20
 If you have problems, you may need to regenerate the build system entirely.
21 21
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
22 22
 
23
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
24
-# serial 1 (pkg-config-0.24)
25
-# 
26
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
27
-#
28
-# This program is free software; you can redistribute it and/or modify
29
-# it under the terms of the GNU General Public License as published by
30
-# the Free Software Foundation; either version 2 of the License, or
31
-# (at your option) any later version.
32
-#
33
-# This program is distributed in the hope that it will be useful, but
34
-# WITHOUT ANY WARRANTY; without even the implied warranty of
35
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
36
-# General Public License for more details.
37
-#
38
-# You should have received a copy of the GNU General Public License
39
-# along with this program; if not, write to the Free Software
40
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
41
-#
42
-# As a special exception to the GNU General Public License, if you
43
-# distribute this file as part of a program that contains a
44
-# configuration script generated by Autoconf, you may include it under
45
-# the same distribution terms that you use for the rest of that program.
46
-
47
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
48
-# ----------------------------------
23
+dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
24
+dnl serial 11 (pkg-config-0.29.1)
25
+dnl
26
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
27
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
28
+dnl
29
+dnl This program is free software; you can redistribute it and/or modify
30
+dnl it under the terms of the GNU General Public License as published by
31
+dnl the Free Software Foundation; either version 2 of the License, or
32
+dnl (at your option) any later version.
33
+dnl
34
+dnl This program is distributed in the hope that it will be useful, but
35
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
36
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
37
+dnl General Public License for more details.
38
+dnl
39
+dnl You should have received a copy of the GNU General Public License
40
+dnl along with this program; if not, write to the Free Software
41
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
42
+dnl 02111-1307, USA.
43
+dnl
44
+dnl As a special exception to the GNU General Public License, if you
45
+dnl distribute this file as part of a program that contains a
46
+dnl configuration script generated by Autoconf, you may include it under
47
+dnl the same distribution terms that you use for the rest of that
48
+dnl program.
49
+
50
+dnl PKG_PREREQ(MIN-VERSION)
51
+dnl -----------------------
52
+dnl Since: 0.29
53
+dnl
54
+dnl Verify that the version of the pkg-config macros are at least
55
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
56
+dnl installed version of pkg-config, this checks the developer's version
57
+dnl of pkg.m4 when generating configure.
58
+dnl
59
+dnl To ensure that this macro is defined, also add:
60
+dnl m4_ifndef([PKG_PREREQ],
61
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
62
+dnl
63
+dnl See the "Since" comment for each macro you use to see what version
64
+dnl of the macros you require.
65
+m4_defun([PKG_PREREQ],
66
+[m4_define([PKG_MACROS_VERSION], [0.29.1])
67
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
68
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
69
+])dnl PKG_PREREQ
70
+
71
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
72
+dnl ----------------------------------
73
+dnl Since: 0.16
74
+dnl
75
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
76
+dnl first found in the path. Checks that the version of pkg-config found
77
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
78
+dnl used since that's the first version where most current features of
79
+dnl pkg-config existed.
49 80
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
50 81
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
51 82
 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
... ...
@@ -67,18 +98,19 @@ if test -n "$PKG_CONFIG"; then
67 67
 		PKG_CONFIG=""
68 68
 	fi
69 69
 fi[]dnl
70
-])# PKG_PROG_PKG_CONFIG
70
+])dnl PKG_PROG_PKG_CONFIG
71 71
 
72
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
73
-#
74
-# Check to see whether a particular set of modules exists.  Similar
75
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
76
-#
77
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
78
-# only at the first occurence in configure.ac, so if the first place
79
-# it's called might be skipped (such as if it is within an "if", you
80
-# have to call PKG_CHECK_EXISTS manually
81
-# --------------------------------------------------------------
72
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
73
+dnl -------------------------------------------------------------------
74
+dnl Since: 0.18
75
+dnl
76
+dnl Check to see whether a particular set of modules exists. Similar to
77
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
78
+dnl
79
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
80
+dnl only at the first occurence in configure.ac, so if the first place
81
+dnl it's called might be skipped (such as if it is within an "if", you
82
+dnl have to call PKG_CHECK_EXISTS manually
82 83
 AC_DEFUN([PKG_CHECK_EXISTS],
83 84
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
84 85
 if test -n "$PKG_CONFIG" && \
... ...
@@ -88,8 +120,10 @@ m4_ifvaln([$3], [else
88 88
   $3])dnl
89 89
 fi])
90 90
 
91
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
92
-# ---------------------------------------------
91
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
92
+dnl ---------------------------------------------
93
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
94
+dnl pkg_failed based on the result.
93 95
 m4_define([_PKG_CONFIG],
94 96
 [if test -n "$$1"; then
95 97
     pkg_cv_[]$1="$$1"
... ...
@@ -101,10 +135,11 @@ m4_define([_PKG_CONFIG],
101 101
  else
102 102
     pkg_failed=untried
103 103
 fi[]dnl
104
-])# _PKG_CONFIG
104
+])dnl _PKG_CONFIG
105 105
 
106
-# _PKG_SHORT_ERRORS_SUPPORTED
107
-# -----------------------------
106
+dnl _PKG_SHORT_ERRORS_SUPPORTED
107
+dnl ---------------------------
108
+dnl Internal check to see if pkg-config supports short errors.
108 109
 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
109 110
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
110 111
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
... ...
@@ -112,19 +147,17 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
112 112
 else
113 113
         _pkg_short_errors_supported=no
114 114
 fi[]dnl
115
-])# _PKG_SHORT_ERRORS_SUPPORTED
115
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
116 116
 
117 117
 
118
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
119
-# [ACTION-IF-NOT-FOUND])
120
-#
121
-#
122
-# Note that if there is a possibility the first call to
123
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
124
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
125
-#
126
-#
127
-# --------------------------------------------------------------
118
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
119
+dnl   [ACTION-IF-NOT-FOUND])
120
+dnl --------------------------------------------------------------
121
+dnl Since: 0.4.0
122
+dnl
123
+dnl Note that if there is a possibility the first call to
124
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
125
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
128 126
 AC_DEFUN([PKG_CHECK_MODULES],
129 127
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
130 128
 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
... ...
@@ -178,9 +211,92 @@ else
178 178
         AC_MSG_RESULT([yes])
179 179
 	$3
180 180
 fi[]dnl
181
-])# PKG_CHECK_MODULES
181
+])dnl PKG_CHECK_MODULES
182
+
183
+
184
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
185
+dnl   [ACTION-IF-NOT-FOUND])
186
+dnl ---------------------------------------------------------------------
187
+dnl Since: 0.29
188
+dnl
189
+dnl Checks for existence of MODULES and gathers its build flags with
190
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
191
+dnl and VARIABLE-PREFIX_LIBS from --libs.
192
+dnl
193
+dnl Note that if there is a possibility the first call to
194
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
195
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
196
+dnl configure.ac.
197
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
198
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
199
+_save_PKG_CONFIG=$PKG_CONFIG
200
+PKG_CONFIG="$PKG_CONFIG --static"
201
+PKG_CHECK_MODULES($@)
202
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
203
+])dnl PKG_CHECK_MODULES_STATIC
204
+
182 205
 
183
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
206
+dnl PKG_INSTALLDIR([DIRECTORY])
207
+dnl -------------------------
208
+dnl Since: 0.27
209
+dnl
210
+dnl Substitutes the variable pkgconfigdir as the location where a module
211
+dnl should install pkg-config .pc files. By default the directory is
212
+dnl $libdir/pkgconfig, but the default can be changed by passing
213
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
214
+dnl parameter.
215
+AC_DEFUN([PKG_INSTALLDIR],
216
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
217
+m4_pushdef([pkg_description],
218
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
219
+AC_ARG_WITH([pkgconfigdir],
220
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
221
+    [with_pkgconfigdir=]pkg_default)
222
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
223
+m4_popdef([pkg_default])
224
+m4_popdef([pkg_description])
225
+])dnl PKG_INSTALLDIR
226
+
227
+
228
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
229
+dnl --------------------------------
230
+dnl Since: 0.27
231
+dnl
232
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
233
+dnl module should install arch-independent pkg-config .pc files. By
234
+dnl default the directory is $datadir/pkgconfig, but the default can be
235
+dnl changed by passing DIRECTORY. The user can override through the
236
+dnl --with-noarch-pkgconfigdir parameter.
237
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
238
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
239
+m4_pushdef([pkg_description],
240
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
241
+AC_ARG_WITH([noarch-pkgconfigdir],
242
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
243
+    [with_noarch_pkgconfigdir=]pkg_default)
244
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
245
+m4_popdef([pkg_default])
246
+m4_popdef([pkg_description])
247
+])dnl PKG_NOARCH_INSTALLDIR
248
+
249
+
250
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
251
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
252
+dnl -------------------------------------------
253
+dnl Since: 0.28
254
+dnl
255
+dnl Retrieves the value of the pkg-config variable for the given module.
256
+AC_DEFUN([PKG_CHECK_VAR],
257
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
258
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
259
+
260
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
261
+AS_VAR_COPY([$1], [pkg_cv_][$1])
262
+
263
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
264
+])dnl PKG_CHECK_VAR
265
+
266
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
184 267
 #
185 268
 # This file is free software; the Free Software Foundation
186 269
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -192,10 +308,10 @@ fi[]dnl
192 192
 # generated from the m4 files accompanying Automake X.Y.
193 193
 # (This private macro should not be called outside this file.)
194 194
 AC_DEFUN([AM_AUTOMAKE_VERSION],
195
-[am__api_version='1.14'
195
+[am__api_version='1.15'
196 196
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
197 197
 dnl require some minimum version.  Point them to the right macro.
198
-m4_if([$1], [1.14.1], [],
198
+m4_if([$1], [1.15.1], [],
199 199
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
200 200
 ])
201 201
 
... ...
@@ -211,12 +327,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
211 211
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
212 212
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
213 213
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
214
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
214
+[AM_AUTOMAKE_VERSION([1.15.1])dnl
215 215
 m4_ifndef([AC_AUTOCONF_VERSION],
216 216
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
217 217
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
218 218
 
219
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
219
+# Copyright (C) 2011-2017 Free Software Foundation, Inc.
220 220
 #
221 221
 # This file is free software; the Free Software Foundation
222 222
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -278,7 +394,7 @@ AC_SUBST([AR])dnl
278 278
 
279 279
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
280 280
 
281
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
281
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
282 282
 #
283 283
 # This file is free software; the Free Software Foundation
284 284
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -323,15 +439,14 @@ AC_SUBST([AR])dnl
323 323
 # configured tree to be moved without reconfiguration.
324 324
 
325 325
 AC_DEFUN([AM_AUX_DIR_EXPAND],
326
-[dnl Rely on autoconf to set up CDPATH properly.
327
-AC_PREREQ([2.50])dnl
328
-# expand $ac_aux_dir to an absolute path
329
-am_aux_dir=`cd $ac_aux_dir && pwd`
326
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
327
+# Expand $ac_aux_dir to an absolute path.
328
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
330 329
 ])
331 330
 
332 331
 # AM_CONDITIONAL                                            -*- Autoconf -*-
333 332
 
334
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
333
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
335 334
 #
336 335
 # This file is free software; the Free Software Foundation
337 336
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -362,7 +477,7 @@ AC_CONFIG_COMMANDS_PRE(
362 362
 Usually this means the macro was only invoked conditionally.]])
363 363
 fi])])
364 364
 
365
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
365
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
366 366
 #
367 367
 # This file is free software; the Free Software Foundation
368 368
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -553,7 +668,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
553 553
 
554 554
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
555 555
 
556
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
556
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
557 557
 #
558 558
 # This file is free software; the Free Software Foundation
559 559
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -629,7 +744,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
629 629
 
630 630
 # Do all the work for Automake.                             -*- Autoconf -*-
631 631
 
632
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
632
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
633 633
 #
634 634
 # This file is free software; the Free Software Foundation
635 635
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -719,8 +834,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
719 719
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
720 720
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
721 721
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
722
-# We need awk for the "check" target.  The system "awk" is bad on
723
-# some platforms.
722
+# We need awk for the "check" target (and possibly the TAP driver).  The
723
+# system "awk" is bad on some platforms.
724 724
 AC_REQUIRE([AC_PROG_AWK])dnl
725 725
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
726 726
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
... ...
@@ -793,7 +908,11 @@ to "yes", and re-run configure.
793 793
 END
794 794
     AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
795 795
   fi
796
-fi])
796
+fi
797
+dnl The trailing newline in this macro's definition is deliberate, for
798
+dnl backward compatibility and to allow trailing 'dnl'-style comments
799
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
800
+])
797 801
 
798 802
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
799 803
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
... ...
@@ -822,7 +941,7 @@ for _am_header in $config_headers :; do
822 822
 done
823 823
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
824 824
 
825
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
825
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
826 826
 #
827 827
 # This file is free software; the Free Software Foundation
828 828
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -833,7 +952,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
833 833
 # Define $install_sh.
834 834
 AC_DEFUN([AM_PROG_INSTALL_SH],
835 835
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
836
-if test x"${install_sh}" != xset; then
836
+if test x"${install_sh+set}" != xset; then
837 837
   case $am_aux_dir in
838 838
   *\ * | *\	*)
839 839
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
... ...
@@ -843,7 +962,7 @@ if test x"${install_sh}" != xset; then
843 843
 fi
844 844
 AC_SUBST([install_sh])])
845 845
 
846
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
846
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
847 847
 #
848 848
 # This file is free software; the Free Software Foundation
849 849
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -862,7 +981,7 @@ fi
862 862
 rmdir .tst 2>/dev/null
863 863
 AC_SUBST([am__leading_dot])])
864 864
 
865
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
865
+# Copyright (C) 1998-2017 Free Software Foundation, Inc.
866 866
 #
867 867
 # This file is free software; the Free Software Foundation
868 868
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -882,7 +1001,7 @@ fi])
882 882
 
883 883
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
884 884
 
885
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
885
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
886 886
 #
887 887
 # This file is free software; the Free Software Foundation
888 888
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -932,7 +1051,7 @@ rm -f confinc confmf
932 932
 
933 933
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
934 934
 
935
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
935
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
936 936
 #
937 937
 # This file is free software; the Free Software Foundation
938 938
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -971,7 +1090,7 @@ fi
971 971
 
972 972
 # Helper functions for option handling.                     -*- Autoconf -*-
973 973
 
974
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
974
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
975 975
 #
976 976
 # This file is free software; the Free Software Foundation
977 977
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -1000,7 +1119,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
1000 1000
 AC_DEFUN([_AM_IF_OPTION],
1001 1001
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
1002 1002
 
1003
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
1003
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
1004 1004
 #
1005 1005
 # This file is free software; the Free Software Foundation
1006 1006
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -1047,7 +1166,7 @@ AC_LANG_POP([C])])
1047 1047
 # For backward compatibility.
1048 1048
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
1049 1049
 
1050
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
1050
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
1051 1051
 #
1052 1052
 # This file is free software; the Free Software Foundation
1053 1053
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -1066,7 +1185,7 @@ AC_DEFUN([AM_RUN_LOG],
1066 1066
 
1067 1067
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
1068 1068
 
1069
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
1069
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
1070 1070
 #
1071 1071
 # This file is free software; the Free Software Foundation
1072 1072
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -1147,7 +1266,7 @@ AC_CONFIG_COMMANDS_PRE(
1147 1147
 rm -f conftest.file
1148 1148
 ])
1149 1149
 
1150
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
1150
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
1151 1151
 #
1152 1152
 # This file is free software; the Free Software Foundation
1153 1153
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -1207,7 +1326,7 @@ AC_SUBST([AM_BACKSLASH])dnl
1207 1207
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
1208 1208
 ])
1209 1209
 
1210
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
1210
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
1211 1211
 #
1212 1212
 # This file is free software; the Free Software Foundation
1213 1213
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -1235,7 +1354,7 @@ fi
1235 1235
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1236 1236
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
1237 1237
 
1238
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
1238
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
1239 1239
 #
1240 1240
 # This file is free software; the Free Software Foundation
1241 1241
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -1254,7 +1373,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
1254 1254
 
1255 1255
 # Check how to create a tarball.                            -*- Autoconf -*-
1256 1256
 
1257
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
1257
+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
1258 1258
 #
1259 1259
 # This file is free software; the Free Software Foundation
1260 1260
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -1,7 +1,7 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
 
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -35,7 +35,17 @@
35 35
 #  MA 02110-1301, USA.
36 36
 
37 37
 VPATH = @srcdir@
38
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
38
+am__is_gnu_make = { \
39
+  if test -z '$(MAKELEVEL)'; then \
40
+    false; \
41
+  elif test -n '$(MAKE_HOST)'; then \
42
+    true; \
43
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
44
+    true; \
45
+  else \
46
+    false; \
47
+  fi; \
48
+}
39 49
 am__make_running_with_option = \
40 50
   case $${target_option-} in \
41 51
       ?) ;; \
... ...
@@ -102,8 +112,6 @@ target_triplet = @target@
102 102
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@sbin_PROGRAMS =  \
103 103
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	clamav-milter$(EXEEXT)
104 104
 subdir = clamav-milter
105
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
106
-	$(top_srcdir)/config/depcomp
107 105
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
108 106
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
109 107
 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \
... ...
@@ -184,6 +192,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
184 184
 	$(top_srcdir)/configure.ac
185 185
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
186 186
 	$(ACLOCAL_M4)
187
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
187 188
 mkinstalldirs = $(install_sh) -d
188 189
 CONFIG_HEADER = $(top_builddir)/clamav-config.h \
189 190
 	$(top_builddir)/libclammspack/config.h
... ...
@@ -304,6 +313,7 @@ am__define_uniq_tagged_files = \
304 304
   done | $(am__uniquify_input)`
305 305
 ETAGS = etags
306 306
 CTAGS = ctags
307
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
307 308
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
308 309
 ACLOCAL = @ACLOCAL@
309 310
 AMTAR = @AMTAR@
... ...
@@ -529,6 +539,7 @@ pdfdir = @pdfdir@
529 529
 prefix = @prefix@
530 530
 program_transform_name = @program_transform_name@
531 531
 psdir = @psdir@
532
+runstatedir = @runstatedir@
532 533
 sbindir = @sbindir@
533 534
 sharedstatedir = @sharedstatedir@
534 535
 srcdir = @srcdir@
... ...
@@ -583,7 +594,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
583 583
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign clamav-milter/Makefile'; \
584 584
 	$(am__cd) $(top_srcdir) && \
585 585
 	  $(AUTOMAKE) --foreign clamav-milter/Makefile
586
-.PRECIOUS: Makefile
587 586
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
588 587
 	@case '$?' in \
589 588
 	  *config.status*) \
... ...
@@ -1024,6 +1034,8 @@ uninstall-man: uninstall-man8
1024 1024
 	tags tags-am uninstall uninstall-am uninstall-man \
1025 1025
 	uninstall-man8 uninstall-sbinPROGRAMS
1026 1026
 
1027
+.PRECIOUS: Makefile
1028
+
1027 1029
 
1028 1030
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
1029 1031
 # Otherwise a system limit (for SysV at least) may be exceeded.
... ...
@@ -1,7 +1,7 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
 
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -15,7 +15,17 @@
15 15
 @SET_MAKE@
16 16
 
17 17
 VPATH = @srcdir@
18
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
18
+am__is_gnu_make = { \
19
+  if test -z '$(MAKELEVEL)'; then \
20
+    false; \
21
+  elif test -n '$(MAKE_HOST)'; then \
22
+    true; \
23
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
24
+    true; \
25
+  else \
26
+    false; \
27
+  fi; \
28
+}
19 29
 am__make_running_with_option = \
20 30
   case $${target_option-} in \
21 31
       ?) ;; \
... ...
@@ -81,8 +91,6 @@ host_triplet = @host@
81 81
 target_triplet = @target@
82 82
 bin_PROGRAMS = clambc$(EXEEXT)
83 83
 subdir = clambc
84
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
85
-	$(top_srcdir)/config/depcomp
86 84
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
87 85
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
88 86
 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \
... ...
@@ -163,6 +171,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
163 163
 	$(top_srcdir)/configure.ac
164 164
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
165 165
 	$(ACLOCAL_M4)
166
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
166 167
 mkinstalldirs = $(install_sh) -d
167 168
 CONFIG_HEADER = $(top_builddir)/clamav-config.h \
168 169
 	$(top_builddir)/libclammspack/config.h
... ...
@@ -238,6 +247,7 @@ am__define_uniq_tagged_files = \
238 238
   done | $(am__uniquify_input)`
239 239
 ETAGS = etags
240 240
 CTAGS = ctags
241
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
241 242
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
242 243
 ACLOCAL = @ACLOCAL@
243 244
 AMTAR = @AMTAR@
... ...
@@ -463,6 +473,7 @@ pdfdir = @pdfdir@
463 463
 prefix = @prefix@
464 464
 program_transform_name = @program_transform_name@
465 465
 psdir = @psdir@
466
+runstatedir = @runstatedir@
466 467
 sbindir = @sbindir@
467 468
 sharedstatedir = @sharedstatedir@
468 469
 srcdir = @srcdir@
... ...
@@ -506,7 +517,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
506 506
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign clambc/Makefile'; \
507 507
 	$(am__cd) $(top_srcdir) && \
508 508
 	  $(AUTOMAKE) --foreign clambc/Makefile
509
-.PRECIOUS: Makefile
510 509
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
511 510
 	@case '$?' in \
512 511
 	  *config.status*) \
... ...
@@ -881,6 +891,8 @@ uninstall-am: uninstall-binPROGRAMS
881 881
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
882 882
 	uninstall-am uninstall-binPROGRAMS
883 883
 
884
+.PRECIOUS: Makefile
885
+
884 886
 
885 887
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
886 888
 # Otherwise a system limit (for SysV at least) may be exceeded.
... ...
@@ -1,7 +1,7 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
 
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -35,7 +35,17 @@
35 35
 #  MA 02110-1301, USA.
36 36
 
37 37
 VPATH = @srcdir@
38
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
38
+am__is_gnu_make = { \
39
+  if test -z '$(MAKELEVEL)'; then \
40
+    false; \
41
+  elif test -n '$(MAKE_HOST)'; then \
42
+    true; \
43
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
44
+    true; \
45
+  else \
46
+    false; \
47
+  fi; \
48
+}
39 49
 am__make_running_with_option = \
40 50
   case $${target_option-} in \
41 51
       ?) ;; \
... ...
@@ -101,8 +111,6 @@ host_triplet = @host@
101 101
 target_triplet = @target@
102 102
 bin_PROGRAMS = clamconf$(EXEEXT)
103 103
 subdir = clamconf
104
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
105
-	$(top_srcdir)/config/depcomp
106 104
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
107 105
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
108 106
 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \
... ...
@@ -183,6 +191,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
183 183
 	$(top_srcdir)/configure.ac
184 184
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
185 185
 	$(ACLOCAL_M4)
186
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
186 187
 mkinstalldirs = $(install_sh) -d
187 188
 CONFIG_HEADER = $(top_builddir)/clamav-config.h \
188 189
 	$(top_builddir)/libclammspack/config.h
... ...
@@ -258,6 +267,7 @@ am__define_uniq_tagged_files = \
258 258
   done | $(am__uniquify_input)`
259 259
 ETAGS = etags
260 260
 CTAGS = ctags
261
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
261 262
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
262 263
 ACLOCAL = @ACLOCAL@
263 264
 AMTAR = @AMTAR@
... ...
@@ -483,6 +493,7 @@ pdfdir = @pdfdir@
483 483
 prefix = @prefix@
484 484
 program_transform_name = @program_transform_name@
485 485
 psdir = @psdir@
486
+runstatedir = @runstatedir@
486 487
 sbindir = @sbindir@
487 488
 sharedstatedir = @sharedstatedir@
488 489
 srcdir = @srcdir@
... ...
@@ -531,7 +542,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
531 531
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign clamconf/Makefile'; \
532 532
 	$(am__cd) $(top_srcdir) && \
533 533
 	  $(AUTOMAKE) --foreign clamconf/Makefile
534
-.PRECIOUS: Makefile
535 534
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
536 535
 	@case '$?' in \
537 536
 	  *config.status*) \
... ...
@@ -906,6 +916,8 @@ uninstall-am: uninstall-binPROGRAMS
906 906
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
907 907
 	uninstall-am uninstall-binPROGRAMS
908 908
 
909
+.PRECIOUS: Makefile
910
+
909 911
 
910 912
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
911 913
 # Otherwise a system limit (for SysV at least) may be exceeded.
... ...
@@ -1,7 +1,7 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
 
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -36,7 +36,17 @@
36 36
 
37 37
 
38 38
 VPATH = @srcdir@
39
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
39
+am__is_gnu_make = { \
40
+  if test -z '$(MAKELEVEL)'; then \
41
+    false; \
42
+  elif test -n '$(MAKE_HOST)'; then \
43
+    true; \
44
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
45
+    true; \
46
+  else \
47
+    false; \
48
+  fi; \
49
+}
40 50
 am__make_running_with_option = \
41 51
   case $${target_option-} in \
42 52
       ?) ;; \
... ...
@@ -103,9 +113,6 @@ target_triplet = @target@
103 103
 @BUILD_CLAMD_TRUE@sbin_PROGRAMS = clamd$(EXEEXT)
104 104
 @BUILD_CLAMD_TRUE@@SYSTEM_LFS_FTS_FALSE@am__append_1 = fts.c
105 105
 subdir = clamd
106
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
107
-	$(srcdir)/clamav-daemon.service.in \
108
-	$(srcdir)/clamav-daemon.socket.in $(top_srcdir)/config/depcomp
109 106
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
110 107
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
111 108
 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \
... ...
@@ -186,6 +193,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
186 186
 	$(top_srcdir)/configure.ac
187 187
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
188 188
 	$(ACLOCAL_M4)
189
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
189 190
 mkinstalldirs = $(install_sh) -d
190 191
 CONFIG_HEADER = $(top_builddir)/clamav-config.h \
191 192
 	$(top_builddir)/libclammspack/config.h
... ...
@@ -315,6 +323,9 @@ am__define_uniq_tagged_files = \
315 315
   done | $(am__uniquify_input)`
316 316
 ETAGS = etags
317 317
 CTAGS = ctags
318
+am__DIST_COMMON = $(srcdir)/Makefile.in \
319
+	$(srcdir)/clamav-daemon.service.in \
320
+	$(srcdir)/clamav-daemon.socket.in $(top_srcdir)/config/depcomp
318 321
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
319 322
 ACLOCAL = @ACLOCAL@
320 323
 AMTAR = @AMTAR@
... ...
@@ -540,6 +551,7 @@ pdfdir = @pdfdir@
540 540
 prefix = @prefix@
541 541
 program_transform_name = @program_transform_name@
542 542
 psdir = @psdir@
543
+runstatedir = @runstatedir@
543 544
 sbindir = @sbindir@
544 545
 sharedstatedir = @sharedstatedir@
545 546
 srcdir = @srcdir@
... ...
@@ -598,7 +610,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
598 598
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign clamd/Makefile'; \
599 599
 	$(am__cd) $(top_srcdir) && \
600 600
 	  $(AUTOMAKE) --foreign clamd/Makefile
601
-.PRECIOUS: Makefile
602 601
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
603 602
 	@case '$?' in \
604 603
 	  *config.status*) \
... ...
@@ -1043,6 +1054,8 @@ uninstall-am: uninstall-sbinPROGRAMS uninstall-systemdsystemunitDATA
1043 1043
 	tags tags-am uninstall uninstall-am uninstall-sbinPROGRAMS \
1044 1044
 	uninstall-systemdsystemunitDATA
1045 1045
 
1046
+.PRECIOUS: Makefile
1047
+
1046 1048
 
1047 1049
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
1048 1050
 # Otherwise a system limit (for SysV at least) may be exceeded.
... ...
@@ -1,7 +1,7 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
 
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -34,7 +34,17 @@
34 34
 #  MA 02110-1301, USA.
35 35
 
36 36
 VPATH = @srcdir@
37
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
37
+am__is_gnu_make = { \
38
+  if test -z '$(MAKELEVEL)'; then \
39
+    false; \
40
+  elif test -n '$(MAKE_HOST)'; then \
41
+    true; \
42
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
43
+    true; \
44
+  else \
45
+    false; \
46
+  fi; \
47
+}
38 48
 am__make_running_with_option = \
39 49
   case $${target_option-} in \
40 50
       ?) ;; \
... ...
@@ -100,8 +110,6 @@ host_triplet = @host@
100 100
 target_triplet = @target@
101 101
 @BUILD_CLAMD_TRUE@bin_PROGRAMS = clamdscan$(EXEEXT)
102 102
 subdir = clamdscan
103
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
104
-	$(top_srcdir)/config/depcomp
105 103
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
106 104
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
107 105
 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \
... ...
@@ -182,6 +190,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
182 182
 	$(top_srcdir)/configure.ac
183 183
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
184 184
 	$(ACLOCAL_M4)
185
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
185 186
 mkinstalldirs = $(install_sh) -d
186 187
 CONFIG_HEADER = $(top_builddir)/clamav-config.h \
187 188
 	$(top_builddir)/libclammspack/config.h
... ...
@@ -268,6 +277,7 @@ am__define_uniq_tagged_files = \
268 268
   done | $(am__uniquify_input)`
269 269
 ETAGS = etags
270 270
 CTAGS = ctags
271
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
271 272
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
272 273
 ACLOCAL = @ACLOCAL@
273 274
 AMTAR = @AMTAR@
... ...
@@ -493,6 +503,7 @@ pdfdir = @pdfdir@
493 493
 prefix = @prefix@
494 494
 program_transform_name = @program_transform_name@
495 495
 psdir = @psdir@
496
+runstatedir = @runstatedir@
496 497
 sbindir = @sbindir@
497 498
 sharedstatedir = @sharedstatedir@
498 499
 srcdir = @srcdir@
... ...
@@ -547,7 +558,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
547 547
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign clamdscan/Makefile'; \
548 548
 	$(am__cd) $(top_srcdir) && \
549 549
 	  $(AUTOMAKE) --foreign clamdscan/Makefile
550
-.PRECIOUS: Makefile
551 550
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
552 551
 	@case '$?' in \
553 552
 	  *config.status*) \
... ...
@@ -969,6 +979,8 @@ uninstall-am: uninstall-binPROGRAMS
969 969
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
970 970
 	uninstall-am uninstall-binPROGRAMS
971 971
 
972
+.PRECIOUS: Makefile
973
+
972 974
 
973 975
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
974 976
 # Otherwise a system limit (for SysV at least) may be exceeded.
... ...
@@ -1,7 +1,7 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
 
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -15,7 +15,17 @@
15 15
 @SET_MAKE@
16 16
 
17 17
 VPATH = @srcdir@
18
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
18
+am__is_gnu_make = { \
19
+  if test -z '$(MAKELEVEL)'; then \
20
+    false; \
21
+  elif test -n '$(MAKE_HOST)'; then \
22
+    true; \
23
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
24
+    true; \
25
+  else \
26
+    false; \
27
+  fi; \
28
+}
19 29
 am__make_running_with_option = \
20 30
   case $${target_option-} in \
21 31
       ?) ;; \
... ...
@@ -81,8 +91,6 @@ host_triplet = @host@
81 81
 target_triplet = @target@
82 82
 @HAVE_CURSES_TRUE@bin_PROGRAMS = clamdtop$(EXEEXT)
83 83
 subdir = clamdtop
84
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
85
-	$(top_srcdir)/config/depcomp
86 84
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
87 85
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
88 86
 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \
... ...
@@ -163,6 +171,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
163 163
 	$(top_srcdir)/configure.ac
164 164
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
165 165
 	$(ACLOCAL_M4)
166
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
166 167
 mkinstalldirs = $(install_sh) -d
167 168
 CONFIG_HEADER = $(top_builddir)/clamav-config.h \
168 169
 	$(top_builddir)/libclammspack/config.h
... ...
@@ -273,6 +282,7 @@ am__define_uniq_tagged_files = \
273 273
   done | $(am__uniquify_input)`
274 274
 ETAGS = etags
275 275
 CTAGS = ctags
276
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
276 277
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
277 278
 ACLOCAL = @ACLOCAL@
278 279
 AMTAR = @AMTAR@
... ...
@@ -498,6 +508,7 @@ pdfdir = @pdfdir@
498 498
 prefix = @prefix@
499 499
 program_transform_name = @program_transform_name@
500 500
 psdir = @psdir@
501
+runstatedir = @runstatedir@
501 502
 sbindir = @sbindir@
502 503
 sharedstatedir = @sharedstatedir@
503 504
 srcdir = @srcdir@
... ...
@@ -543,7 +554,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
543 543
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign clamdtop/Makefile'; \
544 544
 	$(am__cd) $(top_srcdir) && \
545 545
 	  $(AUTOMAKE) --foreign clamdtop/Makefile
546
-.PRECIOUS: Makefile
547 546
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
548 547
 	@case '$?' in \
549 548
 	  *config.status*) \
... ...
@@ -963,6 +973,8 @@ uninstall-man: uninstall-man1
963 963
 	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
964 964
 	uninstall-man uninstall-man1
965 965
 
966
+.PRECIOUS: Makefile
967
+
966 968
 
967 969
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
968 970
 # Otherwise a system limit (for SysV at least) may be exceeded.
... ...
@@ -1,7 +1,7 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
 
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -37,7 +37,17 @@
37 37
 #  MA 02110-1301, USA.
38 38
 
39 39
 VPATH = @srcdir@
40
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
40
+am__is_gnu_make = { \
41
+  if test -z '$(MAKELEVEL)'; then \
42
+    false; \
43
+  elif test -n '$(MAKE_HOST)'; then \
44
+    true; \
45
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
46
+    true; \
47
+  else \
48
+    false; \
49
+  fi; \
50
+}
41 51
 am__make_running_with_option = \
42 52
   case $${target_option-} in \
43 53
       ?) ;; \
... ...
@@ -103,8 +113,6 @@ host_triplet = @host@
103 103
 target_triplet = @target@
104 104
 bin_PROGRAMS = clamscan$(EXEEXT)
105 105
 subdir = clamscan
106
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
107
-	$(top_srcdir)/config/depcomp
108 106
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
109 107
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
110 108
 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \
... ...
@@ -185,6 +193,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
185 185
 	$(top_srcdir)/configure.ac
186 186
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
187 187
 	$(ACLOCAL_M4)
188
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
188 189
 mkinstalldirs = $(install_sh) -d
189 190
 CONFIG_HEADER = $(top_builddir)/clamav-config.h \
190 191
 	$(top_builddir)/libclammspack/config.h
... ...
@@ -261,6 +270,7 @@ am__define_uniq_tagged_files = \
261 261
   done | $(am__uniquify_input)`
262 262
 ETAGS = etags
263 263
 CTAGS = ctags
264
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
264 265
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
265 266
 ACLOCAL = @ACLOCAL@
266 267
 AMTAR = @AMTAR@
... ...
@@ -486,6 +496,7 @@ pdfdir = @pdfdir@
486 486
 prefix = @prefix@
487 487
 program_transform_name = @program_transform_name@
488 488
 psdir = @psdir@
489
+runstatedir = @runstatedir@
489 490
 sbindir = @sbindir@
490 491
 sharedstatedir = @sharedstatedir@
491 492
 srcdir = @srcdir@
... ...
@@ -536,7 +547,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
536 536
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign clamscan/Makefile'; \
537 537
 	$(am__cd) $(top_srcdir) && \
538 538
 	  $(AUTOMAKE) --foreign clamscan/Makefile
539
-.PRECIOUS: Makefile
540 539
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
541 540
 	@case '$?' in \
542 541
 	  *config.status*) \
... ...
@@ -942,6 +952,8 @@ uninstall-am: uninstall-binPROGRAMS
942 942
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
943 943
 	uninstall-am uninstall-binPROGRAMS
944 944
 
945
+.PRECIOUS: Makefile
946
+
945 947
 
946 948
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
947 949
 # Otherwise a system limit (for SysV at least) may be exceeded.
... ...
@@ -1,7 +1,7 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
 
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -33,7 +33,17 @@
33 33
 #  MA 02110-1301, USA.
34 34
 
35 35
 VPATH = @srcdir@
36
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
36
+am__is_gnu_make = { \
37
+  if test -z '$(MAKELEVEL)'; then \
38
+    false; \
39
+  elif test -n '$(MAKE_HOST)'; then \
40
+    true; \
41
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
42
+    true; \
43
+  else \
44
+    false; \
45
+  fi; \
46
+}
37 47
 am__make_running_with_option = \
38 48
   case $${target_option-} in \
39 49
       ?) ;; \
... ...
@@ -99,8 +109,6 @@ host_triplet = @host@
99 99
 target_triplet = @target@
100 100
 bin_PROGRAMS = clamsubmit$(EXEEXT)
101 101
 subdir = clamsubmit
102
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
103
-	$(top_srcdir)/config/depcomp
104 102
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
105 103
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
106 104
 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \
... ...
@@ -181,6 +189,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
181 181
 	$(top_srcdir)/configure.ac
182 182
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
183 183
 	$(ACLOCAL_M4)
184
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
184 185
 mkinstalldirs = $(install_sh) -d
185 186
 CONFIG_HEADER = $(top_builddir)/clamav-config.h \
186 187
 	$(top_builddir)/libclammspack/config.h
... ...
@@ -256,6 +265,7 @@ am__define_uniq_tagged_files = \
256 256
   done | $(am__uniquify_input)`
257 257
 ETAGS = etags
258 258
 CTAGS = ctags
259
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
259 260
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
260 261
 ACLOCAL = @ACLOCAL@
261 262
 AMTAR = @AMTAR@
... ...
@@ -481,6 +491,7 @@ pdfdir = @pdfdir@
481 481
 prefix = @prefix@
482 482
 program_transform_name = @program_transform_name@
483 483
 psdir = @psdir@
484
+runstatedir = @runstatedir@
484 485
 sbindir = @sbindir@
485 486
 sharedstatedir = @sharedstatedir@
486 487
 srcdir = @srcdir@
... ...
@@ -527,7 +538,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
527 527
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign clamsubmit/Makefile'; \
528 528
 	$(am__cd) $(top_srcdir) && \
529 529
 	  $(AUTOMAKE) --foreign clamsubmit/Makefile
530
-.PRECIOUS: Makefile
531 530
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
532 531
 	@case '$?' in \
533 532
 	  *config.status*) \
... ...
@@ -917,6 +927,8 @@ uninstall-am: uninstall-binPROGRAMS
917 917
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
918 918
 	uninstall-am uninstall-binPROGRAMS
919 919
 
920
+.PRECIOUS: Makefile
921
+
920 922
 
921 923
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
922 924
 # Otherwise a system limit (for SysV at least) may be exceeded.
... ...
@@ -4,7 +4,7 @@
4 4
 me=ar-lib
5 5
 scriptversion=2012-03-01.08; # UTC
6 6
 
7
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
7
+# Copyright (C) 2010-2017 Free Software Foundation, Inc.
8 8
 # Written by Peter Rosin <peda@lysator.liu.se>.
9 9
 #
10 10
 # This program is free software; you can redistribute it and/or modify
... ...
@@ -3,7 +3,7 @@
3 3
 
4 4
 scriptversion=2012-10-14.11; # UTC
5 5
 
6
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
6
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
7 7
 # Written by Tom Tromey <tromey@cygnus.com>.
8 8
 #
9 9
 # This program is free software; you can redistribute it and/or modify
... ...
@@ -1,8 +1,8 @@
1 1
 #! /bin/sh
2 2
 # Attempt to guess a canonical system name.
3
-#   Copyright 1992-2013 Free Software Foundation, Inc.
3
+#   Copyright 1992-2018 Free Software Foundation, Inc.
4 4
 
5
-timestamp='2013-06-10'
5
+timestamp='2018-02-24'
6 6
 
7 7
 # This file is free software; you can redistribute it and/or modify it
8 8
 # under the terms of the GNU General Public License as published by
... ...
@@ -15,7 +15,7 @@ timestamp='2013-06-10'
15 15
 # General Public License for more details.
16 16
 #
17 17
 # You should have received a copy of the GNU General Public License
18
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
18
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
19 19
 #
20 20
 # As a special exception to the GNU General Public License, if you
21 21
 # distribute this file as part of a program that contains a
... ...
@@ -24,12 +24,12 @@ timestamp='2013-06-10'
24 24
 # program.  This Exception is an additional permission under section 7
25 25
 # of the GNU General Public License, version 3 ("GPLv3").
26 26
 #
27
-# Originally written by Per Bothner.
27
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
28 28
 #
29 29
 # You can get the latest version of this script from:
30
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
30
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
31 31
 #
32
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
32
+# Please send patches to <config-patches@gnu.org>.
33 33
 
34 34
 
35 35
 me=`echo "$0" | sed -e 's,.*/,,'`
... ...
@@ -39,7 +39,7 @@ Usage: $0 [OPTION]
39 39
 
40 40
 Output the configuration name of the system \`$me' is run on.
41 41
 
42
-Operation modes:
42
+Options:
43 43
   -h, --help         print this help, then exit
44 44
   -t, --time-stamp   print date of last modification, then exit
45 45
   -v, --version      print version number, then exit
... ...
@@ -50,7 +50,7 @@ version="\
50 50
 GNU config.guess ($timestamp)
51 51
 
52 52
 Originally written by Per Bothner.
53
-Copyright 1992-2013 Free Software Foundation, Inc.
53
+Copyright 1992-2018 Free Software Foundation, Inc.
54 54
 
55 55
 This is free software; see the source for copying conditions.  There is NO
56 56
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
... ...
@@ -107,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
107 107
 dummy=$tmp/dummy ;
108 108
 tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
109 109
 case $CC_FOR_BUILD,$HOST_CC,$CC in
110
- ,,)    echo "int x;" > $dummy.c ;
110
+ ,,)    echo "int x;" > "$dummy.c" ;
111 111
 	for c in cc gcc c89 c99 ; do
112
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
112
+	  if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
113 113
 	     CC_FOR_BUILD="$c"; break ;
114 114
 	  fi ;
115 115
 	done ;
... ...
@@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
132 132
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
133 133
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
134 134
 
135
-case "${UNAME_SYSTEM}" in
135
+case "$UNAME_SYSTEM" in
136 136
 Linux|GNU|GNU/*)
137 137
 	# If the system lacks a compiler, then just pick glibc.
138 138
 	# We could probably try harder.
139 139
 	LIBC=gnu
140 140
 
141
-	eval $set_cc_for_build
142
-	cat <<-EOF > $dummy.c
141
+	eval "$set_cc_for_build"
142
+	cat <<-EOF > "$dummy.c"
143 143
 	#include <features.h>
144 144
 	#if defined(__UCLIBC__)
145 145
 	LIBC=uclibc
... ...
@@ -149,13 +149,20 @@ Linux|GNU|GNU/*)
149 149
 	LIBC=gnu
150 150
 	#endif
151 151
 	EOF
152
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
152
+	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
153
+
154
+	# If ldd exists, use it to detect musl libc.
155
+	if command -v ldd >/dev/null && \
156
+		ldd --version 2>&1 | grep -q ^musl
157
+	then
158
+	    LIBC=musl
159
+	fi
153 160
 	;;
154 161
 esac
155 162
 
156 163
 # Note: order is significant - the case branches are not exclusive.
157 164
 
158
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
165
+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
159 166
     *:NetBSD:*:*)
160 167
 	# NetBSD (nbsd) targets should (where applicable) match one or
161 168
 	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
... ...
@@ -168,21 +175,31 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
168 168
 	# Note: NetBSD doesn't particularly care about the vendor
169 169
 	# portion of the name.  We always set it to "unknown".
170 170
 	sysctl="sysctl -n hw.machine_arch"
171
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
172
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
173
-	case "${UNAME_MACHINE_ARCH}" in
171
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
172
+	    "/sbin/$sysctl" 2>/dev/null || \
173
+	    "/usr/sbin/$sysctl" 2>/dev/null || \
174
+	    echo unknown)`
175
+	case "$UNAME_MACHINE_ARCH" in
174 176
 	    armeb) machine=armeb-unknown ;;
175 177
 	    arm*) machine=arm-unknown ;;
176 178
 	    sh3el) machine=shl-unknown ;;
177 179
 	    sh3eb) machine=sh-unknown ;;
178 180
 	    sh5el) machine=sh5le-unknown ;;
179
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
181
+	    earmv*)
182
+		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
183
+		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
184
+		machine="${arch}${endian}"-unknown
185
+		;;
186
+	    *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
180 187
 	esac
181 188
 	# The Operating System including object format, if it has switched
182
-	# to ELF recently, or will in the future.
183
-	case "${UNAME_MACHINE_ARCH}" in
189
+	# to ELF recently (or will in the future) and ABI.
190
+	case "$UNAME_MACHINE_ARCH" in
191
+	    earm*)
192
+		os=netbsdelf
193
+		;;
184 194
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
185
-		eval $set_cc_for_build
195
+		eval "$set_cc_for_build"
186 196
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
187 197
 			| grep -q __ELF__
188 198
 		then
... ...
@@ -197,44 +214,67 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
197 197
 		os=netbsd
198 198
 		;;
199 199
 	esac
200
+	# Determine ABI tags.
201
+	case "$UNAME_MACHINE_ARCH" in
202
+	    earm*)
203
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
204
+		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
205
+		;;
206
+	esac
200 207
 	# The OS release
201 208
 	# Debian GNU/NetBSD machines have a different userland, and
202 209
 	# thus, need a distinct triplet. However, they do not need
203 210
 	# kernel version information, so it can be replaced with a
204 211
 	# suitable tag, in the style of linux-gnu.
205
-	case "${UNAME_VERSION}" in
212
+	case "$UNAME_VERSION" in
206 213
 	    Debian*)
207 214
 		release='-gnu'
208 215
 		;;
209 216
 	    *)
210
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
217
+		release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
211 218
 		;;
212 219
 	esac
213 220
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
214 221
 	# contains redundant information, the shorter form:
215 222
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
216
-	echo "${machine}-${os}${release}"
223
+	echo "$machine-${os}${release}${abi}"
217 224
 	exit ;;
218 225
     *:Bitrig:*:*)
219 226
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
220
-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
227
+	echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
221 228
 	exit ;;
222 229
     *:OpenBSD:*:*)
223 230
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
224
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
231
+	echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
232
+	exit ;;
233
+    *:LibertyBSD:*:*)
234
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
235
+	echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
236
+	exit ;;
237
+    *:MidnightBSD:*:*)
238
+	echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
225 239
 	exit ;;
226 240
     *:ekkoBSD:*:*)
227
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
241
+	echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
228 242
 	exit ;;
229 243
     *:SolidBSD:*:*)
230
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
244
+	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
231 245
 	exit ;;
232 246
     macppc:MirBSD:*:*)
233
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
247
+	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
234 248
 	exit ;;
235 249
     *:MirBSD:*:*)
236
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
250
+	echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
237 251
 	exit ;;
252
+    *:Sortix:*:*)
253
+	echo "$UNAME_MACHINE"-unknown-sortix
254
+	exit ;;
255
+    *:Redox:*:*)
256
+	echo "$UNAME_MACHINE"-unknown-redox
257
+	exit ;;
258
+    mips:OSF1:*.*)
259
+        echo mips-dec-osf1
260
+        exit ;;
238 261
     alpha:OSF1:*:*)
239 262
 	case $UNAME_RELEASE in
240 263
 	*4.0)
... ...
@@ -251,63 +291,54 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
251 251
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
252 252
 	case "$ALPHA_CPU_TYPE" in
253 253
 	    "EV4 (21064)")
254
-		UNAME_MACHINE="alpha" ;;
254
+		UNAME_MACHINE=alpha ;;
255 255
 	    "EV4.5 (21064)")
256
-		UNAME_MACHINE="alpha" ;;
256
+		UNAME_MACHINE=alpha ;;
257 257
 	    "LCA4 (21066/21068)")
258
-		UNAME_MACHINE="alpha" ;;
258
+		UNAME_MACHINE=alpha ;;
259 259
 	    "EV5 (21164)")
260
-		UNAME_MACHINE="alphaev5" ;;
260
+		UNAME_MACHINE=alphaev5 ;;
261 261
 	    "EV5.6 (21164A)")
262
-		UNAME_MACHINE="alphaev56" ;;
262
+		UNAME_MACHINE=alphaev56 ;;
263 263
 	    "EV5.6 (21164PC)")
264
-		UNAME_MACHINE="alphapca56" ;;
264
+		UNAME_MACHINE=alphapca56 ;;
265 265
 	    "EV5.7 (21164PC)")
266
-		UNAME_MACHINE="alphapca57" ;;
266
+		UNAME_MACHINE=alphapca57 ;;
267 267
 	    "EV6 (21264)")
268
-		UNAME_MACHINE="alphaev6" ;;
268
+		UNAME_MACHINE=alphaev6 ;;
269 269
 	    "EV6.7 (21264A)")
270
-		UNAME_MACHINE="alphaev67" ;;
270
+		UNAME_MACHINE=alphaev67 ;;
271 271
 	    "EV6.8CB (21264C)")
272
-		UNAME_MACHINE="alphaev68" ;;
272
+		UNAME_MACHINE=alphaev68 ;;
273 273
 	    "EV6.8AL (21264B)")
274
-		UNAME_MACHINE="alphaev68" ;;
274
+		UNAME_MACHINE=alphaev68 ;;
275 275
 	    "EV6.8CX (21264D)")
276
-		UNAME_MACHINE="alphaev68" ;;
276
+		UNAME_MACHINE=alphaev68 ;;
277 277
 	    "EV6.9A (21264/EV69A)")
278
-		UNAME_MACHINE="alphaev69" ;;
278
+		UNAME_MACHINE=alphaev69 ;;
279 279
 	    "EV7 (21364)")
280
-		UNAME_MACHINE="alphaev7" ;;
280
+		UNAME_MACHINE=alphaev7 ;;
281 281
 	    "EV7.9 (21364A)")
282
-		UNAME_MACHINE="alphaev79" ;;
282
+		UNAME_MACHINE=alphaev79 ;;
283 283
 	esac
284 284
 	# A Pn.n version is a patched version.
285 285
 	# A Vn.n version is a released version.
286 286
 	# A Tn.n version is a released field test version.
287 287
 	# A Xn.n version is an unreleased experimental baselevel.
288 288
 	# 1.2 uses "1.2" for uname -r.
289
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
289
+	echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
290 290
 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
291 291
 	exitcode=$?
292 292
 	trap '' 0
293 293
 	exit $exitcode ;;
294
-    Alpha\ *:Windows_NT*:*)
295
-	# How do we know it's Interix rather than the generic POSIX subsystem?
296
-	# Should we change UNAME_MACHINE based on the output of uname instead
297
-	# of the specific Alpha model?
298
-	echo alpha-pc-interix
299
-	exit ;;
300
-    21064:Windows_NT:50:3)
301
-	echo alpha-dec-winnt3.5
302
-	exit ;;
303 294
     Amiga*:UNIX_System_V:4.0:*)
304 295
 	echo m68k-unknown-sysv4
305 296
 	exit ;;
306 297
     *:[Aa]miga[Oo][Ss]:*:*)
307
-	echo ${UNAME_MACHINE}-unknown-amigaos
298
+	echo "$UNAME_MACHINE"-unknown-amigaos
308 299
 	exit ;;
309 300
     *:[Mm]orph[Oo][Ss]:*:*)
310
-	echo ${UNAME_MACHINE}-unknown-morphos
301
+	echo "$UNAME_MACHINE"-unknown-morphos
311 302
 	exit ;;
312 303
     *:OS/390:*:*)
313 304
 	echo i370-ibm-openedition
... ...
@@ -319,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
319 319
 	echo powerpc-ibm-os400
320 320
 	exit ;;
321 321
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
322
-	echo arm-acorn-riscix${UNAME_RELEASE}
322
+	echo arm-acorn-riscix"$UNAME_RELEASE"
323 323
 	exit ;;
324 324
     arm*:riscos:*:*|arm*:RISCOS:*:*)
325 325
 	echo arm-unknown-riscos
... ...
@@ -346,38 +377,38 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
346 346
 	    sparc) echo sparc-icl-nx7; exit ;;
347 347
 	esac ;;
348 348
     s390x:SunOS:*:*)
349
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
349
+	echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
350 350
 	exit ;;
351 351
     sun4H:SunOS:5.*:*)
352
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
352
+	echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
353 353
 	exit ;;
354 354
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
355
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
355
+	echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
356 356
 	exit ;;
357 357
     i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
358
-	echo i386-pc-auroraux${UNAME_RELEASE}
358
+	echo i386-pc-auroraux"$UNAME_RELEASE"
359 359
 	exit ;;
360 360
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
361
-	eval $set_cc_for_build
362
-	SUN_ARCH="i386"
361
+	eval "$set_cc_for_build"
362
+	SUN_ARCH=i386
363 363
 	# If there is a compiler, see if it is configured for 64-bit objects.
364 364
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
365 365
 	# This test works for both compilers.
366
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
366
+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
367 367
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
368
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
368
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
369 369
 		grep IS_64BIT_ARCH >/dev/null
370 370
 	    then
371
-		SUN_ARCH="x86_64"
371
+		SUN_ARCH=x86_64
372 372
 	    fi
373 373
 	fi
374
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
374
+	echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
375 375
 	exit ;;
376 376
     sun4*:SunOS:6*:*)
377 377
 	# According to config.sub, this is the proper way to canonicalize
378 378
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
379 379
 	# it's likely to be more like Solaris than SunOS4.
380
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
380
+	echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
381 381
 	exit ;;
382 382
     sun4*:SunOS:*:*)
383 383
 	case "`/usr/bin/arch -k`" in
... ...
@@ -386,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
386 386
 		;;
387 387
 	esac
388 388
 	# Japanese Language versions have a version number like `4.1.3-JL'.
389
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
389
+	echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
390 390
 	exit ;;
391 391
     sun3*:SunOS:*:*)
392
-	echo m68k-sun-sunos${UNAME_RELEASE}
392
+	echo m68k-sun-sunos"$UNAME_RELEASE"
393 393
 	exit ;;
394 394
     sun*:*:4.2BSD:*)
395 395
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
396
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
396
+	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
397 397
 	case "`/bin/arch`" in
398 398
 	    sun3)
399
-		echo m68k-sun-sunos${UNAME_RELEASE}
399
+		echo m68k-sun-sunos"$UNAME_RELEASE"
400 400
 		;;
401 401
 	    sun4)
402
-		echo sparc-sun-sunos${UNAME_RELEASE}
402
+		echo sparc-sun-sunos"$UNAME_RELEASE"
403 403
 		;;
404 404
 	esac
405 405
 	exit ;;
406 406
     aushp:SunOS:*:*)
407
-	echo sparc-auspex-sunos${UNAME_RELEASE}
407
+	echo sparc-auspex-sunos"$UNAME_RELEASE"
408 408
 	exit ;;
409 409
     # The situation for MiNT is a little confusing.  The machine name
410 410
     # can be virtually everything (everything which is not
... ...
@@ -415,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
415 415
     # MiNT.  But MiNT is downward compatible to TOS, so this should
416 416
     # be no problem.
417 417
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
418
-	echo m68k-atari-mint${UNAME_RELEASE}
418
+	echo m68k-atari-mint"$UNAME_RELEASE"
419 419
 	exit ;;
420 420
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
421
-	echo m68k-atari-mint${UNAME_RELEASE}
421
+	echo m68k-atari-mint"$UNAME_RELEASE"
422 422
 	exit ;;
423 423
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
424
-	echo m68k-atari-mint${UNAME_RELEASE}
424
+	echo m68k-atari-mint"$UNAME_RELEASE"
425 425
 	exit ;;
426 426
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
427
-	echo m68k-milan-mint${UNAME_RELEASE}
427
+	echo m68k-milan-mint"$UNAME_RELEASE"
428 428
 	exit ;;
429 429
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
430
-	echo m68k-hades-mint${UNAME_RELEASE}
430
+	echo m68k-hades-mint"$UNAME_RELEASE"
431 431
 	exit ;;
432 432
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
433
-	echo m68k-unknown-mint${UNAME_RELEASE}
433
+	echo m68k-unknown-mint"$UNAME_RELEASE"
434 434
 	exit ;;
435 435
     m68k:machten:*:*)
436
-	echo m68k-apple-machten${UNAME_RELEASE}
436
+	echo m68k-apple-machten"$UNAME_RELEASE"
437 437
 	exit ;;
438 438
     powerpc:machten:*:*)
439
-	echo powerpc-apple-machten${UNAME_RELEASE}
439
+	echo powerpc-apple-machten"$UNAME_RELEASE"
440 440
 	exit ;;
441 441
     RISC*:Mach:*:*)
442 442
 	echo mips-dec-mach_bsd4.3
443 443
 	exit ;;
444 444
     RISC*:ULTRIX:*:*)
445
-	echo mips-dec-ultrix${UNAME_RELEASE}
445
+	echo mips-dec-ultrix"$UNAME_RELEASE"
446 446
 	exit ;;
447 447
     VAX*:ULTRIX*:*:*)
448
-	echo vax-dec-ultrix${UNAME_RELEASE}
448
+	echo vax-dec-ultrix"$UNAME_RELEASE"
449 449
 	exit ;;
450 450
     2020:CLIX:*:* | 2430:CLIX:*:*)
451
-	echo clipper-intergraph-clix${UNAME_RELEASE}
451
+	echo clipper-intergraph-clix"$UNAME_RELEASE"
452 452
 	exit ;;
453 453
     mips:*:*:UMIPS | mips:*:*:RISCos)
454
-	eval $set_cc_for_build
455
-	sed 's/^	//' << EOF >$dummy.c
454
+	eval "$set_cc_for_build"
455
+	sed 's/^	//' << EOF > "$dummy.c"
456 456
 #ifdef __cplusplus
457 457
 #include <stdio.h>  /* for printf() prototype */
458 458
 	int main (int argc, char *argv[]) {
... ...
@@ -461,23 +492,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
461 461
 #endif
462 462
 	#if defined (host_mips) && defined (MIPSEB)
463 463
 	#if defined (SYSTYPE_SYSV)
464
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
464
+	  printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
465 465
 	#endif
466 466
 	#if defined (SYSTYPE_SVR4)
467
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
467
+	  printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
468 468
 	#endif
469 469
 	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
470
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
470
+	  printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
471 471
 	#endif
472 472
 	#endif
473 473
 	  exit (-1);
474 474
 	}
475 475
 EOF
476
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
477
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
478
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
476
+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
477
+	  dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
478
+	  SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
479 479
 	    { echo "$SYSTEM_NAME"; exit; }
480
-	echo mips-mips-riscos${UNAME_RELEASE}
480
+	echo mips-mips-riscos"$UNAME_RELEASE"
481 481
 	exit ;;
482 482
     Motorola:PowerMAX_OS:*:*)
483 483
 	echo powerpc-motorola-powermax
... ...
@@ -503,17 +534,17 @@ EOF
503 503
     AViiON:dgux:*:*)
504 504
 	# DG/UX returns AViiON for all architectures
505 505
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
506
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
506
+	if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
507 507
 	then
508
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
509
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
508
+	    if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
509
+	       [ "$TARGET_BINARY_INTERFACE"x = x ]
510 510
 	    then
511
-		echo m88k-dg-dgux${UNAME_RELEASE}
511
+		echo m88k-dg-dgux"$UNAME_RELEASE"
512 512
 	    else
513
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
513
+		echo m88k-dg-dguxbcs"$UNAME_RELEASE"
514 514
 	    fi
515 515
 	else
516
-	    echo i586-dg-dgux${UNAME_RELEASE}
516
+	    echo i586-dg-dgux"$UNAME_RELEASE"
517 517
 	fi
518 518
 	exit ;;
519 519
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
... ...
@@ -530,7 +561,7 @@ EOF
530 530
 	echo m68k-tektronix-bsd
531 531
 	exit ;;
532 532
     *:IRIX*:*:*)
533
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
533
+	echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
534 534
 	exit ;;
535 535
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
536 536
 	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
... ...
@@ -542,14 +573,14 @@ EOF
542 542
 	if [ -x /usr/bin/oslevel ] ; then
543 543
 		IBM_REV=`/usr/bin/oslevel`
544 544
 	else
545
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
545
+		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
546 546
 	fi
547
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
547
+	echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
548 548
 	exit ;;
549 549
     *:AIX:2:3)
550 550
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
551
-		eval $set_cc_for_build
552
-		sed 's/^		//' << EOF >$dummy.c
551
+		eval "$set_cc_for_build"
552
+		sed 's/^		//' << EOF > "$dummy.c"
553 553
 		#include <sys/systemcfg.h>
554 554
 
555 555
 		main()
... ...
@@ -560,7 +591,7 @@ EOF
560 560
 			exit(0);
561 561
 			}
562 562
 EOF
563
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
563
+		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
564 564
 		then
565 565
 			echo "$SYSTEM_NAME"
566 566
 		else
... ...
@@ -574,26 +605,27 @@ EOF
574 574
 	exit ;;
575 575
     *:AIX:*:[4567])
576 576
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
577
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
577
+	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
578 578
 		IBM_ARCH=rs6000
579 579
 	else
580 580
 		IBM_ARCH=powerpc
581 581
 	fi
582
-	if [ -x /usr/bin/oslevel ] ; then
583
-		IBM_REV=`/usr/bin/oslevel`
582
+	if [ -x /usr/bin/lslpp ] ; then
583
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
584
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
584 585
 	else
585
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
586
+		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
586 587
 	fi
587
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
588
+	echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
588 589
 	exit ;;
589 590
     *:AIX:*:*)
590 591
 	echo rs6000-ibm-aix
591 592
 	exit ;;
592
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
593
+    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
593 594
 	echo romp-ibm-bsd4.4
594 595
 	exit ;;
595 596
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
596
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
597
+	echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to
597 598
 	exit ;;                             # report: romp-ibm BSD 4.3
598 599
     *:BOSX:*:*)
599 600
 	echo rs6000-bull-bosx
... ...
@@ -608,28 +640,28 @@ EOF
608 608
 	echo m68k-hp-bsd4.4
609 609
 	exit ;;
610 610
     9000/[34678]??:HP-UX:*:*)
611
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
612
-	case "${UNAME_MACHINE}" in
613
-	    9000/31? )            HP_ARCH=m68000 ;;
614
-	    9000/[34]?? )         HP_ARCH=m68k ;;
611
+	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
612
+	case "$UNAME_MACHINE" in
613
+	    9000/31?)            HP_ARCH=m68000 ;;
614
+	    9000/[34]??)         HP_ARCH=m68k ;;
615 615
 	    9000/[678][0-9][0-9])
616 616
 		if [ -x /usr/bin/getconf ]; then
617 617
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
618 618
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
619
-		    case "${sc_cpu_version}" in
620
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
621
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
619
+		    case "$sc_cpu_version" in
620
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
621
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
622 622
 		      532)                      # CPU_PA_RISC2_0
623
-			case "${sc_kernel_bits}" in
624
-			  32) HP_ARCH="hppa2.0n" ;;
625
-			  64) HP_ARCH="hppa2.0w" ;;
626
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
623
+			case "$sc_kernel_bits" in
624
+			  32) HP_ARCH=hppa2.0n ;;
625
+			  64) HP_ARCH=hppa2.0w ;;
626
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
627 627
 			esac ;;
628 628
 		    esac
629 629
 		fi
630
-		if [ "${HP_ARCH}" = "" ]; then
631
-		    eval $set_cc_for_build
632
-		    sed 's/^		//' << EOF >$dummy.c
630
+		if [ "$HP_ARCH" = "" ]; then
631
+		    eval "$set_cc_for_build"
632
+		    sed 's/^		//' << EOF > "$dummy.c"
633 633
 
634 634
 		#define _HPUX_SOURCE
635 635
 		#include <stdlib.h>
... ...
@@ -662,13 +694,13 @@ EOF
662 662
 		    exit (0);
663 663
 		}
664 664
 EOF
665
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
665
+		    (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
666 666
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
667 667
 		fi ;;
668 668
 	esac
669
-	if [ ${HP_ARCH} = "hppa2.0w" ]
669
+	if [ "$HP_ARCH" = hppa2.0w ]
670 670
 	then
671
-	    eval $set_cc_for_build
671
+	    eval "$set_cc_for_build"
672 672
 
673 673
 	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
674 674
 	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
... ...
@@ -679,23 +711,23 @@ EOF
679 679
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
680 680
 	    # => hppa64-hp-hpux11.23
681 681
 
682
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
682
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
683 683
 		grep -q __LP64__
684 684
 	    then
685
-		HP_ARCH="hppa2.0w"
685
+		HP_ARCH=hppa2.0w
686 686
 	    else
687
-		HP_ARCH="hppa64"
687
+		HP_ARCH=hppa64
688 688
 	    fi
689 689
 	fi
690
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
690
+	echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
691 691
 	exit ;;
692 692
     ia64:HP-UX:*:*)
693
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
694
-	echo ia64-hp-hpux${HPUX_REV}
693
+	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
694
+	echo ia64-hp-hpux"$HPUX_REV"
695 695
 	exit ;;
696 696
     3050*:HI-UX:*:*)
697
-	eval $set_cc_for_build
698
-	sed 's/^	//' << EOF >$dummy.c
697
+	eval "$set_cc_for_build"
698
+	sed 's/^	//' << EOF > "$dummy.c"
699 699
 	#include <unistd.h>
700 700
 	int
701 701
 	main ()
... ...
@@ -720,11 +752,11 @@ EOF
720 720
 	  exit (0);
721 721
 	}
722 722
 EOF
723
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
723
+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
724 724
 		{ echo "$SYSTEM_NAME"; exit; }
725 725
 	echo unknown-hitachi-hiuxwe2
726 726
 	exit ;;
727
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
727
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
728 728
 	echo hppa1.1-hp-bsd
729 729
 	exit ;;
730 730
     9000/8??:4.3bsd:*:*)
... ...
@@ -733,7 +765,7 @@ EOF
733 733
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
734 734
 	echo hppa1.0-hp-mpeix
735 735
 	exit ;;
736
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
736
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
737 737
 	echo hppa1.1-hp-osf
738 738
 	exit ;;
739 739
     hp8??:OSF1:*:*)
... ...
@@ -741,9 +773,9 @@ EOF
741 741
 	exit ;;
742 742
     i*86:OSF1:*:*)
743 743
 	if [ -x /usr/sbin/sysversion ] ; then
744
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
744
+	    echo "$UNAME_MACHINE"-unknown-osf1mk
745 745
 	else
746
-	    echo ${UNAME_MACHINE}-unknown-osf1
746
+	    echo "$UNAME_MACHINE"-unknown-osf1
747 747
 	fi
748 748
 	exit ;;
749 749
     parisc*:Lites*:*:*)
... ...
@@ -768,127 +800,109 @@ EOF
768 768
 	echo c4-convex-bsd
769 769
 	exit ;;
770 770
     CRAY*Y-MP:*:*:*)
771
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
771
+	echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
772 772
 	exit ;;
773 773
     CRAY*[A-Z]90:*:*:*)
774
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
774
+	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
775 775
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
776 776
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
777 777
 	      -e 's/\.[^.]*$/.X/'
778 778
 	exit ;;
779 779
     CRAY*TS:*:*:*)
780
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
780
+	echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
781 781
 	exit ;;
782 782
     CRAY*T3E:*:*:*)
783
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
783
+	echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
784 784
 	exit ;;
785 785
     CRAY*SV1:*:*:*)
786
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
786
+	echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
787 787
 	exit ;;
788 788
     *:UNICOS/mp:*:*)
789
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
789
+	echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
790 790
 	exit ;;
791 791
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
792
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
793
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
794
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
792
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
793
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
794
+	FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
795 795
 	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
796 796
 	exit ;;
797 797
     5000:UNIX_System_V:4.*:*)
798
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
799
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
798
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
799
+	FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
800 800
 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
801 801
 	exit ;;
802 802
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
803
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
803
+	echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
804 804
 	exit ;;
805 805
     sparc*:BSD/OS:*:*)
806
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
806
+	echo sparc-unknown-bsdi"$UNAME_RELEASE"
807 807
 	exit ;;
808 808
     *:BSD/OS:*:*)
809
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
809
+	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
810 810
 	exit ;;
811 811
     *:FreeBSD:*:*)
812 812
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
813
-	case ${UNAME_PROCESSOR} in
813
+	case "$UNAME_PROCESSOR" in
814 814
 	    amd64)
815
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
816
-	    *)
817
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
815
+		UNAME_PROCESSOR=x86_64 ;;
816
+	    i386)
817
+		UNAME_PROCESSOR=i586 ;;
818 818
 	esac
819
+	echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
819 820
 	exit ;;
820 821
     i*:CYGWIN*:*)
821
-	echo ${UNAME_MACHINE}-pc-cygwin
822
+	echo "$UNAME_MACHINE"-pc-cygwin
822 823
 	exit ;;
823 824
     *:MINGW64*:*)
824
-	echo ${UNAME_MACHINE}-pc-mingw64
825
+	echo "$UNAME_MACHINE"-pc-mingw64
825 826
 	exit ;;
826 827
     *:MINGW*:*)
827
-	echo ${UNAME_MACHINE}-pc-mingw32
828
-	exit ;;
829
-    i*:MSYS*:*)
830
-	echo ${UNAME_MACHINE}-pc-msys
828
+	echo "$UNAME_MACHINE"-pc-mingw32
831 829
 	exit ;;
832
-    i*:windows32*:*)
833
-	# uname -m includes "-pc" on this system.
834
-	echo ${UNAME_MACHINE}-mingw32
830
+    *:MSYS*:*)
831
+	echo "$UNAME_MACHINE"-pc-msys
835 832
 	exit ;;
836 833
     i*:PW*:*)
837
-	echo ${UNAME_MACHINE}-pc-pw32
834
+	echo "$UNAME_MACHINE"-pc-pw32
838 835
 	exit ;;
839 836
     *:Interix*:*)
840
-	case ${UNAME_MACHINE} in
837
+	case "$UNAME_MACHINE" in
841 838
 	    x86)
842
-		echo i586-pc-interix${UNAME_RELEASE}
839
+		echo i586-pc-interix"$UNAME_RELEASE"
843 840
 		exit ;;
844 841
 	    authenticamd | genuineintel | EM64T)
845
-		echo x86_64-unknown-interix${UNAME_RELEASE}
842
+		echo x86_64-unknown-interix"$UNAME_RELEASE"
846 843
 		exit ;;
847 844
 	    IA64)
848
-		echo ia64-unknown-interix${UNAME_RELEASE}
845
+		echo ia64-unknown-interix"$UNAME_RELEASE"
849 846
 		exit ;;
850 847
 	esac ;;
851
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
852
-	echo i${UNAME_MACHINE}-pc-mks
853
-	exit ;;
854
-    8664:Windows_NT:*)
855
-	echo x86_64-pc-mks
856
-	exit ;;
857
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
858
-	# How do we know it's Interix rather than the generic POSIX subsystem?
859
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
860
-	# UNAME_MACHINE based on the output of uname instead of i386?
861
-	echo i586-pc-interix
862
-	exit ;;
863 848
     i*:UWIN*:*)
864
-	echo ${UNAME_MACHINE}-pc-uwin
849
+	echo "$UNAME_MACHINE"-pc-uwin
865 850
 	exit ;;
866 851
     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
867 852
 	echo x86_64-unknown-cygwin
868 853
 	exit ;;
869
-    p*:CYGWIN*:*)
870
-	echo powerpcle-unknown-cygwin
871
-	exit ;;
872 854
     prep*:SunOS:5.*:*)
873
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
855
+	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
874 856
 	exit ;;
875 857
     *:GNU:*:*)
876 858
 	# the GNU system
877
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
859
+	echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
878 860
 	exit ;;
879 861
     *:GNU/*:*:*)
880 862
 	# other systems with GNU libc and userland
881
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
863
+	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
882 864
 	exit ;;
883 865
     i*86:Minix:*:*)
884
-	echo ${UNAME_MACHINE}-pc-minix
866
+	echo "$UNAME_MACHINE"-pc-minix
885 867
 	exit ;;
886 868
     aarch64:Linux:*:*)
887
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
869
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
888 870
 	exit ;;
889 871
     aarch64_be:Linux:*:*)
890 872
 	UNAME_MACHINE=aarch64_be
891
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
873
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
892 874
 	exit ;;
893 875
     alpha:Linux:*:*)
894 876
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
... ...
@@ -901,58 +915,64 @@ EOF
901 901
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
902 902
 	esac
903 903
 	objdump --private-headers /bin/sh | grep -q ld.so.1
904
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
905
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
904
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
905
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
906 906
 	exit ;;
907 907
     arc:Linux:*:* | arceb:Linux:*:*)
908
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
908
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
909 909
 	exit ;;
910 910
     arm*:Linux:*:*)
911
-	eval $set_cc_for_build
911
+	eval "$set_cc_for_build"
912 912
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
913 913
 	    | grep -q __ARM_EABI__
914 914
 	then
915
-	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
915
+	    echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
916 916
 	else
917 917
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
918 918
 		| grep -q __ARM_PCS_VFP
919 919
 	    then
920
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
920
+		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
921 921
 	    else
922
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
922
+		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
923 923
 	    fi
924 924
 	fi
925 925
 	exit ;;
926 926
     avr32*:Linux:*:*)
927
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
927
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
928 928
 	exit ;;
929 929
     cris:Linux:*:*)
930
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
930
+	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
931 931
 	exit ;;
932 932
     crisv32:Linux:*:*)
933
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
933
+	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
934
+	exit ;;
935
+    e2k:Linux:*:*)
936
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
934 937
 	exit ;;
935 938
     frv:Linux:*:*)
936
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
939
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
937 940
 	exit ;;
938 941
     hexagon:Linux:*:*)
939
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
942
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
940 943
 	exit ;;
941 944
     i*86:Linux:*:*)
942
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
945
+	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
943 946
 	exit ;;
944 947
     ia64:Linux:*:*)
945
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
948
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
949
+	exit ;;
950
+    k1om:Linux:*:*)
951
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
946 952
 	exit ;;
947 953
     m32r*:Linux:*:*)
948
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
954
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
949 955
 	exit ;;
950 956
     m68*:Linux:*:*)
951
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
957
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
952 958
 	exit ;;
953 959
     mips:Linux:*:* | mips64:Linux:*:*)
954
-	eval $set_cc_for_build
955
-	sed 's/^	//' << EOF >$dummy.c
960
+	eval "$set_cc_for_build"
961
+	sed 's/^	//' << EOF > "$dummy.c"
956 962
 	#undef CPU
957 963
 	#undef ${UNAME_MACHINE}
958 964
 	#undef ${UNAME_MACHINE}el
... ...
@@ -966,64 +986,74 @@ EOF
966 966
 	#endif
967 967
 	#endif
968 968
 EOF
969
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
970
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
969
+	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
970
+	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
971 971
 	;;
972
-    or1k:Linux:*:*)
973
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
972
+    mips64el:Linux:*:*)
973
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
974 974
 	exit ;;
975
-    or32:Linux:*:*)
976
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
975
+    openrisc*:Linux:*:*)
976
+	echo or1k-unknown-linux-"$LIBC"
977
+	exit ;;
978
+    or32:Linux:*:* | or1k*:Linux:*:*)
979
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
977 980
 	exit ;;
978 981
     padre:Linux:*:*)
979
-	echo sparc-unknown-linux-${LIBC}
982
+	echo sparc-unknown-linux-"$LIBC"
980 983
 	exit ;;
981 984
     parisc64:Linux:*:* | hppa64:Linux:*:*)
982
-	echo hppa64-unknown-linux-${LIBC}
985
+	echo hppa64-unknown-linux-"$LIBC"
983 986
 	exit ;;
984 987
     parisc:Linux:*:* | hppa:Linux:*:*)
985 988
 	# Look for CPU level
986 989
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
987
-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
988
-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
989
-	  *)    echo hppa-unknown-linux-${LIBC} ;;
990
+	  PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
991
+	  PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
992
+	  *)    echo hppa-unknown-linux-"$LIBC" ;;
990 993
 	esac
991 994
 	exit ;;
992 995
     ppc64:Linux:*:*)
993
-	echo powerpc64-unknown-linux-${LIBC}
996
+	echo powerpc64-unknown-linux-"$LIBC"
994 997
 	exit ;;
995 998
     ppc:Linux:*:*)
996
-	echo powerpc-unknown-linux-${LIBC}
999
+	echo powerpc-unknown-linux-"$LIBC"
997 1000
 	exit ;;
998 1001
     ppc64le:Linux:*:*)
999
-	echo powerpc64le-unknown-linux-${LIBC}
1002
+	echo powerpc64le-unknown-linux-"$LIBC"
1000 1003
 	exit ;;
1001 1004
     ppcle:Linux:*:*)
1002
-	echo powerpcle-unknown-linux-${LIBC}
1005
+	echo powerpcle-unknown-linux-"$LIBC"
1006
+	exit ;;
1007
+    riscv32:Linux:*:* | riscv64:Linux:*:*)
1008
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1003 1009
 	exit ;;
1004 1010
     s390:Linux:*:* | s390x:Linux:*:*)
1005
-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
1011
+	echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
1006 1012
 	exit ;;
1007 1013
     sh64*:Linux:*:*)
1008
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1014
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1009 1015
 	exit ;;
1010 1016
     sh*:Linux:*:*)
1011
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1017
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1012 1018
 	exit ;;
1013 1019
     sparc:Linux:*:* | sparc64:Linux:*:*)
1014
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1020
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1015 1021
 	exit ;;
1016 1022
     tile*:Linux:*:*)
1017
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1023
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1018 1024
 	exit ;;
1019 1025
     vax:Linux:*:*)
1020
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
1026
+	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
1021 1027
 	exit ;;
1022 1028
     x86_64:Linux:*:*)
1023
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1029
+	if objdump -f /bin/sh | grep -q elf32-x86-64; then
1030
+	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
1031
+	else
1032
+	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
1033
+	fi
1024 1034
 	exit ;;
1025 1035
     xtensa*:Linux:*:*)
1026
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1036
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1027 1037
 	exit ;;
1028 1038
     i*86:DYNIX/ptx:4*:*)
1029 1039
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
... ...
@@ -1037,34 +1067,34 @@ EOF
1037 1037
 	# I am not positive that other SVR4 systems won't match this,
1038 1038
 	# I just have to hope.  -- rms.
1039 1039
 	# Use sysv4.2uw... so that sysv4* matches it.
1040
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
1040
+	echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
1041 1041
 	exit ;;
1042 1042
     i*86:OS/2:*:*)
1043 1043
 	# If we were able to find `uname', then EMX Unix compatibility
1044 1044
 	# is probably installed.
1045
-	echo ${UNAME_MACHINE}-pc-os2-emx
1045
+	echo "$UNAME_MACHINE"-pc-os2-emx
1046 1046
 	exit ;;
1047 1047
     i*86:XTS-300:*:STOP)
1048
-	echo ${UNAME_MACHINE}-unknown-stop
1048
+	echo "$UNAME_MACHINE"-unknown-stop
1049 1049
 	exit ;;
1050 1050
     i*86:atheos:*:*)
1051
-	echo ${UNAME_MACHINE}-unknown-atheos
1051
+	echo "$UNAME_MACHINE"-unknown-atheos
1052 1052
 	exit ;;
1053 1053
     i*86:syllable:*:*)
1054
-	echo ${UNAME_MACHINE}-pc-syllable
1054
+	echo "$UNAME_MACHINE"-pc-syllable
1055 1055
 	exit ;;
1056 1056
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
1057
-	echo i386-unknown-lynxos${UNAME_RELEASE}
1057
+	echo i386-unknown-lynxos"$UNAME_RELEASE"
1058 1058
 	exit ;;
1059 1059
     i*86:*DOS:*:*)
1060
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
1060
+	echo "$UNAME_MACHINE"-pc-msdosdjgpp
1061 1061
 	exit ;;
1062
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
1063
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
1062
+    i*86:*:4.*:*)
1063
+	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
1064 1064
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
1065
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
1065
+		echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
1066 1066
 	else
1067
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
1067
+		echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
1068 1068
 	fi
1069 1069
 	exit ;;
1070 1070
     i*86:*:5:[678]*)
... ...
@@ -1074,12 +1104,12 @@ EOF
1074 1074
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
1075 1075
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
1076 1076
 	esac
1077
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
1077
+	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
1078 1078
 	exit ;;
1079 1079
     i*86:*:3.2:*)
1080 1080
 	if test -f /usr/options/cb.name; then
1081 1081
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
1082
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
1082
+		echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
1083 1083
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
1084 1084
 		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
1085 1085
 		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
... ...
@@ -1089,9 +1119,9 @@ EOF
1089 1089
 			&& UNAME_MACHINE=i686
1090 1090
 		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
1091 1091
 			&& UNAME_MACHINE=i686
1092
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
1092
+		echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
1093 1093
 	else
1094
-		echo ${UNAME_MACHINE}-pc-sysv32
1094
+		echo "$UNAME_MACHINE"-pc-sysv32
1095 1095
 	fi
1096 1096
 	exit ;;
1097 1097
     pc:*:*:*)
... ...
@@ -1099,7 +1129,7 @@ EOF
1099 1099
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
1100 1100
 	# the processor, so we play safe by assuming i586.
1101 1101
 	# Note: whatever this is, it MUST be the same as what config.sub
1102
-	# prints for the "djgpp" host, or else GDB configury will decide that
1102
+	# prints for the "djgpp" host, or else GDB configure will decide that
1103 1103
 	# this is a cross-build.
1104 1104
 	echo i586-pc-msdosdjgpp
1105 1105
 	exit ;;
... ...
@@ -1111,9 +1141,9 @@ EOF
1111 1111
 	exit ;;
1112 1112
     i860:*:4.*:*) # i860-SVR4
1113 1113
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
1114
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
1114
+	  echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
1115 1115
 	else # Add other i860-SVR4 vendors below as they are discovered.
1116
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
1116
+	  echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
1117 1117
 	fi
1118 1118
 	exit ;;
1119 1119
     mini*:CTIX:SYS*5:*)
... ...
@@ -1133,9 +1163,9 @@ EOF
1133 1133
 	test -r /etc/.relid \
1134 1134
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1135 1135
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1136
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1136
+	  && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
1137 1137
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1138
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1138
+	  && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
1139 1139
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1140 1140
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1141 1141
 	  && { echo i486-ncr-sysv4; exit; } ;;
... ...
@@ -1144,28 +1174,28 @@ EOF
1144 1144
 	test -r /etc/.relid \
1145 1145
 	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1146 1146
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1147
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1147
+	    && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
1148 1148
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1149
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
1149
+	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
1150 1150
 	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
1151
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1151
+	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
1152 1152
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
1153
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
1153
+	echo m68k-unknown-lynxos"$UNAME_RELEASE"
1154 1154
 	exit ;;
1155 1155
     mc68030:UNIX_System_V:4.*:*)
1156 1156
 	echo m68k-atari-sysv4
1157 1157
 	exit ;;
1158 1158
     TSUNAMI:LynxOS:2.*:*)
1159
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
1159
+	echo sparc-unknown-lynxos"$UNAME_RELEASE"
1160 1160
 	exit ;;
1161 1161
     rs6000:LynxOS:2.*:*)
1162
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
1162
+	echo rs6000-unknown-lynxos"$UNAME_RELEASE"
1163 1163
 	exit ;;
1164 1164
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
1165
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
1165
+	echo powerpc-unknown-lynxos"$UNAME_RELEASE"
1166 1166
 	exit ;;
1167 1167
     SM[BE]S:UNIX_SV:*:*)
1168
-	echo mips-dde-sysv${UNAME_RELEASE}
1168
+	echo mips-dde-sysv"$UNAME_RELEASE"
1169 1169
 	exit ;;
1170 1170
     RM*:ReliantUNIX-*:*:*)
1171 1171
 	echo mips-sni-sysv4
... ...
@@ -1176,7 +1206,7 @@ EOF
1176 1176
     *:SINIX-*:*:*)
1177 1177
 	if uname -p 2>/dev/null >/dev/null ; then
1178 1178
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
1179
-		echo ${UNAME_MACHINE}-sni-sysv4
1179
+		echo "$UNAME_MACHINE"-sni-sysv4
1180 1180
 	else
1181 1181
 		echo ns32k-sni-sysv
1182 1182
 	fi
... ...
@@ -1196,23 +1226,23 @@ EOF
1196 1196
 	exit ;;
1197 1197
     i*86:VOS:*:*)
1198 1198
 	# From Paul.Green@stratus.com.
1199
-	echo ${UNAME_MACHINE}-stratus-vos
1199
+	echo "$UNAME_MACHINE"-stratus-vos
1200 1200
 	exit ;;
1201 1201
     *:VOS:*:*)
1202 1202
 	# From Paul.Green@stratus.com.
1203 1203
 	echo hppa1.1-stratus-vos
1204 1204
 	exit ;;
1205 1205
     mc68*:A/UX:*:*)
1206
-	echo m68k-apple-aux${UNAME_RELEASE}
1206
+	echo m68k-apple-aux"$UNAME_RELEASE"
1207 1207
 	exit ;;
1208 1208
     news*:NEWS-OS:6*:*)
1209 1209
 	echo mips-sony-newsos6
1210 1210
 	exit ;;
1211 1211
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1212 1212
 	if [ -d /usr/nec ]; then
1213
-		echo mips-nec-sysv${UNAME_RELEASE}
1213
+		echo mips-nec-sysv"$UNAME_RELEASE"
1214 1214
 	else
1215
-		echo mips-unknown-sysv${UNAME_RELEASE}
1215
+		echo mips-unknown-sysv"$UNAME_RELEASE"
1216 1216
 	fi
1217 1217
 	exit ;;
1218 1218
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
... ...
@@ -1231,67 +1261,93 @@ EOF
1231 1231
 	echo x86_64-unknown-haiku
1232 1232
 	exit ;;
1233 1233
     SX-4:SUPER-UX:*:*)
1234
-	echo sx4-nec-superux${UNAME_RELEASE}
1234
+	echo sx4-nec-superux"$UNAME_RELEASE"
1235 1235
 	exit ;;
1236 1236
     SX-5:SUPER-UX:*:*)
1237
-	echo sx5-nec-superux${UNAME_RELEASE}
1237
+	echo sx5-nec-superux"$UNAME_RELEASE"
1238 1238
 	exit ;;
1239 1239
     SX-6:SUPER-UX:*:*)
1240
-	echo sx6-nec-superux${UNAME_RELEASE}
1240
+	echo sx6-nec-superux"$UNAME_RELEASE"
1241 1241
 	exit ;;
1242 1242
     SX-7:SUPER-UX:*:*)
1243
-	echo sx7-nec-superux${UNAME_RELEASE}
1243
+	echo sx7-nec-superux"$UNAME_RELEASE"
1244 1244
 	exit ;;
1245 1245
     SX-8:SUPER-UX:*:*)
1246
-	echo sx8-nec-superux${UNAME_RELEASE}
1246
+	echo sx8-nec-superux"$UNAME_RELEASE"
1247 1247
 	exit ;;
1248 1248
     SX-8R:SUPER-UX:*:*)
1249
-	echo sx8r-nec-superux${UNAME_RELEASE}
1249
+	echo sx8r-nec-superux"$UNAME_RELEASE"
1250
+	exit ;;
1251
+    SX-ACE:SUPER-UX:*:*)
1252
+	echo sxace-nec-superux"$UNAME_RELEASE"
1250 1253
 	exit ;;
1251 1254
     Power*:Rhapsody:*:*)
1252
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
1255
+	echo powerpc-apple-rhapsody"$UNAME_RELEASE"
1253 1256
 	exit ;;
1254 1257
     *:Rhapsody:*:*)
1255
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
1258
+	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
1256 1259
 	exit ;;
1257 1260
     *:Darwin:*:*)
1258 1261
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1259
-	eval $set_cc_for_build
1262
+	eval "$set_cc_for_build"
1260 1263
 	if test "$UNAME_PROCESSOR" = unknown ; then
1261 1264
 	    UNAME_PROCESSOR=powerpc
1262 1265
 	fi
1263
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1264
-	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1265
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1266
-		grep IS_64BIT_ARCH >/dev/null
1267
-	    then
1268
-		case $UNAME_PROCESSOR in
1269
-		    i386) UNAME_PROCESSOR=x86_64 ;;
1270
-		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
1271
-		esac
1266
+	if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
1267
+	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
1268
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1269
+		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
1270
+		       grep IS_64BIT_ARCH >/dev/null
1271
+		then
1272
+		    case $UNAME_PROCESSOR in
1273
+			i386) UNAME_PROCESSOR=x86_64 ;;
1274
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
1275
+		    esac
1276
+		fi
1277
+		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
1278
+		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
1279
+		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
1280
+		       grep IS_PPC >/dev/null
1281
+		then
1282
+		    UNAME_PROCESSOR=powerpc
1283
+		fi
1272 1284
 	    fi
1285
+	elif test "$UNAME_PROCESSOR" = i386 ; then
1286
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
1287
+	    # that puts up a graphical alert prompting to install
1288
+	    # developer tools.  Any system running Mac OS X 10.7 or
1289
+	    # later (Darwin 11 and later) is required to have a 64-bit
1290
+	    # processor. This is not true of the ARM version of Darwin
1291
+	    # that Apple uses in portable devices.
1292
+	    UNAME_PROCESSOR=x86_64
1273 1293
 	fi
1274
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1294
+	echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
1275 1295
 	exit ;;
1276 1296
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
1277 1297
 	UNAME_PROCESSOR=`uname -p`
1278
-	if test "$UNAME_PROCESSOR" = "x86"; then
1298
+	if test "$UNAME_PROCESSOR" = x86; then
1279 1299
 		UNAME_PROCESSOR=i386
1280 1300
 		UNAME_MACHINE=pc
1281 1301
 	fi
1282
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
1302
+	echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
1283 1303
 	exit ;;
1284 1304
     *:QNX:*:4*)
1285 1305
 	echo i386-pc-qnx
1286 1306
 	exit ;;
1287
-    NEO-?:NONSTOP_KERNEL:*:*)
1288
-	echo neo-tandem-nsk${UNAME_RELEASE}
1307
+    NEO-*:NONSTOP_KERNEL:*:*)
1308
+	echo neo-tandem-nsk"$UNAME_RELEASE"
1289 1309
 	exit ;;
1290 1310
     NSE-*:NONSTOP_KERNEL:*:*)
1291
-	echo nse-tandem-nsk${UNAME_RELEASE}
1311
+	echo nse-tandem-nsk"$UNAME_RELEASE"
1292 1312
 	exit ;;
1293
-    NSR-?:NONSTOP_KERNEL:*:*)
1294
-	echo nsr-tandem-nsk${UNAME_RELEASE}
1313
+    NSR-*:NONSTOP_KERNEL:*:*)
1314
+	echo nsr-tandem-nsk"$UNAME_RELEASE"
1315
+	exit ;;
1316
+    NSV-*:NONSTOP_KERNEL:*:*)
1317
+	echo nsv-tandem-nsk"$UNAME_RELEASE"
1318
+	exit ;;
1319
+    NSX-*:NONSTOP_KERNEL:*:*)
1320
+	echo nsx-tandem-nsk"$UNAME_RELEASE"
1295 1321
 	exit ;;
1296 1322
     *:NonStop-UX:*:*)
1297 1323
 	echo mips-compaq-nonstopux
... ...
@@ -1300,18 +1356,18 @@ EOF
1300 1300
 	echo bs2000-siemens-sysv
1301 1301
 	exit ;;
1302 1302
     DS/*:UNIX_System_V:*:*)
1303
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
1303
+	echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
1304 1304
 	exit ;;
1305 1305
     *:Plan9:*:*)
1306 1306
 	# "uname -m" is not consistent, so use $cputype instead. 386
1307 1307
 	# is converted to i386 for consistency with other x86
1308 1308
 	# operating systems.
1309
-	if test "$cputype" = "386"; then
1309
+	if test "$cputype" = 386; then
1310 1310
 	    UNAME_MACHINE=i386
1311 1311
 	else
1312 1312
 	    UNAME_MACHINE="$cputype"
1313 1313
 	fi
1314
-	echo ${UNAME_MACHINE}-unknown-plan9
1314
+	echo "$UNAME_MACHINE"-unknown-plan9
1315 1315
 	exit ;;
1316 1316
     *:TOPS-10:*:*)
1317 1317
 	echo pdp10-unknown-tops10
... ...
@@ -1332,14 +1388,14 @@ EOF
1332 1332
 	echo pdp10-unknown-its
1333 1333
 	exit ;;
1334 1334
     SEI:*:*:SEIUX)
1335
-	echo mips-sei-seiux${UNAME_RELEASE}
1335
+	echo mips-sei-seiux"$UNAME_RELEASE"
1336 1336
 	exit ;;
1337 1337
     *:DragonFly:*:*)
1338
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1338
+	echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
1339 1339
 	exit ;;
1340 1340
     *:*VMS:*:*)
1341 1341
 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
1342
-	case "${UNAME_MACHINE}" in
1342
+	case "$UNAME_MACHINE" in
1343 1343
 	    A*) echo alpha-dec-vms ; exit ;;
1344 1344
 	    I*) echo ia64-dec-vms ; exit ;;
1345 1345
 	    V*) echo vax-dec-vms ; exit ;;
... ...
@@ -1348,182 +1404,48 @@ EOF
1348 1348
 	echo i386-pc-xenix
1349 1349
 	exit ;;
1350 1350
     i*86:skyos:*:*)
1351
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
1351
+	echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
1352 1352
 	exit ;;
1353 1353
     i*86:rdos:*:*)
1354
-	echo ${UNAME_MACHINE}-pc-rdos
1354
+	echo "$UNAME_MACHINE"-pc-rdos
1355 1355
 	exit ;;
1356 1356
     i*86:AROS:*:*)
1357
-	echo ${UNAME_MACHINE}-pc-aros
1357
+	echo "$UNAME_MACHINE"-pc-aros
1358 1358
 	exit ;;
1359 1359
     x86_64:VMkernel:*:*)
1360
-	echo ${UNAME_MACHINE}-unknown-esx
1360
+	echo "$UNAME_MACHINE"-unknown-esx
1361
+	exit ;;
1362
+    amd64:Isilon\ OneFS:*:*)
1363
+	echo x86_64-unknown-onefs
1361 1364
 	exit ;;
1362 1365
 esac
1363 1366
 
1364
-eval $set_cc_for_build
1365
-cat >$dummy.c <<EOF
1366
-#ifdef _SEQUENT_
1367
-# include <sys/types.h>
1368
-# include <sys/utsname.h>
1369
-#endif
1370
-main ()
1371
-{
1372
-#if defined (sony)
1373
-#if defined (MIPSEB)
1374
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
1375
-     I don't know....  */
1376
-  printf ("mips-sony-bsd\n"); exit (0);
1377
-#else
1378
-#include <sys/param.h>
1379
-  printf ("m68k-sony-newsos%s\n",
1380
-#ifdef NEWSOS4
1381
-	"4"
1382
-#else
1383
-	""
1384
-#endif
1385
-	); exit (0);
1386
-#endif
1387
-#endif
1388
-
1389
-#if defined (__arm) && defined (__acorn) && defined (__unix)
1390
-  printf ("arm-acorn-riscix\n"); exit (0);
1391
-#endif
1392
-
1393
-#if defined (hp300) && !defined (hpux)
1394
-  printf ("m68k-hp-bsd\n"); exit (0);
1395
-#endif
1396
-
1397
-#if defined (NeXT)
1398
-#if !defined (__ARCHITECTURE__)
1399
-#define __ARCHITECTURE__ "m68k"
1400
-#endif
1401
-  int version;
1402
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
1403
-  if (version < 4)
1404
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
1405
-  else
1406
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
1407
-  exit (0);
1408
-#endif
1409
-
1410
-#if defined (MULTIMAX) || defined (n16)
1411
-#if defined (UMAXV)
1412
-  printf ("ns32k-encore-sysv\n"); exit (0);
1413
-#else
1414
-#if defined (CMU)
1415
-  printf ("ns32k-encore-mach\n"); exit (0);
1416
-#else
1417
-  printf ("ns32k-encore-bsd\n"); exit (0);
1418
-#endif
1419
-#endif
1420
-#endif
1421
-
1422
-#if defined (__386BSD__)
1423
-  printf ("i386-pc-bsd\n"); exit (0);
1424
-#endif
1425
-
1426
-#if defined (sequent)
1427
-#if defined (i386)
1428
-  printf ("i386-sequent-dynix\n"); exit (0);
1429
-#endif
1430
-#if defined (ns32000)
1431
-  printf ("ns32k-sequent-dynix\n"); exit (0);
1432
-#endif
1433
-#endif
1434
-
1435
-#if defined (_SEQUENT_)
1436
-    struct utsname un;
1437
-
1438
-    uname(&un);
1439
-
1440
-    if (strncmp(un.version, "V2", 2) == 0) {
1441
-	printf ("i386-sequent-ptx2\n"); exit (0);
1442
-    }
1443
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
1444
-	printf ("i386-sequent-ptx1\n"); exit (0);
1445
-    }
1446
-    printf ("i386-sequent-ptx\n"); exit (0);
1447
-
1448
-#endif
1449
-
1450
-#if defined (vax)
1451
-# if !defined (ultrix)
1452
-#  include <sys/param.h>
1453
-#  if defined (BSD)
1454
-#   if BSD == 43
1455
-      printf ("vax-dec-bsd4.3\n"); exit (0);
1456
-#   else
1457
-#    if BSD == 199006
1458
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
1459
-#    else
1460
-      printf ("vax-dec-bsd\n"); exit (0);
1461
-#    endif
1462
-#   endif
1463
-#  else
1464
-    printf ("vax-dec-bsd\n"); exit (0);
1465
-#  endif
1466
-# else
1467
-    printf ("vax-dec-ultrix\n"); exit (0);
1468
-# endif
1469
-#endif
1367
+echo "$0: unable to guess system type" >&2
1470 1368
 
1471
-#if defined (alliant) && defined (i860)
1472
-  printf ("i860-alliant-bsd\n"); exit (0);
1473
-#endif
1369
+case "$UNAME_MACHINE:$UNAME_SYSTEM" in
1370
+    mips:Linux | mips64:Linux)
1371
+	# If we got here on MIPS GNU/Linux, output extra information.
1372
+	cat >&2 <<EOF
1474 1373
 
1475
-  exit (1);
1476
-}
1374
+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
1375
+the system type. Please install a C compiler and try again.
1477 1376
 EOF
1478
-
1479
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
1480
-	{ echo "$SYSTEM_NAME"; exit; }
1481
-
1482
-# Apollos put the system type in the environment.
1483
-
1484
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
1485
-
1486
-# Convex versions that predate uname can use getsysinfo(1)
1487
-
1488
-if [ -x /usr/convex/getsysinfo ]
1489
-then
1490
-    case `getsysinfo -f cpu_type` in
1491
-    c1*)
1492
-	echo c1-convex-bsd
1493
-	exit ;;
1494
-    c2*)
1495
-	if getsysinfo -f scalar_acc
1496
-	then echo c32-convex-bsd
1497
-	else echo c2-convex-bsd
1498
-	fi
1499
-	exit ;;
1500
-    c34*)
1501
-	echo c34-convex-bsd
1502
-	exit ;;
1503
-    c38*)
1504
-	echo c38-convex-bsd
1505
-	exit ;;
1506
-    c4*)
1507
-	echo c4-convex-bsd
1508
-	exit ;;
1509
-    esac
1510
-fi
1377
+	;;
1378
+esac
1511 1379
 
1512 1380
 cat >&2 <<EOF
1513
-$0: unable to guess system type
1514 1381
 
1515
-This script, last modified $timestamp, has failed to recognize
1516
-the operating system you are using. It is advised that you
1517
-download the most up to date version of the config scripts from
1382
+This script (version $timestamp), has failed to recognize the
1383
+operating system you are using. If your script is old, overwrite *all*
1384
+copies of config.guess and config.sub with the latest versions from:
1518 1385
 
1519
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
1386
+  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
1520 1387
 and
1521
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
1388
+  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
1522 1389
 
1523
-If the version you run ($0) is already up to date, please
1524
-send the following data and any information you think might be
1525
-pertinent to <config-patches@gnu.org> in order to provide the needed
1526
-information to handle your system.
1390
+If $0 has already been updated, send the following data and any
1391
+information you think might be pertinent to config-patches@gnu.org to
1392
+provide the necessary information to handle your system.
1527 1393
 
1528 1394
 config.guess timestamp = $timestamp
1529 1395
 
... ...
@@ -1542,16 +1464,16 @@ hostinfo               = `(hostinfo) 2>/dev/null`
1542 1542
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
1543 1543
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
1544 1544
 
1545
-UNAME_MACHINE = ${UNAME_MACHINE}
1546
-UNAME_RELEASE = ${UNAME_RELEASE}
1547
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
1548
-UNAME_VERSION = ${UNAME_VERSION}
1545
+UNAME_MACHINE = "$UNAME_MACHINE"
1546
+UNAME_RELEASE = "$UNAME_RELEASE"
1547
+UNAME_SYSTEM  = "$UNAME_SYSTEM"
1548
+UNAME_VERSION = "$UNAME_VERSION"
1549 1549
 EOF
1550 1550
 
1551 1551
 exit 1
1552 1552
 
1553 1553
 # Local variables:
1554
-# eval: (add-hook 'write-file-hooks 'time-stamp)
1554
+# eval: (add-hook 'write-file-functions 'time-stamp)
1555 1555
 # time-stamp-start: "timestamp='"
1556 1556
 # time-stamp-format: "%:y-%02m-%02d"
1557 1557
 # time-stamp-end: "'"
... ...
@@ -1,8 +1,8 @@
1 1
 #! /bin/sh
2 2
 # Configuration validation subroutine script.
3
-#   Copyright 1992-2013 Free Software Foundation, Inc.
3
+#   Copyright 1992-2018 Free Software Foundation, Inc.
4 4
 
5
-timestamp='2013-08-10'
5
+timestamp='2018-02-22'
6 6
 
7 7
 # This file is free software; you can redistribute it and/or modify it
8 8
 # under the terms of the GNU General Public License as published by
... ...
@@ -15,7 +15,7 @@ timestamp='2013-08-10'
15 15
 # General Public License for more details.
16 16
 #
17 17
 # You should have received a copy of the GNU General Public License
18
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
18
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
19 19
 #
20 20
 # As a special exception to the GNU General Public License, if you
21 21
 # distribute this file as part of a program that contains a
... ...
@@ -25,7 +25,7 @@ timestamp='2013-08-10'
25 25
 # of the GNU General Public License, version 3 ("GPLv3").
26 26
 
27 27
 
28
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
28
+# Please send patches to <config-patches@gnu.org>.
29 29
 #
30 30
 # Configuration subroutine to validate and canonicalize a configuration type.
31 31
 # Supply the specified configuration type as an argument.
... ...
@@ -33,7 +33,7 @@ timestamp='2013-08-10'
33 33
 # Otherwise, we print the canonical config type on stdout and succeed.
34 34
 
35 35
 # You can get the latest version of this script from:
36
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
36
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
37 37
 
38 38
 # This file is supposed to be the same for all GNU packages
39 39
 # and recognize all the CPU types, system types and aliases
... ...
@@ -53,12 +53,11 @@ timestamp='2013-08-10'
53 53
 me=`echo "$0" | sed -e 's,.*/,,'`
54 54
 
55 55
 usage="\
56
-Usage: $0 [OPTION] CPU-MFR-OPSYS
57
-       $0 [OPTION] ALIAS
56
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
58 57
 
59 58
 Canonicalize a configuration name.
60 59
 
61
-Operation modes:
60
+Options:
62 61
   -h, --help         print this help, then exit
63 62
   -t, --time-stamp   print date of last modification, then exit
64 63
   -v, --version      print version number, then exit
... ...
@@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
68 68
 version="\
69 69
 GNU config.sub ($timestamp)
70 70
 
71
-Copyright 1992-2013 Free Software Foundation, Inc.
71
+Copyright 1992-2018 Free Software Foundation, Inc.
72 72
 
73 73
 This is free software; see the source for copying conditions.  There is NO
74 74
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
... ...
@@ -95,7 +94,7 @@ while test $# -gt 0 ; do
95 95
 
96 96
     *local*)
97 97
        # First pass through any local machine types.
98
-       echo $1
98
+       echo "$1"
99 99
        exit ;;
100 100
 
101 101
     * )
... ...
@@ -113,24 +112,24 @@ esac
113 113
 
114 114
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
115 115
 # Here we must recognize all the valid KERNEL-OS combinations.
116
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
116
+maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
117 117
 case $maybe_os in
118 118
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
119 119
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
120
-  knetbsd*-gnu* | netbsd*-gnu* | \
121
-  kopensolaris*-gnu* | \
120
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
121
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
122 122
   storm-chaos* | os2-emx* | rtmk-nova*)
123 123
     os=-$maybe_os
124
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
124
+    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
125 125
     ;;
126 126
   android-linux)
127 127
     os=-linux-android
128
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
128
+    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
129 129
     ;;
130 130
   *)
131
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
132
-    if [ $basic_machine != $1 ]
133
-    then os=`echo $1 | sed 's/.*-/-/'`
131
+    basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
132
+    if [ "$basic_machine" != "$1" ]
133
+    then os=`echo "$1" | sed 's/.*-/-/'`
134 134
     else os=; fi
135 135
     ;;
136 136
 esac
... ...
@@ -179,44 +178,44 @@ case $os in
179 179
 		;;
180 180
 	-sco6)
181 181
 		os=-sco5v6
182
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
182
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
183 183
 		;;
184 184
 	-sco5)
185 185
 		os=-sco3.2v5
186
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
186
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
187 187
 		;;
188 188
 	-sco4)
189 189
 		os=-sco3.2v4
190
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
190
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
191 191
 		;;
192 192
 	-sco3.2.[4-9]*)
193 193
 		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
194
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
194
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
195 195
 		;;
196 196
 	-sco3.2v[4-9]*)
197 197
 		# Don't forget version if it is 3.2v4 or newer.
198
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
198
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
199 199
 		;;
200 200
 	-sco5v6*)
201 201
 		# Don't forget version if it is 3.2v4 or newer.
202
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
202
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
203 203
 		;;
204 204
 	-sco*)
205 205
 		os=-sco3.2v2
206
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
206
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
207 207
 		;;
208 208
 	-udk*)
209
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
209
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
210 210
 		;;
211 211
 	-isc)
212 212
 		os=-isc2.2
213
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
213
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
214 214
 		;;
215 215
 	-clix*)
216 216
 		basic_machine=clipper-intergraph
217 217
 		;;
218 218
 	-isc*)
219
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
219
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
220 220
 		;;
221 221
 	-lynx*178)
222 222
 		os=-lynxos178
... ...
@@ -228,10 +227,7 @@ case $os in
228 228
 		os=-lynxos
229 229
 		;;
230 230
 	-ptx*)
231
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
232
-		;;
233
-	-windowsnt*)
234
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
231
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
235 232
 		;;
236 233
 	-psos*)
237 234
 		os=-psos
... ...
@@ -255,16 +251,18 @@ case $basic_machine in
255 255
 	| arc | arceb \
256 256
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
257 257
 	| avr | avr32 \
258
+	| ba \
258 259
 	| be32 | be64 \
259 260
 	| bfin \
260 261
 	| c4x | c8051 | clipper \
261 262
 	| d10v | d30v | dlx | dsp16xx \
262
-	| epiphany \
263
-	| fido | fr30 | frv \
263
+	| e2k | epiphany \
264
+	| fido | fr30 | frv | ft32 \
264 265
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
265 266
 	| hexagon \
266
-	| i370 | i860 | i960 | ia64 \
267
+	| i370 | i860 | i960 | ia16 | ia64 \
267 268
 	| ip2k | iq2000 \
269
+	| k1om \
268 270
 	| le32 | le64 \
269 271
 	| lm32 \
270 272
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
... ...
@@ -282,8 +280,10 @@ case $basic_machine in
282 282
 	| mips64vr5900 | mips64vr5900el \
283 283
 	| mipsisa32 | mipsisa32el \
284 284
 	| mipsisa32r2 | mipsisa32r2el \
285
+	| mipsisa32r6 | mipsisa32r6el \
285 286
 	| mipsisa64 | mipsisa64el \
286 287
 	| mipsisa64r2 | mipsisa64r2el \
288
+	| mipsisa64r6 | mipsisa64r6el \
287 289
 	| mipsisa64sb1 | mipsisa64sb1el \
288 290
 	| mipsisa64sr71k | mipsisa64sr71kel \
289 291
 	| mipsr5900 | mipsr5900el \
... ...
@@ -295,14 +295,15 @@ case $basic_machine in
295 295
 	| nds32 | nds32le | nds32be \
296 296
 	| nios | nios2 | nios2eb | nios2el \
297 297
 	| ns16k | ns32k \
298
-	| open8 \
299
-	| or1k | or32 \
300
-	| pdp10 | pdp11 | pj | pjl \
298
+	| open8 | or1k | or1knd | or32 \
299
+	| pdp10 | pj | pjl \
301 300
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
301
+	| pru \
302 302
 	| pyramid \
303
+	| riscv32 | riscv64 \
303 304
 	| rl78 | rx \
304 305
 	| score \
305
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
306
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
306 307
 	| sh64 | sh64le \
307 308
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
308 309
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
... ...
@@ -310,7 +311,8 @@ case $basic_machine in
310 310
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
311 311
 	| ubicom32 \
312 312
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
313
-	| we32k \
313
+	| visium \
314
+	| wasm32 \
314 315
 	| x86 | xc16x | xstormy16 | xtensa \
315 316
 	| z8k | z80)
316 317
 		basic_machine=$basic_machine-unknown
... ...
@@ -324,11 +326,14 @@ case $basic_machine in
324 324
 	c6x)
325 325
 		basic_machine=tic6x-unknown
326 326
 		;;
327
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
327
+	leon|leon[3-9])
328
+		basic_machine=sparc-$basic_machine
329
+		;;
330
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
328 331
 		basic_machine=$basic_machine-unknown
329 332
 		os=-none
330 333
 		;;
331
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
334
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
332 335
 		;;
333 336
 	ms1)
334 337
 		basic_machine=mt-unknown
... ...
@@ -357,7 +362,7 @@ case $basic_machine in
357 357
 	  ;;
358 358
 	# Object if more than one company name word.
359 359
 	*-*-*)
360
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
360
+		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
361 361
 		exit 1
362 362
 		;;
363 363
 	# Recognize the basic CPU types with company name.
... ...
@@ -369,18 +374,20 @@ case $basic_machine in
369 369
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
370 370
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
371 371
 	| avr-* | avr32-* \
372
+	| ba-* \
372 373
 	| be32-* | be64-* \
373 374
 	| bfin-* | bs2000-* \
374 375
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
375 376
 	| c8051-* | clipper-* | craynv-* | cydra-* \
376 377
 	| d10v-* | d30v-* | dlx-* \
377
-	| elxsi-* \
378
+	| e2k-* | elxsi-* \
378 379
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
379 380
 	| h8300-* | h8500-* \
380 381
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
381 382
 	| hexagon-* \
382
-	| i*86-* | i860-* | i960-* | ia64-* \
383
+	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
383 384
 	| ip2k-* | iq2000-* \
385
+	| k1om-* \
384 386
 	| le32-* | le64-* \
385 387
 	| lm32-* \
386 388
 	| m32c-* | m32r-* | m32rle-* \
... ...
@@ -400,8 +407,10 @@ case $basic_machine in
400 400
 	| mips64vr5900-* | mips64vr5900el-* \
401 401
 	| mipsisa32-* | mipsisa32el-* \
402 402
 	| mipsisa32r2-* | mipsisa32r2el-* \
403
+	| mipsisa32r6-* | mipsisa32r6el-* \
403 404
 	| mipsisa64-* | mipsisa64el-* \
404 405
 	| mipsisa64r2-* | mipsisa64r2el-* \
406
+	| mipsisa64r6-* | mipsisa64r6el-* \
405 407
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
406 408
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
407 409
 	| mipsr5900-* | mipsr5900el-* \
... ...
@@ -413,16 +422,19 @@ case $basic_machine in
413 413
 	| nios-* | nios2-* | nios2eb-* | nios2el-* \
414 414
 	| none-* | np1-* | ns16k-* | ns32k-* \
415 415
 	| open8-* \
416
+	| or1k*-* \
416 417
 	| orion-* \
417 418
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
418 419
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
420
+	| pru-* \
419 421
 	| pyramid-* \
422
+	| riscv32-* | riscv64-* \
420 423
 	| rl78-* | romp-* | rs6000-* | rx-* \
421 424
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
422 425
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
423 426
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
424 427
 	| sparclite-* \
425
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
428
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
426 429
 	| tahoe-* \
427 430
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
428 431
 	| tile*-* \
... ...
@@ -430,6 +442,8 @@ case $basic_machine in
430 430
 	| ubicom32-* \
431 431
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
432 432
 	| vax-* \
433
+	| visium-* \
434
+	| wasm32-* \
433 435
 	| we32k-* \
434 436
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
435 437
 	| xstormy16-* | xtensa*-* \
... ...
@@ -443,7 +457,7 @@ case $basic_machine in
443 443
 	# Recognize the various machine names and aliases which stand
444 444
 	# for a CPU type and a company and sometimes even an OS.
445 445
 	386bsd)
446
-		basic_machine=i386-unknown
446
+		basic_machine=i386-pc
447 447
 		os=-bsd
448 448
 		;;
449 449
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
... ...
@@ -477,7 +491,7 @@ case $basic_machine in
477 477
 		basic_machine=x86_64-pc
478 478
 		;;
479 479
 	amd64-*)
480
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
480
+		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
481 481
 		;;
482 482
 	amdahl)
483 483
 		basic_machine=580-amdahl
... ...
@@ -506,6 +520,9 @@ case $basic_machine in
506 506
 		basic_machine=i386-pc
507 507
 		os=-aros
508 508
 		;;
509
+	asmjs)
510
+		basic_machine=asmjs-unknown
511
+		;;
509 512
 	aux)
510 513
 		basic_machine=m68k-apple
511 514
 		os=-aux
... ...
@@ -519,7 +536,7 @@ case $basic_machine in
519 519
 		os=-linux
520 520
 		;;
521 521
 	blackfin-*)
522
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
522
+		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
523 523
 		os=-linux
524 524
 		;;
525 525
 	bluegene*)
... ...
@@ -527,13 +544,13 @@ case $basic_machine in
527 527
 		os=-cnk
528 528
 		;;
529 529
 	c54x-*)
530
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
530
+		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
531 531
 		;;
532 532
 	c55x-*)
533
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
533
+		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
534 534
 		;;
535 535
 	c6x-*)
536
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
536
+		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
537 537
 		;;
538 538
 	c90)
539 539
 		basic_machine=c90-cray
... ...
@@ -622,10 +639,18 @@ case $basic_machine in
622 622
 		basic_machine=rs6000-bull
623 623
 		os=-bosx
624 624
 		;;
625
-	dpx2* | dpx2*-bull)
625
+	dpx2*)
626 626
 		basic_machine=m68k-bull
627 627
 		os=-sysv3
628 628
 		;;
629
+	e500v[12])
630
+		basic_machine=powerpc-unknown
631
+		os=$os"spe"
632
+		;;
633
+	e500v[12]-*)
634
+		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
635
+		os=$os"spe"
636
+		;;
629 637
 	ebmon29k)
630 638
 		basic_machine=a29k-amd
631 639
 		os=-ebmon
... ...
@@ -715,9 +740,6 @@ case $basic_machine in
715 715
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
716 716
 		basic_machine=hppa1.0-hp
717 717
 		;;
718
-	hppa-next)
719
-		os=-nextstep3
720
-		;;
721 718
 	hppaosf)
722 719
 		basic_machine=hppa1.1-hp
723 720
 		os=-osf
... ...
@@ -730,26 +752,26 @@ case $basic_machine in
730 730
 		basic_machine=i370-ibm
731 731
 		;;
732 732
 	i*86v32)
733
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
733
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
734 734
 		os=-sysv32
735 735
 		;;
736 736
 	i*86v4*)
737
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
737
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
738 738
 		os=-sysv4
739 739
 		;;
740 740
 	i*86v)
741
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
741
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
742 742
 		os=-sysv
743 743
 		;;
744 744
 	i*86sol2)
745
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
745
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
746 746
 		os=-solaris2
747 747
 		;;
748 748
 	i386mach)
749 749
 		basic_machine=i386-mach
750 750
 		os=-mach
751 751
 		;;
752
-	i386-vsta | vsta)
752
+	vsta)
753 753
 		basic_machine=i386-unknown
754 754
 		os=-vsta
755 755
 		;;
... ...
@@ -767,17 +789,17 @@ case $basic_machine in
767 767
 		basic_machine=m68k-isi
768 768
 		os=-sysv
769 769
 		;;
770
+	leon-*|leon[3-9]-*)
771
+		basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
772
+		;;
770 773
 	m68knommu)
771 774
 		basic_machine=m68k-unknown
772 775
 		os=-linux
773 776
 		;;
774 777
 	m68knommu-*)
775
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
778
+		basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
776 779
 		os=-linux
777 780
 		;;
778
-	m88k-omron*)
779
-		basic_machine=m88k-omron
780
-		;;
781 781
 	magnum | m3230)
782 782
 		basic_machine=mips-mips
783 783
 		os=-sysv
... ...
@@ -809,10 +831,10 @@ case $basic_machine in
809 809
 		os=-mint
810 810
 		;;
811 811
 	mips3*-*)
812
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
812
+		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
813 813
 		;;
814 814
 	mips3*)
815
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
815
+		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
816 816
 		;;
817 817
 	monitor)
818 818
 		basic_machine=m68k-rom68k
... ...
@@ -822,12 +844,16 @@ case $basic_machine in
822 822
 		basic_machine=powerpc-unknown
823 823
 		os=-morphos
824 824
 		;;
825
+	moxiebox)
826
+		basic_machine=moxie-unknown
827
+		os=-moxiebox
828
+		;;
825 829
 	msdos)
826 830
 		basic_machine=i386-pc
827 831
 		os=-msdos
828 832
 		;;
829 833
 	ms1-*)
830
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
834
+		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
831 835
 		;;
832 836
 	msys)
833 837
 		basic_machine=i686-pc
... ...
@@ -869,7 +895,7 @@ case $basic_machine in
869 869
 		basic_machine=v70-nec
870 870
 		os=-sysv
871 871
 		;;
872
-	next | m*-next )
872
+	next | m*-next)
873 873
 		basic_machine=m68k-next
874 874
 		case $os in
875 875
 		    -nextstep* )
... ...
@@ -914,6 +940,12 @@ case $basic_machine in
914 914
 	nsr-tandem)
915 915
 		basic_machine=nsr-tandem
916 916
 		;;
917
+	nsv-tandem)
918
+		basic_machine=nsv-tandem
919
+		;;
920
+	nsx-tandem)
921
+		basic_machine=nsx-tandem
922
+		;;
917 923
 	op50n-* | op60c-*)
918 924
 		basic_machine=hppa1.1-oki
919 925
 		os=-proelf
... ...
@@ -946,7 +978,7 @@ case $basic_machine in
946 946
 		os=-linux
947 947
 		;;
948 948
 	parisc-*)
949
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
949
+		basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
950 950
 		os=-linux
951 951
 		;;
952 952
 	pbd)
... ...
@@ -962,7 +994,7 @@ case $basic_machine in
962 962
 		basic_machine=i386-pc
963 963
 		;;
964 964
 	pc98-*)
965
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
965
+		basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
966 966
 		;;
967 967
 	pentium | p5 | k5 | k6 | nexgen | viac3)
968 968
 		basic_machine=i586-pc
... ...
@@ -977,16 +1009,16 @@ case $basic_machine in
977 977
 		basic_machine=i786-pc
978 978
 		;;
979 979
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
980
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
980
+		basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
981 981
 		;;
982 982
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
983
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
983
+		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
984 984
 		;;
985 985
 	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
986
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
986
+		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
987 987
 		;;
988 988
 	pentium4-*)
989
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
989
+		basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
990 990
 		;;
991 991
 	pn)
992 992
 		basic_machine=pn-gould
... ...
@@ -996,23 +1028,23 @@ case $basic_machine in
996 996
 	ppc | ppcbe)	basic_machine=powerpc-unknown
997 997
 		;;
998 998
 	ppc-* | ppcbe-*)
999
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
999
+		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1000 1000
 		;;
1001
-	ppcle | powerpclittle | ppc-le | powerpc-little)
1001
+	ppcle | powerpclittle)
1002 1002
 		basic_machine=powerpcle-unknown
1003 1003
 		;;
1004 1004
 	ppcle-* | powerpclittle-*)
1005
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
1005
+		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1006 1006
 		;;
1007 1007
 	ppc64)	basic_machine=powerpc64-unknown
1008 1008
 		;;
1009
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
1009
+	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1010 1010
 		;;
1011
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
1011
+	ppc64le | powerpc64little)
1012 1012
 		basic_machine=powerpc64le-unknown
1013 1013
 		;;
1014 1014
 	ppc64le-* | powerpc64little-*)
1015
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
1015
+		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1016 1016
 		;;
1017 1017
 	ps2)
1018 1018
 		basic_machine=i386-ibm
... ...
@@ -1066,17 +1098,10 @@ case $basic_machine in
1066 1066
 	sequent)
1067 1067
 		basic_machine=i386-sequent
1068 1068
 		;;
1069
-	sh)
1070
-		basic_machine=sh-hitachi
1071
-		os=-hms
1072
-		;;
1073 1069
 	sh5el)
1074 1070
 		basic_machine=sh5le-unknown
1075 1071
 		;;
1076
-	sh64)
1077
-		basic_machine=sh64-unknown
1078
-		;;
1079
-	sparclite-wrs | simso-wrs)
1072
+	simso-wrs)
1080 1073
 		basic_machine=sparclite-wrs
1081 1074
 		os=-vxworks
1082 1075
 		;;
... ...
@@ -1095,7 +1120,7 @@ case $basic_machine in
1095 1095
 		os=-sysv4
1096 1096
 		;;
1097 1097
 	strongarm-* | thumb-*)
1098
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
1098
+		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1099 1099
 		;;
1100 1100
 	sun2)
1101 1101
 		basic_machine=m68000-sun
... ...
@@ -1217,6 +1242,9 @@ case $basic_machine in
1217 1217
 		basic_machine=hppa1.1-winbond
1218 1218
 		os=-proelf
1219 1219
 		;;
1220
+	x64)
1221
+		basic_machine=x86_64-pc
1222
+		;;
1220 1223
 	xbox)
1221 1224
 		basic_machine=i686-pc
1222 1225
 		os=-mingw32
... ...
@@ -1225,20 +1253,12 @@ case $basic_machine in
1225 1225
 		basic_machine=xps100-honeywell
1226 1226
 		;;
1227 1227
 	xscale-* | xscalee[bl]-*)
1228
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
1228
+		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
1229 1229
 		;;
1230 1230
 	ymp)
1231 1231
 		basic_machine=ymp-cray
1232 1232
 		os=-unicos
1233 1233
 		;;
1234
-	z8k-*-coff)
1235
-		basic_machine=z8k-unknown
1236
-		os=-sim
1237
-		;;
1238
-	z80-*-coff)
1239
-		basic_machine=z80-unknown
1240
-		os=-sim
1241
-		;;
1242 1234
 	none)
1243 1235
 		basic_machine=none-none
1244 1236
 		os=-none
... ...
@@ -1267,10 +1287,6 @@ case $basic_machine in
1267 1267
 	vax)
1268 1268
 		basic_machine=vax-dec
1269 1269
 		;;
1270
-	pdp10)
1271
-		# there are many clones, so DEC is not a safe bet
1272
-		basic_machine=pdp10-unknown
1273
-		;;
1274 1270
 	pdp11)
1275 1271
 		basic_machine=pdp11-dec
1276 1272
 		;;
... ...
@@ -1280,9 +1296,6 @@ case $basic_machine in
1280 1280
 	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
1281 1281
 		basic_machine=sh-unknown
1282 1282
 		;;
1283
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
1284
-		basic_machine=sparc-sun
1285
-		;;
1286 1283
 	cydra)
1287 1284
 		basic_machine=cydra-cydrome
1288 1285
 		;;
... ...
@@ -1302,7 +1315,7 @@ case $basic_machine in
1302 1302
 		# Make sure to match an already-canonicalized machine name.
1303 1303
 		;;
1304 1304
 	*)
1305
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
1305
+		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
1306 1306
 		exit 1
1307 1307
 		;;
1308 1308
 esac
... ...
@@ -1310,10 +1323,10 @@ esac
1310 1310
 # Here we canonicalize certain aliases for manufacturers.
1311 1311
 case $basic_machine in
1312 1312
 	*-digital*)
1313
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
1313
+		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
1314 1314
 		;;
1315 1315
 	*-commodore*)
1316
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
1316
+		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
1317 1317
 		;;
1318 1318
 	*)
1319 1319
 		;;
... ...
@@ -1324,8 +1337,8 @@ esac
1324 1324
 if [ x"$os" != x"" ]
1325 1325
 then
1326 1326
 case $os in
1327
-	# First match some system type aliases
1328
-	# that might get confused with valid system types.
1327
+	# First match some system type aliases that might get confused
1328
+	# with valid system types.
1329 1329
 	# -solaris* is a basic system type, with this one exception.
1330 1330
 	-auroraux)
1331 1331
 		os=-auroraux
... ...
@@ -1336,45 +1349,48 @@ case $os in
1336 1336
 	-solaris)
1337 1337
 		os=-solaris2
1338 1338
 		;;
1339
-	-svr4*)
1340
-		os=-sysv4
1341
-		;;
1342 1339
 	-unixware*)
1343 1340
 		os=-sysv4.2uw
1344 1341
 		;;
1345 1342
 	-gnu/linux*)
1346 1343
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
1347 1344
 		;;
1348
-	# First accept the basic system types.
1345
+	# es1800 is here to avoid being matched by es* (a different OS)
1346
+	-es1800*)
1347
+		os=-ose
1348
+		;;
1349
+	# Now accept the basic system types.
1349 1350
 	# The portable systems comes first.
1350
-	# Each alternative MUST END IN A *, to match a version number.
1351
+	# Each alternative MUST end in a * to match a version number.
1351 1352
 	# -sysv* is not here because it comes later, after sysvr4.
1352 1353
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1353 1354
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1354 1355
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1355 1356
 	      | -sym* | -kopensolaris* | -plan9* \
1356 1357
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1357
-	      | -aos* | -aros* \
1358
+	      | -aos* | -aros* | -cloudabi* | -sortix* \
1358 1359
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1359 1360
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1360
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1361
-	      | -bitrig* | -openbsd* | -solidbsd* \
1361
+	      | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
1362
+	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
1362 1363
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1363 1364
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1364 1365
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1365 1366
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1366
-	      | -chorusos* | -chorusrdb* | -cegcc* \
1367
+	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
1367 1368
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1368
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
1369
+	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
1369 1370
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
1370
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
1371
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1371
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
1372
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
1372 1373
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1373 1374
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1374 1375
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1375
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1376
+	      | -morphos* | -superux* | -rtmk* | -windiss* \
1376 1377
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1377
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1378
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
1379
+	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
1380
+	      | -midnightbsd*)
1378 1381
 	# Remember, each alternative MUST END IN *, to match a version number.
1379 1382
 		;;
1380 1383
 	-qnx*)
... ...
@@ -1391,12 +1407,12 @@ case $os in
1391 1391
 	-nto*)
1392 1392
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
1393 1393
 		;;
1394
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
1395
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
1394
+	-sim | -xray | -os68k* | -v88r* \
1395
+	      | -windows* | -osx | -abug | -netware* | -os9* \
1396 1396
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
1397 1397
 		;;
1398 1398
 	-mac*)
1399
-		os=`echo $os | sed -e 's|mac|macos|'`
1399
+		os=`echo "$os" | sed -e 's|mac|macos|'`
1400 1400
 		;;
1401 1401
 	-linux-dietlibc)
1402 1402
 		os=-linux-dietlibc
... ...
@@ -1405,10 +1421,10 @@ case $os in
1405 1405
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
1406 1406
 		;;
1407 1407
 	-sunos5*)
1408
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
1408
+		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
1409 1409
 		;;
1410 1410
 	-sunos6*)
1411
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
1411
+		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
1412 1412
 		;;
1413 1413
 	-opened*)
1414 1414
 		os=-openedition
... ...
@@ -1419,12 +1435,6 @@ case $os in
1419 1419
 	-wince*)
1420 1420
 		os=-wince
1421 1421
 		;;
1422
-	-osfrose*)
1423
-		os=-osfrose
1424
-		;;
1425
-	-osf*)
1426
-		os=-osf
1427
-		;;
1428 1422
 	-utek*)
1429 1423
 		os=-bsd
1430 1424
 		;;
... ...
@@ -1449,7 +1459,7 @@ case $os in
1449 1449
 	-nova*)
1450 1450
 		os=-rtmk-nova
1451 1451
 		;;
1452
-	-ns2 )
1452
+	-ns2)
1453 1453
 		os=-nextstep2
1454 1454
 		;;
1455 1455
 	-nsk*)
... ...
@@ -1471,7 +1481,7 @@ case $os in
1471 1471
 	-oss*)
1472 1472
 		os=-sysv3
1473 1473
 		;;
1474
-	-svr4)
1474
+	-svr4*)
1475 1475
 		os=-sysv4
1476 1476
 		;;
1477 1477
 	-svr3)
... ...
@@ -1486,32 +1496,38 @@ case $os in
1486 1486
 	-ose*)
1487 1487
 		os=-ose
1488 1488
 		;;
1489
-	-es1800*)
1490
-		os=-ose
1491
-		;;
1492
-	-xenix)
1493
-		os=-xenix
1494
-		;;
1495 1489
 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1496 1490
 		os=-mint
1497 1491
 		;;
1498
-	-aros*)
1499
-		os=-aros
1500
-		;;
1501 1492
 	-zvmoe)
1502 1493
 		os=-zvmoe
1503 1494
 		;;
1504 1495
 	-dicos*)
1505 1496
 		os=-dicos
1506 1497
 		;;
1498
+	-pikeos*)
1499
+		# Until real need of OS specific support for
1500
+		# particular features comes up, bare metal
1501
+		# configurations are quite functional.
1502
+		case $basic_machine in
1503
+		    arm*)
1504
+			os=-eabi
1505
+			;;
1506
+		    *)
1507
+			os=-elf
1508
+			;;
1509
+		esac
1510
+		;;
1507 1511
 	-nacl*)
1508 1512
 		;;
1513
+	-ios)
1514
+		;;
1509 1515
 	-none)
1510 1516
 		;;
1511 1517
 	*)
1512 1518
 		# Get rid of the `-' at the beginning of $os.
1513 1519
 		os=`echo $os | sed 's/[^-]*-//'`
1514
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
1520
+		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
1515 1521
 		exit 1
1516 1522
 		;;
1517 1523
 esac
... ...
@@ -1592,9 +1608,6 @@ case $basic_machine in
1592 1592
 	mips*-*)
1593 1593
 		os=-elf
1594 1594
 		;;
1595
-	or1k-*)
1596
-		os=-elf
1597
-		;;
1598 1595
 	or32-*)
1599 1596
 		os=-coff
1600 1597
 		;;
... ...
@@ -1604,12 +1617,12 @@ case $basic_machine in
1604 1604
 	sparc-* | *-sun)
1605 1605
 		os=-sunos4.1.1
1606 1606
 		;;
1607
+	pru-*)
1608
+		os=-elf
1609
+		;;
1607 1610
 	*-be)
1608 1611
 		os=-beos
1609 1612
 		;;
1610
-	*-haiku)
1611
-		os=-haiku
1612
-		;;
1613 1613
 	*-ibm)
1614 1614
 		os=-aix
1615 1615
 		;;
... ...
@@ -1649,7 +1662,7 @@ case $basic_machine in
1649 1649
 	m88k-omron*)
1650 1650
 		os=-luna
1651 1651
 		;;
1652
-	*-next )
1652
+	*-next)
1653 1653
 		os=-nextstep
1654 1654
 		;;
1655 1655
 	*-sequent)
... ...
@@ -1664,9 +1677,6 @@ case $basic_machine in
1664 1664
 	i370-*)
1665 1665
 		os=-mvs
1666 1666
 		;;
1667
-	*-next)
1668
-		os=-nextstep3
1669
-		;;
1670 1667
 	*-gould)
1671 1668
 		os=-sysv
1672 1669
 		;;
... ...
@@ -1776,15 +1786,15 @@ case $basic_machine in
1776 1776
 				vendor=stratus
1777 1777
 				;;
1778 1778
 		esac
1779
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
1779
+		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
1780 1780
 		;;
1781 1781
 esac
1782 1782
 
1783
-echo $basic_machine$os
1783
+echo "$basic_machine$os"
1784 1784
 exit
1785 1785
 
1786 1786
 # Local variables:
1787
-# eval: (add-hook 'write-file-hooks 'time-stamp)
1787
+# eval: (add-hook 'write-file-functions 'time-stamp)
1788 1788
 # time-stamp-start: "timestamp='"
1789 1789
 # time-stamp-format: "%:y-%02m-%02d"
1790 1790
 # time-stamp-end: "'"
... ...
@@ -1,9 +1,9 @@
1 1
 #! /bin/sh
2 2
 # depcomp - compile a program generating dependencies as side-effects
3 3
 
4
-scriptversion=2013-05-30.07; # UTC
4
+scriptversion=2016-01-11.22; # UTC
5 5
 
6
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
6
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
7 7
 
8 8
 # This program is free software; you can redistribute it and/or modify
9 9
 # it under the terms of the GNU General Public License as published by
... ...
@@ -786,6 +786,6 @@ exit 0
786 786
 # eval: (add-hook 'write-file-hooks 'time-stamp)
787 787
 # time-stamp-start: "scriptversion="
788 788
 # time-stamp-format: "%:y-%02m-%02d.%02H"
789
-# time-stamp-time-zone: "UTC"
789
+# time-stamp-time-zone: "UTC0"
790 790
 # time-stamp-end: "; # UTC"
791 791
 # End:
... ...
@@ -1,7 +1,7 @@
1 1
 #!/bin/sh
2 2
 # install - install a program, script, or datafile
3 3
 
4
-scriptversion=2011-11-20.07; # UTC
4
+scriptversion=2014-09-12.12; # UTC
5 5
 
6 6
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
7 7
 # later released in X11R6 (xc/config/util/install.sh) with the
... ...
@@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC
41 41
 # This script is compatible with the BSD install script, but was written
42 42
 # from scratch.
43 43
 
44
+tab='	'
44 45
 nl='
45 46
 '
46
-IFS=" ""	$nl"
47
+IFS=" $tab$nl"
47 48
 
48
-# set DOITPROG to echo to test this script
49
+# Set DOITPROG to "echo" to test this script.
49 50
 
50
-# Don't use :- since 4.3BSD and earlier shells don't like it.
51 51
 doit=${DOITPROG-}
52
-if test -z "$doit"; then
53
-  doit_exec=exec
54
-else
55
-  doit_exec=$doit
56
-fi
52
+doit_exec=${doit:-exec}
57 53
 
58 54
 # Put in absolute file names if you don't have them in your path;
59 55
 # or use environment vars.
... ...
@@ -68,17 +64,6 @@ mvprog=${MVPROG-mv}
68 68
 rmprog=${RMPROG-rm}
69 69
 stripprog=${STRIPPROG-strip}
70 70
 
71
-posix_glob='?'
72
-initialize_posix_glob='
73
-  test "$posix_glob" != "?" || {
74
-    if (set -f) 2>/dev/null; then
75
-      posix_glob=
76
-    else
77
-      posix_glob=:
78
-    fi
79
-  }
80
-'
81
-
82 71
 posix_mkdir=
83 72
 
84 73
 # Desired mode of installed file.
... ...
@@ -97,7 +82,7 @@ dir_arg=
97 97
 dst_arg=
98 98
 
99 99
 copy_on_change=false
100
-no_target_directory=
100
+is_target_a_directory=possibly
101 101
 
102 102
 usage="\
103 103
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
... ...
@@ -137,46 +122,57 @@ while test $# -ne 0; do
137 137
     -d) dir_arg=true;;
138 138
 
139 139
     -g) chgrpcmd="$chgrpprog $2"
140
-	shift;;
140
+        shift;;
141 141
 
142 142
     --help) echo "$usage"; exit $?;;
143 143
 
144 144
     -m) mode=$2
145
-	case $mode in
146
-	  *' '* | *'	'* | *'
147
-'*	  | *'*'* | *'?'* | *'['*)
148
-	    echo "$0: invalid mode: $mode" >&2
149
-	    exit 1;;
150
-	esac
151
-	shift;;
145
+        case $mode in
146
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
147
+            echo "$0: invalid mode: $mode" >&2
148
+            exit 1;;
149
+        esac
150
+        shift;;
152 151
 
153 152
     -o) chowncmd="$chownprog $2"
154
-	shift;;
153
+        shift;;
155 154
 
156 155
     -s) stripcmd=$stripprog;;
157 156
 
158
-    -t) dst_arg=$2
159
-	# Protect names problematic for 'test' and other utilities.
160
-	case $dst_arg in
161
-	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
162
-	esac
163
-	shift;;
157
+    -t)
158
+        is_target_a_directory=always
159
+        dst_arg=$2
160
+        # Protect names problematic for 'test' and other utilities.
161
+        case $dst_arg in
162
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
163
+        esac
164
+        shift;;
164 165
 
165
-    -T) no_target_directory=true;;
166
+    -T) is_target_a_directory=never;;
166 167
 
167 168
     --version) echo "$0 $scriptversion"; exit $?;;
168 169
 
169
-    --)	shift
170
-	break;;
170
+    --) shift
171
+        break;;
171 172
 
172
-    -*)	echo "$0: invalid option: $1" >&2
173
-	exit 1;;
173
+    -*) echo "$0: invalid option: $1" >&2
174
+        exit 1;;
174 175
 
175 176
     *)  break;;
176 177
   esac
177 178
   shift
178 179
 done
179 180
 
181
+# We allow the use of options -d and -T together, by making -d
182
+# take the precedence; this is for compatibility with GNU install.
183
+
184
+if test -n "$dir_arg"; then
185
+  if test -n "$dst_arg"; then
186
+    echo "$0: target directory not allowed when installing a directory." >&2
187
+    exit 1
188
+  fi
189
+fi
190
+
180 191
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
181 192
   # When -d is used, all remaining arguments are directories to create.
182 193
   # When -t is used, the destination is already specified.
... ...
@@ -208,6 +204,15 @@ if test $# -eq 0; then
208 208
 fi
209 209
 
210 210
 if test -z "$dir_arg"; then
211
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
212
+    if test ! -d "$dst_arg"; then
213
+      echo "$0: $dst_arg: Is not a directory." >&2
214
+      exit 1
215
+    fi
216
+  fi
217
+fi
218
+
219
+if test -z "$dir_arg"; then
211 220
   do_exit='(exit $ret); exit $ret'
212 221
   trap "ret=129; $do_exit" 1
213 222
   trap "ret=130; $do_exit" 2
... ...
@@ -223,16 +228,16 @@ if test -z "$dir_arg"; then
223 223
 
224 224
     *[0-7])
225 225
       if test -z "$stripcmd"; then
226
-	u_plus_rw=
226
+        u_plus_rw=
227 227
       else
228
-	u_plus_rw='% 200'
228
+        u_plus_rw='% 200'
229 229
       fi
230 230
       cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
231 231
     *)
232 232
       if test -z "$stripcmd"; then
233
-	u_plus_rw=
233
+        u_plus_rw=
234 234
       else
235
-	u_plus_rw=,u+rw
235
+        u_plus_rw=,u+rw
236 236
       fi
237 237
       cp_umask=$mode$u_plus_rw;;
238 238
   esac
... ...
@@ -269,41 +274,15 @@ do
269 269
     # If destination is a directory, append the input filename; won't work
270 270
     # if double slashes aren't ignored.
271 271
     if test -d "$dst"; then
272
-      if test -n "$no_target_directory"; then
273
-	echo "$0: $dst_arg: Is a directory" >&2
274
-	exit 1
272
+      if test "$is_target_a_directory" = never; then
273
+        echo "$0: $dst_arg: Is a directory" >&2
274
+        exit 1
275 275
       fi
276 276
       dstdir=$dst
277 277
       dst=$dstdir/`basename "$src"`
278 278
       dstdir_status=0
279 279
     else
280
-      # Prefer dirname, but fall back on a substitute if dirname fails.
281
-      dstdir=`
282
-	(dirname "$dst") 2>/dev/null ||
283
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
284
-	     X"$dst" : 'X\(//\)[^/]' \| \
285
-	     X"$dst" : 'X\(//\)$' \| \
286
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
287
-	echo X"$dst" |
288
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
289
-		   s//\1/
290
-		   q
291
-		 }
292
-		 /^X\(\/\/\)[^/].*/{
293
-		   s//\1/
294
-		   q
295
-		 }
296
-		 /^X\(\/\/\)$/{
297
-		   s//\1/
298
-		   q
299
-		 }
300
-		 /^X\(\/\).*/{
301
-		   s//\1/
302
-		   q
303
-		 }
304
-		 s/.*/./; q'
305
-      `
306
-
280
+      dstdir=`dirname "$dst"`
307 281
       test -d "$dstdir"
308 282
       dstdir_status=$?
309 283
     fi
... ...
@@ -314,74 +293,81 @@ do
314 314
   if test $dstdir_status != 0; then
315 315
     case $posix_mkdir in
316 316
       '')
317
-	# Create intermediate dirs using mode 755 as modified by the umask.
318
-	# This is like FreeBSD 'install' as of 1997-10-28.
319
-	umask=`umask`
320
-	case $stripcmd.$umask in
321
-	  # Optimize common cases.
322
-	  *[2367][2367]) mkdir_umask=$umask;;
323
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
324
-
325
-	  *[0-7])
326
-	    mkdir_umask=`expr $umask + 22 \
327
-	      - $umask % 100 % 40 + $umask % 20 \
328
-	      - $umask % 10 % 4 + $umask % 2
329
-	    `;;
330
-	  *) mkdir_umask=$umask,go-w;;
331
-	esac
332
-
333
-	# With -d, create the new directory with the user-specified mode.
334
-	# Otherwise, rely on $mkdir_umask.
335
-	if test -n "$dir_arg"; then
336
-	  mkdir_mode=-m$mode
337
-	else
338
-	  mkdir_mode=
339
-	fi
340
-
341
-	posix_mkdir=false
342
-	case $umask in
343
-	  *[123567][0-7][0-7])
344
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
345
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
346
-	    ;;
347
-	  *)
348
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
349
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
350
-
351
-	    if (umask $mkdir_umask &&
352
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
353
-	    then
354
-	      if test -z "$dir_arg" || {
355
-		   # Check for POSIX incompatibilities with -m.
356
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
357
-		   # other-writable bit of parent directory when it shouldn't.
358
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
359
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
360
-		   case $ls_ld_tmpdir in
361
-		     d????-?r-*) different_mode=700;;
362
-		     d????-?--*) different_mode=755;;
363
-		     *) false;;
364
-		   esac &&
365
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
366
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
367
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
368
-		   }
369
-		 }
370
-	      then posix_mkdir=:
371
-	      fi
372
-	      rmdir "$tmpdir/d" "$tmpdir"
373
-	    else
374
-	      # Remove any dirs left behind by ancient mkdir implementations.
375
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
376
-	    fi
377
-	    trap '' 0;;
378
-	esac;;
317
+        # Create intermediate dirs using mode 755 as modified by the umask.
318
+        # This is like FreeBSD 'install' as of 1997-10-28.
319
+        umask=`umask`
320
+        case $stripcmd.$umask in
321
+          # Optimize common cases.
322
+          *[2367][2367]) mkdir_umask=$umask;;
323
+          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
324
+
325
+          *[0-7])
326
+            mkdir_umask=`expr $umask + 22 \
327
+              - $umask % 100 % 40 + $umask % 20 \
328
+              - $umask % 10 % 4 + $umask % 2
329
+            `;;
330
+          *) mkdir_umask=$umask,go-w;;
331
+        esac
332
+
333
+        # With -d, create the new directory with the user-specified mode.
334
+        # Otherwise, rely on $mkdir_umask.
335
+        if test -n "$dir_arg"; then
336
+          mkdir_mode=-m$mode
337
+        else
338
+          mkdir_mode=
339
+        fi
340
+
341
+        posix_mkdir=false
342
+        case $umask in
343
+          *[123567][0-7][0-7])
344
+            # POSIX mkdir -p sets u+wx bits regardless of umask, which
345
+            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
346
+            ;;
347
+          *)
348
+            # $RANDOM is not portable (e.g. dash);  use it when possible to
349
+            # lower collision chance
350
+            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
351
+            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
352
+
353
+            # As "mkdir -p" follows symlinks and we work in /tmp possibly;  so
354
+            # create the $tmpdir first (and fail if unsuccessful) to make sure
355
+            # that nobody tries to guess the $tmpdir name.
356
+            if (umask $mkdir_umask &&
357
+                $mkdirprog $mkdir_mode "$tmpdir" &&
358
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
359
+            then
360
+              if test -z "$dir_arg" || {
361
+                   # Check for POSIX incompatibilities with -m.
362
+                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
363
+                   # other-writable bit of parent directory when it shouldn't.
364
+                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
365
+                   test_tmpdir="$tmpdir/a"
366
+                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
367
+                   case $ls_ld_tmpdir in
368
+                     d????-?r-*) different_mode=700;;
369
+                     d????-?--*) different_mode=755;;
370
+                     *) false;;
371
+                   esac &&
372
+                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
373
+                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
374
+                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
375
+                   }
376
+                 }
377
+              then posix_mkdir=:
378
+              fi
379
+              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
380
+            else
381
+              # Remove any dirs left behind by ancient mkdir implementations.
382
+              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
383
+            fi
384
+            trap '' 0;;
385
+        esac;;
379 386
     esac
380 387
 
381 388
     if
382 389
       $posix_mkdir && (
383
-	umask $mkdir_umask &&
384
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
390
+        umask $mkdir_umask &&
391
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
385 392
       )
386 393
     then :
387 394
     else
... ...
@@ -391,53 +377,51 @@ do
391 391
       # directory the slow way, step by step, checking for races as we go.
392 392
 
393 393
       case $dstdir in
394
-	/*) prefix='/';;
395
-	[-=\(\)!]*) prefix='./';;
396
-	*)  prefix='';;
394
+        /*) prefix='/';;
395
+        [-=\(\)!]*) prefix='./';;
396
+        *)  prefix='';;
397 397
       esac
398 398
 
399
-      eval "$initialize_posix_glob"
400
-
401 399
       oIFS=$IFS
402 400
       IFS=/
403
-      $posix_glob set -f
401
+      set -f
404 402
       set fnord $dstdir
405 403
       shift
406
-      $posix_glob set +f
404
+      set +f
407 405
       IFS=$oIFS
408 406
 
409 407
       prefixes=
410 408
 
411 409
       for d
412 410
       do
413
-	test X"$d" = X && continue
414
-
415
-	prefix=$prefix$d
416
-	if test -d "$prefix"; then
417
-	  prefixes=
418
-	else
419
-	  if $posix_mkdir; then
420
-	    (umask=$mkdir_umask &&
421
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
422
-	    # Don't fail if two instances are running concurrently.
423
-	    test -d "$prefix" || exit 1
424
-	  else
425
-	    case $prefix in
426
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
427
-	      *) qprefix=$prefix;;
428
-	    esac
429
-	    prefixes="$prefixes '$qprefix'"
430
-	  fi
431
-	fi
432
-	prefix=$prefix/
411
+        test X"$d" = X && continue
412
+
413
+        prefix=$prefix$d
414
+        if test -d "$prefix"; then
415
+          prefixes=
416
+        else
417
+          if $posix_mkdir; then
418
+            (umask=$mkdir_umask &&
419
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
420
+            # Don't fail if two instances are running concurrently.
421
+            test -d "$prefix" || exit 1
422
+          else
423
+            case $prefix in
424
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
425
+              *) qprefix=$prefix;;
426
+            esac
427
+            prefixes="$prefixes '$qprefix'"
428
+          fi
429
+        fi
430
+        prefix=$prefix/
433 431
       done
434 432
 
435 433
       if test -n "$prefixes"; then
436
-	# Don't fail if two instances are running concurrently.
437
-	(umask $mkdir_umask &&
438
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
439
-	  test -d "$dstdir" || exit 1
440
-	obsolete_mkdir_used=true
434
+        # Don't fail if two instances are running concurrently.
435
+        (umask $mkdir_umask &&
436
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
437
+          test -d "$dstdir" || exit 1
438
+        obsolete_mkdir_used=true
441 439
       fi
442 440
     fi
443 441
   fi
... ...
@@ -472,15 +456,12 @@ do
472 472
 
473 473
     # If -C, don't bother to copy if it wouldn't change the file.
474 474
     if $copy_on_change &&
475
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
476
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
477
-
478
-       eval "$initialize_posix_glob" &&
479
-       $posix_glob set -f &&
475
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
476
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
477
+       set -f &&
480 478
        set X $old && old=:$2:$4:$5:$6 &&
481 479
        set X $new && new=:$2:$4:$5:$6 &&
482
-       $posix_glob set +f &&
483
-
480
+       set +f &&
484 481
        test "$old" = "$new" &&
485 482
        $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
486 483
     then
... ...
@@ -493,24 +474,24 @@ do
493 493
       # to itself, or perhaps because mv is so ancient that it does not
494 494
       # support -f.
495 495
       {
496
-	# Now remove or move aside any old file at destination location.
497
-	# We try this two ways since rm can't unlink itself on some
498
-	# systems and the destination file might be busy for other
499
-	# reasons.  In this case, the final cleanup might fail but the new
500
-	# file should still install successfully.
501
-	{
502
-	  test ! -f "$dst" ||
503
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
504
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
505
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
506
-	  } ||
507
-	  { echo "$0: cannot unlink or rename $dst" >&2
508
-	    (exit 1); exit 1
509
-	  }
510
-	} &&
511
-
512
-	# Now rename the file to the real destination.
513
-	$doit $mvcmd "$dsttmp" "$dst"
496
+        # Now remove or move aside any old file at destination location.
497
+        # We try this two ways since rm can't unlink itself on some
498
+        # systems and the destination file might be busy for other
499
+        # reasons.  In this case, the final cleanup might fail but the new
500
+        # file should still install successfully.
501
+        {
502
+          test ! -f "$dst" ||
503
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
504
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
505
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
506
+          } ||
507
+          { echo "$0: cannot unlink or rename $dst" >&2
508
+            (exit 1); exit 1
509
+          }
510
+        } &&
511
+
512
+        # Now rename the file to the real destination.
513
+        $doit $mvcmd "$dsttmp" "$dst"
514 514
       }
515 515
     fi || exit 1
516 516
 
... ...
@@ -31,7 +31,7 @@
31 31
 
32 32
 PROGRAM=libtool
33 33
 PACKAGE=libtool
34
-VERSION=2.4.6
34
+VERSION="2.4.6 Debian-2.4.6-2"
35 35
 package_revision=2.4.6
36 36
 
37 37
 
... ...
@@ -2068,12 +2068,12 @@ include the following information:
2068 2068
        compiler:       $LTCC
2069 2069
        compiler flags: $LTCFLAGS
2070 2070
        linker:         $LD (gnu? $with_gnu_ld)
2071
-       version:        $progname (GNU libtool) 2.4.6
2071
+       version:        $progname $scriptversion Debian-2.4.6-2
2072 2072
        automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
2073 2073
        autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
2074 2074
 
2075 2075
 Report bugs to <bug-libtool@gnu.org>.
2076
-GNU libtool home page: <http://www.gnu.org/software/libtool/>.
2076
+GNU libtool home page: <http://www.gnu.org/s/libtool/>.
2077 2077
 General help using GNU software: <http://www.gnu.org/gethelp/>."
2078 2078
     exit 0
2079 2079
 }
... ...
@@ -7272,10 +7272,13 @@ func_mode_link ()
7272 7272
       # -tp=*                Portland pgcc target processor selection
7273 7273
       # --sysroot=*          for sysroot support
7274 7274
       # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
7275
+      # -specs=*             GCC specs files
7275 7276
       # -stdlib=*            select c++ std lib with clang
7277
+      # -fsanitize=*         Clang/GCC memory and address sanitizer
7276 7278
       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
7277 7279
       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
7278
-      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
7280
+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
7281
+      -specs=*|-fsanitize=*)
7279 7282
         func_quote_for_eval "$arg"
7280 7283
 	arg=$func_quote_for_eval_result
7281 7284
         func_append compile_command " $arg"
... ...
@@ -7568,7 +7571,10 @@ func_mode_link ()
7568 7568
 	case $pass in
7569 7569
 	dlopen) libs=$dlfiles ;;
7570 7570
 	dlpreopen) libs=$dlprefiles ;;
7571
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
7571
+	link)
7572
+	  libs="$deplibs %DEPLIBS%"
7573
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
7574
+	  ;;
7572 7575
 	esac
7573 7576
       fi
7574 7577
       if test lib,dlpreopen = "$linkmode,$pass"; then
... ...
@@ -7887,19 +7893,19 @@ func_mode_link ()
7887 7887
 	    # It is a libtool convenience library, so add in its objects.
7888 7888
 	    func_append convenience " $ladir/$objdir/$old_library"
7889 7889
 	    func_append old_convenience " $ladir/$objdir/$old_library"
7890
+	    tmp_libs=
7891
+	    for deplib in $dependency_libs; do
7892
+	      deplibs="$deplib $deplibs"
7893
+	      if $opt_preserve_dup_deps; then
7894
+		case "$tmp_libs " in
7895
+		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
7896
+		esac
7897
+	      fi
7898
+	      func_append tmp_libs " $deplib"
7899
+	    done
7890 7900
 	  elif test prog != "$linkmode" && test lib != "$linkmode"; then
7891 7901
 	    func_fatal_error "'$lib' is not a convenience library"
7892 7902
 	  fi
7893
-	  tmp_libs=
7894
-	  for deplib in $dependency_libs; do
7895
-	    deplibs="$deplib $deplibs"
7896
-	    if $opt_preserve_dup_deps; then
7897
-	      case "$tmp_libs " in
7898
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
7899
-	      esac
7900
-	    fi
7901
-	    func_append tmp_libs " $deplib"
7902
-	  done
7903 7903
 	  continue
7904 7904
 	fi # $pass = conv
7905 7905
 
... ...
@@ -8823,6 +8829,9 @@ func_mode_link ()
8823 8823
 	    revision=$number_minor
8824 8824
 	    lt_irix_increment=no
8825 8825
 	    ;;
8826
+	  *)
8827
+	    func_fatal_configuration "$modename: unknown library version type '$version_type'"
8828
+	    ;;
8826 8829
 	  esac
8827 8830
 	  ;;
8828 8831
 	no)
... ...
@@ -3,7 +3,7 @@
3 3
 
4 4
 scriptversion=2013-10-28.13; # UTC
5 5
 
6
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
6
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
7 7
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
8 8
 
9 9
 # This program is free software; you can redistribute it and/or modify
... ...
@@ -3,7 +3,7 @@
3 3
 
4 4
 scriptversion=2013-07-13.22; # UTC
5 5
 
6
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
6
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
7 7
 #
8 8
 # This program is free software; you can redistribute it and/or modify
9 9
 # it under the terms of the GNU General Public License as published by
... ...
@@ -106,11 +106,14 @@ trap "st=143; $do_exit" 15
106 106
 # Test script is run here.
107 107
 "$@" >$log_file 2>&1
108 108
 estatus=$?
109
+
109 110
 if test $enable_hard_errors = no && test $estatus -eq 99; then
110
-  estatus=1
111
+  tweaked_estatus=1
112
+else
113
+  tweaked_estatus=$estatus
111 114
 fi
112 115
 
113
-case $estatus:$expect_failure in
116
+case $tweaked_estatus:$expect_failure in
114 117
   0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
115 118
   0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
116 119
   77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
... ...
@@ -119,6 +122,12 @@ case $estatus:$expect_failure in
119 119
   *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
120 120
 esac
121 121
 
122
+# Report the test outcome and exit status in the logs, so that one can
123
+# know whether the test passed or failed simply by looking at the '.log'
124
+# file, without the need of also peaking into the corresponding '.trs'
125
+# file (automake bug#11814).
126
+echo "$res $test_name (exit status: $estatus)" >>$log_file
127
+
122 128
 # Report outcome to console.
123 129
 echo "${col}${res}${std}: $test_name"
124 130
 
... ...
@@ -1,9 +1,9 @@
1 1
 #! /bin/sh
2 2
 # ylwrap - wrapper for lex/yacc invocations.
3 3
 
4
-scriptversion=2013-01-12.17; # UTC
4
+scriptversion=2016-01-11.22; # UTC
5 5
 
6
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
6
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
7 7
 #
8 8
 # Written by Tom Tromey <tromey@cygnus.com>.
9 9
 #
... ...
@@ -242,6 +242,6 @@ exit $ret
242 242
 # eval: (add-hook 'write-file-hooks 'time-stamp)
243 243
 # time-stamp-start: "scriptversion="
244 244
 # time-stamp-format: "%:y-%02m-%02d.%02H"
245
-# time-stamp-time-zone: "UTC"
245
+# time-stamp-time-zone: "UTC0"
246 246
 # time-stamp-end: "; # UTC"
247 247
 # End:
... ...
@@ -900,6 +900,7 @@ infodir
900 900
 docdir
901 901
 oldincludedir
902 902
 includedir
903
+runstatedir
903 904
 localstatedir
904 905
 sharedstatedir
905 906
 sysconfdir
... ...
@@ -948,6 +949,7 @@ enable_xml
948 948
 with_xml
949 949
 with_openssl
950 950
 with_libjson
951
+with_libjson_static
951 952
 with_pcre
952 953
 with_system_libmspack
953 954
 enable_maintainer_mode
... ...
@@ -1056,6 +1058,7 @@ datadir='${datarootdir}'
1056 1056
 sysconfdir='${prefix}/etc'
1057 1057
 sharedstatedir='${prefix}/com'
1058 1058
 localstatedir='${prefix}/var'
1059
+runstatedir='${localstatedir}/run'
1059 1060
 includedir='${prefix}/include'
1060 1061
 oldincludedir='/usr/include'
1061 1062
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
... ...
@@ -1308,6 +1311,15 @@ do
1308 1308
   | -silent | --silent | --silen | --sile | --sil)
1309 1309
     silent=yes ;;
1310 1310
 
1311
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
1312
+  | --runstate | --runstat | --runsta | --runst | --runs \
1313
+  | --run | --ru | --r)
1314
+    ac_prev=runstatedir ;;
1315
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1316
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1317
+  | --run=* | --ru=* | --r=*)
1318
+    runstatedir=$ac_optarg ;;
1319
+
1311 1320
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
1312 1321
     ac_prev=sbindir ;;
1313 1322
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
... ...
@@ -1445,7 +1457,7 @@ fi
1445 1445
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
1446 1446
 		datadir sysconfdir sharedstatedir localstatedir includedir \
1447 1447
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1448
-		libdir localedir mandir
1448
+		libdir localedir mandir runstatedir
1449 1449
 do
1450 1450
   eval ac_val=\$$ac_var
1451 1451
   # Remove trailing slashes.
... ...
@@ -1598,6 +1610,7 @@ Fine tuning of the installation directories:
1598 1598
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
1599 1599
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
1600 1600
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
1601
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
1601 1602
   --libdir=DIR            object code libraries [EPREFIX/lib]
1602 1603
   --includedir=DIR        C header files [PREFIX/include]
1603 1604
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
... ...
@@ -1717,6 +1730,8 @@ Optional Packages:
1717 1717
   --with-libjson[=DIR]    path to directory containing libjson
1718 1718
                           [default=/usr/local or /usr if not found in
1719 1719
                           /usr/local]
1720
+  --with-libjson-static=DIR
1721
+                          path to libjson-c.a static library
1720 1722
   --with-pcre[=DIR]       path to directory containing libpcre library,
1721 1723
                           prioritizes PCRE2 over PCRE [default=search PATH
1722 1724
                           environment variable]
... ...
@@ -3652,7 +3667,7 @@ done
3652 3652
 
3653 3653
 
3654 3654
 
3655
-am__api_version='1.14'
3655
+am__api_version='1.15'
3656 3656
 
3657 3657
 # Find a good install program.  We prefer a C program (faster),
3658 3658
 # so one script is as good as another.  But avoid the broken or
... ...
@@ -3824,8 +3839,8 @@ test "$program_suffix" != NONE &&
3824 3824
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
3825 3825
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
3826 3826
 
3827
-# expand $ac_aux_dir to an absolute path
3828
-am_aux_dir=`cd $ac_aux_dir && pwd`
3827
+# Expand $ac_aux_dir to an absolute path.
3828
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
3829 3829
 
3830 3830
 if test x"${MISSING+set}" != xset; then
3831 3831
   case $am_aux_dir in
... ...
@@ -3844,7 +3859,7 @@ else
3844 3844
 $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
3845 3845
 fi
3846 3846
 
3847
-if test x"${install_sh}" != xset; then
3847
+if test x"${install_sh+set}" != xset; then
3848 3848
   case $am_aux_dir in
3849 3849
   *\ * | *\	*)
3850 3850
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
... ...
@@ -4226,8 +4241,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
4226 4226
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
4227 4227
 mkdir_p='$(MKDIR_P)'
4228 4228
 
4229
-# We need awk for the "check" target.  The system "awk" is bad on
4230
-# some platforms.
4229
+# We need awk for the "check" target (and possibly the TAP driver).  The
4230
+# system "awk" is bad on some platforms.
4231 4231
 # Always define AMTAR for backward compatibility.  Yes, it's still used
4232 4232
 # in the wild :-(  We should find a proper way to deprecate it ...
4233 4233
 AMTAR='$${TAR-tar}'
... ...
@@ -4528,6 +4543,7 @@ END
4528 4528
     as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
4529 4529
   fi
4530 4530
 fi
4531
+
4531 4532
 # Check whether --enable-silent-rules was given.
4532 4533
 if test "${enable_silent_rules+set}" = set; then :
4533 4534
   enableval=$enable_silent_rules;
... ...
@@ -5932,7 +5948,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
5932 5932
 VERSION="0.101.5"
5933 5933
 
5934 5934
 LC_CURRENT=9
5935
-LC_REVISION=2
5935
+LC_REVISION=4
5936 5936
 LC_AGE=0
5937 5937
 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
5938 5938
 
... ...
@@ -7078,7 +7094,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
7078 7078
   lt_cv_deplibs_check_method=pass_all
7079 7079
   ;;
7080 7080
 
7081
-netbsd*)
7081
+netbsd* | netbsdelf*-gnu)
7082 7082
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
7083 7083
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
7084 7084
   else
... ...
@@ -10512,6 +10528,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
10512 10512
   openbsd* | bitrig*)
10513 10513
     with_gnu_ld=no
10514 10514
     ;;
10515
+  linux* | k*bsd*-gnu | gnu*)
10516
+    link_all_deplibs=no
10517
+    ;;
10515 10518
   esac
10516 10519
 
10517 10520
   ld_shlibs=yes
... ...
@@ -10766,7 +10785,7 @@ _LT_EOF
10766 10766
       fi
10767 10767
       ;;
10768 10768
 
10769
-    netbsd*)
10769
+    netbsd* | netbsdelf*-gnu)
10770 10770
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
10771 10771
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
10772 10772
 	wlarc=
... ...
@@ -11436,6 +11455,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
11436 11436
 	if test yes = "$lt_cv_irix_exported_symbol"; then
11437 11437
           archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
11438 11438
 	fi
11439
+	link_all_deplibs=no
11439 11440
       else
11440 11441
 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
11441 11442
 	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
... ...
@@ -11457,7 +11477,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
11457 11457
       esac
11458 11458
       ;;
11459 11459
 
11460
-    netbsd*)
11460
+    netbsd* | netbsdelf*-gnu)
11461 11461
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
11462 11462
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
11463 11463
       else
... ...
@@ -12572,6 +12592,18 @@ fi
12572 12572
   dynamic_linker='GNU/Linux ld.so'
12573 12573
   ;;
12574 12574
 
12575
+netbsdelf*-gnu)
12576
+  version_type=linux
12577
+  need_lib_prefix=no
12578
+  need_version=no
12579
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
12580
+  soname_spec='${libname}${release}${shared_ext}$major'
12581
+  shlibpath_var=LD_LIBRARY_PATH
12582
+  shlibpath_overrides_runpath=no
12583
+  hardcode_into_libs=yes
12584
+  dynamic_linker='NetBSD ld.elf_so'
12585
+  ;;
12586
+
12575 12587
 netbsd*)
12576 12588
   version_type=sunos
12577 12589
   need_lib_prefix=no
... ...
@@ -15466,7 +15498,7 @@ lt_prog_compiler_static_CXX=
15466 15466
 	    ;;
15467 15467
 	esac
15468 15468
 	;;
15469
-      netbsd*)
15469
+      netbsd* | netbsdelf*-gnu)
15470 15470
 	;;
15471 15471
       *qnx* | *nto*)
15472 15472
         # QNX uses GNU C++, but need to define -shared option too, otherwise
... ...
@@ -15841,6 +15873,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
15841 15841
       ;;
15842 15842
     esac
15843 15843
     ;;
15844
+  linux* | k*bsd*-gnu | gnu*)
15845
+    link_all_deplibs_CXX=no
15846
+    ;;
15844 15847
   *)
15845 15848
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
15846 15849
     ;;
... ...
@@ -16534,6 +16569,18 @@ fi
16534 16534
   dynamic_linker='GNU/Linux ld.so'
16535 16535
   ;;
16536 16536
 
16537
+netbsdelf*-gnu)
16538
+  version_type=linux
16539
+  need_lib_prefix=no
16540
+  need_version=no
16541
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
16542
+  soname_spec='${libname}${release}${shared_ext}$major'
16543
+  shlibpath_var=LD_LIBRARY_PATH
16544
+  shlibpath_overrides_runpath=no
16545
+  hardcode_into_libs=yes
16546
+  dynamic_linker='NetBSD ld.elf_so'
16547
+  ;;
16548
+
16537 16549
 netbsd*)
16538 16550
   version_type=sunos
16539 16551
   need_lib_prefix=no
... ...
@@ -17498,7 +17545,7 @@ else
17498 17498
     # at 6.2 and later dlopen does load deplibs.
17499 17499
     lt_cv_sys_dlopen_deplibs=yes
17500 17500
     ;;
17501
-  netbsd*)
17501
+  netbsd* | netbsdelf*-gnu)
17502 17502
     lt_cv_sys_dlopen_deplibs=yes
17503 17503
     ;;
17504 17504
   openbsd*)
... ...
@@ -22241,20 +22288,21 @@ $as_echo_n "checking for libjson installation... " >&6; }
22241 22241
 # Check whether --with-libjson was given.
22242 22242
 if test "${with_libjson+set}" = set; then :
22243 22243
   withval=$with_libjson;
22244
-find_json="no"
22245
-if test "X$withval" = "Xyes"; then
22246
-    find_json="yes"
22247
-else
22248
-    if test "X$withval" != "Xno"; then
22249
-        if test -f "${withval}/include/json/json.h" -o -f "${withval}/include/json-c/json.h"; then
22250
-            LIBJSON_HOME="$withval"
22251
-            have_json_header="yes"
22244
+        find_json="no"
22245
+        if test "X$withval" = "Xyes"; then
22246
+            find_json="yes"
22247
+        else
22248
+            if test "X$withval" != "Xno"; then
22249
+                if test -f "${withval}/include/json/json.h" -o -f "${withval}/include/json-c/json.h"; then
22250
+                    LIBJSON_HOME="$withval"
22251
+                    have_json_header="yes"
22252
+                fi
22253
+            fi
22252 22254
         fi
22253
-    fi
22254
-fi
22255 22255
 
22256 22256
 else
22257 22257
   find_json="yes"
22258
+
22258 22259
 fi
22259 22260
 
22260 22261
 
... ...
@@ -22297,12 +22345,13 @@ $as_echo "$as_me: WARNING: json header lost." >&2;}
22297 22297
         CFLAGS="$CFLAGS $JSON_CPPFLAGS"
22298 22298
     fi
22299 22299
 
22300
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing json_object_object_get_ex" >&5
22301
-$as_echo_n "checking for library containing json_object_object_get_ex... " >&6; }
22302
-if ${ac_cv_search_json_object_object_get_ex+:} false; then :
22300
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for json_object_object_get_ex in -ljson-c" >&5
22301
+$as_echo_n "checking for json_object_object_get_ex in -ljson-c... " >&6; }
22302
+if ${ac_cv_lib_json_c_json_object_object_get_ex+:} false; then :
22303 22303
   $as_echo_n "(cached) " >&6
22304 22304
 else
22305
-  ac_func_search_save_LIBS=$LIBS
22305
+  ac_check_lib_save_LIBS=$LIBS
22306
+LIBS="-ljson-c  $LIBS"
22306 22307
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22307 22308
 /* end confdefs.h.  */
22308 22309
 
... ...
@@ -22321,47 +22370,76 @@ return json_object_object_get_ex ();
22321 22321
   return 0;
22322 22322
 }
22323 22323
 _ACEOF
22324
-for ac_lib in '' json-c json; do
22325
-  if test -z "$ac_lib"; then
22326
-    ac_res="none required"
22327
-  else
22328
-    ac_res=-l$ac_lib
22329
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
22330
-  fi
22331
-  if ac_fn_c_try_link "$LINENO"; then :
22332
-  ac_cv_search_json_object_object_get_ex=$ac_res
22324
+if ac_fn_c_try_link "$LINENO"; then :
22325
+  ac_cv_lib_json_c_json_object_object_get_ex=yes
22326
+else
22327
+  ac_cv_lib_json_c_json_object_object_get_ex=no
22333 22328
 fi
22334 22329
 rm -f core conftest.err conftest.$ac_objext \
22335
-    conftest$ac_exeext
22336
-  if ${ac_cv_search_json_object_object_get_ex+:} false; then :
22337
-  break
22330
+    conftest$ac_exeext conftest.$ac_ext
22331
+LIBS=$ac_check_lib_save_LIBS
22338 22332
 fi
22339
-done
22340
-if ${ac_cv_search_json_object_object_get_ex+:} false; then :
22333
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_json_c_json_object_object_get_ex" >&5
22334
+$as_echo "$ac_cv_lib_json_c_json_object_object_get_ex" >&6; }
22335
+if test "x$ac_cv_lib_json_c_json_object_object_get_ex" = xyes; then :
22341 22336
 
22337
+                        have_json="yes"
22338
+            have_deprecated_json="no"
22339
+            json_libname="json-c"
22340
+
22341
+else
22342
+
22343
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for json_object_object_get_ex in -ljson" >&5
22344
+$as_echo_n "checking for json_object_object_get_ex in -ljson... " >&6; }
22345
+if ${ac_cv_lib_json_json_object_object_get_ex+:} false; then :
22346
+  $as_echo_n "(cached) " >&6
22347
+else
22348
+  ac_check_lib_save_LIBS=$LIBS
22349
+LIBS="-ljson  $LIBS"
22350
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22351
+/* end confdefs.h.  */
22352
+
22353
+/* Override any GCC internal prototype to avoid an error.
22354
+   Use char because int might match the return type of a GCC
22355
+   builtin and then its argument prototype would still apply.  */
22356
+#ifdef __cplusplus
22357
+extern "C"
22358
+#endif
22359
+char json_object_object_get_ex ();
22360
+int
22361
+main ()
22362
+{
22363
+return json_object_object_get_ex ();
22364
+  ;
22365
+  return 0;
22366
+}
22367
+_ACEOF
22368
+if ac_fn_c_try_link "$LINENO"; then :
22369
+  ac_cv_lib_json_json_object_object_get_ex=yes
22342 22370
 else
22343
-  ac_cv_search_json_object_object_get_ex=no
22371
+  ac_cv_lib_json_json_object_object_get_ex=no
22344 22372
 fi
22345
-rm conftest.$ac_ext
22346
-LIBS=$ac_func_search_save_LIBS
22373
+rm -f core conftest.err conftest.$ac_objext \
22374
+    conftest$ac_exeext conftest.$ac_ext
22375
+LIBS=$ac_check_lib_save_LIBS
22347 22376
 fi
22348
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_json_object_object_get_ex" >&5
22349
-$as_echo "$ac_cv_search_json_object_object_get_ex" >&6; }
22350
-ac_res=$ac_cv_search_json_object_object_get_ex
22351
-if test "$ac_res" != no; then :
22352
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
22377
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_json_json_object_object_get_ex" >&5
22378
+$as_echo "$ac_cv_lib_json_json_object_object_get_ex" >&6; }
22379
+if test "x$ac_cv_lib_json_json_object_object_get_ex" = xyes; then :
22380
+
22381
+                                        have_json="yes"
22382
+                    have_deprecated_json="no"
22383
+                    json_libname="json"
22353 22384
 
22354
-        have_json="yes"
22355
-        have_deprecated_json="no"
22356 22385
 else
22357 22386
 
22358
-        have_json="no"
22359
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing json_object_object_get" >&5
22360
-$as_echo_n "checking for library containing json_object_object_get... " >&6; }
22361
-if ${ac_cv_search_json_object_object_get+:} false; then :
22387
+                                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for json_object_object_get in -ljson-c" >&5
22388
+$as_echo_n "checking for json_object_object_get in -ljson-c... " >&6; }
22389
+if ${ac_cv_lib_json_c_json_object_object_get+:} false; then :
22362 22390
   $as_echo_n "(cached) " >&6
22363 22391
 else
22364
-  ac_func_search_save_LIBS=$LIBS
22392
+  ac_check_lib_save_LIBS=$LIBS
22393
+LIBS="-ljson-c  $LIBS"
22365 22394
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22366 22395
 /* end confdefs.h.  */
22367 22396
 
... ...
@@ -22380,42 +22458,85 @@ return json_object_object_get ();
22380 22380
   return 0;
22381 22381
 }
22382 22382
 _ACEOF
22383
-for ac_lib in '' json-c json; do
22384
-  if test -z "$ac_lib"; then
22385
-    ac_res="none required"
22386
-  else
22387
-    ac_res=-l$ac_lib
22388
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
22389
-  fi
22390
-  if ac_fn_c_try_link "$LINENO"; then :
22391
-  ac_cv_search_json_object_object_get=$ac_res
22383
+if ac_fn_c_try_link "$LINENO"; then :
22384
+  ac_cv_lib_json_c_json_object_object_get=yes
22385
+else
22386
+  ac_cv_lib_json_c_json_object_object_get=no
22392 22387
 fi
22393 22388
 rm -f core conftest.err conftest.$ac_objext \
22394
-    conftest$ac_exeext
22395
-  if ${ac_cv_search_json_object_object_get+:} false; then :
22396
-  break
22389
+    conftest$ac_exeext conftest.$ac_ext
22390
+LIBS=$ac_check_lib_save_LIBS
22397 22391
 fi
22398
-done
22399
-if ${ac_cv_search_json_object_object_get+:} false; then :
22392
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_json_c_json_object_object_get" >&5
22393
+$as_echo "$ac_cv_lib_json_c_json_object_object_get" >&6; }
22394
+if test "x$ac_cv_lib_json_c_json_object_object_get" = xyes; then :
22395
+
22396
+                                                        have_json="yes"
22397
+                            have_deprecated_json="yes"
22398
+                            json_libname="json-c"
22400 22399
 
22401 22400
 else
22402
-  ac_cv_search_json_object_object_get=no
22401
+
22402
+                                                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for json_object_object_get in -ljson" >&5
22403
+$as_echo_n "checking for json_object_object_get in -ljson... " >&6; }
22404
+if ${ac_cv_lib_json_json_object_object_get+:} false; then :
22405
+  $as_echo_n "(cached) " >&6
22406
+else
22407
+  ac_check_lib_save_LIBS=$LIBS
22408
+LIBS="-ljson  $LIBS"
22409
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22410
+/* end confdefs.h.  */
22411
+
22412
+/* Override any GCC internal prototype to avoid an error.
22413
+   Use char because int might match the return type of a GCC
22414
+   builtin and then its argument prototype would still apply.  */
22415
+#ifdef __cplusplus
22416
+extern "C"
22417
+#endif
22418
+char json_object_object_get ();
22419
+int
22420
+main ()
22421
+{
22422
+return json_object_object_get ();
22423
+  ;
22424
+  return 0;
22425
+}
22426
+_ACEOF
22427
+if ac_fn_c_try_link "$LINENO"; then :
22428
+  ac_cv_lib_json_json_object_object_get=yes
22429
+else
22430
+  ac_cv_lib_json_json_object_object_get=no
22403 22431
 fi
22404
-rm conftest.$ac_ext
22405
-LIBS=$ac_func_search_save_LIBS
22432
+rm -f core conftest.err conftest.$ac_objext \
22433
+    conftest$ac_exeext conftest.$ac_ext
22434
+LIBS=$ac_check_lib_save_LIBS
22406 22435
 fi
22407
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_json_object_object_get" >&5
22408
-$as_echo "$ac_cv_search_json_object_object_get" >&6; }
22409
-ac_res=$ac_cv_search_json_object_object_get
22410
-if test "$ac_res" != no; then :
22411
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
22436
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_json_json_object_object_get" >&5
22437
+$as_echo "$ac_cv_lib_json_json_object_object_get" >&6; }
22438
+if test "x$ac_cv_lib_json_json_object_object_get" = xyes; then :
22439
+
22440
+                                                                        have_json="yes"
22441
+                                    have_deprecated_json="yes"
22442
+                                    json_libname="json"
22443
+
22444
+else
22445
+
22446
+                                                                        have_json="no"
22447
+                                    as_fn_error $? "Unable to find libjson library." "$LINENO" 5
22412 22448
 
22413
-            have_json="yes"
22414
-            have_deprecated_json="yes"
22415 22449
 
22416 22450
 fi
22417 22451
 
22418 22452
 
22453
+
22454
+fi
22455
+
22456
+
22457
+
22458
+fi
22459
+
22460
+
22461
+
22419 22462
 fi
22420 22463
 
22421 22464
 
... ...
@@ -22432,7 +22553,22 @@ $as_echo "#define HAVE_JSON 1" >>confdefs.h
22432 22432
 $as_echo "#define HAVE_DEPRECATED_JSON 1" >>confdefs.h
22433 22433
 
22434 22434
     fi
22435
-    JSON_LIBS="$LIBS"
22435
+
22436
+
22437
+# Check whether --with-libjson-static was given.
22438
+if test "${with_libjson_static+set}" = set; then :
22439
+  withval=$with_libjson_static;
22440
+            json_linking="static"
22441
+            JSON_LIBS="$withval $LIBS"
22442
+
22443
+else
22444
+
22445
+            json_linking="dynamic"
22446
+            JSON_LIBS="-l${json_libname} $LIBS"
22447
+
22448
+
22449
+fi
22450
+
22436 22451
 fi
22437 22452
 
22438 22453
 LIBS="$save_LIBS"
... ...
@@ -31309,7 +31445,6 @@ $as_echo X"$file" |
31309 31309
     cat <<_LT_EOF >> "$cfgfile"
31310 31310
 #! $SHELL
31311 31311
 # Generated automatically by $as_me ($PACKAGE) $VERSION
31312
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
31313 31312
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
31314 31313
 
31315 31314
 # Provide generalized library-building support services.
... ...
@@ -34200,7 +34335,6 @@ $as_echo X"$file" |
34200 34200
     cat <<_LT_EOF >> "$cfgfile"
34201 34201
 #! $SHELL
34202 34202
 # Generated automatically by $as_me ($PACKAGE) $VERSION
34203
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
34204 34203
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
34205 34204
 
34206 34205
 # Provide generalized library-building support services.
... ...
@@ -35200,13 +35334,13 @@ if test "X$have_curl" = "Xyes" && test "X$have_json" = "Xyes"; then
35200 35200
 
35201 35201
    $as_echo_n "              clamsubmit  : "
35202 35202
    if test "xyes" = "xno"; then :
35203
-  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME), libcurl-devel found at $LIBCURL_HOME) (disabled)"
35203
+  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME, linking=$json_linking), libcurl-devel found at $LIBCURL_HOME) (disabled)"
35204 35204
 elif test "xyes" = "xyes"; then :
35205
-  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME), libcurl-devel found at $LIBCURL_HOME)"
35205
+  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME, linking=$json_linking), libcurl-devel found at $LIBCURL_HOME)"
35206 35206
 elif test "xyes" = "x"; then :
35207
-  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME), libcurl-devel found at $LIBCURL_HOME)"
35207
+  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME, linking=$json_linking), libcurl-devel found at $LIBCURL_HOME)"
35208 35208
 else
35209
-  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME), libcurl-devel found at $LIBCURL_HOME) (yes)"
35209
+  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME, linking=$json_linking), libcurl-devel found at $LIBCURL_HOME) (yes)"
35210 35210
 fi
35211 35211
 
35212 35212
 else
... ...
@@ -35395,13 +35529,13 @@ if test "X$have_json" = "Xyes"; then
35395 35395
 
35396 35396
    $as_echo_n "              preclass    : "
35397 35397
    if test "xyes" = "xno"; then :
35398
-  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME) (disabled)"
35398
+  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME, linking=$json_linking) (disabled)"
35399 35399
 elif test "xyes" = "xyes"; then :
35400
-  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME)"
35400
+  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME, linking=$json_linking)"
35401 35401
 elif test "xyes" = "x"; then :
35402
-  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME)"
35402
+  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME, linking=$json_linking)"
35403 35403
 else
35404
-  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME) (yes)"
35404
+  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME, linking=$json_linking) (yes)"
35405 35405
 fi
35406 35406
 
35407 35407
 else
... ...
@@ -35522,27 +35656,27 @@ fi
35522 35522
 # 4.0.x, and 4.1.0 are the known buggy versions
35523 35523
 # 3.4 doesn't have the bug
35524 35524
 if test "x$gcc_check" != "xyes"; then
35525
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
35525
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
35526 35526
 ****** Optimizations disabled to avoid compiler bugs
35527 35527
 ****** The resulting binaries will be slow!
35528 35528
 ****** It is recommended to either upgrade or downgrade your compiler
35529
-" >&5
35529
+    " >&5
35530 35530
 $as_echo "$as_me: WARNING:
35531 35531
 ****** Optimizations disabled to avoid compiler bugs
35532 35532
 ****** The resulting binaries will be slow!
35533 35533
 ****** It is recommended to either upgrade or downgrade your compiler
35534
-" >&2;}
35534
+    " >&2;}
35535 35535
 fi
35536 35536
 
35537 35537
 if test "x$cross_compiling" != "xno" || test "x$gcc_check" != "xyes" || test "x$zlib_check" = "xno" || test "x$bzip_check" != "xok" ; then
35538
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
35538
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
35539 35539
 ****** WARNING:
35540 35540
 ****** You are cross compiling to a different host or you are
35541 35541
 ****** linking to bugged system libraries or you have manually
35542 35542
 ****** disabled important configure checks.
35543 35543
 ****** Please be aware that this build may be badly broken.
35544 35544
 ****** DO NOT REPORT BUGS BASED ON THIS BUILD !!!
35545
-" >&5
35545
+    " >&5
35546 35546
 $as_echo "$as_me: WARNING:
35547 35547
 ****** WARNING:
35548 35548
 ****** You are cross compiling to a different host or you are
... ...
@@ -35550,6 +35684,20 @@ $as_echo "$as_me: WARNING:
35550 35550
 ****** disabled important configure checks.
35551 35551
 ****** Please be aware that this build may be badly broken.
35552 35552
 ****** DO NOT REPORT BUGS BASED ON THIS BUILD !!!
35553
-" >&2;}
35553
+    " >&2;}
35554 35554
 fi
35555 35555
 
35556
+if test "X$have_json" = "Xyes" && test "x$json_linking" = "xdynamic"; then
35557
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
35558
+****** libjson-c is known to share symbol names with other JSON libraries
35559
+****** which may result in crashes for applications that use libclamav.
35560
+****** Consider using --with-libjson-static=path/to/libjson-c.a,
35561
+****** providing a json-c library that was compiled with CFLAGS=\"-fPIC\".
35562
+    " >&5
35563
+$as_echo "$as_me: WARNING:
35564
+****** libjson-c is known to share symbol names with other JSON libraries
35565
+****** which may result in crashes for applications that use libclamav.
35566
+****** Consider using --with-libjson-static=path/to/libjson-c.a,
35567
+****** providing a json-c library that was compiled with CFLAGS=\"-fPIC\".
35568
+    " >&2;}
35569
+fi
... ...
@@ -1,7 +1,7 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
 
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -35,7 +35,17 @@
35 35
 #  along with this program; if not, write to the Free Software
36 36
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
37 37
 VPATH = @srcdir@
38
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
38
+am__is_gnu_make = { \
39
+  if test -z '$(MAKELEVEL)'; then \
40
+    false; \
41
+  elif test -n '$(MAKE_HOST)'; then \
42
+    true; \
43
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
44
+    true; \
45
+  else \
46
+    false; \
47
+  fi; \
48
+}
39 49
 am__make_running_with_option = \
40 50
   case $${target_option-} in \
41 51
       ?) ;; \
... ...
@@ -100,7 +110,6 @@ build_triplet = @build@
100 100
 host_triplet = @host@
101 101
 target_triplet = @target@
102 102
 subdir = database
103
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
104 103
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
105 104
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
106 105
 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \
... ...
@@ -181,6 +190,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
181 181
 	$(top_srcdir)/configure.ac
182 182
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
183 183
 	$(ACLOCAL_M4)
184
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
184 185
 mkinstalldirs = $(install_sh) -d
185 186
 CONFIG_HEADER = $(top_builddir)/clamav-config.h \
186 187
 	$(top_builddir)/libclammspack/config.h
... ...
@@ -206,6 +216,7 @@ am__can_run_installinfo = \
206 206
     *) (install-info --version) >/dev/null 2>&1;; \
207 207
   esac
208 208
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
209
+am__DIST_COMMON = $(srcdir)/Makefile.in
209 210
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
210 211
 ACLOCAL = @ACLOCAL@
211 212
 AMTAR = @AMTAR@
... ...
@@ -431,6 +442,7 @@ pdfdir = @pdfdir@
431 431
 prefix = @prefix@
432 432
 program_transform_name = @program_transform_name@
433 433
 psdir = @psdir@
434
+runstatedir = @runstatedir@
434 435
 sbindir = @sbindir@
435 436
 sharedstatedir = @sharedstatedir@
436 437
 srcdir = @srcdir@
... ...
@@ -463,7 +475,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
463 463
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign database/Makefile'; \
464 464
 	$(am__cd) $(top_srcdir) && \
465 465
 	  $(AUTOMAKE) --foreign database/Makefile
466
-.PRECIOUS: Makefile
467 466
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
468 467
 	@case '$?' in \
469 468
 	  *config.status*) \
... ...
@@ -639,6 +650,8 @@ uninstall-am:
639 639
 	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
640 640
 	uninstall-am
641 641
 
642
+.PRECIOUS: Makefile
643
+
642 644
 
643 645
 install-data-local:
644 646
 	@test -s $(srcdir)/main.cvd -a -s $(srcdir)/daily.cvd || exit 0;\
... ...
@@ -1,7 +1,7 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
 
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -34,7 +34,17 @@
34 34
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
35 35
 #  MA 02110-1301, USA.
36 36
 VPATH = @srcdir@
37
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
37
+am__is_gnu_make = { \
38
+  if test -z '$(MAKELEVEL)'; then \
39
+    false; \
40
+  elif test -n '$(MAKE_HOST)'; then \
41
+    true; \
42
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
43
+    true; \
44
+  else \
45
+    false; \
46
+  fi; \
47
+}
38 48
 am__make_running_with_option = \
39 49
   case $${target_option-} in \
40 50
       ?) ;; \
... ...
@@ -100,7 +110,6 @@ host_triplet = @host@
100 100
 target_triplet = @target@
101 101
 @ENABLE_CLAMSUBMIT_TRUE@am__append_1 = man/clamsubmit.1
102 102
 subdir = docs
103
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
104 103
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
105 104
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
106 105
 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \
... ...
@@ -181,6 +190,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
181 181
 	$(top_srcdir)/configure.ac
182 182
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
183 183
 	$(ACLOCAL_M4)
184
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
184 185
 mkinstalldirs = $(install_sh) -d
185 186
 CONFIG_HEADER = $(top_builddir)/clamav-config.h \
186 187
 	$(top_builddir)/libclammspack/config.h
... ...
@@ -240,6 +250,7 @@ man8dir = $(mandir)/man8
240 240
 NROFF = nroff
241 241
 MANS = $(man_MANS)
242 242
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
243
+am__DIST_COMMON = $(srcdir)/Makefile.in
243 244
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
244 245
 ACLOCAL = @ACLOCAL@
245 246
 AMTAR = @AMTAR@
... ...
@@ -465,6 +476,7 @@ pdfdir = @pdfdir@
465 465
 prefix = @prefix@
466 466
 program_transform_name = @program_transform_name@
467 467
 psdir = @psdir@
468
+runstatedir = @runstatedir@
468 469
 sbindir = @sbindir@
469 470
 sharedstatedir = @sharedstatedir@
470 471
 srcdir = @srcdir@
... ...
@@ -500,7 +512,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
500 500
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docs/Makefile'; \
501 501
 	$(am__cd) $(top_srcdir) && \
502 502
 	  $(AUTOMAKE) --foreign docs/Makefile
503
-.PRECIOUS: Makefile
504 503
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
505 504
 	@case '$?' in \
506 505
 	  *config.status*) \
... ...
@@ -811,6 +822,8 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8
811 811
 	uninstall-am uninstall-man uninstall-man1 uninstall-man5 \
812 812
 	uninstall-man8
813 813
 
814
+.PRECIOUS: Makefile
815
+
814 816
 
815 817
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
816 818
 # Otherwise a system limit (for SysV at least) may be exceeded.
... ...
@@ -1,7 +1,7 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
 
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -35,7 +35,17 @@
35 35
 #  MA 02110-1301, USA.
36 36
 
37 37
 VPATH = @srcdir@
38
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
38
+am__is_gnu_make = { \
39
+  if test -z '$(MAKELEVEL)'; then \
40
+    false; \
41
+  elif test -n '$(MAKE_HOST)'; then \
42
+    true; \
43
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
44
+    true; \
45
+  else \
46
+    false; \
47
+  fi; \
48
+}
39 49
 am__make_running_with_option = \
40 50
   case $${target_option-} in \
41 51
       ?) ;; \
... ...
@@ -101,7 +111,6 @@ host_triplet = @host@
101 101
 target_triplet = @target@
102 102
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@am__append_1 = clamav-milter.conf.sample
103 103
 subdir = etc
104
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
105 104
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
106 105
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
107 106
 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \
... ...
@@ -182,6 +191,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
182 182
 	$(top_srcdir)/configure.ac
183 183
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
184 184
 	$(ACLOCAL_M4)
185
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
185 186
 mkinstalldirs = $(install_sh) -d
186 187
 CONFIG_HEADER = $(top_builddir)/clamav-config.h \
187 188
 	$(top_builddir)/libclammspack/config.h
... ...
@@ -236,6 +246,7 @@ am__uninstall_files_from_dir = { \
236 236
 am__installdirs = "$(DESTDIR)$(sysconfdir)"
237 237
 DATA = $(sysconf_DATA)
238 238
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
239
+am__DIST_COMMON = $(srcdir)/Makefile.in
239 240
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
240 241
 ACLOCAL = @ACLOCAL@
241 242
 AMTAR = @AMTAR@
... ...
@@ -461,6 +472,7 @@ pdfdir = @pdfdir@
461 461
 prefix = @prefix@
462 462
 program_transform_name = @program_transform_name@
463 463
 psdir = @psdir@
464
+runstatedir = @runstatedir@
464 465
 sbindir = @sbindir@
465 466
 sharedstatedir = @sharedstatedir@
466 467
 srcdir = @srcdir@
... ...
@@ -494,7 +506,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
494 494
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign etc/Makefile'; \
495 495
 	$(am__cd) $(top_srcdir) && \
496 496
 	  $(AUTOMAKE) --foreign etc/Makefile
497
-.PRECIOUS: Makefile
498 497
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
499 498
 	@case '$?' in \
500 499
 	  *config.status*) \
... ...
@@ -693,6 +704,8 @@ uninstall-am: uninstall-sysconfDATA
693 693
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
694 694
 	ps ps-am tags-am uninstall uninstall-am uninstall-sysconfDATA
695 695
 
696
+.PRECIOUS: Makefile
697
+
696 698
 
697 699
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
698 700
 # Otherwise a system limit (for SysV at least) may be exceeded.
... ...
@@ -1,7 +1,7 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
 
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -37,7 +37,17 @@
37 37
 
38 38
 
39 39
 VPATH = @srcdir@
40
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
40
+am__is_gnu_make = { \
41
+  if test -z '$(MAKELEVEL)'; then \
42
+    false; \
43
+  elif test -n '$(MAKE_HOST)'; then \
44
+    true; \
45
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
46
+    true; \
47
+  else \
48
+    false; \
49
+  fi; \
50
+}
41 51
 am__make_running_with_option = \
42 52
   case $${target_option-} in \
43 53
       ?) ;; \
... ...
@@ -103,9 +113,6 @@ host_triplet = @host@
103 103
 target_triplet = @target@
104 104
 bin_PROGRAMS = freshclam$(EXEEXT)
105 105
 subdir = freshclam
106
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
107
-	$(srcdir)/clamav-freshclam.service.in \
108
-	$(top_srcdir)/config/depcomp
109 106
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
110 107
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
111 108
 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \
... ...
@@ -186,6 +193,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
186 186
 	$(top_srcdir)/configure.ac
187 187
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
188 188
 	$(ACLOCAL_M4)
189
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
189 190
 mkinstalldirs = $(install_sh) -d
190 191
 CONFIG_HEADER = $(top_builddir)/clamav-config.h \
191 192
 	$(top_builddir)/libclammspack/config.h
... ...
@@ -293,6 +301,9 @@ am__define_uniq_tagged_files = \
293 293
   done | $(am__uniquify_input)`
294 294
 ETAGS = etags
295 295
 CTAGS = ctags
296
+am__DIST_COMMON = $(srcdir)/Makefile.in \
297
+	$(srcdir)/clamav-freshclam.service.in \
298
+	$(top_srcdir)/config/depcomp
296 299
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
297 300
 ACLOCAL = @ACLOCAL@
298 301
 AMTAR = @AMTAR@
... ...
@@ -518,6 +529,7 @@ pdfdir = @pdfdir@
518 518
 prefix = @prefix@
519 519
 program_transform_name = @program_transform_name@
520 520
 psdir = @psdir@
521
+runstatedir = @runstatedir@
521 522
 sbindir = @sbindir@
522 523
 sharedstatedir = @sharedstatedir@
523 524
 srcdir = @srcdir@
... ...
@@ -584,7 +596,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
584 584
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign freshclam/Makefile'; \
585 585
 	$(am__cd) $(top_srcdir) && \
586 586
 	  $(AUTOMAKE) --foreign freshclam/Makefile
587
-.PRECIOUS: Makefile
588 587
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
589 588
 	@case '$?' in \
590 589
 	  *config.status*) \
... ...
@@ -1049,6 +1060,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-systemdsystemunitDATA
1049 1049
 	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
1050 1050
 	uninstall-systemdsystemunitDATA
1051 1051
 
1052
+.PRECIOUS: Makefile
1053
+
1052 1054
 
1053 1055
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
1054 1056
 # Otherwise a system limit (for SysV at least) may be exceeded.
... ...
@@ -1,7 +1,7 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
 
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -26,7 +26,17 @@
26 26
 
27 27
 
28 28
 VPATH = @srcdir@
29
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
29
+am__is_gnu_make = { \
30
+  if test -z '$(MAKELEVEL)'; then \
31
+    false; \
32
+  elif test -n '$(MAKE_HOST)'; then \
33
+    true; \
34
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
35
+    true; \
36
+  else \
37
+    false; \
38
+  fi; \
39
+}
30 40
 am__make_running_with_option = \
31 41
   case $${target_option-} in \
32 42
       ?) ;; \
... ...
@@ -130,8 +140,6 @@ target_triplet = @target@
130 130
 @ENABLE_FUZZ_TRUE@	clamav_dbload_WDB_fuzzer$(EXEEXT) \
131 131
 @ENABLE_FUZZ_TRUE@	clamav_dbload_YARA_fuzzer$(EXEEXT)
132 132
 subdir = fuzz
133
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
134
-	$(top_srcdir)/config/depcomp
135 133
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
136 134
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
137 135
 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \
... ...
@@ -212,6 +220,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
212 212
 	$(top_srcdir)/configure.ac
213 213
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
214 214
 	$(ACLOCAL_M4)
215
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
215 216
 mkinstalldirs = $(install_sh) -d
216 217
 CONFIG_HEADER = $(top_builddir)/clamav-config.h \
217 218
 	$(top_builddir)/libclammspack/config.h
... ...
@@ -689,6 +698,7 @@ am__define_uniq_tagged_files = \
689 689
   done | $(am__uniquify_input)`
690 690
 ETAGS = etags
691 691
 CTAGS = ctags
692
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
692 693
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
693 694
 ACLOCAL = @ACLOCAL@
694 695
 AMTAR = @AMTAR@
... ...
@@ -914,6 +924,7 @@ pdfdir = @pdfdir@
914 914
 prefix = @prefix@
915 915
 program_transform_name = @program_transform_name@
916 916
 psdir = @psdir@
917
+runstatedir = @runstatedir@
917 918
 sbindir = @sbindir@
918 919
 sharedstatedir = @sharedstatedir@
919 920
 srcdir = @srcdir@
... ...
@@ -1073,7 +1084,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
1073 1073
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign fuzz/Makefile'; \
1074 1074
 	$(am__cd) $(top_srcdir) && \
1075 1075
 	  $(AUTOMAKE) --foreign fuzz/Makefile
1076
-.PRECIOUS: Makefile
1077 1076
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
1078 1077
 	@case '$?' in \
1079 1078
 	  *config.status*) \
... ...
@@ -2122,6 +2132,8 @@ uninstall-am: uninstall-fuzzPROGRAMS
2122 2122
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
2123 2123
 	uninstall-fuzzPROGRAMS
2124 2124
 
2125
+.PRECIOUS: Makefile
2126
+
2125 2127
 
2126 2128
 @ENABLE_FUZZ_TRUE@LIB_FUZZING_ENGINE ?= standalone_fuzz_target_runner.a
2127 2129
 
... ...
@@ -1,7 +1,7 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
 
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -36,7 +36,17 @@
36 36
 
37 37
 
38 38
 VPATH = @srcdir@
39
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
39
+am__is_gnu_make = { \
40
+  if test -z '$(MAKELEVEL)'; then \
41
+    false; \
42
+  elif test -n '$(MAKE_HOST)'; then \
43
+    true; \
44
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
45
+    true; \
46
+  else \
47
+    false; \
48
+  fi; \
49
+}
40 50
 am__make_running_with_option = \
41 51
   case $${target_option-} in \
42 52
       ?) ;; \
... ...
@@ -127,10 +137,6 @@ target_triplet = @target@
127 127
 @ENABLE_YARA_TRUE@	yara_clam.h
128 128
 
129 129
 subdir = libclamav
130
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
131
-	yara_grammar.h yara_grammar.c yara_lexer.c \
132
-	$(top_srcdir)/config/depcomp $(top_srcdir)/config/ylwrap \
133
-	$(include_HEADERS)
134 130
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
135 131
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
136 132
 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \
... ...
@@ -211,6 +217,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
211 211
 	$(top_srcdir)/configure.ac
212 212
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
213 213
 	$(ACLOCAL_M4)
214
+DIST_COMMON = $(srcdir)/Makefile.am $(include_HEADERS) \
215
+	$(am__DIST_COMMON)
214 216
 mkinstalldirs = $(install_sh) -d
215 217
 CONFIG_HEADER = $(top_builddir)/clamav-config.h \
216 218
 	$(top_builddir)/libclammspack/config.h
... ...
@@ -833,6 +841,9 @@ am__define_uniq_tagged_files = \
833 833
 ETAGS = etags
834 834
 CTAGS = ctags
835 835
 DIST_SUBDIRS = c++
836
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp \
837
+	$(top_srcdir)/config/ylwrap yara_grammar.c yara_grammar.h \
838
+	yara_lexer.c
836 839
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
837 840
 am__relativize = \
838 841
   dir0=`pwd`; \
... ...
@@ -1083,6 +1094,7 @@ pdfdir = @pdfdir@
1083 1083
 prefix = @prefix@
1084 1084
 program_transform_name = @program_transform_name@
1085 1085
 psdir = @psdir@
1086
+runstatedir = @runstatedir@
1086 1087
 sbindir = @sbindir@
1087 1088
 sharedstatedir = @sharedstatedir@
1088 1089
 srcdir = @srcdir@
... ...
@@ -1201,7 +1213,7 @@ libclamav_internal_utils_la_SOURCES = str.c\
1201 1201
 
1202 1202
 libclamav_internal_utils_la_LDFLAGS = -static @SSL_LDFLAGS@ @JSON_LDFLAGS@
1203 1203
 libclamav_internal_utils_la_CFLAGS = $(AM_CFLAGS)  -fPIC -DPIC @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ @XML_CPPFLAGS@
1204
-libclamav_internal_utils_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ @PCRE_LIBS@
1204
+libclamav_internal_utils_la_LIBADD = @SSL_LIBS@ @PCRE_LIBS@
1205 1205
 libclamav_internal_utils_nothreads_la_SOURCES = str.c\
1206 1206
 					conv.c \
1207 1207
 					conv.h \
... ...
@@ -1227,7 +1239,7 @@ libclamav_internal_utils_nothreads_la_SOURCES = str.c\
1227 1227
 
1228 1228
 libclamav_internal_utils_nothreads_la_LDFLAGS = -static @SSL_LDFLAGS@ @JSON_LDFLAGS@
1229 1229
 libclamav_internal_utils_nothreads_la_CFLAGS = $(AM_CFLAGS) -DCL_NOTHREADS @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
1230
-libclamav_internal_utils_nothreads_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ @PCRE_LIBS@
1230
+libclamav_internal_utils_nothreads_la_LIBADD = @SSL_LIBS@ @PCRE_LIBS@
1231 1231
 SUBDIRS = $(am__append_6)
1232 1232
 @ENABLE_LLVM_FALSE@LLVMLIBADD = libclamav_nocxx.la
1233 1233
 @ENABLE_LLVM_TRUE@LLVMLIBADD = c++/libclamavcxx.la -lstdc++ -lm
... ...
@@ -1443,7 +1455,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
1443 1443
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libclamav/Makefile'; \
1444 1444
 	$(am__cd) $(top_srcdir) && \
1445 1445
 	  $(AUTOMAKE) --foreign libclamav/Makefile
1446
-.PRECIOUS: Makefile
1447 1446
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
1448 1447
 	@case '$?' in \
1449 1448
 	  *config.status*) \
... ...
@@ -4553,11 +4564,13 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
4553 4553
 	tags tags-am uninstall uninstall-am uninstall-includeHEADERS \
4554 4554
 	uninstall-libLTLIBRARIES
4555 4555
 
4556
+.PRECIOUS: Makefile
4557
+
4556 4558
 @ENABLE_LLVM_FALSE@c++/Makefile: c++/Makefile.nollvm.in
4557 4559
 @ENABLE_LLVM_FALSE@	$(AM_V_at) cp $< $@
4558 4560
 @ENABLE_LLVM_FALSE@distclean-recursive distdir maintainer-clean-recursive: c++/Makefile
4559 4561
 
4560
-@USE_INTERNAL_MSPACK_FALSE@libmspack/Makefile: 
4562
+@USE_INTERNAL_MSPACK_FALSE@libmspack/Makefile:
4561 4563
 @USE_INTERNAL_MSPACK_FALSE@.PHONY: distdir distclean maintainer-clean
4562 4564
 @USE_INTERNAL_MSPACK_FALSE@distdir:
4563 4565
 @USE_INTERNAL_MSPACK_FALSE@	echo "make distdir requires --with-system-libmspack=no"
... ...
@@ -1,7 +1,7 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
 
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -31,7 +31,17 @@
31 31
 
32 32
 
33 33
 VPATH = @srcdir@
34
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
34
+am__is_gnu_make = { \
35
+  if test -z '$(MAKELEVEL)'; then \
36
+    false; \
37
+  elif test -n '$(MAKE_HOST)'; then \
38
+    true; \
39
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
40
+    true; \
41
+  else \
42
+    false; \
43
+  fi; \
44
+}
35 45
 am__make_running_with_option = \
36 46
   case $${target_option-} in \
37 47
       ?) ;; \
... ...
@@ -107,16 +117,6 @@ target_triplet = @target@
107 107
 @BUILD_EXTERNAL_LLVM_FALSE@@MAINTAINER_MODE_TRUE@am__append_9 = $(TBLGENFILES)
108 108
 @BUILD_EXTERNAL_LLVM_FALSE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = tblgen$(EXEEXT)
109 109
 subdir = .
110
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
111
-	$(top_srcdir)/configure $(am__configure_deps) \
112
-	$(srcdir)/clamavcxx-config.h.in $(top_srcdir)/config/depcomp \
113
-	config/compile config/config.guess config/config.sub \
114
-	config/depcomp config/install-sh config/missing \
115
-	config/ltmain.sh $(top_srcdir)/config/compile \
116
-	$(top_srcdir)/config/config.guess \
117
-	$(top_srcdir)/config/config.sub \
118
-	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
119
-	$(top_srcdir)/config/missing
120 110
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
121 111
 am__aclocal_m4_deps = $(top_srcdir)/m4/check_gnu_make.m4 \
122 112
 	$(top_srcdir)/m4/cxx_flag_check.m4 $(top_srcdir)/m4/libtool.m4 \
... ...
@@ -126,6 +126,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/check_gnu_make.m4 \
126 126
 	$(top_srcdir)/m4/llvm-opts.m4 $(top_srcdir)/configure.ac
127 127
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
128 128
 	$(ACLOCAL_M4)
129
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
130
+	$(am__configure_deps) $(am__DIST_COMMON)
129 131
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
130 132
  configure.lineno config.status.lineno
131 133
 mkinstalldirs = $(install_sh) -d
... ...
@@ -902,6 +904,14 @@ ETAGS = etags
902 902
 CTAGS = ctags
903 903
 CSCOPE = cscope
904 904
 AM_RECURSIVE_TARGETS = cscope
905
+am__DIST_COMMON = $(srcdir)/Makefile.in \
906
+	$(srcdir)/clamavcxx-config.h.in $(top_srcdir)/config/compile \
907
+	$(top_srcdir)/config/config.guess \
908
+	$(top_srcdir)/config/config.sub $(top_srcdir)/config/depcomp \
909
+	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
910
+	$(top_srcdir)/config/missing config/compile \
911
+	config/config.guess config/config.sub config/depcomp \
912
+	config/install-sh config/ltmain.sh config/missing
905 913
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
906 914
 distdir = $(PACKAGE)-$(VERSION)
907 915
 top_distdir = $(distdir)
... ...
@@ -1044,6 +1054,7 @@ pdfdir = @pdfdir@
1044 1044
 prefix = @prefix@
1045 1045
 program_transform_name = @program_transform_name@
1046 1046
 psdir = @psdir@
1047
+runstatedir = @runstatedir@
1047 1048
 sbindir = @sbindir@
1048 1049
 sharedstatedir = @sharedstatedir@
1049 1050
 srcdir = @srcdir@
... ...
@@ -1555,7 +1566,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
1555 1555
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
1556 1556
 	$(am__cd) $(top_srcdir) && \
1557 1557
 	  $(AUTOMAKE) --foreign Makefile
1558
-.PRECIOUS: Makefile
1559 1558
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
1560 1559
 	@case '$?' in \
1561 1560
 	  *config.status*) \
... ...
@@ -5595,7 +5605,7 @@ distdir: $(DISTFILES)
5595 5595
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
5596 5596
 	|| chmod -R a+r "$(distdir)"
5597 5597
 dist-gzip: distdir
5598
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
5598
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
5599 5599
 	$(am__post_remove_distdir)
5600 5600
 
5601 5601
 dist-bzip2: distdir
... ...
@@ -5611,17 +5621,17 @@ dist-xz: distdir
5611 5611
 	$(am__post_remove_distdir)
5612 5612
 
5613 5613
 dist-tarZ: distdir
5614
-	@echo WARNING: "Support for shar distribution archives is" \
5615
-	               "deprecated." >&2
5614
+	@echo WARNING: "Support for distribution archives compressed with" \
5615
+		       "legacy program 'compress' is deprecated." >&2
5616 5616
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
5617 5617
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
5618 5618
 	$(am__post_remove_distdir)
5619 5619
 
5620 5620
 dist-shar: distdir
5621
-	@echo WARNING: "Support for distribution archives compressed with" \
5622
-		       "legacy program 'compress' is deprecated." >&2
5621
+	@echo WARNING: "Support for shar distribution archives is" \
5622
+	               "deprecated." >&2
5623 5623
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
5624
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
5624
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
5625 5625
 	$(am__post_remove_distdir)
5626 5626
 
5627 5627
 dist-zip: distdir
... ...
@@ -5639,7 +5649,7 @@ dist dist-all:
5639 5639
 distcheck: dist
5640 5640
 	case '$(DIST_ARCHIVES)' in \
5641 5641
 	*.tar.gz*) \
5642
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
5642
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
5643 5643
 	*.tar.bz2*) \
5644 5644
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
5645 5645
 	*.tar.lz*) \
... ...
@@ -5649,23 +5659,23 @@ distcheck: dist
5649 5649
 	*.tar.Z*) \
5650 5650
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
5651 5651
 	*.shar.gz*) \
5652
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
5652
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
5653 5653
 	*.zip*) \
5654 5654
 	  unzip $(distdir).zip ;;\
5655 5655
 	esac
5656 5656
 	chmod -R a-w $(distdir)
5657 5657
 	chmod u+w $(distdir)
5658
-	mkdir $(distdir)/_build $(distdir)/_inst
5658
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
5659 5659
 	chmod a-w $(distdir)
5660 5660
 	test -d $(distdir)/_build || exit 0; \
5661 5661
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
5662 5662
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
5663 5663
 	  && am__cwd=`pwd` \
5664
-	  && $(am__cd) $(distdir)/_build \
5665
-	  && ../configure \
5664
+	  && $(am__cd) $(distdir)/_build/sub \
5665
+	  && ../../configure \
5666 5666
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
5667 5667
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
5668
-	    --srcdir=.. --prefix="$$dc_install_base" \
5668
+	    --srcdir=../.. --prefix="$$dc_install_base" \
5669 5669
 	  && $(MAKE) $(AM_MAKEFLAGS) \
5670 5670
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
5671 5671
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
... ...
@@ -5851,6 +5861,8 @@ uninstall-am:
5851 5851
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
5852 5852
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am
5853 5853
 
5854
+.PRECIOUS: Makefile
5855
+
5854 5856
 
5855 5857
 @BUILD_EXTERNAL_LLVM_FALSE@@MAINTAINER_MODE_TRUE@llvm/include/llvm/Intrinsics.gen: llvm/include/llvm/Intrinsics.td $(TBLGEN)
5856 5858
 @BUILD_EXTERNAL_LLVM_FALSE@@MAINTAINER_MODE_TRUE@	$(TBLGEN_V) $(TBLGEN_FLAGS) -gen-intrinsic -o $@ $<
... ...
@@ -1,6 +1,6 @@
1
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
1
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
2 2
 
3
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
3
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
4 4
 
5 5
 # This file is free software; the Free Software Foundation
6 6
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -20,7 +20,7 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
20 20
 If you have problems, you may need to regenerate the build system entirely.
21 21
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
22 22
 
23
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
23
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
24 24
 #
25 25
 # This file is free software; the Free Software Foundation
26 26
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
32 32
 # generated from the m4 files accompanying Automake X.Y.
33 33
 # (This private macro should not be called outside this file.)
34 34
 AC_DEFUN([AM_AUTOMAKE_VERSION],
35
-[am__api_version='1.14'
35
+[am__api_version='1.15'
36 36
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
37 37
 dnl require some minimum version.  Point them to the right macro.
38
-m4_if([$1], [1.14.1], [],
38
+m4_if([$1], [1.15.1], [],
39 39
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
40 40
 ])
41 41
 
... ...
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
51 51
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
52 52
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
53 53
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
54
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
54
+[AM_AUTOMAKE_VERSION([1.15.1])dnl
55 55
 m4_ifndef([AC_AUTOCONF_VERSION],
56 56
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
57 57
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
58 58
 
59 59
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
60 60
 
61
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
61
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
62 62
 #
63 63
 # This file is free software; the Free Software Foundation
64 64
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
103 103
 # configured tree to be moved without reconfiguration.
104 104
 
105 105
 AC_DEFUN([AM_AUX_DIR_EXPAND],
106
-[dnl Rely on autoconf to set up CDPATH properly.
107
-AC_PREREQ([2.50])dnl
108
-# expand $ac_aux_dir to an absolute path
109
-am_aux_dir=`cd $ac_aux_dir && pwd`
106
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
107
+# Expand $ac_aux_dir to an absolute path.
108
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
110 109
 ])
111 110
 
112 111
 # AM_CONDITIONAL                                            -*- Autoconf -*-
113 112
 
114
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
113
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
115 114
 #
116 115
 # This file is free software; the Free Software Foundation
117 116
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
142 142
 Usually this means the macro was only invoked conditionally.]])
143 143
 fi])])
144 144
 
145
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
145
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
146 146
 #
147 147
 # This file is free software; the Free Software Foundation
148 148
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
333 333
 
334 334
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
335 335
 
336
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
336
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
337 337
 #
338 338
 # This file is free software; the Free Software Foundation
339 339
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
409 409
 
410 410
 # Do all the work for Automake.                             -*- Autoconf -*-
411 411
 
412
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
412
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
413 413
 #
414 414
 # This file is free software; the Free Software Foundation
415 415
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
499 499
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
500 500
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
501 501
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
502
-# We need awk for the "check" target.  The system "awk" is bad on
503
-# some platforms.
502
+# We need awk for the "check" target (and possibly the TAP driver).  The
503
+# system "awk" is bad on some platforms.
504 504
 AC_REQUIRE([AC_PROG_AWK])dnl
505 505
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
506 506
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
... ...
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
573 573
 END
574 574
     AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
575 575
   fi
576
-fi])
576
+fi
577
+dnl The trailing newline in this macro's definition is deliberate, for
578
+dnl backward compatibility and to allow trailing 'dnl'-style comments
579
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
580
+])
577 581
 
578 582
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
579 583
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
... ...
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
602 602
 done
603 603
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
604 604
 
605
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
605
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
606 606
 #
607 607
 # This file is free software; the Free Software Foundation
608 608
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
613 613
 # Define $install_sh.
614 614
 AC_DEFUN([AM_PROG_INSTALL_SH],
615 615
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
616
-if test x"${install_sh}" != xset; then
616
+if test x"${install_sh+set}" != xset; then
617 617
   case $am_aux_dir in
618 618
   *\ * | *\	*)
619 619
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
... ...
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
623 623
 fi
624 624
 AC_SUBST([install_sh])])
625 625
 
626
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
626
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
627 627
 #
628 628
 # This file is free software; the Free Software Foundation
629 629
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -645,7 +648,7 @@ AC_SUBST([am__leading_dot])])
645 645
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
646 646
 # From Jim Meyering
647 647
 
648
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
648
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
649 649
 #
650 650
 # This file is free software; the Free Software Foundation
651 651
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -680,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
680 680
 
681 681
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
682 682
 
683
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
683
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
684 684
 #
685 685
 # This file is free software; the Free Software Foundation
686 686
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -730,7 +733,7 @@ rm -f confinc confmf
730 730
 
731 731
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
732 732
 
733
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
733
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
734 734
 #
735 735
 # This file is free software; the Free Software Foundation
736 736
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -769,7 +772,7 @@ fi
769 769
 
770 770
 # Helper functions for option handling.                     -*- Autoconf -*-
771 771
 
772
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
772
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
773 773
 #
774 774
 # This file is free software; the Free Software Foundation
775 775
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -798,7 +801,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
798 798
 AC_DEFUN([_AM_IF_OPTION],
799 799
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
800 800
 
801
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
801
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
802 802
 #
803 803
 # This file is free software; the Free Software Foundation
804 804
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -845,7 +848,7 @@ AC_LANG_POP([C])])
845 845
 # For backward compatibility.
846 846
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
847 847
 
848
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
848
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
849 849
 #
850 850
 # This file is free software; the Free Software Foundation
851 851
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -864,7 +867,7 @@ AC_DEFUN([AM_RUN_LOG],
864 864
 
865 865
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
866 866
 
867
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
867
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
868 868
 #
869 869
 # This file is free software; the Free Software Foundation
870 870
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -945,7 +948,7 @@ AC_CONFIG_COMMANDS_PRE(
945 945
 rm -f conftest.file
946 946
 ])
947 947
 
948
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
948
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
949 949
 #
950 950
 # This file is free software; the Free Software Foundation
951 951
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -1005,7 +1008,7 @@ AC_SUBST([AM_BACKSLASH])dnl
1005 1005
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
1006 1006
 ])
1007 1007
 
1008
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
1008
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
1009 1009
 #
1010 1010
 # This file is free software; the Free Software Foundation
1011 1011
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -1033,7 +1036,7 @@ fi
1033 1033
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1034 1034
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
1035 1035
 
1036
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
1036
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
1037 1037
 #
1038 1038
 # This file is free software; the Free Software Foundation
1039 1039
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -1052,7 +1055,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
1052 1052
 
1053 1053
 # Check how to create a tarball.                            -*- Autoconf -*-
1054 1054
 
1055
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
1055
+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
1056 1056
 #
1057 1057
 # This file is free software; the Free Software Foundation
1058 1058
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -3,7 +3,7 @@
3 3
 
4 4
 scriptversion=2012-10-14.11; # UTC
5 5
 
6
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
6
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
7 7
 # Written by Tom Tromey <tromey@cygnus.com>.
8 8
 #
9 9
 # This program is free software; you can redistribute it and/or modify
... ...
@@ -1,8 +1,8 @@
1 1
 #! /bin/sh
2 2
 # Attempt to guess a canonical system name.
3
-#   Copyright 1992-2013 Free Software Foundation, Inc.
3
+#   Copyright 1992-2018 Free Software Foundation, Inc.
4 4
 
5
-timestamp='2013-06-10'
5
+timestamp='2018-02-24'
6 6
 
7 7
 # This file is free software; you can redistribute it and/or modify it
8 8
 # under the terms of the GNU General Public License as published by
... ...
@@ -15,7 +15,7 @@ timestamp='2013-06-10'
15 15
 # General Public License for more details.
16 16
 #
17 17
 # You should have received a copy of the GNU General Public License
18
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
18
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
19 19
 #
20 20
 # As a special exception to the GNU General Public License, if you
21 21
 # distribute this file as part of a program that contains a
... ...
@@ -24,12 +24,12 @@ timestamp='2013-06-10'
24 24
 # program.  This Exception is an additional permission under section 7
25 25
 # of the GNU General Public License, version 3 ("GPLv3").
26 26
 #
27
-# Originally written by Per Bothner.
27
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
28 28
 #
29 29
 # You can get the latest version of this script from:
30
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
30
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
31 31
 #
32
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
32
+# Please send patches to <config-patches@gnu.org>.
33 33
 
34 34
 
35 35
 me=`echo "$0" | sed -e 's,.*/,,'`
... ...
@@ -39,7 +39,7 @@ Usage: $0 [OPTION]
39 39
 
40 40
 Output the configuration name of the system \`$me' is run on.
41 41
 
42
-Operation modes:
42
+Options:
43 43
   -h, --help         print this help, then exit
44 44
   -t, --time-stamp   print date of last modification, then exit
45 45
   -v, --version      print version number, then exit
... ...
@@ -50,7 +50,7 @@ version="\
50 50
 GNU config.guess ($timestamp)
51 51
 
52 52
 Originally written by Per Bothner.
53
-Copyright 1992-2013 Free Software Foundation, Inc.
53
+Copyright 1992-2018 Free Software Foundation, Inc.
54 54
 
55 55
 This is free software; see the source for copying conditions.  There is NO
56 56
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
... ...
@@ -107,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
107 107
 dummy=$tmp/dummy ;
108 108
 tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
109 109
 case $CC_FOR_BUILD,$HOST_CC,$CC in
110
- ,,)    echo "int x;" > $dummy.c ;
110
+ ,,)    echo "int x;" > "$dummy.c" ;
111 111
 	for c in cc gcc c89 c99 ; do
112
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
112
+	  if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
113 113
 	     CC_FOR_BUILD="$c"; break ;
114 114
 	  fi ;
115 115
 	done ;
... ...
@@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
132 132
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
133 133
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
134 134
 
135
-case "${UNAME_SYSTEM}" in
135
+case "$UNAME_SYSTEM" in
136 136
 Linux|GNU|GNU/*)
137 137
 	# If the system lacks a compiler, then just pick glibc.
138 138
 	# We could probably try harder.
139 139
 	LIBC=gnu
140 140
 
141
-	eval $set_cc_for_build
142
-	cat <<-EOF > $dummy.c
141
+	eval "$set_cc_for_build"
142
+	cat <<-EOF > "$dummy.c"
143 143
 	#include <features.h>
144 144
 	#if defined(__UCLIBC__)
145 145
 	LIBC=uclibc
... ...
@@ -149,13 +149,20 @@ Linux|GNU|GNU/*)
149 149
 	LIBC=gnu
150 150
 	#endif
151 151
 	EOF
152
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
152
+	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
153
+
154
+	# If ldd exists, use it to detect musl libc.
155
+	if command -v ldd >/dev/null && \
156
+		ldd --version 2>&1 | grep -q ^musl
157
+	then
158
+	    LIBC=musl
159
+	fi
153 160
 	;;
154 161
 esac
155 162
 
156 163
 # Note: order is significant - the case branches are not exclusive.
157 164
 
158
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
165
+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
159 166
     *:NetBSD:*:*)
160 167
 	# NetBSD (nbsd) targets should (where applicable) match one or
161 168
 	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
... ...
@@ -168,21 +175,31 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
168 168
 	# Note: NetBSD doesn't particularly care about the vendor
169 169
 	# portion of the name.  We always set it to "unknown".
170 170
 	sysctl="sysctl -n hw.machine_arch"
171
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
172
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
173
-	case "${UNAME_MACHINE_ARCH}" in
171
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
172
+	    "/sbin/$sysctl" 2>/dev/null || \
173
+	    "/usr/sbin/$sysctl" 2>/dev/null || \
174
+	    echo unknown)`
175
+	case "$UNAME_MACHINE_ARCH" in
174 176
 	    armeb) machine=armeb-unknown ;;
175 177
 	    arm*) machine=arm-unknown ;;
176 178
 	    sh3el) machine=shl-unknown ;;
177 179
 	    sh3eb) machine=sh-unknown ;;
178 180
 	    sh5el) machine=sh5le-unknown ;;
179
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
181
+	    earmv*)
182
+		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
183
+		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
184
+		machine="${arch}${endian}"-unknown
185
+		;;
186
+	    *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
180 187
 	esac
181 188
 	# The Operating System including object format, if it has switched
182
-	# to ELF recently, or will in the future.
183
-	case "${UNAME_MACHINE_ARCH}" in
189
+	# to ELF recently (or will in the future) and ABI.
190
+	case "$UNAME_MACHINE_ARCH" in
191
+	    earm*)
192
+		os=netbsdelf
193
+		;;
184 194
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
185
-		eval $set_cc_for_build
195
+		eval "$set_cc_for_build"
186 196
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
187 197
 			| grep -q __ELF__
188 198
 		then
... ...
@@ -197,44 +214,67 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
197 197
 		os=netbsd
198 198
 		;;
199 199
 	esac
200
+	# Determine ABI tags.
201
+	case "$UNAME_MACHINE_ARCH" in
202
+	    earm*)
203
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
204
+		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
205
+		;;
206
+	esac
200 207
 	# The OS release
201 208
 	# Debian GNU/NetBSD machines have a different userland, and
202 209
 	# thus, need a distinct triplet. However, they do not need
203 210
 	# kernel version information, so it can be replaced with a
204 211
 	# suitable tag, in the style of linux-gnu.
205
-	case "${UNAME_VERSION}" in
212
+	case "$UNAME_VERSION" in
206 213
 	    Debian*)
207 214
 		release='-gnu'
208 215
 		;;
209 216
 	    *)
210
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
217
+		release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
211 218
 		;;
212 219
 	esac
213 220
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
214 221
 	# contains redundant information, the shorter form:
215 222
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
216
-	echo "${machine}-${os}${release}"
223
+	echo "$machine-${os}${release}${abi}"
217 224
 	exit ;;
218 225
     *:Bitrig:*:*)
219 226
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
220
-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
227
+	echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
221 228
 	exit ;;
222 229
     *:OpenBSD:*:*)
223 230
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
224
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
231
+	echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
232
+	exit ;;
233
+    *:LibertyBSD:*:*)
234
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
235
+	echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
236
+	exit ;;
237
+    *:MidnightBSD:*:*)
238
+	echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
225 239
 	exit ;;
226 240
     *:ekkoBSD:*:*)
227
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
241
+	echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
228 242
 	exit ;;
229 243
     *:SolidBSD:*:*)
230
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
244
+	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
231 245
 	exit ;;
232 246
     macppc:MirBSD:*:*)
233
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
247
+	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
234 248
 	exit ;;
235 249
     *:MirBSD:*:*)
236
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
250
+	echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
237 251
 	exit ;;
252
+    *:Sortix:*:*)
253
+	echo "$UNAME_MACHINE"-unknown-sortix
254
+	exit ;;
255
+    *:Redox:*:*)
256
+	echo "$UNAME_MACHINE"-unknown-redox
257
+	exit ;;
258
+    mips:OSF1:*.*)
259
+        echo mips-dec-osf1
260
+        exit ;;
238 261
     alpha:OSF1:*:*)
239 262
 	case $UNAME_RELEASE in
240 263
 	*4.0)
... ...
@@ -251,63 +291,54 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
251 251
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
252 252
 	case "$ALPHA_CPU_TYPE" in
253 253
 	    "EV4 (21064)")
254
-		UNAME_MACHINE="alpha" ;;
254
+		UNAME_MACHINE=alpha ;;
255 255
 	    "EV4.5 (21064)")
256
-		UNAME_MACHINE="alpha" ;;
256
+		UNAME_MACHINE=alpha ;;
257 257
 	    "LCA4 (21066/21068)")
258
-		UNAME_MACHINE="alpha" ;;
258
+		UNAME_MACHINE=alpha ;;
259 259
 	    "EV5 (21164)")
260
-		UNAME_MACHINE="alphaev5" ;;
260
+		UNAME_MACHINE=alphaev5 ;;
261 261
 	    "EV5.6 (21164A)")
262
-		UNAME_MACHINE="alphaev56" ;;
262
+		UNAME_MACHINE=alphaev56 ;;
263 263
 	    "EV5.6 (21164PC)")
264
-		UNAME_MACHINE="alphapca56" ;;
264
+		UNAME_MACHINE=alphapca56 ;;
265 265
 	    "EV5.7 (21164PC)")
266
-		UNAME_MACHINE="alphapca57" ;;
266
+		UNAME_MACHINE=alphapca57 ;;
267 267
 	    "EV6 (21264)")
268
-		UNAME_MACHINE="alphaev6" ;;
268
+		UNAME_MACHINE=alphaev6 ;;
269 269
 	    "EV6.7 (21264A)")
270
-		UNAME_MACHINE="alphaev67" ;;
270
+		UNAME_MACHINE=alphaev67 ;;
271 271
 	    "EV6.8CB (21264C)")
272
-		UNAME_MACHINE="alphaev68" ;;
272
+		UNAME_MACHINE=alphaev68 ;;
273 273
 	    "EV6.8AL (21264B)")
274
-		UNAME_MACHINE="alphaev68" ;;
274
+		UNAME_MACHINE=alphaev68 ;;
275 275
 	    "EV6.8CX (21264D)")
276
-		UNAME_MACHINE="alphaev68" ;;
276
+		UNAME_MACHINE=alphaev68 ;;
277 277
 	    "EV6.9A (21264/EV69A)")
278
-		UNAME_MACHINE="alphaev69" ;;
278
+		UNAME_MACHINE=alphaev69 ;;
279 279
 	    "EV7 (21364)")
280
-		UNAME_MACHINE="alphaev7" ;;
280
+		UNAME_MACHINE=alphaev7 ;;
281 281
 	    "EV7.9 (21364A)")
282
-		UNAME_MACHINE="alphaev79" ;;
282
+		UNAME_MACHINE=alphaev79 ;;
283 283
 	esac
284 284
 	# A Pn.n version is a patched version.
285 285
 	# A Vn.n version is a released version.
286 286
 	# A Tn.n version is a released field test version.
287 287
 	# A Xn.n version is an unreleased experimental baselevel.
288 288
 	# 1.2 uses "1.2" for uname -r.
289
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
289
+	echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
290 290
 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
291 291
 	exitcode=$?
292 292
 	trap '' 0
293 293
 	exit $exitcode ;;
294
-    Alpha\ *:Windows_NT*:*)
295
-	# How do we know it's Interix rather than the generic POSIX subsystem?
296
-	# Should we change UNAME_MACHINE based on the output of uname instead
297
-	# of the specific Alpha model?
298
-	echo alpha-pc-interix
299
-	exit ;;
300
-    21064:Windows_NT:50:3)
301
-	echo alpha-dec-winnt3.5
302
-	exit ;;
303 294
     Amiga*:UNIX_System_V:4.0:*)
304 295
 	echo m68k-unknown-sysv4
305 296
 	exit ;;
306 297
     *:[Aa]miga[Oo][Ss]:*:*)
307
-	echo ${UNAME_MACHINE}-unknown-amigaos
298
+	echo "$UNAME_MACHINE"-unknown-amigaos
308 299
 	exit ;;
309 300
     *:[Mm]orph[Oo][Ss]:*:*)
310
-	echo ${UNAME_MACHINE}-unknown-morphos
301
+	echo "$UNAME_MACHINE"-unknown-morphos
311 302
 	exit ;;
312 303
     *:OS/390:*:*)
313 304
 	echo i370-ibm-openedition
... ...
@@ -319,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
319 319
 	echo powerpc-ibm-os400
320 320
 	exit ;;
321 321
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
322
-	echo arm-acorn-riscix${UNAME_RELEASE}
322
+	echo arm-acorn-riscix"$UNAME_RELEASE"
323 323
 	exit ;;
324 324
     arm*:riscos:*:*|arm*:RISCOS:*:*)
325 325
 	echo arm-unknown-riscos
... ...
@@ -346,38 +377,38 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
346 346
 	    sparc) echo sparc-icl-nx7; exit ;;
347 347
 	esac ;;
348 348
     s390x:SunOS:*:*)
349
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
349
+	echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
350 350
 	exit ;;
351 351
     sun4H:SunOS:5.*:*)
352
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
352
+	echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
353 353
 	exit ;;
354 354
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
355
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
355
+	echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
356 356
 	exit ;;
357 357
     i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
358
-	echo i386-pc-auroraux${UNAME_RELEASE}
358
+	echo i386-pc-auroraux"$UNAME_RELEASE"
359 359
 	exit ;;
360 360
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
361
-	eval $set_cc_for_build
362
-	SUN_ARCH="i386"
361
+	eval "$set_cc_for_build"
362
+	SUN_ARCH=i386
363 363
 	# If there is a compiler, see if it is configured for 64-bit objects.
364 364
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
365 365
 	# This test works for both compilers.
366
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
366
+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
367 367
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
368
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
368
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
369 369
 		grep IS_64BIT_ARCH >/dev/null
370 370
 	    then
371
-		SUN_ARCH="x86_64"
371
+		SUN_ARCH=x86_64
372 372
 	    fi
373 373
 	fi
374
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
374
+	echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
375 375
 	exit ;;
376 376
     sun4*:SunOS:6*:*)
377 377
 	# According to config.sub, this is the proper way to canonicalize
378 378
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
379 379
 	# it's likely to be more like Solaris than SunOS4.
380
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
380
+	echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
381 381
 	exit ;;
382 382
     sun4*:SunOS:*:*)
383 383
 	case "`/usr/bin/arch -k`" in
... ...
@@ -386,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
386 386
 		;;
387 387
 	esac
388 388
 	# Japanese Language versions have a version number like `4.1.3-JL'.
389
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
389
+	echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
390 390
 	exit ;;
391 391
     sun3*:SunOS:*:*)
392
-	echo m68k-sun-sunos${UNAME_RELEASE}
392
+	echo m68k-sun-sunos"$UNAME_RELEASE"
393 393
 	exit ;;
394 394
     sun*:*:4.2BSD:*)
395 395
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
396
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
396
+	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
397 397
 	case "`/bin/arch`" in
398 398
 	    sun3)
399
-		echo m68k-sun-sunos${UNAME_RELEASE}
399
+		echo m68k-sun-sunos"$UNAME_RELEASE"
400 400
 		;;
401 401
 	    sun4)
402
-		echo sparc-sun-sunos${UNAME_RELEASE}
402
+		echo sparc-sun-sunos"$UNAME_RELEASE"
403 403
 		;;
404 404
 	esac
405 405
 	exit ;;
406 406
     aushp:SunOS:*:*)
407
-	echo sparc-auspex-sunos${UNAME_RELEASE}
407
+	echo sparc-auspex-sunos"$UNAME_RELEASE"
408 408
 	exit ;;
409 409
     # The situation for MiNT is a little confusing.  The machine name
410 410
     # can be virtually everything (everything which is not
... ...
@@ -415,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
415 415
     # MiNT.  But MiNT is downward compatible to TOS, so this should
416 416
     # be no problem.
417 417
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
418
-	echo m68k-atari-mint${UNAME_RELEASE}
418
+	echo m68k-atari-mint"$UNAME_RELEASE"
419 419
 	exit ;;
420 420
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
421
-	echo m68k-atari-mint${UNAME_RELEASE}
421
+	echo m68k-atari-mint"$UNAME_RELEASE"
422 422
 	exit ;;
423 423
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
424
-	echo m68k-atari-mint${UNAME_RELEASE}
424
+	echo m68k-atari-mint"$UNAME_RELEASE"
425 425
 	exit ;;
426 426
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
427
-	echo m68k-milan-mint${UNAME_RELEASE}
427
+	echo m68k-milan-mint"$UNAME_RELEASE"
428 428
 	exit ;;
429 429
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
430
-	echo m68k-hades-mint${UNAME_RELEASE}
430
+	echo m68k-hades-mint"$UNAME_RELEASE"
431 431
 	exit ;;
432 432
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
433
-	echo m68k-unknown-mint${UNAME_RELEASE}
433
+	echo m68k-unknown-mint"$UNAME_RELEASE"
434 434
 	exit ;;
435 435
     m68k:machten:*:*)
436
-	echo m68k-apple-machten${UNAME_RELEASE}
436
+	echo m68k-apple-machten"$UNAME_RELEASE"
437 437
 	exit ;;
438 438
     powerpc:machten:*:*)
439
-	echo powerpc-apple-machten${UNAME_RELEASE}
439
+	echo powerpc-apple-machten"$UNAME_RELEASE"
440 440
 	exit ;;
441 441
     RISC*:Mach:*:*)
442 442
 	echo mips-dec-mach_bsd4.3
443 443
 	exit ;;
444 444
     RISC*:ULTRIX:*:*)
445
-	echo mips-dec-ultrix${UNAME_RELEASE}
445
+	echo mips-dec-ultrix"$UNAME_RELEASE"
446 446
 	exit ;;
447 447
     VAX*:ULTRIX*:*:*)
448
-	echo vax-dec-ultrix${UNAME_RELEASE}
448
+	echo vax-dec-ultrix"$UNAME_RELEASE"
449 449
 	exit ;;
450 450
     2020:CLIX:*:* | 2430:CLIX:*:*)
451
-	echo clipper-intergraph-clix${UNAME_RELEASE}
451
+	echo clipper-intergraph-clix"$UNAME_RELEASE"
452 452
 	exit ;;
453 453
     mips:*:*:UMIPS | mips:*:*:RISCos)
454
-	eval $set_cc_for_build
455
-	sed 's/^	//' << EOF >$dummy.c
454
+	eval "$set_cc_for_build"
455
+	sed 's/^	//' << EOF > "$dummy.c"
456 456
 #ifdef __cplusplus
457 457
 #include <stdio.h>  /* for printf() prototype */
458 458
 	int main (int argc, char *argv[]) {
... ...
@@ -461,23 +492,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
461 461
 #endif
462 462
 	#if defined (host_mips) && defined (MIPSEB)
463 463
 	#if defined (SYSTYPE_SYSV)
464
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
464
+	  printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
465 465
 	#endif
466 466
 	#if defined (SYSTYPE_SVR4)
467
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
467
+	  printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
468 468
 	#endif
469 469
 	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
470
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
470
+	  printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
471 471
 	#endif
472 472
 	#endif
473 473
 	  exit (-1);
474 474
 	}
475 475
 EOF
476
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
477
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
478
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
476
+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
477
+	  dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
478
+	  SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
479 479
 	    { echo "$SYSTEM_NAME"; exit; }
480
-	echo mips-mips-riscos${UNAME_RELEASE}
480
+	echo mips-mips-riscos"$UNAME_RELEASE"
481 481
 	exit ;;
482 482
     Motorola:PowerMAX_OS:*:*)
483 483
 	echo powerpc-motorola-powermax
... ...
@@ -503,17 +534,17 @@ EOF
503 503
     AViiON:dgux:*:*)
504 504
 	# DG/UX returns AViiON for all architectures
505 505
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
506
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
506
+	if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
507 507
 	then
508
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
509
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
508
+	    if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
509
+	       [ "$TARGET_BINARY_INTERFACE"x = x ]
510 510
 	    then
511
-		echo m88k-dg-dgux${UNAME_RELEASE}
511
+		echo m88k-dg-dgux"$UNAME_RELEASE"
512 512
 	    else
513
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
513
+		echo m88k-dg-dguxbcs"$UNAME_RELEASE"
514 514
 	    fi
515 515
 	else
516
-	    echo i586-dg-dgux${UNAME_RELEASE}
516
+	    echo i586-dg-dgux"$UNAME_RELEASE"
517 517
 	fi
518 518
 	exit ;;
519 519
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
... ...
@@ -530,7 +561,7 @@ EOF
530 530
 	echo m68k-tektronix-bsd
531 531
 	exit ;;
532 532
     *:IRIX*:*:*)
533
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
533
+	echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
534 534
 	exit ;;
535 535
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
536 536
 	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
... ...
@@ -542,14 +573,14 @@ EOF
542 542
 	if [ -x /usr/bin/oslevel ] ; then
543 543
 		IBM_REV=`/usr/bin/oslevel`
544 544
 	else
545
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
545
+		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
546 546
 	fi
547
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
547
+	echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
548 548
 	exit ;;
549 549
     *:AIX:2:3)
550 550
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
551
-		eval $set_cc_for_build
552
-		sed 's/^		//' << EOF >$dummy.c
551
+		eval "$set_cc_for_build"
552
+		sed 's/^		//' << EOF > "$dummy.c"
553 553
 		#include <sys/systemcfg.h>
554 554
 
555 555
 		main()
... ...
@@ -560,7 +591,7 @@ EOF
560 560
 			exit(0);
561 561
 			}
562 562
 EOF
563
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
563
+		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
564 564
 		then
565 565
 			echo "$SYSTEM_NAME"
566 566
 		else
... ...
@@ -574,26 +605,27 @@ EOF
574 574
 	exit ;;
575 575
     *:AIX:*:[4567])
576 576
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
577
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
577
+	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
578 578
 		IBM_ARCH=rs6000
579 579
 	else
580 580
 		IBM_ARCH=powerpc
581 581
 	fi
582
-	if [ -x /usr/bin/oslevel ] ; then
583
-		IBM_REV=`/usr/bin/oslevel`
582
+	if [ -x /usr/bin/lslpp ] ; then
583
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
584
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
584 585
 	else
585
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
586
+		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
586 587
 	fi
587
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
588
+	echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
588 589
 	exit ;;
589 590
     *:AIX:*:*)
590 591
 	echo rs6000-ibm-aix
591 592
 	exit ;;
592
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
593
+    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
593 594
 	echo romp-ibm-bsd4.4
594 595
 	exit ;;
595 596
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
596
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
597
+	echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to
597 598
 	exit ;;                             # report: romp-ibm BSD 4.3
598 599
     *:BOSX:*:*)
599 600
 	echo rs6000-bull-bosx
... ...
@@ -608,28 +640,28 @@ EOF
608 608
 	echo m68k-hp-bsd4.4
609 609
 	exit ;;
610 610
     9000/[34678]??:HP-UX:*:*)
611
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
612
-	case "${UNAME_MACHINE}" in
613
-	    9000/31? )            HP_ARCH=m68000 ;;
614
-	    9000/[34]?? )         HP_ARCH=m68k ;;
611
+	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
612
+	case "$UNAME_MACHINE" in
613
+	    9000/31?)            HP_ARCH=m68000 ;;
614
+	    9000/[34]??)         HP_ARCH=m68k ;;
615 615
 	    9000/[678][0-9][0-9])
616 616
 		if [ -x /usr/bin/getconf ]; then
617 617
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
618 618
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
619
-		    case "${sc_cpu_version}" in
620
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
621
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
619
+		    case "$sc_cpu_version" in
620
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
621
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
622 622
 		      532)                      # CPU_PA_RISC2_0
623
-			case "${sc_kernel_bits}" in
624
-			  32) HP_ARCH="hppa2.0n" ;;
625
-			  64) HP_ARCH="hppa2.0w" ;;
626
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
623
+			case "$sc_kernel_bits" in
624
+			  32) HP_ARCH=hppa2.0n ;;
625
+			  64) HP_ARCH=hppa2.0w ;;
626
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
627 627
 			esac ;;
628 628
 		    esac
629 629
 		fi
630
-		if [ "${HP_ARCH}" = "" ]; then
631
-		    eval $set_cc_for_build
632
-		    sed 's/^		//' << EOF >$dummy.c
630
+		if [ "$HP_ARCH" = "" ]; then
631
+		    eval "$set_cc_for_build"
632
+		    sed 's/^		//' << EOF > "$dummy.c"
633 633
 
634 634
 		#define _HPUX_SOURCE
635 635
 		#include <stdlib.h>
... ...
@@ -662,13 +694,13 @@ EOF
662 662
 		    exit (0);
663 663
 		}
664 664
 EOF
665
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
665
+		    (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
666 666
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
667 667
 		fi ;;
668 668
 	esac
669
-	if [ ${HP_ARCH} = "hppa2.0w" ]
669
+	if [ "$HP_ARCH" = hppa2.0w ]
670 670
 	then
671
-	    eval $set_cc_for_build
671
+	    eval "$set_cc_for_build"
672 672
 
673 673
 	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
674 674
 	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
... ...
@@ -679,23 +711,23 @@ EOF
679 679
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
680 680
 	    # => hppa64-hp-hpux11.23
681 681
 
682
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
682
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
683 683
 		grep -q __LP64__
684 684
 	    then
685
-		HP_ARCH="hppa2.0w"
685
+		HP_ARCH=hppa2.0w
686 686
 	    else
687
-		HP_ARCH="hppa64"
687
+		HP_ARCH=hppa64
688 688
 	    fi
689 689
 	fi
690
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
690
+	echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
691 691
 	exit ;;
692 692
     ia64:HP-UX:*:*)
693
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
694
-	echo ia64-hp-hpux${HPUX_REV}
693
+	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
694
+	echo ia64-hp-hpux"$HPUX_REV"
695 695
 	exit ;;
696 696
     3050*:HI-UX:*:*)
697
-	eval $set_cc_for_build
698
-	sed 's/^	//' << EOF >$dummy.c
697
+	eval "$set_cc_for_build"
698
+	sed 's/^	//' << EOF > "$dummy.c"
699 699
 	#include <unistd.h>
700 700
 	int
701 701
 	main ()
... ...
@@ -720,11 +752,11 @@ EOF
720 720
 	  exit (0);
721 721
 	}
722 722
 EOF
723
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
723
+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
724 724
 		{ echo "$SYSTEM_NAME"; exit; }
725 725
 	echo unknown-hitachi-hiuxwe2
726 726
 	exit ;;
727
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
727
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
728 728
 	echo hppa1.1-hp-bsd
729 729
 	exit ;;
730 730
     9000/8??:4.3bsd:*:*)
... ...
@@ -733,7 +765,7 @@ EOF
733 733
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
734 734
 	echo hppa1.0-hp-mpeix
735 735
 	exit ;;
736
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
736
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
737 737
 	echo hppa1.1-hp-osf
738 738
 	exit ;;
739 739
     hp8??:OSF1:*:*)
... ...
@@ -741,9 +773,9 @@ EOF
741 741
 	exit ;;
742 742
     i*86:OSF1:*:*)
743 743
 	if [ -x /usr/sbin/sysversion ] ; then
744
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
744
+	    echo "$UNAME_MACHINE"-unknown-osf1mk
745 745
 	else
746
-	    echo ${UNAME_MACHINE}-unknown-osf1
746
+	    echo "$UNAME_MACHINE"-unknown-osf1
747 747
 	fi
748 748
 	exit ;;
749 749
     parisc*:Lites*:*:*)
... ...
@@ -768,127 +800,109 @@ EOF
768 768
 	echo c4-convex-bsd
769 769
 	exit ;;
770 770
     CRAY*Y-MP:*:*:*)
771
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
771
+	echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
772 772
 	exit ;;
773 773
     CRAY*[A-Z]90:*:*:*)
774
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
774
+	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
775 775
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
776 776
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
777 777
 	      -e 's/\.[^.]*$/.X/'
778 778
 	exit ;;
779 779
     CRAY*TS:*:*:*)
780
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
780
+	echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
781 781
 	exit ;;
782 782
     CRAY*T3E:*:*:*)
783
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
783
+	echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
784 784
 	exit ;;
785 785
     CRAY*SV1:*:*:*)
786
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
786
+	echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
787 787
 	exit ;;
788 788
     *:UNICOS/mp:*:*)
789
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
789
+	echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
790 790
 	exit ;;
791 791
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
792
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
793
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
794
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
792
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
793
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
794
+	FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
795 795
 	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
796 796
 	exit ;;
797 797
     5000:UNIX_System_V:4.*:*)
798
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
799
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
798
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
799
+	FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
800 800
 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
801 801
 	exit ;;
802 802
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
803
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
803
+	echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
804 804
 	exit ;;
805 805
     sparc*:BSD/OS:*:*)
806
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
806
+	echo sparc-unknown-bsdi"$UNAME_RELEASE"
807 807
 	exit ;;
808 808
     *:BSD/OS:*:*)
809
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
809
+	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
810 810
 	exit ;;
811 811
     *:FreeBSD:*:*)
812 812
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
813
-	case ${UNAME_PROCESSOR} in
813
+	case "$UNAME_PROCESSOR" in
814 814
 	    amd64)
815
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
816
-	    *)
817
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
815
+		UNAME_PROCESSOR=x86_64 ;;
816
+	    i386)
817
+		UNAME_PROCESSOR=i586 ;;
818 818
 	esac
819
+	echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
819 820
 	exit ;;
820 821
     i*:CYGWIN*:*)
821
-	echo ${UNAME_MACHINE}-pc-cygwin
822
+	echo "$UNAME_MACHINE"-pc-cygwin
822 823
 	exit ;;
823 824
     *:MINGW64*:*)
824
-	echo ${UNAME_MACHINE}-pc-mingw64
825
+	echo "$UNAME_MACHINE"-pc-mingw64
825 826
 	exit ;;
826 827
     *:MINGW*:*)
827
-	echo ${UNAME_MACHINE}-pc-mingw32
828
-	exit ;;
829
-    i*:MSYS*:*)
830
-	echo ${UNAME_MACHINE}-pc-msys
828
+	echo "$UNAME_MACHINE"-pc-mingw32
831 829
 	exit ;;
832
-    i*:windows32*:*)
833
-	# uname -m includes "-pc" on this system.
834
-	echo ${UNAME_MACHINE}-mingw32
830
+    *:MSYS*:*)
831
+	echo "$UNAME_MACHINE"-pc-msys
835 832
 	exit ;;
836 833
     i*:PW*:*)
837
-	echo ${UNAME_MACHINE}-pc-pw32
834
+	echo "$UNAME_MACHINE"-pc-pw32
838 835
 	exit ;;
839 836
     *:Interix*:*)
840
-	case ${UNAME_MACHINE} in
837
+	case "$UNAME_MACHINE" in
841 838
 	    x86)
842
-		echo i586-pc-interix${UNAME_RELEASE}
839
+		echo i586-pc-interix"$UNAME_RELEASE"
843 840
 		exit ;;
844 841
 	    authenticamd | genuineintel | EM64T)
845
-		echo x86_64-unknown-interix${UNAME_RELEASE}
842
+		echo x86_64-unknown-interix"$UNAME_RELEASE"
846 843
 		exit ;;
847 844
 	    IA64)
848
-		echo ia64-unknown-interix${UNAME_RELEASE}
845
+		echo ia64-unknown-interix"$UNAME_RELEASE"
849 846
 		exit ;;
850 847
 	esac ;;
851
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
852
-	echo i${UNAME_MACHINE}-pc-mks
853
-	exit ;;
854
-    8664:Windows_NT:*)
855
-	echo x86_64-pc-mks
856
-	exit ;;
857
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
858
-	# How do we know it's Interix rather than the generic POSIX subsystem?
859
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
860
-	# UNAME_MACHINE based on the output of uname instead of i386?
861
-	echo i586-pc-interix
862
-	exit ;;
863 848
     i*:UWIN*:*)
864
-	echo ${UNAME_MACHINE}-pc-uwin
849
+	echo "$UNAME_MACHINE"-pc-uwin
865 850
 	exit ;;
866 851
     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
867 852
 	echo x86_64-unknown-cygwin
868 853
 	exit ;;
869
-    p*:CYGWIN*:*)
870
-	echo powerpcle-unknown-cygwin
871
-	exit ;;
872 854
     prep*:SunOS:5.*:*)
873
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
855
+	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
874 856
 	exit ;;
875 857
     *:GNU:*:*)
876 858
 	# the GNU system
877
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
859
+	echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
878 860
 	exit ;;
879 861
     *:GNU/*:*:*)
880 862
 	# other systems with GNU libc and userland
881
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
863
+	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
882 864
 	exit ;;
883 865
     i*86:Minix:*:*)
884
-	echo ${UNAME_MACHINE}-pc-minix
866
+	echo "$UNAME_MACHINE"-pc-minix
885 867
 	exit ;;
886 868
     aarch64:Linux:*:*)
887
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
869
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
888 870
 	exit ;;
889 871
     aarch64_be:Linux:*:*)
890 872
 	UNAME_MACHINE=aarch64_be
891
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
873
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
892 874
 	exit ;;
893 875
     alpha:Linux:*:*)
894 876
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
... ...
@@ -901,58 +915,64 @@ EOF
901 901
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
902 902
 	esac
903 903
 	objdump --private-headers /bin/sh | grep -q ld.so.1
904
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
905
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
904
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
905
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
906 906
 	exit ;;
907 907
     arc:Linux:*:* | arceb:Linux:*:*)
908
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
908
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
909 909
 	exit ;;
910 910
     arm*:Linux:*:*)
911
-	eval $set_cc_for_build
911
+	eval "$set_cc_for_build"
912 912
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
913 913
 	    | grep -q __ARM_EABI__
914 914
 	then
915
-	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
915
+	    echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
916 916
 	else
917 917
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
918 918
 		| grep -q __ARM_PCS_VFP
919 919
 	    then
920
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
920
+		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
921 921
 	    else
922
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
922
+		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
923 923
 	    fi
924 924
 	fi
925 925
 	exit ;;
926 926
     avr32*:Linux:*:*)
927
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
927
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
928 928
 	exit ;;
929 929
     cris:Linux:*:*)
930
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
930
+	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
931 931
 	exit ;;
932 932
     crisv32:Linux:*:*)
933
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
933
+	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
934
+	exit ;;
935
+    e2k:Linux:*:*)
936
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
934 937
 	exit ;;
935 938
     frv:Linux:*:*)
936
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
939
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
937 940
 	exit ;;
938 941
     hexagon:Linux:*:*)
939
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
942
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
940 943
 	exit ;;
941 944
     i*86:Linux:*:*)
942
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
945
+	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
943 946
 	exit ;;
944 947
     ia64:Linux:*:*)
945
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
948
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
949
+	exit ;;
950
+    k1om:Linux:*:*)
951
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
946 952
 	exit ;;
947 953
     m32r*:Linux:*:*)
948
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
954
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
949 955
 	exit ;;
950 956
     m68*:Linux:*:*)
951
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
957
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
952 958
 	exit ;;
953 959
     mips:Linux:*:* | mips64:Linux:*:*)
954
-	eval $set_cc_for_build
955
-	sed 's/^	//' << EOF >$dummy.c
960
+	eval "$set_cc_for_build"
961
+	sed 's/^	//' << EOF > "$dummy.c"
956 962
 	#undef CPU
957 963
 	#undef ${UNAME_MACHINE}
958 964
 	#undef ${UNAME_MACHINE}el
... ...
@@ -966,64 +986,74 @@ EOF
966 966
 	#endif
967 967
 	#endif
968 968
 EOF
969
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
970
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
969
+	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
970
+	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
971 971
 	;;
972
-    or1k:Linux:*:*)
973
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
972
+    mips64el:Linux:*:*)
973
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
974 974
 	exit ;;
975
-    or32:Linux:*:*)
976
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
975
+    openrisc*:Linux:*:*)
976
+	echo or1k-unknown-linux-"$LIBC"
977
+	exit ;;
978
+    or32:Linux:*:* | or1k*:Linux:*:*)
979
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
977 980
 	exit ;;
978 981
     padre:Linux:*:*)
979
-	echo sparc-unknown-linux-${LIBC}
982
+	echo sparc-unknown-linux-"$LIBC"
980 983
 	exit ;;
981 984
     parisc64:Linux:*:* | hppa64:Linux:*:*)
982
-	echo hppa64-unknown-linux-${LIBC}
985
+	echo hppa64-unknown-linux-"$LIBC"
983 986
 	exit ;;
984 987
     parisc:Linux:*:* | hppa:Linux:*:*)
985 988
 	# Look for CPU level
986 989
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
987
-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
988
-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
989
-	  *)    echo hppa-unknown-linux-${LIBC} ;;
990
+	  PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
991
+	  PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
992
+	  *)    echo hppa-unknown-linux-"$LIBC" ;;
990 993
 	esac
991 994
 	exit ;;
992 995
     ppc64:Linux:*:*)
993
-	echo powerpc64-unknown-linux-${LIBC}
996
+	echo powerpc64-unknown-linux-"$LIBC"
994 997
 	exit ;;
995 998
     ppc:Linux:*:*)
996
-	echo powerpc-unknown-linux-${LIBC}
999
+	echo powerpc-unknown-linux-"$LIBC"
997 1000
 	exit ;;
998 1001
     ppc64le:Linux:*:*)
999
-	echo powerpc64le-unknown-linux-${LIBC}
1002
+	echo powerpc64le-unknown-linux-"$LIBC"
1000 1003
 	exit ;;
1001 1004
     ppcle:Linux:*:*)
1002
-	echo powerpcle-unknown-linux-${LIBC}
1005
+	echo powerpcle-unknown-linux-"$LIBC"
1006
+	exit ;;
1007
+    riscv32:Linux:*:* | riscv64:Linux:*:*)
1008
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1003 1009
 	exit ;;
1004 1010
     s390:Linux:*:* | s390x:Linux:*:*)
1005
-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
1011
+	echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
1006 1012
 	exit ;;
1007 1013
     sh64*:Linux:*:*)
1008
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1014
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1009 1015
 	exit ;;
1010 1016
     sh*:Linux:*:*)
1011
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1017
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1012 1018
 	exit ;;
1013 1019
     sparc:Linux:*:* | sparc64:Linux:*:*)
1014
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1020
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1015 1021
 	exit ;;
1016 1022
     tile*:Linux:*:*)
1017
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1023
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1018 1024
 	exit ;;
1019 1025
     vax:Linux:*:*)
1020
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
1026
+	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
1021 1027
 	exit ;;
1022 1028
     x86_64:Linux:*:*)
1023
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1029
+	if objdump -f /bin/sh | grep -q elf32-x86-64; then
1030
+	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
1031
+	else
1032
+	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
1033
+	fi
1024 1034
 	exit ;;
1025 1035
     xtensa*:Linux:*:*)
1026
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1036
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1027 1037
 	exit ;;
1028 1038
     i*86:DYNIX/ptx:4*:*)
1029 1039
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
... ...
@@ -1037,34 +1067,34 @@ EOF
1037 1037
 	# I am not positive that other SVR4 systems won't match this,
1038 1038
 	# I just have to hope.  -- rms.
1039 1039
 	# Use sysv4.2uw... so that sysv4* matches it.
1040
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
1040
+	echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
1041 1041
 	exit ;;
1042 1042
     i*86:OS/2:*:*)
1043 1043
 	# If we were able to find `uname', then EMX Unix compatibility
1044 1044
 	# is probably installed.
1045
-	echo ${UNAME_MACHINE}-pc-os2-emx
1045
+	echo "$UNAME_MACHINE"-pc-os2-emx
1046 1046
 	exit ;;
1047 1047
     i*86:XTS-300:*:STOP)
1048
-	echo ${UNAME_MACHINE}-unknown-stop
1048
+	echo "$UNAME_MACHINE"-unknown-stop
1049 1049
 	exit ;;
1050 1050
     i*86:atheos:*:*)
1051
-	echo ${UNAME_MACHINE}-unknown-atheos
1051
+	echo "$UNAME_MACHINE"-unknown-atheos
1052 1052
 	exit ;;
1053 1053
     i*86:syllable:*:*)
1054
-	echo ${UNAME_MACHINE}-pc-syllable
1054
+	echo "$UNAME_MACHINE"-pc-syllable
1055 1055
 	exit ;;
1056 1056
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
1057
-	echo i386-unknown-lynxos${UNAME_RELEASE}
1057
+	echo i386-unknown-lynxos"$UNAME_RELEASE"
1058 1058
 	exit ;;
1059 1059
     i*86:*DOS:*:*)
1060
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
1060
+	echo "$UNAME_MACHINE"-pc-msdosdjgpp
1061 1061
 	exit ;;
1062
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
1063
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
1062
+    i*86:*:4.*:*)
1063
+	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
1064 1064
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
1065
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
1065
+		echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
1066 1066
 	else
1067
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
1067
+		echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
1068 1068
 	fi
1069 1069
 	exit ;;
1070 1070
     i*86:*:5:[678]*)
... ...
@@ -1074,12 +1104,12 @@ EOF
1074 1074
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
1075 1075
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
1076 1076
 	esac
1077
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
1077
+	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
1078 1078
 	exit ;;
1079 1079
     i*86:*:3.2:*)
1080 1080
 	if test -f /usr/options/cb.name; then
1081 1081
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
1082
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
1082
+		echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
1083 1083
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
1084 1084
 		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
1085 1085
 		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
... ...
@@ -1089,9 +1119,9 @@ EOF
1089 1089
 			&& UNAME_MACHINE=i686
1090 1090
 		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
1091 1091
 			&& UNAME_MACHINE=i686
1092
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
1092
+		echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
1093 1093
 	else
1094
-		echo ${UNAME_MACHINE}-pc-sysv32
1094
+		echo "$UNAME_MACHINE"-pc-sysv32
1095 1095
 	fi
1096 1096
 	exit ;;
1097 1097
     pc:*:*:*)
... ...
@@ -1099,7 +1129,7 @@ EOF
1099 1099
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
1100 1100
 	# the processor, so we play safe by assuming i586.
1101 1101
 	# Note: whatever this is, it MUST be the same as what config.sub
1102
-	# prints for the "djgpp" host, or else GDB configury will decide that
1102
+	# prints for the "djgpp" host, or else GDB configure will decide that
1103 1103
 	# this is a cross-build.
1104 1104
 	echo i586-pc-msdosdjgpp
1105 1105
 	exit ;;
... ...
@@ -1111,9 +1141,9 @@ EOF
1111 1111
 	exit ;;
1112 1112
     i860:*:4.*:*) # i860-SVR4
1113 1113
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
1114
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
1114
+	  echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
1115 1115
 	else # Add other i860-SVR4 vendors below as they are discovered.
1116
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
1116
+	  echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
1117 1117
 	fi
1118 1118
 	exit ;;
1119 1119
     mini*:CTIX:SYS*5:*)
... ...
@@ -1133,9 +1163,9 @@ EOF
1133 1133
 	test -r /etc/.relid \
1134 1134
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1135 1135
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1136
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1136
+	  && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
1137 1137
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1138
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1138
+	  && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
1139 1139
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1140 1140
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1141 1141
 	  && { echo i486-ncr-sysv4; exit; } ;;
... ...
@@ -1144,28 +1174,28 @@ EOF
1144 1144
 	test -r /etc/.relid \
1145 1145
 	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1146 1146
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1147
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1147
+	    && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
1148 1148
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1149
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
1149
+	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
1150 1150
 	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
1151
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1151
+	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
1152 1152
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
1153
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
1153
+	echo m68k-unknown-lynxos"$UNAME_RELEASE"
1154 1154
 	exit ;;
1155 1155
     mc68030:UNIX_System_V:4.*:*)
1156 1156
 	echo m68k-atari-sysv4
1157 1157
 	exit ;;
1158 1158
     TSUNAMI:LynxOS:2.*:*)
1159
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
1159
+	echo sparc-unknown-lynxos"$UNAME_RELEASE"
1160 1160
 	exit ;;
1161 1161
     rs6000:LynxOS:2.*:*)
1162
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
1162
+	echo rs6000-unknown-lynxos"$UNAME_RELEASE"
1163 1163
 	exit ;;
1164 1164
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
1165
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
1165
+	echo powerpc-unknown-lynxos"$UNAME_RELEASE"
1166 1166
 	exit ;;
1167 1167
     SM[BE]S:UNIX_SV:*:*)
1168
-	echo mips-dde-sysv${UNAME_RELEASE}
1168
+	echo mips-dde-sysv"$UNAME_RELEASE"
1169 1169
 	exit ;;
1170 1170
     RM*:ReliantUNIX-*:*:*)
1171 1171
 	echo mips-sni-sysv4
... ...
@@ -1176,7 +1206,7 @@ EOF
1176 1176
     *:SINIX-*:*:*)
1177 1177
 	if uname -p 2>/dev/null >/dev/null ; then
1178 1178
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
1179
-		echo ${UNAME_MACHINE}-sni-sysv4
1179
+		echo "$UNAME_MACHINE"-sni-sysv4
1180 1180
 	else
1181 1181
 		echo ns32k-sni-sysv
1182 1182
 	fi
... ...
@@ -1196,23 +1226,23 @@ EOF
1196 1196
 	exit ;;
1197 1197
     i*86:VOS:*:*)
1198 1198
 	# From Paul.Green@stratus.com.
1199
-	echo ${UNAME_MACHINE}-stratus-vos
1199
+	echo "$UNAME_MACHINE"-stratus-vos
1200 1200
 	exit ;;
1201 1201
     *:VOS:*:*)
1202 1202
 	# From Paul.Green@stratus.com.
1203 1203
 	echo hppa1.1-stratus-vos
1204 1204
 	exit ;;
1205 1205
     mc68*:A/UX:*:*)
1206
-	echo m68k-apple-aux${UNAME_RELEASE}
1206
+	echo m68k-apple-aux"$UNAME_RELEASE"
1207 1207
 	exit ;;
1208 1208
     news*:NEWS-OS:6*:*)
1209 1209
 	echo mips-sony-newsos6
1210 1210
 	exit ;;
1211 1211
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1212 1212
 	if [ -d /usr/nec ]; then
1213
-		echo mips-nec-sysv${UNAME_RELEASE}
1213
+		echo mips-nec-sysv"$UNAME_RELEASE"
1214 1214
 	else
1215
-		echo mips-unknown-sysv${UNAME_RELEASE}
1215
+		echo mips-unknown-sysv"$UNAME_RELEASE"
1216 1216
 	fi
1217 1217
 	exit ;;
1218 1218
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
... ...
@@ -1231,67 +1261,93 @@ EOF
1231 1231
 	echo x86_64-unknown-haiku
1232 1232
 	exit ;;
1233 1233
     SX-4:SUPER-UX:*:*)
1234
-	echo sx4-nec-superux${UNAME_RELEASE}
1234
+	echo sx4-nec-superux"$UNAME_RELEASE"
1235 1235
 	exit ;;
1236 1236
     SX-5:SUPER-UX:*:*)
1237
-	echo sx5-nec-superux${UNAME_RELEASE}
1237
+	echo sx5-nec-superux"$UNAME_RELEASE"
1238 1238
 	exit ;;
1239 1239
     SX-6:SUPER-UX:*:*)
1240
-	echo sx6-nec-superux${UNAME_RELEASE}
1240
+	echo sx6-nec-superux"$UNAME_RELEASE"
1241 1241
 	exit ;;
1242 1242
     SX-7:SUPER-UX:*:*)
1243
-	echo sx7-nec-superux${UNAME_RELEASE}
1243
+	echo sx7-nec-superux"$UNAME_RELEASE"
1244 1244
 	exit ;;
1245 1245
     SX-8:SUPER-UX:*:*)
1246
-	echo sx8-nec-superux${UNAME_RELEASE}
1246
+	echo sx8-nec-superux"$UNAME_RELEASE"
1247 1247
 	exit ;;
1248 1248
     SX-8R:SUPER-UX:*:*)
1249
-	echo sx8r-nec-superux${UNAME_RELEASE}
1249
+	echo sx8r-nec-superux"$UNAME_RELEASE"
1250
+	exit ;;
1251
+    SX-ACE:SUPER-UX:*:*)
1252
+	echo sxace-nec-superux"$UNAME_RELEASE"
1250 1253
 	exit ;;
1251 1254
     Power*:Rhapsody:*:*)
1252
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
1255
+	echo powerpc-apple-rhapsody"$UNAME_RELEASE"
1253 1256
 	exit ;;
1254 1257
     *:Rhapsody:*:*)
1255
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
1258
+	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
1256 1259
 	exit ;;
1257 1260
     *:Darwin:*:*)
1258 1261
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1259
-	eval $set_cc_for_build
1262
+	eval "$set_cc_for_build"
1260 1263
 	if test "$UNAME_PROCESSOR" = unknown ; then
1261 1264
 	    UNAME_PROCESSOR=powerpc
1262 1265
 	fi
1263
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1264
-	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1265
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1266
-		grep IS_64BIT_ARCH >/dev/null
1267
-	    then
1268
-		case $UNAME_PROCESSOR in
1269
-		    i386) UNAME_PROCESSOR=x86_64 ;;
1270
-		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
1271
-		esac
1266
+	if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
1267
+	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
1268
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1269
+		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
1270
+		       grep IS_64BIT_ARCH >/dev/null
1271
+		then
1272
+		    case $UNAME_PROCESSOR in
1273
+			i386) UNAME_PROCESSOR=x86_64 ;;
1274
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
1275
+		    esac
1276
+		fi
1277
+		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
1278
+		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
1279
+		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
1280
+		       grep IS_PPC >/dev/null
1281
+		then
1282
+		    UNAME_PROCESSOR=powerpc
1283
+		fi
1272 1284
 	    fi
1285
+	elif test "$UNAME_PROCESSOR" = i386 ; then
1286
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
1287
+	    # that puts up a graphical alert prompting to install
1288
+	    # developer tools.  Any system running Mac OS X 10.7 or
1289
+	    # later (Darwin 11 and later) is required to have a 64-bit
1290
+	    # processor. This is not true of the ARM version of Darwin
1291
+	    # that Apple uses in portable devices.
1292
+	    UNAME_PROCESSOR=x86_64
1273 1293
 	fi
1274
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1294
+	echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
1275 1295
 	exit ;;
1276 1296
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
1277 1297
 	UNAME_PROCESSOR=`uname -p`
1278
-	if test "$UNAME_PROCESSOR" = "x86"; then
1298
+	if test "$UNAME_PROCESSOR" = x86; then
1279 1299
 		UNAME_PROCESSOR=i386
1280 1300
 		UNAME_MACHINE=pc
1281 1301
 	fi
1282
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
1302
+	echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
1283 1303
 	exit ;;
1284 1304
     *:QNX:*:4*)
1285 1305
 	echo i386-pc-qnx
1286 1306
 	exit ;;
1287
-    NEO-?:NONSTOP_KERNEL:*:*)
1288
-	echo neo-tandem-nsk${UNAME_RELEASE}
1307
+    NEO-*:NONSTOP_KERNEL:*:*)
1308
+	echo neo-tandem-nsk"$UNAME_RELEASE"
1289 1309
 	exit ;;
1290 1310
     NSE-*:NONSTOP_KERNEL:*:*)
1291
-	echo nse-tandem-nsk${UNAME_RELEASE}
1311
+	echo nse-tandem-nsk"$UNAME_RELEASE"
1292 1312
 	exit ;;
1293
-    NSR-?:NONSTOP_KERNEL:*:*)
1294
-	echo nsr-tandem-nsk${UNAME_RELEASE}
1313
+    NSR-*:NONSTOP_KERNEL:*:*)
1314
+	echo nsr-tandem-nsk"$UNAME_RELEASE"
1315
+	exit ;;
1316
+    NSV-*:NONSTOP_KERNEL:*:*)
1317
+	echo nsv-tandem-nsk"$UNAME_RELEASE"
1318
+	exit ;;
1319
+    NSX-*:NONSTOP_KERNEL:*:*)
1320
+	echo nsx-tandem-nsk"$UNAME_RELEASE"
1295 1321
 	exit ;;
1296 1322
     *:NonStop-UX:*:*)
1297 1323
 	echo mips-compaq-nonstopux
... ...
@@ -1300,18 +1356,18 @@ EOF
1300 1300
 	echo bs2000-siemens-sysv
1301 1301
 	exit ;;
1302 1302
     DS/*:UNIX_System_V:*:*)
1303
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
1303
+	echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
1304 1304
 	exit ;;
1305 1305
     *:Plan9:*:*)
1306 1306
 	# "uname -m" is not consistent, so use $cputype instead. 386
1307 1307
 	# is converted to i386 for consistency with other x86
1308 1308
 	# operating systems.
1309
-	if test "$cputype" = "386"; then
1309
+	if test "$cputype" = 386; then
1310 1310
 	    UNAME_MACHINE=i386
1311 1311
 	else
1312 1312
 	    UNAME_MACHINE="$cputype"
1313 1313
 	fi
1314
-	echo ${UNAME_MACHINE}-unknown-plan9
1314
+	echo "$UNAME_MACHINE"-unknown-plan9
1315 1315
 	exit ;;
1316 1316
     *:TOPS-10:*:*)
1317 1317
 	echo pdp10-unknown-tops10
... ...
@@ -1332,14 +1388,14 @@ EOF
1332 1332
 	echo pdp10-unknown-its
1333 1333
 	exit ;;
1334 1334
     SEI:*:*:SEIUX)
1335
-	echo mips-sei-seiux${UNAME_RELEASE}
1335
+	echo mips-sei-seiux"$UNAME_RELEASE"
1336 1336
 	exit ;;
1337 1337
     *:DragonFly:*:*)
1338
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1338
+	echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
1339 1339
 	exit ;;
1340 1340
     *:*VMS:*:*)
1341 1341
 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
1342
-	case "${UNAME_MACHINE}" in
1342
+	case "$UNAME_MACHINE" in
1343 1343
 	    A*) echo alpha-dec-vms ; exit ;;
1344 1344
 	    I*) echo ia64-dec-vms ; exit ;;
1345 1345
 	    V*) echo vax-dec-vms ; exit ;;
... ...
@@ -1348,182 +1404,48 @@ EOF
1348 1348
 	echo i386-pc-xenix
1349 1349
 	exit ;;
1350 1350
     i*86:skyos:*:*)
1351
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
1351
+	echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
1352 1352
 	exit ;;
1353 1353
     i*86:rdos:*:*)
1354
-	echo ${UNAME_MACHINE}-pc-rdos
1354
+	echo "$UNAME_MACHINE"-pc-rdos
1355 1355
 	exit ;;
1356 1356
     i*86:AROS:*:*)
1357
-	echo ${UNAME_MACHINE}-pc-aros
1357
+	echo "$UNAME_MACHINE"-pc-aros
1358 1358
 	exit ;;
1359 1359
     x86_64:VMkernel:*:*)
1360
-	echo ${UNAME_MACHINE}-unknown-esx
1360
+	echo "$UNAME_MACHINE"-unknown-esx
1361
+	exit ;;
1362
+    amd64:Isilon\ OneFS:*:*)
1363
+	echo x86_64-unknown-onefs
1361 1364
 	exit ;;
1362 1365
 esac
1363 1366
 
1364
-eval $set_cc_for_build
1365
-cat >$dummy.c <<EOF
1366
-#ifdef _SEQUENT_
1367
-# include <sys/types.h>
1368
-# include <sys/utsname.h>
1369
-#endif
1370
-main ()
1371
-{
1372
-#if defined (sony)
1373
-#if defined (MIPSEB)
1374
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
1375
-     I don't know....  */
1376
-  printf ("mips-sony-bsd\n"); exit (0);
1377
-#else
1378
-#include <sys/param.h>
1379
-  printf ("m68k-sony-newsos%s\n",
1380
-#ifdef NEWSOS4
1381
-	"4"
1382
-#else
1383
-	""
1384
-#endif
1385
-	); exit (0);
1386
-#endif
1387
-#endif
1388
-
1389
-#if defined (__arm) && defined (__acorn) && defined (__unix)
1390
-  printf ("arm-acorn-riscix\n"); exit (0);
1391
-#endif
1392
-
1393
-#if defined (hp300) && !defined (hpux)
1394
-  printf ("m68k-hp-bsd\n"); exit (0);
1395
-#endif
1396
-
1397
-#if defined (NeXT)
1398
-#if !defined (__ARCHITECTURE__)
1399
-#define __ARCHITECTURE__ "m68k"
1400
-#endif
1401
-  int version;
1402
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
1403
-  if (version < 4)
1404
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
1405
-  else
1406
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
1407
-  exit (0);
1408
-#endif
1409
-
1410
-#if defined (MULTIMAX) || defined (n16)
1411
-#if defined (UMAXV)
1412
-  printf ("ns32k-encore-sysv\n"); exit (0);
1413
-#else
1414
-#if defined (CMU)
1415
-  printf ("ns32k-encore-mach\n"); exit (0);
1416
-#else
1417
-  printf ("ns32k-encore-bsd\n"); exit (0);
1418
-#endif
1419
-#endif
1420
-#endif
1421
-
1422
-#if defined (__386BSD__)
1423
-  printf ("i386-pc-bsd\n"); exit (0);
1424
-#endif
1425
-
1426
-#if defined (sequent)
1427
-#if defined (i386)
1428
-  printf ("i386-sequent-dynix\n"); exit (0);
1429
-#endif
1430
-#if defined (ns32000)
1431
-  printf ("ns32k-sequent-dynix\n"); exit (0);
1432
-#endif
1433
-#endif
1434
-
1435
-#if defined (_SEQUENT_)
1436
-    struct utsname un;
1437
-
1438
-    uname(&un);
1439
-
1440
-    if (strncmp(un.version, "V2", 2) == 0) {
1441
-	printf ("i386-sequent-ptx2\n"); exit (0);
1442
-    }
1443
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
1444
-	printf ("i386-sequent-ptx1\n"); exit (0);
1445
-    }
1446
-    printf ("i386-sequent-ptx\n"); exit (0);
1447
-
1448
-#endif
1449
-
1450
-#if defined (vax)
1451
-# if !defined (ultrix)
1452
-#  include <sys/param.h>
1453
-#  if defined (BSD)
1454
-#   if BSD == 43
1455
-      printf ("vax-dec-bsd4.3\n"); exit (0);
1456
-#   else
1457
-#    if BSD == 199006
1458
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
1459
-#    else
1460
-      printf ("vax-dec-bsd\n"); exit (0);
1461
-#    endif
1462
-#   endif
1463
-#  else
1464
-    printf ("vax-dec-bsd\n"); exit (0);
1465
-#  endif
1466
-# else
1467
-    printf ("vax-dec-ultrix\n"); exit (0);
1468
-# endif
1469
-#endif
1367
+echo "$0: unable to guess system type" >&2
1470 1368
 
1471
-#if defined (alliant) && defined (i860)
1472
-  printf ("i860-alliant-bsd\n"); exit (0);
1473
-#endif
1369
+case "$UNAME_MACHINE:$UNAME_SYSTEM" in
1370
+    mips:Linux | mips64:Linux)
1371
+	# If we got here on MIPS GNU/Linux, output extra information.
1372
+	cat >&2 <<EOF
1474 1373
 
1475
-  exit (1);
1476
-}
1374
+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
1375
+the system type. Please install a C compiler and try again.
1477 1376
 EOF
1478
-
1479
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
1480
-	{ echo "$SYSTEM_NAME"; exit; }
1481
-
1482
-# Apollos put the system type in the environment.
1483
-
1484
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
1485
-
1486
-# Convex versions that predate uname can use getsysinfo(1)
1487
-
1488
-if [ -x /usr/convex/getsysinfo ]
1489
-then
1490
-    case `getsysinfo -f cpu_type` in
1491
-    c1*)
1492
-	echo c1-convex-bsd
1493
-	exit ;;
1494
-    c2*)
1495
-	if getsysinfo -f scalar_acc
1496
-	then echo c32-convex-bsd
1497
-	else echo c2-convex-bsd
1498
-	fi
1499
-	exit ;;
1500
-    c34*)
1501
-	echo c34-convex-bsd
1502
-	exit ;;
1503
-    c38*)
1504
-	echo c38-convex-bsd
1505
-	exit ;;
1506
-    c4*)
1507
-	echo c4-convex-bsd
1508
-	exit ;;
1509
-    esac
1510
-fi
1377
+	;;
1378
+esac
1511 1379
 
1512 1380
 cat >&2 <<EOF
1513
-$0: unable to guess system type
1514 1381
 
1515
-This script, last modified $timestamp, has failed to recognize
1516
-the operating system you are using. It is advised that you
1517
-download the most up to date version of the config scripts from
1382
+This script (version $timestamp), has failed to recognize the
1383
+operating system you are using. If your script is old, overwrite *all*
1384
+copies of config.guess and config.sub with the latest versions from:
1518 1385
 
1519
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
1386
+  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
1520 1387
 and
1521
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
1388
+  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
1522 1389
 
1523
-If the version you run ($0) is already up to date, please
1524
-send the following data and any information you think might be
1525
-pertinent to <config-patches@gnu.org> in order to provide the needed
1526
-information to handle your system.
1390
+If $0 has already been updated, send the following data and any
1391
+information you think might be pertinent to config-patches@gnu.org to
1392
+provide the necessary information to handle your system.
1527 1393
 
1528 1394
 config.guess timestamp = $timestamp
1529 1395
 
... ...
@@ -1542,16 +1464,16 @@ hostinfo               = `(hostinfo) 2>/dev/null`
1542 1542
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
1543 1543
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
1544 1544
 
1545
-UNAME_MACHINE = ${UNAME_MACHINE}
1546
-UNAME_RELEASE = ${UNAME_RELEASE}
1547
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
1548
-UNAME_VERSION = ${UNAME_VERSION}
1545
+UNAME_MACHINE = "$UNAME_MACHINE"
1546
+UNAME_RELEASE = "$UNAME_RELEASE"
1547
+UNAME_SYSTEM  = "$UNAME_SYSTEM"
1548
+UNAME_VERSION = "$UNAME_VERSION"
1549 1549
 EOF
1550 1550
 
1551 1551
 exit 1
1552 1552
 
1553 1553
 # Local variables:
1554
-# eval: (add-hook 'write-file-hooks 'time-stamp)
1554
+# eval: (add-hook 'write-file-functions 'time-stamp)
1555 1555
 # time-stamp-start: "timestamp='"
1556 1556
 # time-stamp-format: "%:y-%02m-%02d"
1557 1557
 # time-stamp-end: "'"
... ...
@@ -1,8 +1,8 @@
1 1
 #! /bin/sh
2 2
 # Configuration validation subroutine script.
3
-#   Copyright 1992-2013 Free Software Foundation, Inc.
3
+#   Copyright 1992-2018 Free Software Foundation, Inc.
4 4
 
5
-timestamp='2013-08-10'
5
+timestamp='2018-02-22'
6 6
 
7 7
 # This file is free software; you can redistribute it and/or modify it
8 8
 # under the terms of the GNU General Public License as published by
... ...
@@ -15,7 +15,7 @@ timestamp='2013-08-10'
15 15
 # General Public License for more details.
16 16
 #
17 17
 # You should have received a copy of the GNU General Public License
18
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
18
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
19 19
 #
20 20
 # As a special exception to the GNU General Public License, if you
21 21
 # distribute this file as part of a program that contains a
... ...
@@ -25,7 +25,7 @@ timestamp='2013-08-10'
25 25
 # of the GNU General Public License, version 3 ("GPLv3").
26 26
 
27 27
 
28
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
28
+# Please send patches to <config-patches@gnu.org>.
29 29
 #
30 30
 # Configuration subroutine to validate and canonicalize a configuration type.
31 31
 # Supply the specified configuration type as an argument.
... ...
@@ -33,7 +33,7 @@ timestamp='2013-08-10'
33 33
 # Otherwise, we print the canonical config type on stdout and succeed.
34 34
 
35 35
 # You can get the latest version of this script from:
36
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
36
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
37 37
 
38 38
 # This file is supposed to be the same for all GNU packages
39 39
 # and recognize all the CPU types, system types and aliases
... ...
@@ -53,12 +53,11 @@ timestamp='2013-08-10'
53 53
 me=`echo "$0" | sed -e 's,.*/,,'`
54 54
 
55 55
 usage="\
56
-Usage: $0 [OPTION] CPU-MFR-OPSYS
57
-       $0 [OPTION] ALIAS
56
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
58 57
 
59 58
 Canonicalize a configuration name.
60 59
 
61
-Operation modes:
60
+Options:
62 61
   -h, --help         print this help, then exit
63 62
   -t, --time-stamp   print date of last modification, then exit
64 63
   -v, --version      print version number, then exit
... ...
@@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
68 68
 version="\
69 69
 GNU config.sub ($timestamp)
70 70
 
71
-Copyright 1992-2013 Free Software Foundation, Inc.
71
+Copyright 1992-2018 Free Software Foundation, Inc.
72 72
 
73 73
 This is free software; see the source for copying conditions.  There is NO
74 74
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
... ...
@@ -95,7 +94,7 @@ while test $# -gt 0 ; do
95 95
 
96 96
     *local*)
97 97
        # First pass through any local machine types.
98
-       echo $1
98
+       echo "$1"
99 99
        exit ;;
100 100
 
101 101
     * )
... ...
@@ -113,24 +112,24 @@ esac
113 113
 
114 114
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
115 115
 # Here we must recognize all the valid KERNEL-OS combinations.
116
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
116
+maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
117 117
 case $maybe_os in
118 118
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
119 119
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
120
-  knetbsd*-gnu* | netbsd*-gnu* | \
121
-  kopensolaris*-gnu* | \
120
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
121
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
122 122
   storm-chaos* | os2-emx* | rtmk-nova*)
123 123
     os=-$maybe_os
124
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
124
+    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
125 125
     ;;
126 126
   android-linux)
127 127
     os=-linux-android
128
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
128
+    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
129 129
     ;;
130 130
   *)
131
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
132
-    if [ $basic_machine != $1 ]
133
-    then os=`echo $1 | sed 's/.*-/-/'`
131
+    basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
132
+    if [ "$basic_machine" != "$1" ]
133
+    then os=`echo "$1" | sed 's/.*-/-/'`
134 134
     else os=; fi
135 135
     ;;
136 136
 esac
... ...
@@ -179,44 +178,44 @@ case $os in
179 179
 		;;
180 180
 	-sco6)
181 181
 		os=-sco5v6
182
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
182
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
183 183
 		;;
184 184
 	-sco5)
185 185
 		os=-sco3.2v5
186
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
186
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
187 187
 		;;
188 188
 	-sco4)
189 189
 		os=-sco3.2v4
190
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
190
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
191 191
 		;;
192 192
 	-sco3.2.[4-9]*)
193 193
 		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
194
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
194
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
195 195
 		;;
196 196
 	-sco3.2v[4-9]*)
197 197
 		# Don't forget version if it is 3.2v4 or newer.
198
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
198
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
199 199
 		;;
200 200
 	-sco5v6*)
201 201
 		# Don't forget version if it is 3.2v4 or newer.
202
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
202
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
203 203
 		;;
204 204
 	-sco*)
205 205
 		os=-sco3.2v2
206
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
206
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
207 207
 		;;
208 208
 	-udk*)
209
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
209
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
210 210
 		;;
211 211
 	-isc)
212 212
 		os=-isc2.2
213
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
213
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
214 214
 		;;
215 215
 	-clix*)
216 216
 		basic_machine=clipper-intergraph
217 217
 		;;
218 218
 	-isc*)
219
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
219
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
220 220
 		;;
221 221
 	-lynx*178)
222 222
 		os=-lynxos178
... ...
@@ -228,10 +227,7 @@ case $os in
228 228
 		os=-lynxos
229 229
 		;;
230 230
 	-ptx*)
231
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
232
-		;;
233
-	-windowsnt*)
234
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
231
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
235 232
 		;;
236 233
 	-psos*)
237 234
 		os=-psos
... ...
@@ -255,16 +251,18 @@ case $basic_machine in
255 255
 	| arc | arceb \
256 256
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
257 257
 	| avr | avr32 \
258
+	| ba \
258 259
 	| be32 | be64 \
259 260
 	| bfin \
260 261
 	| c4x | c8051 | clipper \
261 262
 	| d10v | d30v | dlx | dsp16xx \
262
-	| epiphany \
263
-	| fido | fr30 | frv \
263
+	| e2k | epiphany \
264
+	| fido | fr30 | frv | ft32 \
264 265
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
265 266
 	| hexagon \
266
-	| i370 | i860 | i960 | ia64 \
267
+	| i370 | i860 | i960 | ia16 | ia64 \
267 268
 	| ip2k | iq2000 \
269
+	| k1om \
268 270
 	| le32 | le64 \
269 271
 	| lm32 \
270 272
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
... ...
@@ -282,8 +280,10 @@ case $basic_machine in
282 282
 	| mips64vr5900 | mips64vr5900el \
283 283
 	| mipsisa32 | mipsisa32el \
284 284
 	| mipsisa32r2 | mipsisa32r2el \
285
+	| mipsisa32r6 | mipsisa32r6el \
285 286
 	| mipsisa64 | mipsisa64el \
286 287
 	| mipsisa64r2 | mipsisa64r2el \
288
+	| mipsisa64r6 | mipsisa64r6el \
287 289
 	| mipsisa64sb1 | mipsisa64sb1el \
288 290
 	| mipsisa64sr71k | mipsisa64sr71kel \
289 291
 	| mipsr5900 | mipsr5900el \
... ...
@@ -295,14 +295,15 @@ case $basic_machine in
295 295
 	| nds32 | nds32le | nds32be \
296 296
 	| nios | nios2 | nios2eb | nios2el \
297 297
 	| ns16k | ns32k \
298
-	| open8 \
299
-	| or1k | or32 \
300
-	| pdp10 | pdp11 | pj | pjl \
298
+	| open8 | or1k | or1knd | or32 \
299
+	| pdp10 | pj | pjl \
301 300
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
301
+	| pru \
302 302
 	| pyramid \
303
+	| riscv32 | riscv64 \
303 304
 	| rl78 | rx \
304 305
 	| score \
305
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
306
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
306 307
 	| sh64 | sh64le \
307 308
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
308 309
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
... ...
@@ -310,7 +311,8 @@ case $basic_machine in
310 310
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
311 311
 	| ubicom32 \
312 312
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
313
-	| we32k \
313
+	| visium \
314
+	| wasm32 \
314 315
 	| x86 | xc16x | xstormy16 | xtensa \
315 316
 	| z8k | z80)
316 317
 		basic_machine=$basic_machine-unknown
... ...
@@ -324,11 +326,14 @@ case $basic_machine in
324 324
 	c6x)
325 325
 		basic_machine=tic6x-unknown
326 326
 		;;
327
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
327
+	leon|leon[3-9])
328
+		basic_machine=sparc-$basic_machine
329
+		;;
330
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
328 331
 		basic_machine=$basic_machine-unknown
329 332
 		os=-none
330 333
 		;;
331
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
334
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
332 335
 		;;
333 336
 	ms1)
334 337
 		basic_machine=mt-unknown
... ...
@@ -357,7 +362,7 @@ case $basic_machine in
357 357
 	  ;;
358 358
 	# Object if more than one company name word.
359 359
 	*-*-*)
360
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
360
+		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
361 361
 		exit 1
362 362
 		;;
363 363
 	# Recognize the basic CPU types with company name.
... ...
@@ -369,18 +374,20 @@ case $basic_machine in
369 369
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
370 370
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
371 371
 	| avr-* | avr32-* \
372
+	| ba-* \
372 373
 	| be32-* | be64-* \
373 374
 	| bfin-* | bs2000-* \
374 375
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
375 376
 	| c8051-* | clipper-* | craynv-* | cydra-* \
376 377
 	| d10v-* | d30v-* | dlx-* \
377
-	| elxsi-* \
378
+	| e2k-* | elxsi-* \
378 379
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
379 380
 	| h8300-* | h8500-* \
380 381
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
381 382
 	| hexagon-* \
382
-	| i*86-* | i860-* | i960-* | ia64-* \
383
+	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
383 384
 	| ip2k-* | iq2000-* \
385
+	| k1om-* \
384 386
 	| le32-* | le64-* \
385 387
 	| lm32-* \
386 388
 	| m32c-* | m32r-* | m32rle-* \
... ...
@@ -400,8 +407,10 @@ case $basic_machine in
400 400
 	| mips64vr5900-* | mips64vr5900el-* \
401 401
 	| mipsisa32-* | mipsisa32el-* \
402 402
 	| mipsisa32r2-* | mipsisa32r2el-* \
403
+	| mipsisa32r6-* | mipsisa32r6el-* \
403 404
 	| mipsisa64-* | mipsisa64el-* \
404 405
 	| mipsisa64r2-* | mipsisa64r2el-* \
406
+	| mipsisa64r6-* | mipsisa64r6el-* \
405 407
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
406 408
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
407 409
 	| mipsr5900-* | mipsr5900el-* \
... ...
@@ -413,16 +422,19 @@ case $basic_machine in
413 413
 	| nios-* | nios2-* | nios2eb-* | nios2el-* \
414 414
 	| none-* | np1-* | ns16k-* | ns32k-* \
415 415
 	| open8-* \
416
+	| or1k*-* \
416 417
 	| orion-* \
417 418
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
418 419
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
420
+	| pru-* \
419 421
 	| pyramid-* \
422
+	| riscv32-* | riscv64-* \
420 423
 	| rl78-* | romp-* | rs6000-* | rx-* \
421 424
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
422 425
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
423 426
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
424 427
 	| sparclite-* \
425
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
428
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
426 429
 	| tahoe-* \
427 430
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
428 431
 	| tile*-* \
... ...
@@ -430,6 +442,8 @@ case $basic_machine in
430 430
 	| ubicom32-* \
431 431
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
432 432
 	| vax-* \
433
+	| visium-* \
434
+	| wasm32-* \
433 435
 	| we32k-* \
434 436
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
435 437
 	| xstormy16-* | xtensa*-* \
... ...
@@ -443,7 +457,7 @@ case $basic_machine in
443 443
 	# Recognize the various machine names and aliases which stand
444 444
 	# for a CPU type and a company and sometimes even an OS.
445 445
 	386bsd)
446
-		basic_machine=i386-unknown
446
+		basic_machine=i386-pc
447 447
 		os=-bsd
448 448
 		;;
449 449
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
... ...
@@ -477,7 +491,7 @@ case $basic_machine in
477 477
 		basic_machine=x86_64-pc
478 478
 		;;
479 479
 	amd64-*)
480
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
480
+		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
481 481
 		;;
482 482
 	amdahl)
483 483
 		basic_machine=580-amdahl
... ...
@@ -506,6 +520,9 @@ case $basic_machine in
506 506
 		basic_machine=i386-pc
507 507
 		os=-aros
508 508
 		;;
509
+	asmjs)
510
+		basic_machine=asmjs-unknown
511
+		;;
509 512
 	aux)
510 513
 		basic_machine=m68k-apple
511 514
 		os=-aux
... ...
@@ -519,7 +536,7 @@ case $basic_machine in
519 519
 		os=-linux
520 520
 		;;
521 521
 	blackfin-*)
522
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
522
+		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
523 523
 		os=-linux
524 524
 		;;
525 525
 	bluegene*)
... ...
@@ -527,13 +544,13 @@ case $basic_machine in
527 527
 		os=-cnk
528 528
 		;;
529 529
 	c54x-*)
530
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
530
+		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
531 531
 		;;
532 532
 	c55x-*)
533
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
533
+		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
534 534
 		;;
535 535
 	c6x-*)
536
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
536
+		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
537 537
 		;;
538 538
 	c90)
539 539
 		basic_machine=c90-cray
... ...
@@ -622,10 +639,18 @@ case $basic_machine in
622 622
 		basic_machine=rs6000-bull
623 623
 		os=-bosx
624 624
 		;;
625
-	dpx2* | dpx2*-bull)
625
+	dpx2*)
626 626
 		basic_machine=m68k-bull
627 627
 		os=-sysv3
628 628
 		;;
629
+	e500v[12])
630
+		basic_machine=powerpc-unknown
631
+		os=$os"spe"
632
+		;;
633
+	e500v[12]-*)
634
+		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
635
+		os=$os"spe"
636
+		;;
629 637
 	ebmon29k)
630 638
 		basic_machine=a29k-amd
631 639
 		os=-ebmon
... ...
@@ -715,9 +740,6 @@ case $basic_machine in
715 715
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
716 716
 		basic_machine=hppa1.0-hp
717 717
 		;;
718
-	hppa-next)
719
-		os=-nextstep3
720
-		;;
721 718
 	hppaosf)
722 719
 		basic_machine=hppa1.1-hp
723 720
 		os=-osf
... ...
@@ -730,26 +752,26 @@ case $basic_machine in
730 730
 		basic_machine=i370-ibm
731 731
 		;;
732 732
 	i*86v32)
733
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
733
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
734 734
 		os=-sysv32
735 735
 		;;
736 736
 	i*86v4*)
737
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
737
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
738 738
 		os=-sysv4
739 739
 		;;
740 740
 	i*86v)
741
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
741
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
742 742
 		os=-sysv
743 743
 		;;
744 744
 	i*86sol2)
745
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
745
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
746 746
 		os=-solaris2
747 747
 		;;
748 748
 	i386mach)
749 749
 		basic_machine=i386-mach
750 750
 		os=-mach
751 751
 		;;
752
-	i386-vsta | vsta)
752
+	vsta)
753 753
 		basic_machine=i386-unknown
754 754
 		os=-vsta
755 755
 		;;
... ...
@@ -767,17 +789,17 @@ case $basic_machine in
767 767
 		basic_machine=m68k-isi
768 768
 		os=-sysv
769 769
 		;;
770
+	leon-*|leon[3-9]-*)
771
+		basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
772
+		;;
770 773
 	m68knommu)
771 774
 		basic_machine=m68k-unknown
772 775
 		os=-linux
773 776
 		;;
774 777
 	m68knommu-*)
775
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
778
+		basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
776 779
 		os=-linux
777 780
 		;;
778
-	m88k-omron*)
779
-		basic_machine=m88k-omron
780
-		;;
781 781
 	magnum | m3230)
782 782
 		basic_machine=mips-mips
783 783
 		os=-sysv
... ...
@@ -809,10 +831,10 @@ case $basic_machine in
809 809
 		os=-mint
810 810
 		;;
811 811
 	mips3*-*)
812
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
812
+		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
813 813
 		;;
814 814
 	mips3*)
815
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
815
+		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
816 816
 		;;
817 817
 	monitor)
818 818
 		basic_machine=m68k-rom68k
... ...
@@ -822,12 +844,16 @@ case $basic_machine in
822 822
 		basic_machine=powerpc-unknown
823 823
 		os=-morphos
824 824
 		;;
825
+	moxiebox)
826
+		basic_machine=moxie-unknown
827
+		os=-moxiebox
828
+		;;
825 829
 	msdos)
826 830
 		basic_machine=i386-pc
827 831
 		os=-msdos
828 832
 		;;
829 833
 	ms1-*)
830
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
834
+		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
831 835
 		;;
832 836
 	msys)
833 837
 		basic_machine=i686-pc
... ...
@@ -869,7 +895,7 @@ case $basic_machine in
869 869
 		basic_machine=v70-nec
870 870
 		os=-sysv
871 871
 		;;
872
-	next | m*-next )
872
+	next | m*-next)
873 873
 		basic_machine=m68k-next
874 874
 		case $os in
875 875
 		    -nextstep* )
... ...
@@ -914,6 +940,12 @@ case $basic_machine in
914 914
 	nsr-tandem)
915 915
 		basic_machine=nsr-tandem
916 916
 		;;
917
+	nsv-tandem)
918
+		basic_machine=nsv-tandem
919
+		;;
920
+	nsx-tandem)
921
+		basic_machine=nsx-tandem
922
+		;;
917 923
 	op50n-* | op60c-*)
918 924
 		basic_machine=hppa1.1-oki
919 925
 		os=-proelf
... ...
@@ -946,7 +978,7 @@ case $basic_machine in
946 946
 		os=-linux
947 947
 		;;
948 948
 	parisc-*)
949
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
949
+		basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
950 950
 		os=-linux
951 951
 		;;
952 952
 	pbd)
... ...
@@ -962,7 +994,7 @@ case $basic_machine in
962 962
 		basic_machine=i386-pc
963 963
 		;;
964 964
 	pc98-*)
965
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
965
+		basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
966 966
 		;;
967 967
 	pentium | p5 | k5 | k6 | nexgen | viac3)
968 968
 		basic_machine=i586-pc
... ...
@@ -977,16 +1009,16 @@ case $basic_machine in
977 977
 		basic_machine=i786-pc
978 978
 		;;
979 979
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
980
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
980
+		basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
981 981
 		;;
982 982
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
983
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
983
+		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
984 984
 		;;
985 985
 	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
986
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
986
+		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
987 987
 		;;
988 988
 	pentium4-*)
989
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
989
+		basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
990 990
 		;;
991 991
 	pn)
992 992
 		basic_machine=pn-gould
... ...
@@ -996,23 +1028,23 @@ case $basic_machine in
996 996
 	ppc | ppcbe)	basic_machine=powerpc-unknown
997 997
 		;;
998 998
 	ppc-* | ppcbe-*)
999
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
999
+		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1000 1000
 		;;
1001
-	ppcle | powerpclittle | ppc-le | powerpc-little)
1001
+	ppcle | powerpclittle)
1002 1002
 		basic_machine=powerpcle-unknown
1003 1003
 		;;
1004 1004
 	ppcle-* | powerpclittle-*)
1005
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
1005
+		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1006 1006
 		;;
1007 1007
 	ppc64)	basic_machine=powerpc64-unknown
1008 1008
 		;;
1009
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
1009
+	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1010 1010
 		;;
1011
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
1011
+	ppc64le | powerpc64little)
1012 1012
 		basic_machine=powerpc64le-unknown
1013 1013
 		;;
1014 1014
 	ppc64le-* | powerpc64little-*)
1015
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
1015
+		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1016 1016
 		;;
1017 1017
 	ps2)
1018 1018
 		basic_machine=i386-ibm
... ...
@@ -1066,17 +1098,10 @@ case $basic_machine in
1066 1066
 	sequent)
1067 1067
 		basic_machine=i386-sequent
1068 1068
 		;;
1069
-	sh)
1070
-		basic_machine=sh-hitachi
1071
-		os=-hms
1072
-		;;
1073 1069
 	sh5el)
1074 1070
 		basic_machine=sh5le-unknown
1075 1071
 		;;
1076
-	sh64)
1077
-		basic_machine=sh64-unknown
1078
-		;;
1079
-	sparclite-wrs | simso-wrs)
1072
+	simso-wrs)
1080 1073
 		basic_machine=sparclite-wrs
1081 1074
 		os=-vxworks
1082 1075
 		;;
... ...
@@ -1095,7 +1120,7 @@ case $basic_machine in
1095 1095
 		os=-sysv4
1096 1096
 		;;
1097 1097
 	strongarm-* | thumb-*)
1098
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
1098
+		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1099 1099
 		;;
1100 1100
 	sun2)
1101 1101
 		basic_machine=m68000-sun
... ...
@@ -1217,6 +1242,9 @@ case $basic_machine in
1217 1217
 		basic_machine=hppa1.1-winbond
1218 1218
 		os=-proelf
1219 1219
 		;;
1220
+	x64)
1221
+		basic_machine=x86_64-pc
1222
+		;;
1220 1223
 	xbox)
1221 1224
 		basic_machine=i686-pc
1222 1225
 		os=-mingw32
... ...
@@ -1225,20 +1253,12 @@ case $basic_machine in
1225 1225
 		basic_machine=xps100-honeywell
1226 1226
 		;;
1227 1227
 	xscale-* | xscalee[bl]-*)
1228
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
1228
+		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
1229 1229
 		;;
1230 1230
 	ymp)
1231 1231
 		basic_machine=ymp-cray
1232 1232
 		os=-unicos
1233 1233
 		;;
1234
-	z8k-*-coff)
1235
-		basic_machine=z8k-unknown
1236
-		os=-sim
1237
-		;;
1238
-	z80-*-coff)
1239
-		basic_machine=z80-unknown
1240
-		os=-sim
1241
-		;;
1242 1234
 	none)
1243 1235
 		basic_machine=none-none
1244 1236
 		os=-none
... ...
@@ -1267,10 +1287,6 @@ case $basic_machine in
1267 1267
 	vax)
1268 1268
 		basic_machine=vax-dec
1269 1269
 		;;
1270
-	pdp10)
1271
-		# there are many clones, so DEC is not a safe bet
1272
-		basic_machine=pdp10-unknown
1273
-		;;
1274 1270
 	pdp11)
1275 1271
 		basic_machine=pdp11-dec
1276 1272
 		;;
... ...
@@ -1280,9 +1296,6 @@ case $basic_machine in
1280 1280
 	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
1281 1281
 		basic_machine=sh-unknown
1282 1282
 		;;
1283
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
1284
-		basic_machine=sparc-sun
1285
-		;;
1286 1283
 	cydra)
1287 1284
 		basic_machine=cydra-cydrome
1288 1285
 		;;
... ...
@@ -1302,7 +1315,7 @@ case $basic_machine in
1302 1302
 		# Make sure to match an already-canonicalized machine name.
1303 1303
 		;;
1304 1304
 	*)
1305
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
1305
+		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
1306 1306
 		exit 1
1307 1307
 		;;
1308 1308
 esac
... ...
@@ -1310,10 +1323,10 @@ esac
1310 1310
 # Here we canonicalize certain aliases for manufacturers.
1311 1311
 case $basic_machine in
1312 1312
 	*-digital*)
1313
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
1313
+		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
1314 1314
 		;;
1315 1315
 	*-commodore*)
1316
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
1316
+		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
1317 1317
 		;;
1318 1318
 	*)
1319 1319
 		;;
... ...
@@ -1324,8 +1337,8 @@ esac
1324 1324
 if [ x"$os" != x"" ]
1325 1325
 then
1326 1326
 case $os in
1327
-	# First match some system type aliases
1328
-	# that might get confused with valid system types.
1327
+	# First match some system type aliases that might get confused
1328
+	# with valid system types.
1329 1329
 	# -solaris* is a basic system type, with this one exception.
1330 1330
 	-auroraux)
1331 1331
 		os=-auroraux
... ...
@@ -1336,45 +1349,48 @@ case $os in
1336 1336
 	-solaris)
1337 1337
 		os=-solaris2
1338 1338
 		;;
1339
-	-svr4*)
1340
-		os=-sysv4
1341
-		;;
1342 1339
 	-unixware*)
1343 1340
 		os=-sysv4.2uw
1344 1341
 		;;
1345 1342
 	-gnu/linux*)
1346 1343
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
1347 1344
 		;;
1348
-	# First accept the basic system types.
1345
+	# es1800 is here to avoid being matched by es* (a different OS)
1346
+	-es1800*)
1347
+		os=-ose
1348
+		;;
1349
+	# Now accept the basic system types.
1349 1350
 	# The portable systems comes first.
1350
-	# Each alternative MUST END IN A *, to match a version number.
1351
+	# Each alternative MUST end in a * to match a version number.
1351 1352
 	# -sysv* is not here because it comes later, after sysvr4.
1352 1353
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1353 1354
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1354 1355
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1355 1356
 	      | -sym* | -kopensolaris* | -plan9* \
1356 1357
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1357
-	      | -aos* | -aros* \
1358
+	      | -aos* | -aros* | -cloudabi* | -sortix* \
1358 1359
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1359 1360
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1360
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1361
-	      | -bitrig* | -openbsd* | -solidbsd* \
1361
+	      | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
1362
+	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
1362 1363
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1363 1364
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1364 1365
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1365 1366
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1366
-	      | -chorusos* | -chorusrdb* | -cegcc* \
1367
+	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
1367 1368
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1368
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
1369
+	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
1369 1370
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
1370
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
1371
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1371
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
1372
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
1372 1373
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1373 1374
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1374 1375
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1375
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1376
+	      | -morphos* | -superux* | -rtmk* | -windiss* \
1376 1377
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1377
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1378
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
1379
+	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
1380
+	      | -midnightbsd*)
1378 1381
 	# Remember, each alternative MUST END IN *, to match a version number.
1379 1382
 		;;
1380 1383
 	-qnx*)
... ...
@@ -1391,12 +1407,12 @@ case $os in
1391 1391
 	-nto*)
1392 1392
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
1393 1393
 		;;
1394
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
1395
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
1394
+	-sim | -xray | -os68k* | -v88r* \
1395
+	      | -windows* | -osx | -abug | -netware* | -os9* \
1396 1396
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
1397 1397
 		;;
1398 1398
 	-mac*)
1399
-		os=`echo $os | sed -e 's|mac|macos|'`
1399
+		os=`echo "$os" | sed -e 's|mac|macos|'`
1400 1400
 		;;
1401 1401
 	-linux-dietlibc)
1402 1402
 		os=-linux-dietlibc
... ...
@@ -1405,10 +1421,10 @@ case $os in
1405 1405
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
1406 1406
 		;;
1407 1407
 	-sunos5*)
1408
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
1408
+		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
1409 1409
 		;;
1410 1410
 	-sunos6*)
1411
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
1411
+		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
1412 1412
 		;;
1413 1413
 	-opened*)
1414 1414
 		os=-openedition
... ...
@@ -1419,12 +1435,6 @@ case $os in
1419 1419
 	-wince*)
1420 1420
 		os=-wince
1421 1421
 		;;
1422
-	-osfrose*)
1423
-		os=-osfrose
1424
-		;;
1425
-	-osf*)
1426
-		os=-osf
1427
-		;;
1428 1422
 	-utek*)
1429 1423
 		os=-bsd
1430 1424
 		;;
... ...
@@ -1449,7 +1459,7 @@ case $os in
1449 1449
 	-nova*)
1450 1450
 		os=-rtmk-nova
1451 1451
 		;;
1452
-	-ns2 )
1452
+	-ns2)
1453 1453
 		os=-nextstep2
1454 1454
 		;;
1455 1455
 	-nsk*)
... ...
@@ -1471,7 +1481,7 @@ case $os in
1471 1471
 	-oss*)
1472 1472
 		os=-sysv3
1473 1473
 		;;
1474
-	-svr4)
1474
+	-svr4*)
1475 1475
 		os=-sysv4
1476 1476
 		;;
1477 1477
 	-svr3)
... ...
@@ -1486,32 +1496,38 @@ case $os in
1486 1486
 	-ose*)
1487 1487
 		os=-ose
1488 1488
 		;;
1489
-	-es1800*)
1490
-		os=-ose
1491
-		;;
1492
-	-xenix)
1493
-		os=-xenix
1494
-		;;
1495 1489
 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1496 1490
 		os=-mint
1497 1491
 		;;
1498
-	-aros*)
1499
-		os=-aros
1500
-		;;
1501 1492
 	-zvmoe)
1502 1493
 		os=-zvmoe
1503 1494
 		;;
1504 1495
 	-dicos*)
1505 1496
 		os=-dicos
1506 1497
 		;;
1498
+	-pikeos*)
1499
+		# Until real need of OS specific support for
1500
+		# particular features comes up, bare metal
1501
+		# configurations are quite functional.
1502
+		case $basic_machine in
1503
+		    arm*)
1504
+			os=-eabi
1505
+			;;
1506
+		    *)
1507
+			os=-elf
1508
+			;;
1509
+		esac
1510
+		;;
1507 1511
 	-nacl*)
1508 1512
 		;;
1513
+	-ios)
1514
+		;;
1509 1515
 	-none)
1510 1516
 		;;
1511 1517
 	*)
1512 1518
 		# Get rid of the `-' at the beginning of $os.
1513 1519
 		os=`echo $os | sed 's/[^-]*-//'`
1514
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
1520
+		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
1515 1521
 		exit 1
1516 1522
 		;;
1517 1523
 esac
... ...
@@ -1592,9 +1608,6 @@ case $basic_machine in
1592 1592
 	mips*-*)
1593 1593
 		os=-elf
1594 1594
 		;;
1595
-	or1k-*)
1596
-		os=-elf
1597
-		;;
1598 1595
 	or32-*)
1599 1596
 		os=-coff
1600 1597
 		;;
... ...
@@ -1604,12 +1617,12 @@ case $basic_machine in
1604 1604
 	sparc-* | *-sun)
1605 1605
 		os=-sunos4.1.1
1606 1606
 		;;
1607
+	pru-*)
1608
+		os=-elf
1609
+		;;
1607 1610
 	*-be)
1608 1611
 		os=-beos
1609 1612
 		;;
1610
-	*-haiku)
1611
-		os=-haiku
1612
-		;;
1613 1613
 	*-ibm)
1614 1614
 		os=-aix
1615 1615
 		;;
... ...
@@ -1649,7 +1662,7 @@ case $basic_machine in
1649 1649
 	m88k-omron*)
1650 1650
 		os=-luna
1651 1651
 		;;
1652
-	*-next )
1652
+	*-next)
1653 1653
 		os=-nextstep
1654 1654
 		;;
1655 1655
 	*-sequent)
... ...
@@ -1664,9 +1677,6 @@ case $basic_machine in
1664 1664
 	i370-*)
1665 1665
 		os=-mvs
1666 1666
 		;;
1667
-	*-next)
1668
-		os=-nextstep3
1669
-		;;
1670 1667
 	*-gould)
1671 1668
 		os=-sysv
1672 1669
 		;;
... ...
@@ -1776,15 +1786,15 @@ case $basic_machine in
1776 1776
 				vendor=stratus
1777 1777
 				;;
1778 1778
 		esac
1779
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
1779
+		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
1780 1780
 		;;
1781 1781
 esac
1782 1782
 
1783
-echo $basic_machine$os
1783
+echo "$basic_machine$os"
1784 1784
 exit
1785 1785
 
1786 1786
 # Local variables:
1787
-# eval: (add-hook 'write-file-hooks 'time-stamp)
1787
+# eval: (add-hook 'write-file-functions 'time-stamp)
1788 1788
 # time-stamp-start: "timestamp='"
1789 1789
 # time-stamp-format: "%:y-%02m-%02d"
1790 1790
 # time-stamp-end: "'"
... ...
@@ -1,9 +1,9 @@
1 1
 #! /bin/sh
2 2
 # depcomp - compile a program generating dependencies as side-effects
3 3
 
4
-scriptversion=2013-05-30.07; # UTC
4
+scriptversion=2016-01-11.22; # UTC
5 5
 
6
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
6
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
7 7
 
8 8
 # This program is free software; you can redistribute it and/or modify
9 9
 # it under the terms of the GNU General Public License as published by
... ...
@@ -786,6 +786,6 @@ exit 0
786 786
 # eval: (add-hook 'write-file-hooks 'time-stamp)
787 787
 # time-stamp-start: "scriptversion="
788 788
 # time-stamp-format: "%:y-%02m-%02d.%02H"
789
-# time-stamp-time-zone: "UTC"
789
+# time-stamp-time-zone: "UTC0"
790 790
 # time-stamp-end: "; # UTC"
791 791
 # End:
... ...
@@ -1,7 +1,7 @@
1 1
 #!/bin/sh
2 2
 # install - install a program, script, or datafile
3 3
 
4
-scriptversion=2011-11-20.07; # UTC
4
+scriptversion=2014-09-12.12; # UTC
5 5
 
6 6
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
7 7
 # later released in X11R6 (xc/config/util/install.sh) with the
... ...
@@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC
41 41
 # This script is compatible with the BSD install script, but was written
42 42
 # from scratch.
43 43
 
44
+tab='	'
44 45
 nl='
45 46
 '
46
-IFS=" ""	$nl"
47
+IFS=" $tab$nl"
47 48
 
48
-# set DOITPROG to echo to test this script
49
+# Set DOITPROG to "echo" to test this script.
49 50
 
50
-# Don't use :- since 4.3BSD and earlier shells don't like it.
51 51
 doit=${DOITPROG-}
52
-if test -z "$doit"; then
53
-  doit_exec=exec
54
-else
55
-  doit_exec=$doit
56
-fi
52
+doit_exec=${doit:-exec}
57 53
 
58 54
 # Put in absolute file names if you don't have them in your path;
59 55
 # or use environment vars.
... ...
@@ -68,17 +64,6 @@ mvprog=${MVPROG-mv}
68 68
 rmprog=${RMPROG-rm}
69 69
 stripprog=${STRIPPROG-strip}
70 70
 
71
-posix_glob='?'
72
-initialize_posix_glob='
73
-  test "$posix_glob" != "?" || {
74
-    if (set -f) 2>/dev/null; then
75
-      posix_glob=
76
-    else
77
-      posix_glob=:
78
-    fi
79
-  }
80
-'
81
-
82 71
 posix_mkdir=
83 72
 
84 73
 # Desired mode of installed file.
... ...
@@ -97,7 +82,7 @@ dir_arg=
97 97
 dst_arg=
98 98
 
99 99
 copy_on_change=false
100
-no_target_directory=
100
+is_target_a_directory=possibly
101 101
 
102 102
 usage="\
103 103
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
... ...
@@ -137,46 +122,57 @@ while test $# -ne 0; do
137 137
     -d) dir_arg=true;;
138 138
 
139 139
     -g) chgrpcmd="$chgrpprog $2"
140
-	shift;;
140
+        shift;;
141 141
 
142 142
     --help) echo "$usage"; exit $?;;
143 143
 
144 144
     -m) mode=$2
145
-	case $mode in
146
-	  *' '* | *'	'* | *'
147
-'*	  | *'*'* | *'?'* | *'['*)
148
-	    echo "$0: invalid mode: $mode" >&2
149
-	    exit 1;;
150
-	esac
151
-	shift;;
145
+        case $mode in
146
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
147
+            echo "$0: invalid mode: $mode" >&2
148
+            exit 1;;
149
+        esac
150
+        shift;;
152 151
 
153 152
     -o) chowncmd="$chownprog $2"
154
-	shift;;
153
+        shift;;
155 154
 
156 155
     -s) stripcmd=$stripprog;;
157 156
 
158
-    -t) dst_arg=$2
159
-	# Protect names problematic for 'test' and other utilities.
160
-	case $dst_arg in
161
-	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
162
-	esac
163
-	shift;;
157
+    -t)
158
+        is_target_a_directory=always
159
+        dst_arg=$2
160
+        # Protect names problematic for 'test' and other utilities.
161
+        case $dst_arg in
162
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
163
+        esac
164
+        shift;;
164 165
 
165
-    -T) no_target_directory=true;;
166
+    -T) is_target_a_directory=never;;
166 167
 
167 168
     --version) echo "$0 $scriptversion"; exit $?;;
168 169
 
169
-    --)	shift
170
-	break;;
170
+    --) shift
171
+        break;;
171 172
 
172
-    -*)	echo "$0: invalid option: $1" >&2
173
-	exit 1;;
173
+    -*) echo "$0: invalid option: $1" >&2
174
+        exit 1;;
174 175
 
175 176
     *)  break;;
176 177
   esac
177 178
   shift
178 179
 done
179 180
 
181
+# We allow the use of options -d and -T together, by making -d
182
+# take the precedence; this is for compatibility with GNU install.
183
+
184
+if test -n "$dir_arg"; then
185
+  if test -n "$dst_arg"; then
186
+    echo "$0: target directory not allowed when installing a directory." >&2
187
+    exit 1
188
+  fi
189
+fi
190
+
180 191
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
181 192
   # When -d is used, all remaining arguments are directories to create.
182 193
   # When -t is used, the destination is already specified.
... ...
@@ -208,6 +204,15 @@ if test $# -eq 0; then
208 208
 fi
209 209
 
210 210
 if test -z "$dir_arg"; then
211
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
212
+    if test ! -d "$dst_arg"; then
213
+      echo "$0: $dst_arg: Is not a directory." >&2
214
+      exit 1
215
+    fi
216
+  fi
217
+fi
218
+
219
+if test -z "$dir_arg"; then
211 220
   do_exit='(exit $ret); exit $ret'
212 221
   trap "ret=129; $do_exit" 1
213 222
   trap "ret=130; $do_exit" 2
... ...
@@ -223,16 +228,16 @@ if test -z "$dir_arg"; then
223 223
 
224 224
     *[0-7])
225 225
       if test -z "$stripcmd"; then
226
-	u_plus_rw=
226
+        u_plus_rw=
227 227
       else
228
-	u_plus_rw='% 200'
228
+        u_plus_rw='% 200'
229 229
       fi
230 230
       cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
231 231
     *)
232 232
       if test -z "$stripcmd"; then
233
-	u_plus_rw=
233
+        u_plus_rw=
234 234
       else
235
-	u_plus_rw=,u+rw
235
+        u_plus_rw=,u+rw
236 236
       fi
237 237
       cp_umask=$mode$u_plus_rw;;
238 238
   esac
... ...
@@ -269,41 +274,15 @@ do
269 269
     # If destination is a directory, append the input filename; won't work
270 270
     # if double slashes aren't ignored.
271 271
     if test -d "$dst"; then
272
-      if test -n "$no_target_directory"; then
273
-	echo "$0: $dst_arg: Is a directory" >&2
274
-	exit 1
272
+      if test "$is_target_a_directory" = never; then
273
+        echo "$0: $dst_arg: Is a directory" >&2
274
+        exit 1
275 275
       fi
276 276
       dstdir=$dst
277 277
       dst=$dstdir/`basename "$src"`
278 278
       dstdir_status=0
279 279
     else
280
-      # Prefer dirname, but fall back on a substitute if dirname fails.
281
-      dstdir=`
282
-	(dirname "$dst") 2>/dev/null ||
283
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
284
-	     X"$dst" : 'X\(//\)[^/]' \| \
285
-	     X"$dst" : 'X\(//\)$' \| \
286
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
287
-	echo X"$dst" |
288
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
289
-		   s//\1/
290
-		   q
291
-		 }
292
-		 /^X\(\/\/\)[^/].*/{
293
-		   s//\1/
294
-		   q
295
-		 }
296
-		 /^X\(\/\/\)$/{
297
-		   s//\1/
298
-		   q
299
-		 }
300
-		 /^X\(\/\).*/{
301
-		   s//\1/
302
-		   q
303
-		 }
304
-		 s/.*/./; q'
305
-      `
306
-
280
+      dstdir=`dirname "$dst"`
307 281
       test -d "$dstdir"
308 282
       dstdir_status=$?
309 283
     fi
... ...
@@ -314,74 +293,81 @@ do
314 314
   if test $dstdir_status != 0; then
315 315
     case $posix_mkdir in
316 316
       '')
317
-	# Create intermediate dirs using mode 755 as modified by the umask.
318
-	# This is like FreeBSD 'install' as of 1997-10-28.
319
-	umask=`umask`
320
-	case $stripcmd.$umask in
321
-	  # Optimize common cases.
322
-	  *[2367][2367]) mkdir_umask=$umask;;
323
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
324
-
325
-	  *[0-7])
326
-	    mkdir_umask=`expr $umask + 22 \
327
-	      - $umask % 100 % 40 + $umask % 20 \
328
-	      - $umask % 10 % 4 + $umask % 2
329
-	    `;;
330
-	  *) mkdir_umask=$umask,go-w;;
331
-	esac
332
-
333
-	# With -d, create the new directory with the user-specified mode.
334
-	# Otherwise, rely on $mkdir_umask.
335
-	if test -n "$dir_arg"; then
336
-	  mkdir_mode=-m$mode
337
-	else
338
-	  mkdir_mode=
339
-	fi
340
-
341
-	posix_mkdir=false
342
-	case $umask in
343
-	  *[123567][0-7][0-7])
344
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
345
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
346
-	    ;;
347
-	  *)
348
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
349
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
350
-
351
-	    if (umask $mkdir_umask &&
352
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
353
-	    then
354
-	      if test -z "$dir_arg" || {
355
-		   # Check for POSIX incompatibilities with -m.
356
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
357
-		   # other-writable bit of parent directory when it shouldn't.
358
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
359
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
360
-		   case $ls_ld_tmpdir in
361
-		     d????-?r-*) different_mode=700;;
362
-		     d????-?--*) different_mode=755;;
363
-		     *) false;;
364
-		   esac &&
365
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
366
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
367
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
368
-		   }
369
-		 }
370
-	      then posix_mkdir=:
371
-	      fi
372
-	      rmdir "$tmpdir/d" "$tmpdir"
373
-	    else
374
-	      # Remove any dirs left behind by ancient mkdir implementations.
375
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
376
-	    fi
377
-	    trap '' 0;;
378
-	esac;;
317
+        # Create intermediate dirs using mode 755 as modified by the umask.
318
+        # This is like FreeBSD 'install' as of 1997-10-28.
319
+        umask=`umask`
320
+        case $stripcmd.$umask in
321
+          # Optimize common cases.
322
+          *[2367][2367]) mkdir_umask=$umask;;
323
+          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
324
+
325
+          *[0-7])
326
+            mkdir_umask=`expr $umask + 22 \
327
+              - $umask % 100 % 40 + $umask % 20 \
328
+              - $umask % 10 % 4 + $umask % 2
329
+            `;;
330
+          *) mkdir_umask=$umask,go-w;;
331
+        esac
332
+
333
+        # With -d, create the new directory with the user-specified mode.
334
+        # Otherwise, rely on $mkdir_umask.
335
+        if test -n "$dir_arg"; then
336
+          mkdir_mode=-m$mode
337
+        else
338
+          mkdir_mode=
339
+        fi
340
+
341
+        posix_mkdir=false
342
+        case $umask in
343
+          *[123567][0-7][0-7])
344
+            # POSIX mkdir -p sets u+wx bits regardless of umask, which
345
+            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
346
+            ;;
347
+          *)
348
+            # $RANDOM is not portable (e.g. dash);  use it when possible to
349
+            # lower collision chance
350
+            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
351
+            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
352
+
353
+            # As "mkdir -p" follows symlinks and we work in /tmp possibly;  so
354
+            # create the $tmpdir first (and fail if unsuccessful) to make sure
355
+            # that nobody tries to guess the $tmpdir name.
356
+            if (umask $mkdir_umask &&
357
+                $mkdirprog $mkdir_mode "$tmpdir" &&
358
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
359
+            then
360
+              if test -z "$dir_arg" || {
361
+                   # Check for POSIX incompatibilities with -m.
362
+                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
363
+                   # other-writable bit of parent directory when it shouldn't.
364
+                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
365
+                   test_tmpdir="$tmpdir/a"
366
+                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
367
+                   case $ls_ld_tmpdir in
368
+                     d????-?r-*) different_mode=700;;
369
+                     d????-?--*) different_mode=755;;
370
+                     *) false;;
371
+                   esac &&
372
+                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
373
+                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
374
+                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
375
+                   }
376
+                 }
377
+              then posix_mkdir=:
378
+              fi
379
+              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
380
+            else
381
+              # Remove any dirs left behind by ancient mkdir implementations.
382
+              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
383
+            fi
384
+            trap '' 0;;
385
+        esac;;
379 386
     esac
380 387
 
381 388
     if
382 389
       $posix_mkdir && (
383
-	umask $mkdir_umask &&
384
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
390
+        umask $mkdir_umask &&
391
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
385 392
       )
386 393
     then :
387 394
     else
... ...
@@ -391,53 +377,51 @@ do
391 391
       # directory the slow way, step by step, checking for races as we go.
392 392
 
393 393
       case $dstdir in
394
-	/*) prefix='/';;
395
-	[-=\(\)!]*) prefix='./';;
396
-	*)  prefix='';;
394
+        /*) prefix='/';;
395
+        [-=\(\)!]*) prefix='./';;
396
+        *)  prefix='';;
397 397
       esac
398 398
 
399
-      eval "$initialize_posix_glob"
400
-
401 399
       oIFS=$IFS
402 400
       IFS=/
403
-      $posix_glob set -f
401
+      set -f
404 402
       set fnord $dstdir
405 403
       shift
406
-      $posix_glob set +f
404
+      set +f
407 405
       IFS=$oIFS
408 406
 
409 407
       prefixes=
410 408
 
411 409
       for d
412 410
       do
413
-	test X"$d" = X && continue
414
-
415
-	prefix=$prefix$d
416
-	if test -d "$prefix"; then
417
-	  prefixes=
418
-	else
419
-	  if $posix_mkdir; then
420
-	    (umask=$mkdir_umask &&
421
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
422
-	    # Don't fail if two instances are running concurrently.
423
-	    test -d "$prefix" || exit 1
424
-	  else
425
-	    case $prefix in
426
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
427
-	      *) qprefix=$prefix;;
428
-	    esac
429
-	    prefixes="$prefixes '$qprefix'"
430
-	  fi
431
-	fi
432
-	prefix=$prefix/
411
+        test X"$d" = X && continue
412
+
413
+        prefix=$prefix$d
414
+        if test -d "$prefix"; then
415
+          prefixes=
416
+        else
417
+          if $posix_mkdir; then
418
+            (umask=$mkdir_umask &&
419
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
420
+            # Don't fail if two instances are running concurrently.
421
+            test -d "$prefix" || exit 1
422
+          else
423
+            case $prefix in
424
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
425
+              *) qprefix=$prefix;;
426
+            esac
427
+            prefixes="$prefixes '$qprefix'"
428
+          fi
429
+        fi
430
+        prefix=$prefix/
433 431
       done
434 432
 
435 433
       if test -n "$prefixes"; then
436
-	# Don't fail if two instances are running concurrently.
437
-	(umask $mkdir_umask &&
438
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
439
-	  test -d "$dstdir" || exit 1
440
-	obsolete_mkdir_used=true
434
+        # Don't fail if two instances are running concurrently.
435
+        (umask $mkdir_umask &&
436
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
437
+          test -d "$dstdir" || exit 1
438
+        obsolete_mkdir_used=true
441 439
       fi
442 440
     fi
443 441
   fi
... ...
@@ -472,15 +456,12 @@ do
472 472
 
473 473
     # If -C, don't bother to copy if it wouldn't change the file.
474 474
     if $copy_on_change &&
475
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
476
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
477
-
478
-       eval "$initialize_posix_glob" &&
479
-       $posix_glob set -f &&
475
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
476
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
477
+       set -f &&
480 478
        set X $old && old=:$2:$4:$5:$6 &&
481 479
        set X $new && new=:$2:$4:$5:$6 &&
482
-       $posix_glob set +f &&
483
-
480
+       set +f &&
484 481
        test "$old" = "$new" &&
485 482
        $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
486 483
     then
... ...
@@ -493,24 +474,24 @@ do
493 493
       # to itself, or perhaps because mv is so ancient that it does not
494 494
       # support -f.
495 495
       {
496
-	# Now remove or move aside any old file at destination location.
497
-	# We try this two ways since rm can't unlink itself on some
498
-	# systems and the destination file might be busy for other
499
-	# reasons.  In this case, the final cleanup might fail but the new
500
-	# file should still install successfully.
501
-	{
502
-	  test ! -f "$dst" ||
503
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
504
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
505
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
506
-	  } ||
507
-	  { echo "$0: cannot unlink or rename $dst" >&2
508
-	    (exit 1); exit 1
509
-	  }
510
-	} &&
511
-
512
-	# Now rename the file to the real destination.
513
-	$doit $mvcmd "$dsttmp" "$dst"
496
+        # Now remove or move aside any old file at destination location.
497
+        # We try this two ways since rm can't unlink itself on some
498
+        # systems and the destination file might be busy for other
499
+        # reasons.  In this case, the final cleanup might fail but the new
500
+        # file should still install successfully.
501
+        {
502
+          test ! -f "$dst" ||
503
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
504
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
505
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
506
+          } ||
507
+          { echo "$0: cannot unlink or rename $dst" >&2
508
+            (exit 1); exit 1
509
+          }
510
+        } &&
511
+
512
+        # Now rename the file to the real destination.
513
+        $doit $mvcmd "$dsttmp" "$dst"
514 514
       }
515 515
     fi || exit 1
516 516
 
... ...
@@ -31,7 +31,7 @@
31 31
 
32 32
 PROGRAM=libtool
33 33
 PACKAGE=libtool
34
-VERSION=2.4.6
34
+VERSION="2.4.6 Debian-2.4.6-2"
35 35
 package_revision=2.4.6
36 36
 
37 37
 
... ...
@@ -2068,12 +2068,12 @@ include the following information:
2068 2068
        compiler:       $LTCC
2069 2069
        compiler flags: $LTCFLAGS
2070 2070
        linker:         $LD (gnu? $with_gnu_ld)
2071
-       version:        $progname (GNU libtool) 2.4.6
2071
+       version:        $progname $scriptversion Debian-2.4.6-2
2072 2072
        automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
2073 2073
        autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
2074 2074
 
2075 2075
 Report bugs to <bug-libtool@gnu.org>.
2076
-GNU libtool home page: <http://www.gnu.org/software/libtool/>.
2076
+GNU libtool home page: <http://www.gnu.org/s/libtool/>.
2077 2077
 General help using GNU software: <http://www.gnu.org/gethelp/>."
2078 2078
     exit 0
2079 2079
 }
... ...
@@ -7272,10 +7272,13 @@ func_mode_link ()
7272 7272
       # -tp=*                Portland pgcc target processor selection
7273 7273
       # --sysroot=*          for sysroot support
7274 7274
       # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
7275
+      # -specs=*             GCC specs files
7275 7276
       # -stdlib=*            select c++ std lib with clang
7277
+      # -fsanitize=*         Clang/GCC memory and address sanitizer
7276 7278
       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
7277 7279
       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
7278
-      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
7280
+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
7281
+      -specs=*|-fsanitize=*)
7279 7282
         func_quote_for_eval "$arg"
7280 7283
 	arg=$func_quote_for_eval_result
7281 7284
         func_append compile_command " $arg"
... ...
@@ -7568,7 +7571,10 @@ func_mode_link ()
7568 7568
 	case $pass in
7569 7569
 	dlopen) libs=$dlfiles ;;
7570 7570
 	dlpreopen) libs=$dlprefiles ;;
7571
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
7571
+	link)
7572
+	  libs="$deplibs %DEPLIBS%"
7573
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
7574
+	  ;;
7572 7575
 	esac
7573 7576
       fi
7574 7577
       if test lib,dlpreopen = "$linkmode,$pass"; then
... ...
@@ -7887,19 +7893,19 @@ func_mode_link ()
7887 7887
 	    # It is a libtool convenience library, so add in its objects.
7888 7888
 	    func_append convenience " $ladir/$objdir/$old_library"
7889 7889
 	    func_append old_convenience " $ladir/$objdir/$old_library"
7890
+	    tmp_libs=
7891
+	    for deplib in $dependency_libs; do
7892
+	      deplibs="$deplib $deplibs"
7893
+	      if $opt_preserve_dup_deps; then
7894
+		case "$tmp_libs " in
7895
+		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
7896
+		esac
7897
+	      fi
7898
+	      func_append tmp_libs " $deplib"
7899
+	    done
7890 7900
 	  elif test prog != "$linkmode" && test lib != "$linkmode"; then
7891 7901
 	    func_fatal_error "'$lib' is not a convenience library"
7892 7902
 	  fi
7893
-	  tmp_libs=
7894
-	  for deplib in $dependency_libs; do
7895
-	    deplibs="$deplib $deplibs"
7896
-	    if $opt_preserve_dup_deps; then
7897
-	      case "$tmp_libs " in
7898
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
7899
-	      esac
7900
-	    fi
7901
-	    func_append tmp_libs " $deplib"
7902
-	  done
7903 7903
 	  continue
7904 7904
 	fi # $pass = conv
7905 7905
 
... ...
@@ -8823,6 +8829,9 @@ func_mode_link ()
8823 8823
 	    revision=$number_minor
8824 8824
 	    lt_irix_increment=no
8825 8825
 	    ;;
8826
+	  *)
8827
+	    func_fatal_configuration "$modename: unknown library version type '$version_type'"
8828
+	    ;;
8826 8829
 	  esac
8827 8830
 	  ;;
8828 8831
 	no)
... ...
@@ -3,7 +3,7 @@
3 3
 
4 4
 scriptversion=2013-10-28.13; # UTC
5 5
 
6
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
6
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
7 7
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
8 8
 
9 9
 # This program is free software; you can redistribute it and/or modify
... ...
@@ -765,6 +765,7 @@ infodir
765 765
 docdir
766 766
 oldincludedir
767 767
 includedir
768
+runstatedir
768 769
 localstatedir
769 770
 sharedstatedir
770 771
 sysconfdir
... ...
@@ -857,6 +858,7 @@ datadir='${datarootdir}'
857 857
 sysconfdir='${prefix}/etc'
858 858
 sharedstatedir='${prefix}/com'
859 859
 localstatedir='${prefix}/var'
860
+runstatedir='${localstatedir}/run'
860 861
 includedir='${prefix}/include'
861 862
 oldincludedir='/usr/include'
862 863
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
... ...
@@ -1109,6 +1111,15 @@ do
1109 1109
   | -silent | --silent | --silen | --sile | --sil)
1110 1110
     silent=yes ;;
1111 1111
 
1112
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
1113
+  | --runstate | --runstat | --runsta | --runst | --runs \
1114
+  | --run | --ru | --r)
1115
+    ac_prev=runstatedir ;;
1116
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1117
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1118
+  | --run=* | --ru=* | --r=*)
1119
+    runstatedir=$ac_optarg ;;
1120
+
1112 1121
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
1113 1122
     ac_prev=sbindir ;;
1114 1123
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
... ...
@@ -1246,7 +1257,7 @@ fi
1246 1246
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
1247 1247
 		datadir sysconfdir sharedstatedir localstatedir includedir \
1248 1248
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1249
-		libdir localedir mandir
1249
+		libdir localedir mandir runstatedir
1250 1250
 do
1251 1251
   eval ac_val=\$$ac_var
1252 1252
   # Remove trailing slashes.
... ...
@@ -1399,6 +1410,7 @@ Fine tuning of the installation directories:
1399 1399
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
1400 1400
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
1401 1401
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
1402
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
1402 1403
   --libdir=DIR            object code libraries [EPREFIX/lib]
1403 1404
   --includedir=DIR        C header files [PREFIX/include]
1404 1405
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
... ...
@@ -2490,7 +2502,7 @@ test -n "$target_alias" &&
2490 2490
   test "$program_prefix$program_suffix$program_transform_name" = \
2491 2491
     NONENONEs,x,x, &&
2492 2492
   program_prefix=${target_alias}-
2493
-am__api_version='1.14'
2493
+am__api_version='1.15'
2494 2494
 
2495 2495
 # Find a good install program.  We prefer a C program (faster),
2496 2496
 # so one script is as good as another.  But avoid the broken or
... ...
@@ -2662,8 +2674,8 @@ test "$program_suffix" != NONE &&
2662 2662
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
2663 2663
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
2664 2664
 
2665
-# expand $ac_aux_dir to an absolute path
2666
-am_aux_dir=`cd $ac_aux_dir && pwd`
2665
+# Expand $ac_aux_dir to an absolute path.
2666
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
2667 2667
 
2668 2668
 if test x"${MISSING+set}" != xset; then
2669 2669
   case $am_aux_dir in
... ...
@@ -2682,7 +2694,7 @@ else
2682 2682
 $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
2683 2683
 fi
2684 2684
 
2685
-if test x"${install_sh}" != xset; then
2685
+if test x"${install_sh+set}" != xset; then
2686 2686
   case $am_aux_dir in
2687 2687
   *\ * | *\	*)
2688 2688
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
... ...
@@ -3001,8 +3013,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
3001 3001
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
3002 3002
 mkdir_p='$(MKDIR_P)'
3003 3003
 
3004
-# We need awk for the "check" target.  The system "awk" is bad on
3005
-# some platforms.
3004
+# We need awk for the "check" target (and possibly the TAP driver).  The
3005
+# system "awk" is bad on some platforms.
3006 3006
 # Always define AMTAR for backward compatibility.  Yes, it's still used
3007 3007
 # in the wild :-(  We should find a proper way to deprecate it ...
3008 3008
 AMTAR='$${TAR-tar}'
... ...
@@ -3144,6 +3156,7 @@ END
3144 3144
     as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
3145 3145
   fi
3146 3146
 fi
3147
+
3147 3148
 # Check whether --enable-silent-rules was given.
3148 3149
 if test "${enable_silent_rules+set}" = set; then :
3149 3150
   enableval=$enable_silent_rules;
... ...
@@ -6542,7 +6555,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
6542 6542
   lt_cv_deplibs_check_method=pass_all
6543 6543
   ;;
6544 6544
 
6545
-netbsd*)
6545
+netbsd* | netbsdelf*-gnu)
6546 6546
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
6547 6547
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
6548 6548
   else
... ...
@@ -9977,6 +9990,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9977 9977
   openbsd* | bitrig*)
9978 9978
     with_gnu_ld=no
9979 9979
     ;;
9980
+  linux* | k*bsd*-gnu | gnu*)
9981
+    link_all_deplibs=no
9982
+    ;;
9980 9983
   esac
9981 9984
 
9982 9985
   ld_shlibs=yes
... ...
@@ -10231,7 +10247,7 @@ _LT_EOF
10231 10231
       fi
10232 10232
       ;;
10233 10233
 
10234
-    netbsd*)
10234
+    netbsd* | netbsdelf*-gnu)
10235 10235
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
10236 10236
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
10237 10237
 	wlarc=
... ...
@@ -10901,6 +10917,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
10901 10901
 	if test yes = "$lt_cv_irix_exported_symbol"; then
10902 10902
           archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
10903 10903
 	fi
10904
+	link_all_deplibs=no
10904 10905
       else
10905 10906
 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
10906 10907
 	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
... ...
@@ -10922,7 +10939,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
10922 10922
       esac
10923 10923
       ;;
10924 10924
 
10925
-    netbsd*)
10925
+    netbsd* | netbsdelf*-gnu)
10926 10926
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
10927 10927
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
10928 10928
       else
... ...
@@ -12037,6 +12054,18 @@ fi
12037 12037
   dynamic_linker='GNU/Linux ld.so'
12038 12038
   ;;
12039 12039
 
12040
+netbsdelf*-gnu)
12041
+  version_type=linux
12042
+  need_lib_prefix=no
12043
+  need_version=no
12044
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
12045
+  soname_spec='${libname}${release}${shared_ext}$major'
12046
+  shlibpath_var=LD_LIBRARY_PATH
12047
+  shlibpath_overrides_runpath=no
12048
+  hardcode_into_libs=yes
12049
+  dynamic_linker='NetBSD ld.elf_so'
12050
+  ;;
12051
+
12040 12052
 netbsd*)
12041 12053
   version_type=sunos
12042 12054
   need_lib_prefix=no
... ...
@@ -14931,7 +14960,7 @@ lt_prog_compiler_static_CXX=
14931 14931
 	    ;;
14932 14932
 	esac
14933 14933
 	;;
14934
-      netbsd*)
14934
+      netbsd* | netbsdelf*-gnu)
14935 14935
 	;;
14936 14936
       *qnx* | *nto*)
14937 14937
         # QNX uses GNU C++, but need to define -shared option too, otherwise
... ...
@@ -15306,6 +15335,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
15306 15306
       ;;
15307 15307
     esac
15308 15308
     ;;
15309
+  linux* | k*bsd*-gnu | gnu*)
15310
+    link_all_deplibs_CXX=no
15311
+    ;;
15309 15312
   *)
15310 15313
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
15311 15314
     ;;
... ...
@@ -15999,6 +16031,18 @@ fi
15999 15999
   dynamic_linker='GNU/Linux ld.so'
16000 16000
   ;;
16001 16001
 
16002
+netbsdelf*-gnu)
16003
+  version_type=linux
16004
+  need_lib_prefix=no
16005
+  need_version=no
16006
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
16007
+  soname_spec='${libname}${release}${shared_ext}$major'
16008
+  shlibpath_var=LD_LIBRARY_PATH
16009
+  shlibpath_overrides_runpath=no
16010
+  hardcode_into_libs=yes
16011
+  dynamic_linker='NetBSD ld.elf_so'
16012
+  ;;
16013
+
16002 16014
 netbsd*)
16003 16015
   version_type=sunos
16004 16016
   need_lib_prefix=no
... ...
@@ -18694,7 +18738,6 @@ $as_echo X"$file" |
18694 18694
     cat <<_LT_EOF >> "$cfgfile"
18695 18695
 #! $SHELL
18696 18696
 # Generated automatically by $as_me ($PACKAGE) $VERSION
18697
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
18698 18697
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
18699 18698
 
18700 18699
 # Provide generalized library-building support services.
... ...
@@ -728,7 +728,6 @@ _LT_CONFIG_SAVE_COMMANDS([
728 728
     cat <<_LT_EOF >> "$cfgfile"
729 729
 #! $SHELL
730 730
 # Generated automatically by $as_me ($PACKAGE) $VERSION
731
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
732 731
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
733 732
 
734 733
 # Provide generalized library-building support services.
... ...
@@ -2887,6 +2886,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
2887 2887
   dynamic_linker='GNU/Linux ld.so'
2888 2888
   ;;
2889 2889
 
2890
+netbsdelf*-gnu)
2891
+  version_type=linux
2892
+  need_lib_prefix=no
2893
+  need_version=no
2894
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
2895
+  soname_spec='${libname}${release}${shared_ext}$major'
2896
+  shlibpath_var=LD_LIBRARY_PATH
2897
+  shlibpath_overrides_runpath=no
2898
+  hardcode_into_libs=yes
2899
+  dynamic_linker='NetBSD ld.elf_so'
2900
+  ;;
2901
+
2890 2902
 netbsd*)
2891 2903
   version_type=sunos
2892 2904
   need_lib_prefix=no
... ...
@@ -3546,7 +3557,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
3546 3546
   lt_cv_deplibs_check_method=pass_all
3547 3547
   ;;
3548 3548
 
3549
-netbsd*)
3549
+netbsd* | netbsdelf*-gnu)
3550 3550
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
3551 3551
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
3552 3552
   else
... ...
@@ -4424,7 +4435,7 @@ m4_if([$1], [CXX], [
4424 4424
 	    ;;
4425 4425
 	esac
4426 4426
 	;;
4427
-      netbsd*)
4427
+      netbsd* | netbsdelf*-gnu)
4428 4428
 	;;
4429 4429
       *qnx* | *nto*)
4430 4430
         # QNX uses GNU C++, but need to define -shared option too, otherwise
... ...
@@ -4936,6 +4947,9 @@ m4_if([$1], [CXX], [
4936 4936
       ;;
4937 4937
     esac
4938 4938
     ;;
4939
+  linux* | k*bsd*-gnu | gnu*)
4940
+    _LT_TAGVAR(link_all_deplibs, $1)=no
4941
+    ;;
4939 4942
   *)
4940 4943
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
4941 4944
     ;;
... ...
@@ -4998,6 +5012,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
4998 4998
   openbsd* | bitrig*)
4999 4999
     with_gnu_ld=no
5000 5000
     ;;
5001
+  linux* | k*bsd*-gnu | gnu*)
5002
+    _LT_TAGVAR(link_all_deplibs, $1)=no
5003
+    ;;
5001 5004
   esac
5002 5005
 
5003 5006
   _LT_TAGVAR(ld_shlibs, $1)=yes
... ...
@@ -5252,7 +5269,7 @@ _LT_EOF
5252 5252
       fi
5253 5253
       ;;
5254 5254
 
5255
-    netbsd*)
5255
+    netbsd* | netbsdelf*-gnu)
5256 5256
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
5257 5257
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
5258 5258
 	wlarc=
... ...
@@ -5773,6 +5790,7 @@ _LT_EOF
5773 5773
 	if test yes = "$lt_cv_irix_exported_symbol"; then
5774 5774
           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
5775 5775
 	fi
5776
+	_LT_TAGVAR(link_all_deplibs, $1)=no
5776 5777
       else
5777 5778
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
5778 5779
 	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
... ...
@@ -5794,7 +5812,7 @@ _LT_EOF
5794 5794
       esac
5795 5795
       ;;
5796 5796
 
5797
-    netbsd*)
5797
+    netbsd* | netbsdelf*-gnu)
5798 5798
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
5799 5799
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
5800 5800
       else
... ...
@@ -1,7 +1,7 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
 
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -33,7 +33,17 @@
33 33
 #  MA 02110-1301, USA.
34 34
 
35 35
 VPATH = @srcdir@
36
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
36
+am__is_gnu_make = { \
37
+  if test -z '$(MAKELEVEL)'; then \
38
+    false; \
39
+  elif test -n '$(MAKE_HOST)'; then \
40
+    true; \
41
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
42
+    true; \
43
+  else \
44
+    false; \
45
+  fi; \
46
+}
37 47
 am__make_running_with_option = \
38 48
   case $${target_option-} in \
39 49
       ?) ;; \
... ...
@@ -98,8 +108,6 @@ build_triplet = @build@
98 98
 host_triplet = @host@
99 99
 target_triplet = @target@
100 100
 subdir = libfreshclam
101
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
102
-	$(top_srcdir)/config/depcomp
103 101
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
104 102
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
105 103
 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \
... ...
@@ -180,6 +188,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
180 180
 	$(top_srcdir)/configure.ac
181 181
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
182 182
 	$(ACLOCAL_M4)
183
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
183 184
 mkinstalldirs = $(install_sh) -d
184 185
 CONFIG_HEADER = $(top_builddir)/clamav-config.h \
185 186
 	$(top_builddir)/libclammspack/config.h
... ...
@@ -283,6 +292,7 @@ am__define_uniq_tagged_files = \
283 283
   done | $(am__uniquify_input)`
284 284
 ETAGS = etags
285 285
 CTAGS = ctags
286
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
286 287
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
287 288
 ACLOCAL = @ACLOCAL@
288 289
 AMTAR = @AMTAR@
... ...
@@ -508,6 +518,7 @@ pdfdir = @pdfdir@
508 508
 prefix = @prefix@
509 509
 program_transform_name = @program_transform_name@
510 510
 psdir = @psdir@
511
+runstatedir = @runstatedir@
511 512
 sbindir = @sbindir@
512 513
 sharedstatedir = @sharedstatedir@
513 514
 srcdir = @srcdir@
... ...
@@ -574,7 +585,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
574 574
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libfreshclam/Makefile'; \
575 575
 	$(am__cd) $(top_srcdir) && \
576 576
 	  $(AUTOMAKE) --foreign libfreshclam/Makefile
577
-.PRECIOUS: Makefile
578 577
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
579 578
 	@case '$?' in \
580 579
 	  *config.status*) \
... ...
@@ -977,6 +987,8 @@ uninstall-am: uninstall-libLTLIBRARIES
977 977
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
978 978
 	tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
979 979
 
980
+.PRECIOUS: Makefile
981
+
980 982
 
981 983
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
982 984
 # Otherwise a system limit (for SysV at least) may be exceeded.
... ...
@@ -1,7 +1,7 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
 
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -18,7 +18,17 @@
18 18
 
19 19
 
20 20
 VPATH = @srcdir@
21
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
21
+am__is_gnu_make = { \
22
+  if test -z '$(MAKELEVEL)'; then \
23
+    false; \
24
+  elif test -n '$(MAKE_HOST)'; then \
25
+    true; \
26
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
27
+    true; \
28
+  else \
29
+    false; \
30
+  fi; \
31
+}
22 32
 am__make_running_with_option = \
23 33
   case $${target_option-} in \
24 34
       ?) ;; \
... ...
@@ -86,9 +96,6 @@ target_triplet = @target@
86 86
 @INSTALL_LTDL_TRUE@am__append_2 = libltdl.la
87 87
 @CONVENIENCE_LTDL_TRUE@am__append_3 = libltdlc.la
88 88
 subdir = libltdl
89
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
90
-	$(top_srcdir)/config/depcomp $(am__include_HEADERS_DIST) \
91
-	$(am__ltdlinclude_HEADERS_DIST) COPYING.LIB README
92 89
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
93 90
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
94 91
 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \
... ...
@@ -169,6 +176,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
169 169
 	$(top_srcdir)/configure.ac
170 170
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
171 171
 	$(ACLOCAL_M4)
172
+DIST_COMMON = $(srcdir)/Makefile.am $(am__include_HEADERS_DIST) \
173
+	$(am__ltdlinclude_HEADERS_DIST) $(am__DIST_COMMON)
172 174
 mkinstalldirs = $(install_sh) -d
173 175
 CONFIG_HEADER = $(top_builddir)/clamav-config.h \
174 176
 	$(top_builddir)/libclammspack/config.h
... ...
@@ -335,6 +344,8 @@ am__define_uniq_tagged_files = \
335 335
   done | $(am__uniquify_input)`
336 336
 ETAGS = etags
337 337
 CTAGS = ctags
338
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp \
339
+	COPYING.LIB README
338 340
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
339 341
 ACLOCAL = @ACLOCAL@
340 342
 AMTAR = @AMTAR@
... ...
@@ -560,6 +571,7 @@ pdfdir = @pdfdir@
560 560
 prefix = @prefix@
561 561
 program_transform_name = @program_transform_name@
562 562
 psdir = @psdir@
563
+runstatedir = @runstatedir@
563 564
 sbindir = @sbindir@
564 565
 sharedstatedir = @sharedstatedir@
565 566
 srcdir = @srcdir@
... ...
@@ -658,7 +670,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
658 658
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libltdl/Makefile'; \
659 659
 	$(am__cd) $(top_srcdir) && \
660 660
 	  $(AUTOMAKE) --foreign libltdl/Makefile
661
-.PRECIOUS: Makefile
662 661
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
663 662
 	@case '$?' in \
664 663
 	  *config.status*) \
... ...
@@ -1182,6 +1193,8 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
1182 1182
 	uninstall-includeHEADERS uninstall-libLTLIBRARIES \
1183 1183
 	uninstall-ltdlincludeHEADERS
1184 1184
 
1185
+.PRECIOUS: Makefile
1186
+
1185 1187
 
1186 1188
 # We need the following in order to create an <argz.h> when the system
1187 1189
 # doesn't have one that works with the given compiler.
... ...
@@ -728,7 +728,6 @@ _LT_CONFIG_SAVE_COMMANDS([
728 728
     cat <<_LT_EOF >> "$cfgfile"
729 729
 #! $SHELL
730 730
 # Generated automatically by $as_me ($PACKAGE) $VERSION
731
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
732 731
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
733 732
 
734 733
 # Provide generalized library-building support services.
... ...
@@ -2887,6 +2886,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
2887 2887
   dynamic_linker='GNU/Linux ld.so'
2888 2888
   ;;
2889 2889
 
2890
+netbsdelf*-gnu)
2891
+  version_type=linux
2892
+  need_lib_prefix=no
2893
+  need_version=no
2894
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
2895
+  soname_spec='${libname}${release}${shared_ext}$major'
2896
+  shlibpath_var=LD_LIBRARY_PATH
2897
+  shlibpath_overrides_runpath=no
2898
+  hardcode_into_libs=yes
2899
+  dynamic_linker='NetBSD ld.elf_so'
2900
+  ;;
2901
+
2890 2902
 netbsd*)
2891 2903
   version_type=sunos
2892 2904
   need_lib_prefix=no
... ...
@@ -3546,7 +3557,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
3546 3546
   lt_cv_deplibs_check_method=pass_all
3547 3547
   ;;
3548 3548
 
3549
-netbsd*)
3549
+netbsd* | netbsdelf*-gnu)
3550 3550
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
3551 3551
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
3552 3552
   else
... ...
@@ -4424,7 +4435,7 @@ m4_if([$1], [CXX], [
4424 4424
 	    ;;
4425 4425
 	esac
4426 4426
 	;;
4427
-      netbsd*)
4427
+      netbsd* | netbsdelf*-gnu)
4428 4428
 	;;
4429 4429
       *qnx* | *nto*)
4430 4430
         # QNX uses GNU C++, but need to define -shared option too, otherwise
... ...
@@ -4936,6 +4947,9 @@ m4_if([$1], [CXX], [
4936 4936
       ;;
4937 4937
     esac
4938 4938
     ;;
4939
+  linux* | k*bsd*-gnu | gnu*)
4940
+    _LT_TAGVAR(link_all_deplibs, $1)=no
4941
+    ;;
4939 4942
   *)
4940 4943
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
4941 4944
     ;;
... ...
@@ -4998,6 +5012,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
4998 4998
   openbsd* | bitrig*)
4999 4999
     with_gnu_ld=no
5000 5000
     ;;
5001
+  linux* | k*bsd*-gnu | gnu*)
5002
+    _LT_TAGVAR(link_all_deplibs, $1)=no
5003
+    ;;
5001 5004
   esac
5002 5005
 
5003 5006
   _LT_TAGVAR(ld_shlibs, $1)=yes
... ...
@@ -5252,7 +5269,7 @@ _LT_EOF
5252 5252
       fi
5253 5253
       ;;
5254 5254
 
5255
-    netbsd*)
5255
+    netbsd* | netbsdelf*-gnu)
5256 5256
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
5257 5257
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
5258 5258
 	wlarc=
... ...
@@ -5773,6 +5790,7 @@ _LT_EOF
5773 5773
 	if test yes = "$lt_cv_irix_exported_symbol"; then
5774 5774
           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
5775 5775
 	fi
5776
+	_LT_TAGVAR(link_all_deplibs, $1)=no
5776 5777
       else
5777 5778
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
5778 5779
 	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
... ...
@@ -5794,7 +5812,7 @@ _LT_EOF
5794 5794
       esac
5795 5795
       ;;
5796 5796
 
5797
-    netbsd*)
5797
+    netbsd* | netbsdelf*-gnu)
5798 5798
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
5799 5799
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
5800 5800
       else
... ...
@@ -496,7 +496,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
496 496
     # at 6.2 and later dlopen does load deplibs.
497 497
     lt_cv_sys_dlopen_deplibs=yes
498 498
     ;;
499
-  netbsd*)
499
+  netbsd* | netbsdelf*-gnu)
500 500
     lt_cv_sys_dlopen_deplibs=yes
501 501
     ;;
502 502
   openbsd*)
... ...
@@ -1,7 +1,7 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
 
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -35,7 +35,17 @@
35 35
 #  MA 02110-1301, USA.
36 36
 
37 37
 VPATH = @srcdir@
38
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
38
+am__is_gnu_make = { \
39
+  if test -z '$(MAKELEVEL)'; then \
40
+    false; \
41
+  elif test -n '$(MAKE_HOST)'; then \
42
+    true; \
43
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
44
+    true; \
45
+  else \
46
+    false; \
47
+  fi; \
48
+}
39 49
 am__make_running_with_option = \
40 50
   case $${target_option-} in \
41 51
       ?) ;; \
... ...
@@ -101,8 +111,6 @@ host_triplet = @host@
101 101
 target_triplet = @target@
102 102
 bin_PROGRAMS = sigtool$(EXEEXT)
103 103
 subdir = sigtool
104
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
105
-	$(top_srcdir)/config/depcomp
106 104
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
107 105
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
108 106
 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \
... ...
@@ -183,6 +191,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
183 183
 	$(top_srcdir)/configure.ac
184 184
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
185 185
 	$(ACLOCAL_M4)
186
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
186 187
 mkinstalldirs = $(install_sh) -d
187 188
 CONFIG_HEADER = $(top_builddir)/clamav-config.h \
188 189
 	$(top_builddir)/libclammspack/config.h
... ...
@@ -259,6 +268,7 @@ am__define_uniq_tagged_files = \
259 259
   done | $(am__uniquify_input)`
260 260
 ETAGS = etags
261 261
 CTAGS = ctags
262
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
262 263
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
263 264
 ACLOCAL = @ACLOCAL@
264 265
 AMTAR = @AMTAR@
... ...
@@ -484,6 +494,7 @@ pdfdir = @pdfdir@
484 484
 prefix = @prefix@
485 485
 program_transform_name = @program_transform_name@
486 486
 psdir = @psdir@
487
+runstatedir = @runstatedir@
487 488
 sbindir = @sbindir@
488 489
 sharedstatedir = @sharedstatedir@
489 490
 srcdir = @srcdir@
... ...
@@ -535,7 +546,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
535 535
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign sigtool/Makefile'; \
536 536
 	$(am__cd) $(top_srcdir) && \
537 537
 	  $(AUTOMAKE) --foreign sigtool/Makefile
538
-.PRECIOUS: Makefile
539 538
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
540 539
 	@case '$?' in \
541 540
 	  *config.status*) \
... ...
@@ -956,6 +966,8 @@ uninstall-am: uninstall-binPROGRAMS
956 956
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
957 957
 	uninstall-am uninstall-binPROGRAMS
958 958
 
959
+.PRECIOUS: Makefile
960
+
959 961
 
960 962
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
961 963
 # Otherwise a system limit (for SysV at least) may be exceeded.
... ...
@@ -1,7 +1,7 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
 
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -14,7 +14,17 @@
14 14
 
15 15
 @SET_MAKE@
16 16
 VPATH = @srcdir@
17
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
17
+am__is_gnu_make = { \
18
+  if test -z '$(MAKELEVEL)'; then \
19
+    false; \
20
+  elif test -n '$(MAKE_HOST)'; then \
21
+    true; \
22
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
23
+    true; \
24
+  else \
25
+    false; \
26
+  fi; \
27
+}
18 28
 am__make_running_with_option = \
19 29
   case $${target_option-} in \
20 30
       ?) ;; \
... ...
@@ -81,7 +91,6 @@ target_triplet = @target@
81 81
 @ENABLE_UNRAR_TRUE@am__append_1 = clam-v2.rar clam-v3.rar
82 82
 @HAVE_LIBBZ2_TRUE@am__append_2 = clam.exe.bz2 clam.bz2.zip
83 83
 subdir = test
84
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README
85 84
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
86 85
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
87 86
 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \
... ...
@@ -162,6 +171,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
162 162
 	$(top_srcdir)/configure.ac
163 163
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
164 164
 	$(ACLOCAL_M4)
165
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
165 166
 mkinstalldirs = $(install_sh) -d
166 167
 CONFIG_HEADER = $(top_builddir)/clamav-config.h \
167 168
 	$(top_builddir)/libclammspack/config.h
... ...
@@ -187,6 +197,7 @@ am__can_run_installinfo = \
187 187
     *) (install-info --version) >/dev/null 2>&1;; \
188 188
   esac
189 189
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
190
+am__DIST_COMMON = $(srcdir)/Makefile.in README
190 191
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
191 192
 ACLOCAL = @ACLOCAL@
192 193
 AMTAR = @AMTAR@
... ...
@@ -412,6 +423,7 @@ pdfdir = @pdfdir@
412 412
 prefix = @prefix@
413 413
 program_transform_name = @program_transform_name@
414 414
 psdir = @psdir@
415
+runstatedir = @runstatedir@
415 416
 sbindir = @sbindir@
416 417
 sharedstatedir = @sharedstatedir@
417 418
 srcdir = @srcdir@
... ...
@@ -458,7 +470,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
458 458
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \
459 459
 	$(am__cd) $(top_srcdir) && \
460 460
 	  $(AUTOMAKE) --foreign test/Makefile
461
-.PRECIOUS: Makefile
462 461
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
463 462
 	@case '$?' in \
464 463
 	  *config.status*) \
... ...
@@ -633,6 +644,8 @@ uninstall-am:
633 633
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
634 634
 	tags-am uninstall uninstall-am
635 635
 
636
+.PRECIOUS: Makefile
637
+
636 638
 
637 639
 all: $(FILES)
638 640
 
... ...
@@ -1,7 +1,7 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
5 5
 
6 6
 # This Makefile.in is free software; the Free Software Foundation
7 7
 # gives unlimited permission to copy and/or distribute it,
... ...
@@ -14,7 +14,17 @@
14 14
 
15 15
 @SET_MAKE@
16 16
 VPATH = @srcdir@
17
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
17
+am__is_gnu_make = { \
18
+  if test -z '$(MAKELEVEL)'; then \
19
+    false; \
20
+  elif test -n '$(MAKE_HOST)'; then \
21
+    true; \
22
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
23
+    true; \
24
+  else \
25
+    false; \
26
+  fi; \
27
+}
18 28
 am__make_running_with_option = \
19 29
   case $${target_option-} in \
20 30
       ?) ;; \
... ...
@@ -82,8 +92,6 @@ target_triplet = @target@
82 82
 TESTS = $(am__EXEEXT_1) $(scripts)
83 83
 check_PROGRAMS = $(am__EXEEXT_1) check_clamd$(EXEEXT) $(am__EXEEXT_2)
84 84
 subdir = unit_tests
85
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
86
-	$(top_srcdir)/config/depcomp $(top_srcdir)/config/test-driver
87 85
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
88 86
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
89 87
 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \
... ...
@@ -164,6 +172,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
164 164
 	$(top_srcdir)/configure.ac
165 165
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
166 166
 	$(ACLOCAL_M4)
167
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
167 168
 mkinstalldirs = $(install_sh) -d
168 169
 CONFIG_HEADER = $(top_builddir)/clamav-config.h \
169 170
 	$(top_builddir)/libclammspack/config.h
... ...
@@ -477,6 +486,8 @@ TEST_LOGS = $(am__test_logs2:.test.log=.log)
477 477
 TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver
478 478
 TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
479 479
 	$(TEST_LOG_FLAGS)
480
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp \
481
+	$(top_srcdir)/config/test-driver
480 482
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
481 483
 ACLOCAL = @ACLOCAL@
482 484
 AMTAR = @AMTAR@
... ...
@@ -702,6 +713,7 @@ pdfdir = @pdfdir@
702 702
 prefix = @prefix@
703 703
 program_transform_name = @program_transform_name@
704 704
 psdir = @psdir@
705
+runstatedir = @runstatedir@
705 706
 sbindir = @sbindir@
706 707
 sharedstatedir = @sharedstatedir@
707 708
 srcdir = @srcdir@
... ...
@@ -769,7 +781,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
769 769
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign unit_tests/Makefile'; \
770 770
 	$(am__cd) $(top_srcdir) && \
771 771
 	  $(AUTOMAKE) --foreign unit_tests/Makefile
772
-.PRECIOUS: Makefile
773 772
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
774 773
 	@case '$?' in \
775 774
 	  *config.status*) \
... ...
@@ -1120,7 +1131,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
1120 1120
 	if test -n "$$am__remaking_logs"; then \
1121 1121
 	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
1122 1122
 	       "recursion detected" >&2; \
1123
-	else \
1123
+	elif test -n "$$redo_logs"; then \
1124 1124
 	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
1125 1125
 	fi; \
1126 1126
 	if $(am__make_dryrun); then :; else \
... ...
@@ -1495,6 +1506,8 @@ uninstall-am:
1495 1495
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
1496 1496
 	recheck tags tags-am uninstall uninstall-am
1497 1497
 
1498
+.PRECIOUS: Makefile
1499
+
1498 1500
 
1499 1501
 check_unit_vg.sh: $(FILES)
1500 1502
 check2_clamd.sh: $(FILES)