Blame SOURCES/0027-scep-correct-GetCAChain-to-GetCACertChain.patch

1495bf
From b853571e14967d7b8a9fcada6576a5cf69637846 Mon Sep 17 00:00:00 2001
1495bf
From: Rob Crittenden <rcritten@redhat.com>
1495bf
Date: Wed, 31 Jul 2019 14:13:09 -0400
1495bf
Subject: [PATCH 27/29] scep: correct GetCAChain to GetCACertChain
1495bf
1495bf
The SCEP helper was incorrectly using "GetCAChain" as the operation
1495bf
name, when the specs call the request "GetCACertChain".  From report by
1495bf
Jason Garland (ticket #50).
1495bf
---
1495bf
 Makefile.in             |  15 +-
1495bf
 aclocal.m4              | 325 ++++++++++++++++++++++++++++------------
1495bf
 compile                 |   9 +-
1495bf
 config.guess            | 191 ++++++++++++++---------
1495bf
 config.sub              |  71 ++++++---
1495bf
 dbus/Makefile.in        |   4 +-
1495bf
 depcomp                 |   6 +-
1495bf
 install-sh              |   4 +-
1495bf
 missing                 |   6 +-
1495bf
 src/Makefile.in         | 249 +++++++++++++++++++++++++++---
1495bf
 src/scep.c              |   6 +-
1495bf
 systemd/Makefile.in     |   4 +-
1495bf
 sysvinit/Makefile.in    |   4 +-
1495bf
 tests/Makefile.in       |  25 ++--
1495bf
 tests/tools/Makefile.in |   4 +-
1495bf
 15 files changed, 676 insertions(+), 247 deletions(-)
1495bf
1495bf
diff --git a/Makefile.in b/Makefile.in
1495bf
index 9b342bd..4885730 100644
1495bf
--- a/Makefile.in
1495bf
+++ b/Makefile.in
1495bf
@@ -1,7 +1,7 @@
1495bf
-# Makefile.in generated by automake 1.15 from Makefile.am.
1495bf
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
1495bf
 # @configure_input@
1495bf
 
1495bf
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
1495bf
 
1495bf
 # This Makefile.in is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -162,7 +162,8 @@ CTAGS = ctags
1495bf
 CSCOPE = cscope
1495bf
 DIST_SUBDIRS = $(SUBDIRS)
1495bf
 am__DIST_COMMON = $(srcdir)/Makefile.in ABOUT-NLS README compile \
1495bf
-	config.guess config.rpath config.sub install-sh missing
1495bf
+	config.guess config.rpath config.sub depcomp install-sh \
1495bf
+	missing
1495bf
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1495bf
 distdir = $(PACKAGE)-$(VERSION)
1495bf
 top_distdir = $(distdir)
1495bf
@@ -619,7 +620,7 @@ distdir: $(DISTFILES)
1495bf
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
1495bf
 	|| chmod -R a+r "$(distdir)"
1495bf
 dist-gzip: distdir
1495bf
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
1495bf
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
1495bf
 	$(am__post_remove_distdir)
1495bf
 
1495bf
 dist-bzip2: distdir
1495bf
@@ -645,7 +646,7 @@ dist-shar: distdir
1495bf
 	@echo WARNING: "Support for shar distribution archives is" \
1495bf
 	               "deprecated." >&2
1495bf
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
1495bf
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
1495bf
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
1495bf
 	$(am__post_remove_distdir)
1495bf
 
1495bf
 dist-zip: distdir
1495bf
@@ -663,7 +664,7 @@ dist dist-all:
1495bf
 distcheck: dist
1495bf
 	case '$(DIST_ARCHIVES)' in \
1495bf
 	*.tar.gz*) \
1495bf
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
1495bf
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
1495bf
 	*.tar.bz2*) \
1495bf
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
1495bf
 	*.tar.lz*) \
1495bf
@@ -673,7 +674,7 @@ distcheck: dist
1495bf
 	*.tar.Z*) \
1495bf
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
1495bf
 	*.shar.gz*) \
1495bf
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
1495bf
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
1495bf
 	*.zip*) \
1495bf
 	  unzip $(distdir).zip ;;\
1495bf
 	esac
1495bf
diff --git a/aclocal.m4 b/aclocal.m4
1495bf
index ad2ebef..170d082 100644
1495bf
--- a/aclocal.m4
1495bf
+++ b/aclocal.m4
1495bf
@@ -1,6 +1,6 @@
1495bf
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
1495bf
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
1495bf
 
1495bf
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
1495bf
 
1495bf
 # This file is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -20,32 +20,63 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
1495bf
 If you have problems, you may need to regenerate the build system entirely.
1495bf
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
1495bf
 
1495bf
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
1495bf
-# serial 1 (pkg-config-0.24)
1495bf
-# 
1495bf
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
1495bf
-#
1495bf
-# This program is free software; you can redistribute it and/or modify
1495bf
-# it under the terms of the GNU General Public License as published by
1495bf
-# the Free Software Foundation; either version 2 of the License, or
1495bf
-# (at your option) any later version.
1495bf
-#
1495bf
-# This program is distributed in the hope that it will be useful, but
1495bf
-# WITHOUT ANY WARRANTY; without even the implied warranty of
1495bf
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
1495bf
-# General Public License for more details.
1495bf
-#
1495bf
-# You should have received a copy of the GNU General Public License
1495bf
-# along with this program; if not, write to the Free Software
1495bf
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1495bf
-#
1495bf
-# As a special exception to the GNU General Public License, if you
1495bf
-# distribute this file as part of a program that contains a
1495bf
-# configuration script generated by Autoconf, you may include it under
1495bf
-# the same distribution terms that you use for the rest of that program.
1495bf
+# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
1495bf
+# serial 11 (pkg-config-0.29.1)
1495bf
 
1495bf
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
1495bf
-# ----------------------------------
1495bf
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
1495bf
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
1495bf
+dnl
1495bf
+dnl This program is free software; you can redistribute it and/or modify
1495bf
+dnl it under the terms of the GNU General Public License as published by
1495bf
+dnl the Free Software Foundation; either version 2 of the License, or
1495bf
+dnl (at your option) any later version.
1495bf
+dnl
1495bf
+dnl This program is distributed in the hope that it will be useful, but
1495bf
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
1495bf
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1495bf
+dnl General Public License for more details.
1495bf
+dnl
1495bf
+dnl You should have received a copy of the GNU General Public License
1495bf
+dnl along with this program; if not, write to the Free Software
1495bf
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1495bf
+dnl 02111-1307, USA.
1495bf
+dnl
1495bf
+dnl As a special exception to the GNU General Public License, if you
1495bf
+dnl distribute this file as part of a program that contains a
1495bf
+dnl configuration script generated by Autoconf, you may include it under
1495bf
+dnl the same distribution terms that you use for the rest of that
1495bf
+dnl program.
1495bf
+
1495bf
+dnl PKG_PREREQ(MIN-VERSION)
1495bf
+dnl -----------------------
1495bf
+dnl Since: 0.29
1495bf
+dnl
1495bf
+dnl Verify that the version of the pkg-config macros are at least
1495bf
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
1495bf
+dnl installed version of pkg-config, this checks the developer's version
1495bf
+dnl of pkg.m4 when generating configure.
1495bf
+dnl
1495bf
+dnl To ensure that this macro is defined, also add:
1495bf
+dnl m4_ifndef([PKG_PREREQ],
1495bf
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
1495bf
+dnl
1495bf
+dnl See the "Since" comment for each macro you use to see what version
1495bf
+dnl of the macros you require.
1495bf
+m4_defun([PKG_PREREQ],
1495bf
+[m4_define([PKG_MACROS_VERSION], [0.29.1])
1495bf
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
1495bf
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
1495bf
+])dnl PKG_PREREQ
1495bf
+
1495bf
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
1495bf
+dnl ----------------------------------
1495bf
+dnl Since: 0.16
1495bf
+dnl
1495bf
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
1495bf
+dnl first found in the path. Checks that the version of pkg-config found
1495bf
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
1495bf
+dnl used since that's the first version where most current features of
1495bf
+dnl pkg-config existed.
1495bf
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
1495bf
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
1495bf
 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
1495bf
@@ -67,18 +98,19 @@ if test -n "$PKG_CONFIG"; then
1495bf
 		PKG_CONFIG=""
1495bf
 	fi
1495bf
 fi[]dnl
1495bf
-])# PKG_PROG_PKG_CONFIG
1495bf
+])dnl PKG_PROG_PKG_CONFIG
1495bf
 
1495bf
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
1495bf
-#
1495bf
-# Check to see whether a particular set of modules exists.  Similar
1495bf
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
1495bf
-#
1495bf
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
1495bf
-# only at the first occurence in configure.ac, so if the first place
1495bf
-# it's called might be skipped (such as if it is within an "if", you
1495bf
-# have to call PKG_CHECK_EXISTS manually
1495bf
-# --------------------------------------------------------------
1495bf
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
1495bf
+dnl -------------------------------------------------------------------
1495bf
+dnl Since: 0.18
1495bf
+dnl
1495bf
+dnl Check to see whether a particular set of modules exists. Similar to
1495bf
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
1495bf
+dnl
1495bf
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
1495bf
+dnl only at the first occurence in configure.ac, so if the first place
1495bf
+dnl it's called might be skipped (such as if it is within an "if", you
1495bf
+dnl have to call PKG_CHECK_EXISTS manually
1495bf
 AC_DEFUN([PKG_CHECK_EXISTS],
1495bf
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
1495bf
 if test -n "$PKG_CONFIG" && \
1495bf
@@ -88,8 +120,10 @@ m4_ifvaln([$3], [else
1495bf
   $3])dnl
1495bf
 fi])
1495bf
 
1495bf
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
1495bf
-# ---------------------------------------------
1495bf
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
1495bf
+dnl ---------------------------------------------
1495bf
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
1495bf
+dnl pkg_failed based on the result.
1495bf
 m4_define([_PKG_CONFIG],
1495bf
 [if test -n "$$1"; then
1495bf
     pkg_cv_[]$1="$$1"
1495bf
@@ -101,10 +135,11 @@ m4_define([_PKG_CONFIG],
1495bf
  else
1495bf
     pkg_failed=untried
1495bf
 fi[]dnl
1495bf
-])# _PKG_CONFIG
1495bf
+])dnl _PKG_CONFIG
1495bf
 
1495bf
-# _PKG_SHORT_ERRORS_SUPPORTED
1495bf
-# -----------------------------
1495bf
+dnl _PKG_SHORT_ERRORS_SUPPORTED
1495bf
+dnl ---------------------------
1495bf
+dnl Internal check to see if pkg-config supports short errors.
1495bf
 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
1495bf
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
1495bf
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
1495bf
@@ -112,19 +147,17 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
1495bf
 else
1495bf
         _pkg_short_errors_supported=no
1495bf
 fi[]dnl
1495bf
-])# _PKG_SHORT_ERRORS_SUPPORTED
1495bf
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
1495bf
 
1495bf
 
1495bf
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
1495bf
-# [ACTION-IF-NOT-FOUND])
1495bf
-#
1495bf
-#
1495bf
-# Note that if there is a possibility the first call to
1495bf
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
1495bf
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
1495bf
-#
1495bf
-#
1495bf
-# --------------------------------------------------------------
1495bf
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
1495bf
+dnl   [ACTION-IF-NOT-FOUND])
1495bf
+dnl --------------------------------------------------------------
1495bf
+dnl Since: 0.4.0
1495bf
+dnl
1495bf
+dnl Note that if there is a possibility the first call to
1495bf
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
1495bf
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
1495bf
 AC_DEFUN([PKG_CHECK_MODULES],
1495bf
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
1495bf
 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
1495bf
@@ -178,16 +211,40 @@ else
1495bf
         AC_MSG_RESULT([yes])
1495bf
 	$3
1495bf
 fi[]dnl
1495bf
-])# PKG_CHECK_MODULES
1495bf
+])dnl PKG_CHECK_MODULES
1495bf
 
1495bf
 
1495bf
-# PKG_INSTALLDIR(DIRECTORY)
1495bf
-# -------------------------
1495bf
-# Substitutes the variable pkgconfigdir as the location where a module
1495bf
-# should install pkg-config .pc files. By default the directory is
1495bf
-# $libdir/pkgconfig, but the default can be changed by passing
1495bf
-# DIRECTORY. The user can override through the --with-pkgconfigdir
1495bf
-# parameter.
1495bf
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
1495bf
+dnl   [ACTION-IF-NOT-FOUND])
1495bf
+dnl ---------------------------------------------------------------------
1495bf
+dnl Since: 0.29
1495bf
+dnl
1495bf
+dnl Checks for existence of MODULES and gathers its build flags with
1495bf
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
1495bf
+dnl and VARIABLE-PREFIX_LIBS from --libs.
1495bf
+dnl
1495bf
+dnl Note that if there is a possibility the first call to
1495bf
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
1495bf
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
1495bf
+dnl configure.ac.
1495bf
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
1495bf
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
1495bf
+_save_PKG_CONFIG=$PKG_CONFIG
1495bf
+PKG_CONFIG="$PKG_CONFIG --static"
1495bf
+PKG_CHECK_MODULES($@)
1495bf
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
1495bf
+])dnl PKG_CHECK_MODULES_STATIC
1495bf
+
1495bf
+
1495bf
+dnl PKG_INSTALLDIR([DIRECTORY])
1495bf
+dnl -------------------------
1495bf
+dnl Since: 0.27
1495bf
+dnl
1495bf
+dnl Substitutes the variable pkgconfigdir as the location where a module
1495bf
+dnl should install pkg-config .pc files. By default the directory is
1495bf
+dnl $libdir/pkgconfig, but the default can be changed by passing
1495bf
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
1495bf
+dnl parameter.
1495bf
 AC_DEFUN([PKG_INSTALLDIR],
1495bf
 [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
1495bf
 m4_pushdef([pkg_description],
1495bf
@@ -198,16 +255,18 @@ AC_ARG_WITH([pkgconfigdir],
1495bf
 AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
1495bf
 m4_popdef([pkg_default])
1495bf
 m4_popdef([pkg_description])
1495bf
-]) dnl PKG_INSTALLDIR
1495bf
+])dnl PKG_INSTALLDIR
1495bf
 
1495bf
 
1495bf
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
1495bf
-# -------------------------
1495bf
-# Substitutes the variable noarch_pkgconfigdir as the location where a
1495bf
-# module should install arch-independent pkg-config .pc files. By
1495bf
-# default the directory is $datadir/pkgconfig, but the default can be
1495bf
-# changed by passing DIRECTORY. The user can override through the
1495bf
-# --with-noarch-pkgconfigdir parameter.
1495bf
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
1495bf
+dnl --------------------------------
1495bf
+dnl Since: 0.27
1495bf
+dnl
1495bf
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
1495bf
+dnl module should install arch-independent pkg-config .pc files. By
1495bf
+dnl default the directory is $datadir/pkgconfig, but the default can be
1495bf
+dnl changed by passing DIRECTORY. The user can override through the
1495bf
+dnl --with-noarch-pkgconfigdir parameter.
1495bf
 AC_DEFUN([PKG_NOARCH_INSTALLDIR],
1495bf
 [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
1495bf
 m4_pushdef([pkg_description],
1495bf
@@ -218,13 +277,15 @@ AC_ARG_WITH([noarch-pkgconfigdir],
1495bf
 AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
1495bf
 m4_popdef([pkg_default])
1495bf
 m4_popdef([pkg_description])
1495bf
-]) dnl PKG_NOARCH_INSTALLDIR
1495bf
+])dnl PKG_NOARCH_INSTALLDIR
1495bf
 
1495bf
 
1495bf
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
1495bf
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
1495bf
-# -------------------------------------------
1495bf
-# Retrieves the value of the pkg-config variable for the given module.
1495bf
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
1495bf
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
1495bf
+dnl -------------------------------------------
1495bf
+dnl Since: 0.28
1495bf
+dnl
1495bf
+dnl Retrieves the value of the pkg-config variable for the given module.
1495bf
 AC_DEFUN([PKG_CHECK_VAR],
1495bf
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
1495bf
 AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
1495bf
@@ -233,9 +294,77 @@ _PKG_CONFIG([$1], [variable="][$3]["], [$2])
1495bf
 AS_VAR_COPY([$1], [pkg_cv_][$1])
1495bf
 
1495bf
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
1495bf
-])# PKG_CHECK_VAR
1495bf
+])dnl PKG_CHECK_VAR
1495bf
 
1495bf
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
1495bf
+dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
1495bf
+dnl   [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
1495bf
+dnl   [DESCRIPTION], [DEFAULT])
1495bf
+dnl ------------------------------------------
1495bf
+dnl
1495bf
+dnl Prepare a "--with-" configure option using the lowercase
1495bf
+dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
1495bf
+dnl PKG_CHECK_MODULES in a single macro.
1495bf
+AC_DEFUN([PKG_WITH_MODULES],
1495bf
+[
1495bf
+m4_pushdef([with_arg], m4_tolower([$1]))
1495bf
+
1495bf
+m4_pushdef([description],
1495bf
+           [m4_default([$5], [build with ]with_arg[ support])])
1495bf
+
1495bf
+m4_pushdef([def_arg], [m4_default([$6], [auto])])
1495bf
+m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
1495bf
+m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
1495bf
+
1495bf
+m4_case(def_arg,
1495bf
+            [yes],[m4_pushdef([with_without], [--without-]with_arg)],
1495bf
+            [m4_pushdef([with_without],[--with-]with_arg)])
1495bf
+
1495bf
+AC_ARG_WITH(with_arg,
1495bf
+     AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
1495bf
+    [AS_TR_SH([with_]with_arg)=def_arg])
1495bf
+
1495bf
+AS_CASE([$AS_TR_SH([with_]with_arg)],
1495bf
+            [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
1495bf
+            [auto],[PKG_CHECK_MODULES([$1],[$2],
1495bf
+                                        [m4_n([def_action_if_found]) $3],
1495bf
+                                        [m4_n([def_action_if_not_found]) $4])])
1495bf
+
1495bf
+m4_popdef([with_arg])
1495bf
+m4_popdef([description])
1495bf
+m4_popdef([def_arg])
1495bf
+
1495bf
+])dnl PKG_WITH_MODULES
1495bf
+
1495bf
+dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
1495bf
+dnl   [DESCRIPTION], [DEFAULT])
1495bf
+dnl -----------------------------------------------
1495bf
+dnl
1495bf
+dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
1495bf
+dnl check._[VARIABLE-PREFIX] is exported as make variable.
1495bf
+AC_DEFUN([PKG_HAVE_WITH_MODULES],
1495bf
+[
1495bf
+PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
1495bf
+
1495bf
+AM_CONDITIONAL([HAVE_][$1],
1495bf
+               [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
1495bf
+])dnl PKG_HAVE_WITH_MODULES
1495bf
+
1495bf
+dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
1495bf
+dnl   [DESCRIPTION], [DEFAULT])
1495bf
+dnl ------------------------------------------------------
1495bf
+dnl
1495bf
+dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
1495bf
+dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
1495bf
+dnl and preprocessor variable.
1495bf
+AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
1495bf
+[
1495bf
+PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
1495bf
+
1495bf
+AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
1495bf
+        [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
1495bf
+])dnl PKG_HAVE_DEFINE_WITH_MODULES
1495bf
+
1495bf
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
1495bf
 #
1495bf
 # This file is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -250,7 +379,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
1495bf
 [am__api_version='1.15'
1495bf
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
1495bf
 dnl require some minimum version.  Point them to the right macro.
1495bf
-m4_if([$1], [1.15], [],
1495bf
+m4_if([$1], [1.15.1], [],
1495bf
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
1495bf
 ])
1495bf
 
1495bf
@@ -266,14 +395,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
1495bf
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
1495bf
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
1495bf
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
1495bf
-[AM_AUTOMAKE_VERSION([1.15])dnl
1495bf
+[AM_AUTOMAKE_VERSION([1.15.1])dnl
1495bf
 m4_ifndef([AC_AUTOCONF_VERSION],
1495bf
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
1495bf
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
1495bf
 
1495bf
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
1495bf
 
1495bf
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
1495bf
 #
1495bf
 # This file is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -325,7 +454,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
1495bf
 
1495bf
 # AM_CONDITIONAL                                            -*- Autoconf -*-
1495bf
 
1495bf
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
1495bf
 #
1495bf
 # This file is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -356,7 +485,7 @@ AC_CONFIG_COMMANDS_PRE(
1495bf
 Usually this means the macro was only invoked conditionally.]])
1495bf
 fi])])
1495bf
 
1495bf
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
1495bf
 #
1495bf
 # This file is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -547,7 +676,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
1495bf
 
1495bf
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
1495bf
 
1495bf
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
1495bf
 #
1495bf
 # This file is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -623,7 +752,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
1495bf
 
1495bf
 # Do all the work for Automake.                             -*- Autoconf -*-
1495bf
 
1495bf
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
1495bf
 #
1495bf
 # This file is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -820,7 +949,7 @@ for _am_header in $config_headers :; do
1495bf
 done
1495bf
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
1495bf
 
1495bf
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
1495bf
 #
1495bf
 # This file is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -841,7 +970,7 @@ if test x"${install_sh+set}" != xset; then
1495bf
 fi
1495bf
 AC_SUBST([install_sh])])
1495bf
 
1495bf
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
1495bf
 #
1495bf
 # This file is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -863,7 +992,7 @@ AC_SUBST([am__leading_dot])])
1495bf
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
1495bf
 # From Jim Meyering
1495bf
 
1495bf
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
1495bf
 #
1495bf
 # This file is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -898,7 +1027,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
1495bf
 
1495bf
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
1495bf
 
1495bf
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
1495bf
 #
1495bf
 # This file is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -948,7 +1077,7 @@ rm -f confinc confmf
1495bf
 
1495bf
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
1495bf
 
1495bf
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
1495bf
 #
1495bf
 # This file is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -985,7 +1114,7 @@ else
1495bf
 fi
1495bf
 ])
1495bf
 
1495bf
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
1495bf
 #
1495bf
 # This file is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -1019,7 +1148,7 @@ esac
1495bf
 
1495bf
 # Helper functions for option handling.                     -*- Autoconf -*-
1495bf
 
1495bf
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
1495bf
 #
1495bf
 # This file is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -1048,7 +1177,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
1495bf
 AC_DEFUN([_AM_IF_OPTION],
1495bf
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
1495bf
 
1495bf
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
1495bf
 #
1495bf
 # This file is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -1095,7 +1224,7 @@ AC_LANG_POP([C])])
1495bf
 # For backward compatibility.
1495bf
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
1495bf
 
1495bf
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
1495bf
 #
1495bf
 # This file is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -1114,7 +1243,7 @@ AC_DEFUN([AM_RUN_LOG],
1495bf
 
1495bf
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
1495bf
 
1495bf
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
1495bf
 #
1495bf
 # This file is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -1195,7 +1324,7 @@ AC_CONFIG_COMMANDS_PRE(
1495bf
 rm -f conftest.file
1495bf
 ])
1495bf
 
1495bf
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
1495bf
 #
1495bf
 # This file is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -1255,7 +1384,7 @@ AC_SUBST([AM_BACKSLASH])dnl
1495bf
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
1495bf
 ])
1495bf
 
1495bf
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
1495bf
 #
1495bf
 # This file is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -1283,7 +1412,7 @@ fi
1495bf
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1495bf
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
1495bf
 
1495bf
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
1495bf
 #
1495bf
 # This file is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -1302,7 +1431,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
1495bf
 
1495bf
 # Check how to create a tarball.                            -*- Autoconf -*-
1495bf
 
1495bf
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
1495bf
 #
1495bf
 # This file is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
diff --git a/compile b/compile
1495bf
index a85b723..2ab71e4 100755
1495bf
--- a/compile
1495bf
+++ b/compile
1495bf
@@ -1,9 +1,9 @@
1495bf
 #! /bin/sh
1495bf
 # Wrapper for compilers which do not understand '-c -o'.
1495bf
 
1495bf
-scriptversion=2012-10-14.11; # UTC
1495bf
+scriptversion=2016-01-11.22; # UTC
1495bf
 
1495bf
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
1495bf
 # Written by Tom Tromey <tromey@cygnus.com>.
1495bf
 #
1495bf
 # This program is free software; you can redistribute it and/or modify
1495bf
@@ -255,7 +255,8 @@ EOF
1495bf
     echo "compile $scriptversion"
1495bf
     exit $?
1495bf
     ;;
1495bf
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
1495bf
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
1495bf
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
1495bf
     func_cl_wrapper "$@"      # Doesn't return...
1495bf
     ;;
1495bf
 esac
1495bf
@@ -342,6 +343,6 @@ exit $ret
1495bf
 # eval: (add-hook 'write-file-hooks 'time-stamp)
1495bf
 # time-stamp-start: "scriptversion="
1495bf
 # time-stamp-format: "%:y-%02m-%02d.%02H"
1495bf
-# time-stamp-time-zone: "UTC"
1495bf
+# time-stamp-time-zone: "UTC0"
1495bf
 # time-stamp-end: "; # UTC"
1495bf
 # End:
1495bf
diff --git a/config.guess b/config.guess
1495bf
index dbfb978..a744844 100755
1495bf
--- a/config.guess
1495bf
+++ b/config.guess
1495bf
@@ -1,8 +1,8 @@
1495bf
 #! /bin/sh
1495bf
 # Attempt to guess a canonical system name.
1495bf
-#   Copyright 1992-2015 Free Software Foundation, Inc.
1495bf
+#   Copyright 1992-2017 Free Software Foundation, Inc.
1495bf
 
1495bf
-timestamp='2015-01-01'
1495bf
+timestamp='2017-08-08'
1495bf
 
1495bf
 # This file is free software; you can redistribute it and/or modify it
1495bf
 # under the terms of the GNU General Public License as published by
1495bf
@@ -27,7 +27,7 @@ timestamp='2015-01-01'
1495bf
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
1495bf
 #
1495bf
 # You can get the latest version of this script from:
1495bf
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
1495bf
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
1495bf
 #
1495bf
 # Please send patches to <config-patches@gnu.org>.
1495bf
 
1495bf
@@ -50,7 +50,7 @@ version="\
1495bf
 GNU config.guess ($timestamp)
1495bf
 
1495bf
 Originally written by Per Bothner.
1495bf
-Copyright 1992-2015 Free Software Foundation, Inc.
1495bf
+Copyright 1992-2017 Free Software Foundation, Inc.
1495bf
 
1495bf
 This is free software; see the source for copying conditions.  There is NO
1495bf
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
1495bf
@@ -168,19 +168,29 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
1495bf
 	# Note: NetBSD doesn't particularly care about the vendor
1495bf
 	# portion of the name.  We always set it to "unknown".
1495bf
 	sysctl="sysctl -n hw.machine_arch"
1495bf
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
1495bf
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
1495bf
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
1495bf
+	    /sbin/$sysctl 2>/dev/null || \
1495bf
+	    /usr/sbin/$sysctl 2>/dev/null || \
1495bf
+	    echo unknown)`
1495bf
 	case "${UNAME_MACHINE_ARCH}" in
1495bf
 	    armeb) machine=armeb-unknown ;;
1495bf
 	    arm*) machine=arm-unknown ;;
1495bf
 	    sh3el) machine=shl-unknown ;;
1495bf
 	    sh3eb) machine=sh-unknown ;;
1495bf
 	    sh5el) machine=sh5le-unknown ;;
1495bf
+	    earmv*)
1495bf
+		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
1495bf
+		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
1495bf
+		machine=${arch}${endian}-unknown
1495bf
+		;;
1495bf
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
1495bf
 	esac
1495bf
 	# The Operating System including object format, if it has switched
1495bf
-	# to ELF recently, or will in the future.
1495bf
+	# to ELF recently (or will in the future) and ABI.
1495bf
 	case "${UNAME_MACHINE_ARCH}" in
1495bf
+	    earm*)
1495bf
+		os=netbsdelf
1495bf
+		;;
1495bf
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
1495bf
 		eval $set_cc_for_build
1495bf
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
1495bf
@@ -197,6 +207,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
1495bf
 		os=netbsd
1495bf
 		;;
1495bf
 	esac
1495bf
+	# Determine ABI tags.
1495bf
+	case "${UNAME_MACHINE_ARCH}" in
1495bf
+	    earm*)
1495bf
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
1495bf
+		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
1495bf
+		;;
1495bf
+	esac
1495bf
 	# The OS release
1495bf
 	# Debian GNU/NetBSD machines have a different userland, and
1495bf
 	# thus, need a distinct triplet. However, they do not need
1495bf
@@ -207,13 +224,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
1495bf
 		release='-gnu'
1495bf
 		;;
1495bf
 	    *)
1495bf
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
1495bf
+		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
1495bf
 		;;
1495bf
 	esac
1495bf
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
1495bf
 	# contains redundant information, the shorter form:
1495bf
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
1495bf
-	echo "${machine}-${os}${release}"
1495bf
+	echo "${machine}-${os}${release}${abi}"
1495bf
 	exit ;;
1495bf
     *:Bitrig:*:*)
1495bf
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
1495bf
@@ -223,6 +240,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
1495bf
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
1495bf
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
1495bf
 	exit ;;
1495bf
+    *:LibertyBSD:*:*)
1495bf
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
1495bf
+	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
1495bf
+	exit ;;
1495bf
     *:ekkoBSD:*:*)
1495bf
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
1495bf
 	exit ;;
1495bf
@@ -235,6 +256,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
1495bf
     *:MirBSD:*:*)
1495bf
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
1495bf
 	exit ;;
1495bf
+    *:Sortix:*:*)
1495bf
+	echo ${UNAME_MACHINE}-unknown-sortix
1495bf
+	exit ;;
1495bf
+    *:Redox:*:*)
1495bf
+	echo ${UNAME_MACHINE}-unknown-redox
1495bf
+	exit ;;
1495bf
     alpha:OSF1:*:*)
1495bf
 	case $UNAME_RELEASE in
1495bf
 	*4.0)
1495bf
@@ -251,42 +278,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
1495bf
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
1495bf
 	case "$ALPHA_CPU_TYPE" in
1495bf
 	    "EV4 (21064)")
1495bf
-		UNAME_MACHINE="alpha" ;;
1495bf
+		UNAME_MACHINE=alpha ;;
1495bf
 	    "EV4.5 (21064)")
1495bf
-		UNAME_MACHINE="alpha" ;;
1495bf
+		UNAME_MACHINE=alpha ;;
1495bf
 	    "LCA4 (21066/21068)")
1495bf
-		UNAME_MACHINE="alpha" ;;
1495bf
+		UNAME_MACHINE=alpha ;;
1495bf
 	    "EV5 (21164)")
1495bf
-		UNAME_MACHINE="alphaev5" ;;
1495bf
+		UNAME_MACHINE=alphaev5 ;;
1495bf
 	    "EV5.6 (21164A)")
1495bf
-		UNAME_MACHINE="alphaev56" ;;
1495bf
+		UNAME_MACHINE=alphaev56 ;;
1495bf
 	    "EV5.6 (21164PC)")
1495bf
-		UNAME_MACHINE="alphapca56" ;;
1495bf
+		UNAME_MACHINE=alphapca56 ;;
1495bf
 	    "EV5.7 (21164PC)")
1495bf
-		UNAME_MACHINE="alphapca57" ;;
1495bf
+		UNAME_MACHINE=alphapca57 ;;
1495bf
 	    "EV6 (21264)")
1495bf
-		UNAME_MACHINE="alphaev6" ;;
1495bf
+		UNAME_MACHINE=alphaev6 ;;
1495bf
 	    "EV6.7 (21264A)")
1495bf
-		UNAME_MACHINE="alphaev67" ;;
1495bf
+		UNAME_MACHINE=alphaev67 ;;
1495bf
 	    "EV6.8CB (21264C)")
1495bf
-		UNAME_MACHINE="alphaev68" ;;
1495bf
+		UNAME_MACHINE=alphaev68 ;;
1495bf
 	    "EV6.8AL (21264B)")
1495bf
-		UNAME_MACHINE="alphaev68" ;;
1495bf
+		UNAME_MACHINE=alphaev68 ;;
1495bf
 	    "EV6.8CX (21264D)")
1495bf
-		UNAME_MACHINE="alphaev68" ;;
1495bf
+		UNAME_MACHINE=alphaev68 ;;
1495bf
 	    "EV6.9A (21264/EV69A)")
1495bf
-		UNAME_MACHINE="alphaev69" ;;
1495bf
+		UNAME_MACHINE=alphaev69 ;;
1495bf
 	    "EV7 (21364)")
1495bf
-		UNAME_MACHINE="alphaev7" ;;
1495bf
+		UNAME_MACHINE=alphaev7 ;;
1495bf
 	    "EV7.9 (21364A)")
1495bf
-		UNAME_MACHINE="alphaev79" ;;
1495bf
+		UNAME_MACHINE=alphaev79 ;;
1495bf
 	esac
1495bf
 	# A Pn.n version is a patched version.
1495bf
 	# A Vn.n version is a released version.
1495bf
 	# A Tn.n version is a released field test version.
1495bf
 	# A Xn.n version is an unreleased experimental baselevel.
1495bf
 	# 1.2 uses "1.2" for uname -r.
1495bf
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1495bf
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
1495bf
 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
1495bf
 	exitcode=$?
1495bf
 	trap '' 0
1495bf
@@ -359,16 +386,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
1495bf
 	exit ;;
1495bf
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
1495bf
 	eval $set_cc_for_build
1495bf
-	SUN_ARCH="i386"
1495bf
+	SUN_ARCH=i386
1495bf
 	# If there is a compiler, see if it is configured for 64-bit objects.
1495bf
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
1495bf
 	# This test works for both compilers.
1495bf
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1495bf
+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
1495bf
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
1495bf
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1495bf
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
1495bf
 		grep IS_64BIT_ARCH >/dev/null
1495bf
 	    then
1495bf
-		SUN_ARCH="x86_64"
1495bf
+		SUN_ARCH=x86_64
1495bf
 	    fi
1495bf
 	fi
1495bf
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
1495bf
@@ -393,7 +420,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
1495bf
 	exit ;;
1495bf
     sun*:*:4.2BSD:*)
1495bf
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
1495bf
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
1495bf
+	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
1495bf
 	case "`/bin/arch`" in
1495bf
 	    sun3)
1495bf
 		echo m68k-sun-sunos${UNAME_RELEASE}
1495bf
@@ -618,13 +645,13 @@ EOF
1495bf
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
1495bf
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
1495bf
 		    case "${sc_cpu_version}" in
1495bf
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
1495bf
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
1495bf
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
1495bf
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
1495bf
 		      532)                      # CPU_PA_RISC2_0
1495bf
 			case "${sc_kernel_bits}" in
1495bf
-			  32) HP_ARCH="hppa2.0n" ;;
1495bf
-			  64) HP_ARCH="hppa2.0w" ;;
1495bf
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
1495bf
+			  32) HP_ARCH=hppa2.0n ;;
1495bf
+			  64) HP_ARCH=hppa2.0w ;;
1495bf
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
1495bf
 			esac ;;
1495bf
 		    esac
1495bf
 		fi
1495bf
@@ -663,11 +690,11 @@ EOF
1495bf
 		    exit (0);
1495bf
 		}
1495bf
 EOF
1495bf
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
1495bf
+		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
1495bf
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
1495bf
 		fi ;;
1495bf
 	esac
1495bf
-	if [ ${HP_ARCH} = "hppa2.0w" ]
1495bf
+	if [ ${HP_ARCH} = hppa2.0w ]
1495bf
 	then
1495bf
 	    eval $set_cc_for_build
1495bf
 
1495bf
@@ -680,12 +707,12 @@ EOF
1495bf
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
1495bf
 	    # => hppa64-hp-hpux11.23
1495bf
 
1495bf
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
1495bf
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
1495bf
 		grep -q __LP64__
1495bf
 	    then
1495bf
-		HP_ARCH="hppa2.0w"
1495bf
+		HP_ARCH=hppa2.0w
1495bf
 	    else
1495bf
-		HP_ARCH="hppa64"
1495bf
+		HP_ARCH=hppa64
1495bf
 	    fi
1495bf
 	fi
1495bf
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
1495bf
@@ -790,14 +817,14 @@ EOF
1495bf
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
1495bf
 	exit ;;
1495bf
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
1495bf
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1495bf
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
1495bf
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
1495bf
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
1495bf
 	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
1495bf
 	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
1495bf
 	exit ;;
1495bf
     5000:UNIX_System_V:4.*:*)
1495bf
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
1495bf
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
1495bf
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
1495bf
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
1495bf
 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
1495bf
 	exit ;;
1495bf
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
1495bf
@@ -813,10 +840,11 @@ EOF
1495bf
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
1495bf
 	case ${UNAME_PROCESSOR} in
1495bf
 	    amd64)
1495bf
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
1495bf
-	    *)
1495bf
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
1495bf
+		UNAME_PROCESSOR=x86_64 ;;
1495bf
+	    i386)
1495bf
+		UNAME_PROCESSOR=i586 ;;
1495bf
 	esac
1495bf
+	echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1495bf
 	exit ;;
1495bf
     i*:CYGWIN*:*)
1495bf
 	echo ${UNAME_MACHINE}-pc-cygwin
1495bf
@@ -879,7 +907,7 @@ EOF
1495bf
 	exit ;;
1495bf
     *:GNU/*:*:*)
1495bf
 	# other systems with GNU libc and userland
1495bf
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
1495bf
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
1495bf
 	exit ;;
1495bf
     i*86:Minix:*:*)
1495bf
 	echo ${UNAME_MACHINE}-pc-minix
1495bf
@@ -902,7 +930,7 @@ EOF
1495bf
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
1495bf
 	esac
1495bf
 	objdump --private-headers /bin/sh | grep -q ld.so.1
1495bf
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
1495bf
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
1495bf
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1495bf
 	exit ;;
1495bf
     arc:Linux:*:* | arceb:Linux:*:*)
1495bf
@@ -933,6 +961,9 @@ EOF
1495bf
     crisv32:Linux:*:*)
1495bf
 	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
1495bf
 	exit ;;
1495bf
+    e2k:Linux:*:*)
1495bf
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1495bf
+	exit ;;
1495bf
     frv:Linux:*:*)
1495bf
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1495bf
 	exit ;;
1495bf
@@ -945,6 +976,9 @@ EOF
1495bf
     ia64:Linux:*:*)
1495bf
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1495bf
 	exit ;;
1495bf
+    k1om:Linux:*:*)
1495bf
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1495bf
+	exit ;;
1495bf
     m32r*:Linux:*:*)
1495bf
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1495bf
 	exit ;;
1495bf
@@ -970,6 +1004,9 @@ EOF
1495bf
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
1495bf
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
1495bf
 	;;
1495bf
+    mips64el:Linux:*:*)
1495bf
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1495bf
+	exit ;;
1495bf
     openrisc*:Linux:*:*)
1495bf
 	echo or1k-unknown-linux-${LIBC}
1495bf
 	exit ;;
1495bf
@@ -1002,6 +1039,9 @@ EOF
1495bf
     ppcle:Linux:*:*)
1495bf
 	echo powerpcle-unknown-linux-${LIBC}
1495bf
 	exit ;;
1495bf
+    riscv32:Linux:*:* | riscv64:Linux:*:*)
1495bf
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1495bf
+	exit ;;
1495bf
     s390:Linux:*:* | s390x:Linux:*:*)
1495bf
 	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
1495bf
 	exit ;;
1495bf
@@ -1021,7 +1061,7 @@ EOF
1495bf
 	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
1495bf
 	exit ;;
1495bf
     x86_64:Linux:*:*)
1495bf
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1495bf
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
1495bf
 	exit ;;
1495bf
     xtensa*:Linux:*:*)
1495bf
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1495bf
@@ -1100,7 +1140,7 @@ EOF
1495bf
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
1495bf
 	# the processor, so we play safe by assuming i586.
1495bf
 	# Note: whatever this is, it MUST be the same as what config.sub
1495bf
-	# prints for the "djgpp" host, or else GDB configury will decide that
1495bf
+	# prints for the "djgpp" host, or else GDB configure will decide that
1495bf
 	# this is a cross-build.
1495bf
 	echo i586-pc-msdosdjgpp
1495bf
 	exit ;;
1495bf
@@ -1249,6 +1289,9 @@ EOF
1495bf
     SX-8R:SUPER-UX:*:*)
1495bf
 	echo sx8r-nec-superux${UNAME_RELEASE}
1495bf
 	exit ;;
1495bf
+    SX-ACE:SUPER-UX:*:*)
1495bf
+	echo sxace-nec-superux${UNAME_RELEASE}
1495bf
+	exit ;;
1495bf
     Power*:Rhapsody:*:*)
1495bf
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
1495bf
 	exit ;;
1495bf
@@ -1262,16 +1305,23 @@ EOF
1495bf
 	    UNAME_PROCESSOR=powerpc
1495bf
 	fi
1495bf
 	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
1495bf
-	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1495bf
+	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
1495bf
 		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1495bf
-		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1495bf
-		    grep IS_64BIT_ARCH >/dev/null
1495bf
+		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
1495bf
+		       grep IS_64BIT_ARCH >/dev/null
1495bf
 		then
1495bf
 		    case $UNAME_PROCESSOR in
1495bf
 			i386) UNAME_PROCESSOR=x86_64 ;;
1495bf
 			powerpc) UNAME_PROCESSOR=powerpc64 ;;
1495bf
 		    esac
1495bf
 		fi
1495bf
+		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
1495bf
+		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
1495bf
+		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
1495bf
+		       grep IS_PPC >/dev/null
1495bf
+		then
1495bf
+		    UNAME_PROCESSOR=powerpc
1495bf
+		fi
1495bf
 	    fi
1495bf
 	elif test "$UNAME_PROCESSOR" = i386 ; then
1495bf
 	    # Avoid executing cc on OS X 10.9, as it ships with a stub
1495bf
@@ -1286,7 +1336,7 @@ EOF
1495bf
 	exit ;;
1495bf
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
1495bf
 	UNAME_PROCESSOR=`uname -p`
1495bf
-	if test "$UNAME_PROCESSOR" = "x86"; then
1495bf
+	if test "$UNAME_PROCESSOR" = x86; then
1495bf
 		UNAME_PROCESSOR=i386
1495bf
 		UNAME_MACHINE=pc
1495bf
 	fi
1495bf
@@ -1295,15 +1345,18 @@ EOF
1495bf
     *:QNX:*:4*)
1495bf
 	echo i386-pc-qnx
1495bf
 	exit ;;
1495bf
-    NEO-?:NONSTOP_KERNEL:*:*)
1495bf
+    NEO-*:NONSTOP_KERNEL:*:*)
1495bf
 	echo neo-tandem-nsk${UNAME_RELEASE}
1495bf
 	exit ;;
1495bf
     NSE-*:NONSTOP_KERNEL:*:*)
1495bf
 	echo nse-tandem-nsk${UNAME_RELEASE}
1495bf
 	exit ;;
1495bf
-    NSR-?:NONSTOP_KERNEL:*:*)
1495bf
+    NSR-*:NONSTOP_KERNEL:*:*)
1495bf
 	echo nsr-tandem-nsk${UNAME_RELEASE}
1495bf
 	exit ;;
1495bf
+    NSX-*:NONSTOP_KERNEL:*:*)
1495bf
+	echo nsx-tandem-nsk${UNAME_RELEASE}
1495bf
+	exit ;;
1495bf
     *:NonStop-UX:*:*)
1495bf
 	echo mips-compaq-nonstopux
1495bf
 	exit ;;
1495bf
@@ -1317,7 +1370,7 @@ EOF
1495bf
 	# "uname -m" is not consistent, so use $cputype instead. 386
1495bf
 	# is converted to i386 for consistency with other x86
1495bf
 	# operating systems.
1495bf
-	if test "$cputype" = "386"; then
1495bf
+	if test "$cputype" = 386; then
1495bf
 	    UNAME_MACHINE=i386
1495bf
 	else
1495bf
 	    UNAME_MACHINE="$cputype"
1495bf
@@ -1359,7 +1412,7 @@ EOF
1495bf
 	echo i386-pc-xenix
1495bf
 	exit ;;
1495bf
     i*86:skyos:*:*)
1495bf
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
1495bf
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
1495bf
 	exit ;;
1495bf
     i*86:rdos:*:*)
1495bf
 	echo ${UNAME_MACHINE}-pc-rdos
1495bf
@@ -1370,23 +1423,25 @@ EOF
1495bf
     x86_64:VMkernel:*:*)
1495bf
 	echo ${UNAME_MACHINE}-unknown-esx
1495bf
 	exit ;;
1495bf
+    amd64:Isilon\ OneFS:*:*)
1495bf
+	echo x86_64-unknown-onefs
1495bf
+	exit ;;
1495bf
 esac
1495bf
 
1495bf
 cat >&2 <
1495bf
 $0: unable to guess system type
1495bf
 
1495bf
-This script, last modified $timestamp, has failed to recognize
1495bf
-the operating system you are using. It is advised that you
1495bf
-download the most up to date version of the config scripts from
1495bf
+This script (version $timestamp), has failed to recognize the
1495bf
+operating system you are using. If your script is old, overwrite *all*
1495bf
+copies of config.guess and config.sub with the latest versions from:
1495bf
 
1495bf
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
1495bf
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
1495bf
 and
1495bf
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
1495bf
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
1495bf
 
1495bf
-If the version you run ($0) is already up to date, please
1495bf
-send the following data and any information you think might be
1495bf
-pertinent to <config-patches@gnu.org> in order to provide the needed
1495bf
-information to handle your system.
1495bf
+If $0 has already been updated, send the following data and any
1495bf
+information you think might be pertinent to config-patches@gnu.org to
1495bf
+provide the necessary information to handle your system.
1495bf
 
1495bf
 config.guess timestamp = $timestamp
1495bf
 
1495bf
diff --git a/config.sub b/config.sub
1495bf
index 6467c95..932128b 100755
1495bf
--- a/config.sub
1495bf
+++ b/config.sub
1495bf
@@ -1,8 +1,8 @@
1495bf
 #! /bin/sh
1495bf
 # Configuration validation subroutine script.
1495bf
-#   Copyright 1992-2015 Free Software Foundation, Inc.
1495bf
+#   Copyright 1992-2017 Free Software Foundation, Inc.
1495bf
 
1495bf
-timestamp='2015-01-01'
1495bf
+timestamp='2017-04-02'
1495bf
 
1495bf
 # This file is free software; you can redistribute it and/or modify it
1495bf
 # under the terms of the GNU General Public License as published by
1495bf
@@ -33,7 +33,7 @@ timestamp='2015-01-01'
1495bf
 # Otherwise, we print the canonical config type on stdout and succeed.
1495bf
 
1495bf
 # You can get the latest version of this script from:
1495bf
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
1495bf
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
1495bf
 
1495bf
 # This file is supposed to be the same for all GNU packages
1495bf
 # and recognize all the CPU types, system types and aliases
1495bf
@@ -53,8 +53,7 @@ timestamp='2015-01-01'
1495bf
 me=`echo "$0" | sed -e 's,.*/,,'`
1495bf
 
1495bf
 usage="\
1495bf
-Usage: $0 [OPTION] CPU-MFR-OPSYS
1495bf
-       $0 [OPTION] ALIAS
1495bf
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
1495bf
 
1495bf
 Canonicalize a configuration name.
1495bf
 
1495bf
@@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
1495bf
 version="\
1495bf
 GNU config.sub ($timestamp)
1495bf
 
1495bf
-Copyright 1992-2015 Free Software Foundation, Inc.
1495bf
+Copyright 1992-2017 Free Software Foundation, Inc.
1495bf
 
1495bf
 This is free software; see the source for copying conditions.  There is NO
1495bf
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
1495bf
@@ -117,8 +116,8 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
1495bf
 case $maybe_os in
1495bf
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
1495bf
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
1495bf
-  knetbsd*-gnu* | netbsd*-gnu* | \
1495bf
-  kopensolaris*-gnu* | \
1495bf
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
1495bf
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
1495bf
   storm-chaos* | os2-emx* | rtmk-nova*)
1495bf
     os=-$maybe_os
1495bf
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
1495bf
@@ -255,15 +254,16 @@ case $basic_machine in
1495bf
 	| arc | arceb \
1495bf
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
1495bf
 	| avr | avr32 \
1495bf
+	| ba \
1495bf
 	| be32 | be64 \
1495bf
 	| bfin \
1495bf
 	| c4x | c8051 | clipper \
1495bf
 	| d10v | d30v | dlx | dsp16xx \
1495bf
-	| epiphany \
1495bf
+	| e2k | epiphany \
1495bf
 	| fido | fr30 | frv | ft32 \
1495bf
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
1495bf
 	| hexagon \
1495bf
-	| i370 | i860 | i960 | ia64 \
1495bf
+	| i370 | i860 | i960 | ia16 | ia64 \
1495bf
 	| ip2k | iq2000 \
1495bf
 	| k1om \
1495bf
 	| le32 | le64 \
1495bf
@@ -301,11 +301,12 @@ case $basic_machine in
1495bf
 	| open8 | or1k | or1knd | or32 \
1495bf
 	| pdp10 | pdp11 | pj | pjl \
1495bf
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
1495bf
+	| pru \
1495bf
 	| pyramid \
1495bf
 	| riscv32 | riscv64 \
1495bf
 	| rl78 | rx \
1495bf
 	| score \
1495bf
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
1495bf
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
1495bf
 	| sh64 | sh64le \
1495bf
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
1495bf
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
1495bf
@@ -314,6 +315,7 @@ case $basic_machine in
1495bf
 	| ubicom32 \
1495bf
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
1495bf
 	| visium \
1495bf
+	| wasm32 \
1495bf
 	| we32k \
1495bf
 	| x86 | xc16x | xstormy16 | xtensa \
1495bf
 	| z8k | z80)
1495bf
@@ -376,17 +378,18 @@ case $basic_machine in
1495bf
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
1495bf
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
1495bf
 	| avr-* | avr32-* \
1495bf
+	| ba-* \
1495bf
 	| be32-* | be64-* \
1495bf
 	| bfin-* | bs2000-* \
1495bf
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
1495bf
 	| c8051-* | clipper-* | craynv-* | cydra-* \
1495bf
 	| d10v-* | d30v-* | dlx-* \
1495bf
-	| elxsi-* \
1495bf
+	| e2k-* | elxsi-* \
1495bf
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
1495bf
 	| h8300-* | h8500-* \
1495bf
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
1495bf
 	| hexagon-* \
1495bf
-	| i*86-* | i860-* | i960-* | ia64-* \
1495bf
+	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
1495bf
 	| ip2k-* | iq2000-* \
1495bf
 	| k1om-* \
1495bf
 	| le32-* | le64-* \
1495bf
@@ -427,13 +430,15 @@ case $basic_machine in
1495bf
 	| orion-* \
1495bf
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
1495bf
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
1495bf
+	| pru-* \
1495bf
 	| pyramid-* \
1495bf
+	| riscv32-* | riscv64-* \
1495bf
 	| rl78-* | romp-* | rs6000-* | rx-* \
1495bf
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
1495bf
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
1495bf
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
1495bf
 	| sparclite-* \
1495bf
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
1495bf
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
1495bf
 	| tahoe-* \
1495bf
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
1495bf
 	| tile*-* \
1495bf
@@ -442,6 +447,7 @@ case $basic_machine in
1495bf
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
1495bf
 	| vax-* \
1495bf
 	| visium-* \
1495bf
+	| wasm32-* \
1495bf
 	| we32k-* \
1495bf
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
1495bf
 	| xstormy16-* | xtensa*-* \
1495bf
@@ -518,6 +524,9 @@ case $basic_machine in
1495bf
 		basic_machine=i386-pc
1495bf
 		os=-aros
1495bf
 		;;
1495bf
+	asmjs)
1495bf
+		basic_machine=asmjs-unknown
1495bf
+		;;
1495bf
 	aux)
1495bf
 		basic_machine=m68k-apple
1495bf
 		os=-aux
1495bf
@@ -638,6 +647,14 @@ case $basic_machine in
1495bf
 		basic_machine=m68k-bull
1495bf
 		os=-sysv3
1495bf
 		;;
1495bf
+	e500v[12])
1495bf
+		basic_machine=powerpc-unknown
1495bf
+		os=$os"spe"
1495bf
+		;;
1495bf
+	e500v[12]-*)
1495bf
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
1495bf
+		os=$os"spe"
1495bf
+		;;
1495bf
 	ebmon29k)
1495bf
 		basic_machine=a29k-amd
1495bf
 		os=-ebmon
1495bf
@@ -933,6 +950,9 @@ case $basic_machine in
1495bf
 	nsr-tandem)
1495bf
 		basic_machine=nsr-tandem
1495bf
 		;;
1495bf
+	nsx-tandem)
1495bf
+		basic_machine=nsx-tandem
1495bf
+		;;
1495bf
 	op50n-* | op60c-*)
1495bf
 		basic_machine=hppa1.1-oki
1495bf
 		os=-proelf
1495bf
@@ -1017,7 +1037,7 @@ case $basic_machine in
1495bf
 	ppc-* | ppcbe-*)
1495bf
 		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
1495bf
 		;;
1495bf
-	ppcle | powerpclittle | ppc-le | powerpc-little)
1495bf
+	ppcle | powerpclittle)
1495bf
 		basic_machine=powerpcle-unknown
1495bf
 		;;
1495bf
 	ppcle-* | powerpclittle-*)
1495bf
@@ -1027,7 +1047,7 @@ case $basic_machine in
1495bf
 		;;
1495bf
 	ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
1495bf
 		;;
1495bf
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
1495bf
+	ppc64le | powerpc64little)
1495bf
 		basic_machine=powerpc64le-unknown
1495bf
 		;;
1495bf
 	ppc64le-* | powerpc64little-*)
1495bf
@@ -1228,6 +1248,9 @@ case $basic_machine in
1495bf
 		basic_machine=a29k-wrs
1495bf
 		os=-vxworks
1495bf
 		;;
1495bf
+	wasm32)
1495bf
+		basic_machine=wasm32-unknown
1495bf
+		;;
1495bf
 	w65*)
1495bf
 		basic_machine=w65-wdc
1495bf
 		os=-none
1495bf
@@ -1373,18 +1396,18 @@ case $os in
1495bf
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1495bf
 	      | -sym* | -kopensolaris* | -plan9* \
1495bf
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1495bf
-	      | -aos* | -aros* \
1495bf
+	      | -aos* | -aros* | -cloudabi* | -sortix* \
1495bf
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1495bf
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1495bf
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1495bf
-	      | -bitrig* | -openbsd* | -solidbsd* \
1495bf
+	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
1495bf
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1495bf
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1495bf
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1495bf
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1495bf
-	      | -chorusos* | -chorusrdb* | -cegcc* \
1495bf
+	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
1495bf
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1495bf
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
1495bf
+	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
1495bf
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
1495bf
 	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
1495bf
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1495bf
@@ -1393,7 +1416,8 @@ case $os in
1495bf
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1495bf
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1495bf
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1495bf
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
1495bf
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
1495bf
+	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
1495bf
 	# Remember, each alternative MUST END IN *, to match a version number.
1495bf
 		;;
1495bf
 	-qnx*)
1495bf
@@ -1525,6 +1549,8 @@ case $os in
1495bf
 		;;
1495bf
 	-nacl*)
1495bf
 		;;
1495bf
+	-ios)
1495bf
+		;;
1495bf
 	-none)
1495bf
 		;;
1495bf
 	*)
1495bf
@@ -1620,6 +1646,9 @@ case $basic_machine in
1495bf
 	sparc-* | *-sun)
1495bf
 		os=-sunos4.1.1
1495bf
 		;;
1495bf
+	pru-*)
1495bf
+		os=-elf
1495bf
+		;;
1495bf
 	*-be)
1495bf
 		os=-beos
1495bf
 		;;
1495bf
diff --git a/dbus/Makefile.in b/dbus/Makefile.in
1495bf
index 579f2ac..0dac7d6 100644
1495bf
--- a/dbus/Makefile.in
1495bf
+++ b/dbus/Makefile.in
1495bf
@@ -1,7 +1,7 @@
1495bf
-# Makefile.in generated by automake 1.15 from Makefile.am.
1495bf
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
1495bf
 # @configure_input@
1495bf
 
1495bf
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
1495bf
 
1495bf
 # This Makefile.in is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
diff --git a/depcomp b/depcomp
1495bf
index fc98710..b39f98f 100755
1495bf
--- a/depcomp
1495bf
+++ b/depcomp
1495bf
@@ -1,9 +1,9 @@
1495bf
 #! /bin/sh
1495bf
 # depcomp - compile a program generating dependencies as side-effects
1495bf
 
1495bf
-scriptversion=2013-05-30.07; # UTC
1495bf
+scriptversion=2016-01-11.22; # UTC
1495bf
 
1495bf
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
1495bf
 
1495bf
 # This program is free software; you can redistribute it and/or modify
1495bf
 # it under the terms of the GNU General Public License as published by
1495bf
@@ -786,6 +786,6 @@ exit 0
1495bf
 # eval: (add-hook 'write-file-hooks 'time-stamp)
1495bf
 # time-stamp-start: "scriptversion="
1495bf
 # time-stamp-format: "%:y-%02m-%02d.%02H"
1495bf
-# time-stamp-time-zone: "UTC"
1495bf
+# time-stamp-time-zone: "UTC0"
1495bf
 # time-stamp-end: "; # UTC"
1495bf
 # End:
1495bf
diff --git a/install-sh b/install-sh
1495bf
index 0b0fdcb..0360b79 100755
1495bf
--- a/install-sh
1495bf
+++ b/install-sh
1495bf
@@ -1,7 +1,7 @@
1495bf
 #!/bin/sh
1495bf
 # install - install a program, script, or datafile
1495bf
 
1495bf
-scriptversion=2013-12-25.23; # UTC
1495bf
+scriptversion=2016-01-11.22; # UTC
1495bf
 
1495bf
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
1495bf
 # later released in X11R6 (xc/config/util/install.sh) with the
1495bf
@@ -496,6 +496,6 @@ done
1495bf
 # eval: (add-hook 'write-file-hooks 'time-stamp)
1495bf
 # time-stamp-start: "scriptversion="
1495bf
 # time-stamp-format: "%:y-%02m-%02d.%02H"
1495bf
-# time-stamp-time-zone: "UTC"
1495bf
+# time-stamp-time-zone: "UTC0"
1495bf
 # time-stamp-end: "; # UTC"
1495bf
 # End:
1495bf
diff --git a/missing b/missing
1495bf
index f62bbae..c6e3795 100755
1495bf
--- a/missing
1495bf
+++ b/missing
1495bf
@@ -1,9 +1,9 @@
1495bf
 #! /bin/sh
1495bf
 # Common wrapper for a few potentially missing GNU programs.
1495bf
 
1495bf
-scriptversion=2013-10-28.13; # UTC
1495bf
+scriptversion=2016-01-11.22; # UTC
1495bf
 
1495bf
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
1495bf
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
1495bf
 
1495bf
 # This program is free software; you can redistribute it and/or modify
1495bf
@@ -210,6 +210,6 @@ exit $st
1495bf
 # eval: (add-hook 'write-file-hooks 'time-stamp)
1495bf
 # time-stamp-start: "scriptversion="
1495bf
 # time-stamp-format: "%:y-%02m-%02d.%02H"
1495bf
-# time-stamp-time-zone: "UTC"
1495bf
+# time-stamp-time-zone: "UTC0"
1495bf
 # time-stamp-end: "; # UTC"
1495bf
 # End:
1495bf
diff --git a/src/Makefile.in b/src/Makefile.in
1495bf
index b8b61af..471a2c6 100644
1495bf
--- a/src/Makefile.in
1495bf
+++ b/src/Makefile.in
1495bf
@@ -1,7 +1,7 @@
1495bf
-# Makefile.in generated by automake 1.15 from Makefile.am.
1495bf
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
1495bf
 # @configure_input@
1495bf
 
1495bf
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
1495bf
 
1495bf
 # This Makefile.in is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -229,13 +229,18 @@ am__DEPENDENCIES_2 = libcm.a $(am__DEPENDENCIES_1) \
1495bf
 @WITH_IPA_TRUE@	$(am__DEPENDENCIES_2)
1495bf
 certmaster_getcert_LINK = $(CCLD) $(certmaster_getcert_CFLAGS) \
1495bf
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
1495bf
-am_certmaster_submit_OBJECTS = certmaster.$(OBJEXT) submit-x.$(OBJEXT) \
1495bf
-	submit-u.$(OBJEXT) util.$(OBJEXT) log.$(OBJEXT) tm.$(OBJEXT)
1495bf
+am_certmaster_submit_OBJECTS = certmaster_submit-certmaster.$(OBJEXT) \
1495bf
+	certmaster_submit-submit-x.$(OBJEXT) \
1495bf
+	certmaster_submit-submit-u.$(OBJEXT) \
1495bf
+	certmaster_submit-util.$(OBJEXT) \
1495bf
+	certmaster_submit-log.$(OBJEXT) certmaster_submit-tm.$(OBJEXT)
1495bf
 certmaster_submit_OBJECTS = $(am_certmaster_submit_OBJECTS)
1495bf
 certmaster_submit_DEPENDENCIES = $(am__DEPENDENCIES_1) \
1495bf
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1495bf
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1495bf
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
1495bf
+certmaster_submit_LINK = $(CCLD) $(certmaster_submit_CFLAGS) $(CFLAGS) \
1495bf
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
1495bf
 am_certmonger_OBJECTS = main.$(OBJEXT) env-system.$(OBJEXT) \
1495bf
 	tm.$(OBJEXT)
1495bf
 certmonger_OBJECTS = $(am_certmonger_OBJECTS)
1495bf
@@ -308,9 +313,11 @@ ipa_getcert_OBJECTS = $(am_ipa_getcert_OBJECTS)
1495bf
 @WITH_IPA_TRUE@ipa_getcert_DEPENDENCIES = $(am__DEPENDENCIES_2)
1495bf
 ipa_getcert_LINK = $(CCLD) $(ipa_getcert_CFLAGS) $(CFLAGS) \
1495bf
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
1495bf
-am_ipa_submit_OBJECTS = ipa.$(OBJEXT) srvloc.$(OBJEXT) \
1495bf
-	store-gen.$(OBJEXT) submit-x.$(OBJEXT) submit-u.$(OBJEXT) \
1495bf
-	util.$(OBJEXT) log.$(OBJEXT) tm.$(OBJEXT)
1495bf
+am_ipa_submit_OBJECTS = ipa_submit-ipa.$(OBJEXT) \
1495bf
+	ipa_submit-srvloc.$(OBJEXT) ipa_submit-store-gen.$(OBJEXT) \
1495bf
+	ipa_submit-submit-x.$(OBJEXT) ipa_submit-submit-u.$(OBJEXT) \
1495bf
+	ipa_submit-util.$(OBJEXT) ipa_submit-log.$(OBJEXT) \
1495bf
+	ipa_submit-tm.$(OBJEXT)
1495bf
 ipa_submit_OBJECTS = $(am_ipa_submit_OBJECTS)
1495bf
 ipa_submit_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1495bf
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1495bf
@@ -318,6 +325,8 @@ ipa_submit_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1495bf
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1495bf
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1495bf
 	$(am__DEPENDENCIES_1)
1495bf
+ipa_submit_LINK = $(CCLD) $(ipa_submit_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
1495bf
+	$(LDFLAGS) -o $@
1495bf
 am_local_getcert_OBJECTS = local_getcert-local-getcert.$(OBJEXT) \
1495bf
 	local_getcert-tm.$(OBJEXT)
1495bf
 local_getcert_OBJECTS = $(am_local_getcert_OBJECTS)
1495bf
@@ -898,7 +907,7 @@ tdbusm_check_SOURCES = tdbusm-check.c tm.c tm.h
1495bf
 tdbusm_check_LDADD = libcm.a $(CERTMONGER_LIBS) $(POPT_LIBS)
1495bf
 serial_check_LDADD = libcm.a $(CERTMONGER_LIBS) $(LTLIBICONV)
1495bf
 nl_check_LDADD = libcm.a $(CERTMONGER_LIBS)
1495bf
-submit_x_CFLAGS = $(AM_CFLAGS) -DCM_SUBMIT_X_MAIN
1495bf
+submit_x_CFLAGS = $(AM_CFLAGS) $(NSS_CFLAGS) -DCM_SUBMIT_X_MAIN
1495bf
 submit_x_SOURCES = submit-x.c submit-x.h submit-u.c submit-u.h log.c log.h \
1495bf
 	tm.c tm.h
1495bf
 
1495bf
@@ -907,6 +916,7 @@ submit_x_LDADD = $(XMLRPC_LIBS) $(KRB5_LIBS) $(TALLOC_LIBS) \
1495bf
 
1495bf
 toklist_CFLAGS = $(AM_CFLAGS) $(NSS_CFLAGS)
1495bf
 toklist_LDADD = $(NSS_LIBS) $(POPT_LIBS)
1495bf
+ipa_submit_CFLAGS = $(AM_CFLAGS) $(NSS_CFLAGS)
1495bf
 ipa_submit_SOURCES = ipa.c srvloc.c srvloc.h store.h store-gen.c \
1495bf
 		submit-x.c submit-x.h submit-u.c submit-u.h \
1495bf
 		submit-e.h util.c util.h log.c log.h tm.c tm.h
1495bf
@@ -915,6 +925,7 @@ ipa_submit_LDADD = $(XMLRPC_LIBS) $(LDAP_LIBS) $(KRB5_LIBS) $(TALLOC_LIBS) \
1495bf
 		   $(GMP_LIBS) $(IDN_LIBS) $(OPENSSL_LIBS) $(UUID_LIBS) \
1495bf
 		   $(RESOLV_LIBS) $(LTLIBICONV) $(POPT_LIBS)
1495bf
 
1495bf
+certmaster_submit_CFLAGS = $(AM_CFLAGS) $(NSS_CFLAGS)
1495bf
 certmaster_submit_SOURCES = certmaster.c submit-x.c submit-x.h \
1495bf
 		submit-e.h submit-u.c submit-u.h util.c util.h log.c log.h \
1495bf
 		tm.c tm.h
1495bf
@@ -1242,7 +1253,7 @@ certmaster-getcert$(EXEEXT): $(certmaster_getcert_OBJECTS) $(certmaster_getcert_
1495bf
 
1495bf
 certmaster-submit$(EXEEXT): $(certmaster_submit_OBJECTS) $(certmaster_submit_DEPENDENCIES) $(EXTRA_certmaster_submit_DEPENDENCIES) 
1495bf
 	@rm -f certmaster-submit$(EXEEXT)
1495bf
-	$(AM_V_CCLD)$(LINK) $(certmaster_submit_OBJECTS) $(certmaster_submit_LDADD) $(LIBS)
1495bf
+	$(AM_V_CCLD)$(certmaster_submit_LINK) $(certmaster_submit_OBJECTS) $(certmaster_submit_LDADD) $(LIBS)
1495bf
 
1495bf
 certmonger$(EXEEXT): $(certmonger_OBJECTS) $(certmonger_DEPENDENCIES) $(EXTRA_certmonger_DEPENDENCIES) 
1495bf
 	@rm -f certmonger$(EXEEXT)
1495bf
@@ -1270,7 +1281,7 @@ ipa-getcert$(EXEEXT): $(ipa_getcert_OBJECTS) $(ipa_getcert_DEPENDENCIES) $(EXTRA
1495bf
 
1495bf
 ipa-submit$(EXEEXT): $(ipa_submit_OBJECTS) $(ipa_submit_DEPENDENCIES) $(EXTRA_ipa_submit_DEPENDENCIES) 
1495bf
 	@rm -f ipa-submit$(EXEEXT)
1495bf
-	$(AM_V_CCLD)$(LINK) $(ipa_submit_OBJECTS) $(ipa_submit_LDADD) $(LIBS)
1495bf
+	$(AM_V_CCLD)$(ipa_submit_LINK) $(ipa_submit_OBJECTS) $(ipa_submit_LDADD) $(LIBS)
1495bf
 
1495bf
 local-getcert$(EXEEXT): $(local_getcert_OBJECTS) $(local_getcert_DEPENDENCIES) $(EXTRA_local_getcert_DEPENDENCIES) 
1495bf
 	@rm -f local-getcert$(EXEEXT)
1495bf
@@ -1326,9 +1337,14 @@ mostlyclean-compile:
1495bf
 distclean-compile:
1495bf
 	-rm -f *.tab.c
1495bf
 
1495bf
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/certmaster.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/certmaster_getcert-certmaster-getcert.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/certmaster_getcert-tm.Po@am__quote@
1495bf
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/certmaster_submit-certmaster.Po@am__quote@
1495bf
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/certmaster_submit-log.Po@am__quote@
1495bf
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/certmaster_submit-submit-u.Po@am__quote@
1495bf
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/certmaster_submit-submit-x.Po@am__quote@
1495bf
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/certmaster_submit-tm.Po@am__quote@
1495bf
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/certmaster_submit-util.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dogtag_ipa_renew_agent_submit-dogtag-ipa.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dogtag_ipa_renew_agent_submit-dogtag.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dogtag_ipa_renew_agent_submit-env-system.Po@am__quote@
1495bf
@@ -1358,9 +1374,16 @@ distclean-compile:
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/env-system.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getcert-getcert.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getcert-tm.Po@am__quote@
1495bf
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipa.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipa_getcert-ipa-getcert.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipa_getcert-tm.Po@am__quote@
1495bf
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipa_submit-ipa.Po@am__quote@
1495bf
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipa_submit-log.Po@am__quote@
1495bf
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipa_submit-srvloc.Po@am__quote@
1495bf
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipa_submit-store-gen.Po@am__quote@
1495bf
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipa_submit-submit-u.Po@am__quote@
1495bf
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipa_submit-submit-x.Po@am__quote@
1495bf
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipa_submit-tm.Po@am__quote@
1495bf
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipa_submit-util.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcm_a-cadata.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcm_a-canalyze.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcm_a-casave.Po@am__quote@
1495bf
@@ -1432,7 +1455,6 @@ distclean-compile:
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/local_submit-tm.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/local_submit-util-o.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/local_submit-util.Po@am__quote@
1495bf
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nl-check.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scep_submit-env-system.Po@am__quote@
1495bf
@@ -1452,10 +1474,6 @@ distclean-compile:
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/selfsign_getcert-selfsign-getcert.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/selfsign_getcert-tm.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serial-check.Po@am__quote@
1495bf
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/srvloc.Po@am__quote@
1495bf
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/store-gen.Po@am__quote@
1495bf
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/submit-u.Po@am__quote@
1495bf
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/submit-x.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/submit_d-log.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/submit_d-submit-d.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/submit_d-submit-h.Po@am__quote@
1495bf
@@ -1475,7 +1493,6 @@ distclean-compile:
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tlslayer-tlslayer.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tm.Po@am__quote@
1495bf
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/toklist-toklist.Po@am__quote@
1495bf
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
1495bf
 
1495bf
 .c.o:
1495bf
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
1495bf
@@ -2305,6 +2322,90 @@ certmaster_getcert-tm.obj: tm.c
1495bf
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_getcert_CFLAGS) $(CFLAGS) -c -o certmaster_getcert-tm.obj `if test -f 'tm.c'; then $(CYGPATH_W) 'tm.c'; else $(CYGPATH_W) '$(srcdir)/tm.c'; fi`
1495bf
 
1495bf
+certmaster_submit-certmaster.o: certmaster.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -MT certmaster_submit-certmaster.o -MD -MP -MF $(DEPDIR)/certmaster_submit-certmaster.Tpo -c -o certmaster_submit-certmaster.o `test -f 'certmaster.c' || echo '$(srcdir)/'`certmaster.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/certmaster_submit-certmaster.Tpo $(DEPDIR)/certmaster_submit-certmaster.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='certmaster.c' object='certmaster_submit-certmaster.o' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -c -o certmaster_submit-certmaster.o `test -f 'certmaster.c' || echo '$(srcdir)/'`certmaster.c
1495bf
+
1495bf
+certmaster_submit-certmaster.obj: certmaster.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -MT certmaster_submit-certmaster.obj -MD -MP -MF $(DEPDIR)/certmaster_submit-certmaster.Tpo -c -o certmaster_submit-certmaster.obj `if test -f 'certmaster.c'; then $(CYGPATH_W) 'certmaster.c'; else $(CYGPATH_W) '$(srcdir)/certmaster.c'; fi`
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/certmaster_submit-certmaster.Tpo $(DEPDIR)/certmaster_submit-certmaster.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='certmaster.c' object='certmaster_submit-certmaster.obj' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -c -o certmaster_submit-certmaster.obj `if test -f 'certmaster.c'; then $(CYGPATH_W) 'certmaster.c'; else $(CYGPATH_W) '$(srcdir)/certmaster.c'; fi`
1495bf
+
1495bf
+certmaster_submit-submit-x.o: submit-x.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -MT certmaster_submit-submit-x.o -MD -MP -MF $(DEPDIR)/certmaster_submit-submit-x.Tpo -c -o certmaster_submit-submit-x.o `test -f 'submit-x.c' || echo '$(srcdir)/'`submit-x.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/certmaster_submit-submit-x.Tpo $(DEPDIR)/certmaster_submit-submit-x.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='submit-x.c' object='certmaster_submit-submit-x.o' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -c -o certmaster_submit-submit-x.o `test -f 'submit-x.c' || echo '$(srcdir)/'`submit-x.c
1495bf
+
1495bf
+certmaster_submit-submit-x.obj: submit-x.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -MT certmaster_submit-submit-x.obj -MD -MP -MF $(DEPDIR)/certmaster_submit-submit-x.Tpo -c -o certmaster_submit-submit-x.obj `if test -f 'submit-x.c'; then $(CYGPATH_W) 'submit-x.c'; else $(CYGPATH_W) '$(srcdir)/submit-x.c'; fi`
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/certmaster_submit-submit-x.Tpo $(DEPDIR)/certmaster_submit-submit-x.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='submit-x.c' object='certmaster_submit-submit-x.obj' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -c -o certmaster_submit-submit-x.obj `if test -f 'submit-x.c'; then $(CYGPATH_W) 'submit-x.c'; else $(CYGPATH_W) '$(srcdir)/submit-x.c'; fi`
1495bf
+
1495bf
+certmaster_submit-submit-u.o: submit-u.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -MT certmaster_submit-submit-u.o -MD -MP -MF $(DEPDIR)/certmaster_submit-submit-u.Tpo -c -o certmaster_submit-submit-u.o `test -f 'submit-u.c' || echo '$(srcdir)/'`submit-u.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/certmaster_submit-submit-u.Tpo $(DEPDIR)/certmaster_submit-submit-u.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='submit-u.c' object='certmaster_submit-submit-u.o' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -c -o certmaster_submit-submit-u.o `test -f 'submit-u.c' || echo '$(srcdir)/'`submit-u.c
1495bf
+
1495bf
+certmaster_submit-submit-u.obj: submit-u.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -MT certmaster_submit-submit-u.obj -MD -MP -MF $(DEPDIR)/certmaster_submit-submit-u.Tpo -c -o certmaster_submit-submit-u.obj `if test -f 'submit-u.c'; then $(CYGPATH_W) 'submit-u.c'; else $(CYGPATH_W) '$(srcdir)/submit-u.c'; fi`
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/certmaster_submit-submit-u.Tpo $(DEPDIR)/certmaster_submit-submit-u.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='submit-u.c' object='certmaster_submit-submit-u.obj' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -c -o certmaster_submit-submit-u.obj `if test -f 'submit-u.c'; then $(CYGPATH_W) 'submit-u.c'; else $(CYGPATH_W) '$(srcdir)/submit-u.c'; fi`
1495bf
+
1495bf
+certmaster_submit-util.o: util.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -MT certmaster_submit-util.o -MD -MP -MF $(DEPDIR)/certmaster_submit-util.Tpo -c -o certmaster_submit-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/certmaster_submit-util.Tpo $(DEPDIR)/certmaster_submit-util.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util.c' object='certmaster_submit-util.o' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -c -o certmaster_submit-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c
1495bf
+
1495bf
+certmaster_submit-util.obj: util.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -MT certmaster_submit-util.obj -MD -MP -MF $(DEPDIR)/certmaster_submit-util.Tpo -c -o certmaster_submit-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi`
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/certmaster_submit-util.Tpo $(DEPDIR)/certmaster_submit-util.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util.c' object='certmaster_submit-util.obj' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -c -o certmaster_submit-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi`
1495bf
+
1495bf
+certmaster_submit-log.o: log.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -MT certmaster_submit-log.o -MD -MP -MF $(DEPDIR)/certmaster_submit-log.Tpo -c -o certmaster_submit-log.o `test -f 'log.c' || echo '$(srcdir)/'`log.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/certmaster_submit-log.Tpo $(DEPDIR)/certmaster_submit-log.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='log.c' object='certmaster_submit-log.o' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -c -o certmaster_submit-log.o `test -f 'log.c' || echo '$(srcdir)/'`log.c
1495bf
+
1495bf
+certmaster_submit-log.obj: log.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -MT certmaster_submit-log.obj -MD -MP -MF $(DEPDIR)/certmaster_submit-log.Tpo -c -o certmaster_submit-log.obj `if test -f 'log.c'; then $(CYGPATH_W) 'log.c'; else $(CYGPATH_W) '$(srcdir)/log.c'; fi`
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/certmaster_submit-log.Tpo $(DEPDIR)/certmaster_submit-log.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='log.c' object='certmaster_submit-log.obj' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -c -o certmaster_submit-log.obj `if test -f 'log.c'; then $(CYGPATH_W) 'log.c'; else $(CYGPATH_W) '$(srcdir)/log.c'; fi`
1495bf
+
1495bf
+certmaster_submit-tm.o: tm.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -MT certmaster_submit-tm.o -MD -MP -MF $(DEPDIR)/certmaster_submit-tm.Tpo -c -o certmaster_submit-tm.o `test -f 'tm.c' || echo '$(srcdir)/'`tm.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/certmaster_submit-tm.Tpo $(DEPDIR)/certmaster_submit-tm.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tm.c' object='certmaster_submit-tm.o' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -c -o certmaster_submit-tm.o `test -f 'tm.c' || echo '$(srcdir)/'`tm.c
1495bf
+
1495bf
+certmaster_submit-tm.obj: tm.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -MT certmaster_submit-tm.obj -MD -MP -MF $(DEPDIR)/certmaster_submit-tm.Tpo -c -o certmaster_submit-tm.obj `if test -f 'tm.c'; then $(CYGPATH_W) 'tm.c'; else $(CYGPATH_W) '$(srcdir)/tm.c'; fi`
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/certmaster_submit-tm.Tpo $(DEPDIR)/certmaster_submit-tm.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tm.c' object='certmaster_submit-tm.obj' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(certmaster_submit_CFLAGS) $(CFLAGS) -c -o certmaster_submit-tm.obj `if test -f 'tm.c'; then $(CYGPATH_W) 'tm.c'; else $(CYGPATH_W) '$(srcdir)/tm.c'; fi`
1495bf
+
1495bf
 dogtag_ipa_renew_agent_submit-dogtag.o: dogtag.c
1495bf
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dogtag_ipa_renew_agent_submit_CFLAGS) $(CFLAGS) -MT dogtag_ipa_renew_agent_submit-dogtag.o -MD -MP -MF $(DEPDIR)/dogtag_ipa_renew_agent_submit-dogtag.Tpo -c -o dogtag_ipa_renew_agent_submit-dogtag.o `test -f 'dogtag.c' || echo '$(srcdir)/'`dogtag.c
1495bf
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dogtag_ipa_renew_agent_submit-dogtag.Tpo $(DEPDIR)/dogtag_ipa_renew_agent_submit-dogtag.Po
1495bf
@@ -2711,6 +2812,118 @@ ipa_getcert-tm.obj: tm.c
1495bf
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_getcert_CFLAGS) $(CFLAGS) -c -o ipa_getcert-tm.obj `if test -f 'tm.c'; then $(CYGPATH_W) 'tm.c'; else $(CYGPATH_W) '$(srcdir)/tm.c'; fi`
1495bf
 
1495bf
+ipa_submit-ipa.o: ipa.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -MT ipa_submit-ipa.o -MD -MP -MF $(DEPDIR)/ipa_submit-ipa.Tpo -c -o ipa_submit-ipa.o `test -f 'ipa.c' || echo '$(srcdir)/'`ipa.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ipa_submit-ipa.Tpo $(DEPDIR)/ipa_submit-ipa.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ipa.c' object='ipa_submit-ipa.o' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -c -o ipa_submit-ipa.o `test -f 'ipa.c' || echo '$(srcdir)/'`ipa.c
1495bf
+
1495bf
+ipa_submit-ipa.obj: ipa.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -MT ipa_submit-ipa.obj -MD -MP -MF $(DEPDIR)/ipa_submit-ipa.Tpo -c -o ipa_submit-ipa.obj `if test -f 'ipa.c'; then $(CYGPATH_W) 'ipa.c'; else $(CYGPATH_W) '$(srcdir)/ipa.c'; fi`
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ipa_submit-ipa.Tpo $(DEPDIR)/ipa_submit-ipa.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ipa.c' object='ipa_submit-ipa.obj' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -c -o ipa_submit-ipa.obj `if test -f 'ipa.c'; then $(CYGPATH_W) 'ipa.c'; else $(CYGPATH_W) '$(srcdir)/ipa.c'; fi`
1495bf
+
1495bf
+ipa_submit-srvloc.o: srvloc.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -MT ipa_submit-srvloc.o -MD -MP -MF $(DEPDIR)/ipa_submit-srvloc.Tpo -c -o ipa_submit-srvloc.o `test -f 'srvloc.c' || echo '$(srcdir)/'`srvloc.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ipa_submit-srvloc.Tpo $(DEPDIR)/ipa_submit-srvloc.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='srvloc.c' object='ipa_submit-srvloc.o' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -c -o ipa_submit-srvloc.o `test -f 'srvloc.c' || echo '$(srcdir)/'`srvloc.c
1495bf
+
1495bf
+ipa_submit-srvloc.obj: srvloc.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -MT ipa_submit-srvloc.obj -MD -MP -MF $(DEPDIR)/ipa_submit-srvloc.Tpo -c -o ipa_submit-srvloc.obj `if test -f 'srvloc.c'; then $(CYGPATH_W) 'srvloc.c'; else $(CYGPATH_W) '$(srcdir)/srvloc.c'; fi`
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ipa_submit-srvloc.Tpo $(DEPDIR)/ipa_submit-srvloc.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='srvloc.c' object='ipa_submit-srvloc.obj' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -c -o ipa_submit-srvloc.obj `if test -f 'srvloc.c'; then $(CYGPATH_W) 'srvloc.c'; else $(CYGPATH_W) '$(srcdir)/srvloc.c'; fi`
1495bf
+
1495bf
+ipa_submit-store-gen.o: store-gen.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -MT ipa_submit-store-gen.o -MD -MP -MF $(DEPDIR)/ipa_submit-store-gen.Tpo -c -o ipa_submit-store-gen.o `test -f 'store-gen.c' || echo '$(srcdir)/'`store-gen.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ipa_submit-store-gen.Tpo $(DEPDIR)/ipa_submit-store-gen.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='store-gen.c' object='ipa_submit-store-gen.o' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -c -o ipa_submit-store-gen.o `test -f 'store-gen.c' || echo '$(srcdir)/'`store-gen.c
1495bf
+
1495bf
+ipa_submit-store-gen.obj: store-gen.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -MT ipa_submit-store-gen.obj -MD -MP -MF $(DEPDIR)/ipa_submit-store-gen.Tpo -c -o ipa_submit-store-gen.obj `if test -f 'store-gen.c'; then $(CYGPATH_W) 'store-gen.c'; else $(CYGPATH_W) '$(srcdir)/store-gen.c'; fi`
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ipa_submit-store-gen.Tpo $(DEPDIR)/ipa_submit-store-gen.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='store-gen.c' object='ipa_submit-store-gen.obj' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -c -o ipa_submit-store-gen.obj `if test -f 'store-gen.c'; then $(CYGPATH_W) 'store-gen.c'; else $(CYGPATH_W) '$(srcdir)/store-gen.c'; fi`
1495bf
+
1495bf
+ipa_submit-submit-x.o: submit-x.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -MT ipa_submit-submit-x.o -MD -MP -MF $(DEPDIR)/ipa_submit-submit-x.Tpo -c -o ipa_submit-submit-x.o `test -f 'submit-x.c' || echo '$(srcdir)/'`submit-x.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ipa_submit-submit-x.Tpo $(DEPDIR)/ipa_submit-submit-x.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='submit-x.c' object='ipa_submit-submit-x.o' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -c -o ipa_submit-submit-x.o `test -f 'submit-x.c' || echo '$(srcdir)/'`submit-x.c
1495bf
+
1495bf
+ipa_submit-submit-x.obj: submit-x.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -MT ipa_submit-submit-x.obj -MD -MP -MF $(DEPDIR)/ipa_submit-submit-x.Tpo -c -o ipa_submit-submit-x.obj `if test -f 'submit-x.c'; then $(CYGPATH_W) 'submit-x.c'; else $(CYGPATH_W) '$(srcdir)/submit-x.c'; fi`
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ipa_submit-submit-x.Tpo $(DEPDIR)/ipa_submit-submit-x.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='submit-x.c' object='ipa_submit-submit-x.obj' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -c -o ipa_submit-submit-x.obj `if test -f 'submit-x.c'; then $(CYGPATH_W) 'submit-x.c'; else $(CYGPATH_W) '$(srcdir)/submit-x.c'; fi`
1495bf
+
1495bf
+ipa_submit-submit-u.o: submit-u.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -MT ipa_submit-submit-u.o -MD -MP -MF $(DEPDIR)/ipa_submit-submit-u.Tpo -c -o ipa_submit-submit-u.o `test -f 'submit-u.c' || echo '$(srcdir)/'`submit-u.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ipa_submit-submit-u.Tpo $(DEPDIR)/ipa_submit-submit-u.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='submit-u.c' object='ipa_submit-submit-u.o' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -c -o ipa_submit-submit-u.o `test -f 'submit-u.c' || echo '$(srcdir)/'`submit-u.c
1495bf
+
1495bf
+ipa_submit-submit-u.obj: submit-u.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -MT ipa_submit-submit-u.obj -MD -MP -MF $(DEPDIR)/ipa_submit-submit-u.Tpo -c -o ipa_submit-submit-u.obj `if test -f 'submit-u.c'; then $(CYGPATH_W) 'submit-u.c'; else $(CYGPATH_W) '$(srcdir)/submit-u.c'; fi`
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ipa_submit-submit-u.Tpo $(DEPDIR)/ipa_submit-submit-u.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='submit-u.c' object='ipa_submit-submit-u.obj' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -c -o ipa_submit-submit-u.obj `if test -f 'submit-u.c'; then $(CYGPATH_W) 'submit-u.c'; else $(CYGPATH_W) '$(srcdir)/submit-u.c'; fi`
1495bf
+
1495bf
+ipa_submit-util.o: util.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -MT ipa_submit-util.o -MD -MP -MF $(DEPDIR)/ipa_submit-util.Tpo -c -o ipa_submit-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ipa_submit-util.Tpo $(DEPDIR)/ipa_submit-util.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util.c' object='ipa_submit-util.o' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -c -o ipa_submit-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c
1495bf
+
1495bf
+ipa_submit-util.obj: util.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -MT ipa_submit-util.obj -MD -MP -MF $(DEPDIR)/ipa_submit-util.Tpo -c -o ipa_submit-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi`
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ipa_submit-util.Tpo $(DEPDIR)/ipa_submit-util.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util.c' object='ipa_submit-util.obj' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -c -o ipa_submit-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi`
1495bf
+
1495bf
+ipa_submit-log.o: log.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -MT ipa_submit-log.o -MD -MP -MF $(DEPDIR)/ipa_submit-log.Tpo -c -o ipa_submit-log.o `test -f 'log.c' || echo '$(srcdir)/'`log.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ipa_submit-log.Tpo $(DEPDIR)/ipa_submit-log.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='log.c' object='ipa_submit-log.o' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -c -o ipa_submit-log.o `test -f 'log.c' || echo '$(srcdir)/'`log.c
1495bf
+
1495bf
+ipa_submit-log.obj: log.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -MT ipa_submit-log.obj -MD -MP -MF $(DEPDIR)/ipa_submit-log.Tpo -c -o ipa_submit-log.obj `if test -f 'log.c'; then $(CYGPATH_W) 'log.c'; else $(CYGPATH_W) '$(srcdir)/log.c'; fi`
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ipa_submit-log.Tpo $(DEPDIR)/ipa_submit-log.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='log.c' object='ipa_submit-log.obj' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -c -o ipa_submit-log.obj `if test -f 'log.c'; then $(CYGPATH_W) 'log.c'; else $(CYGPATH_W) '$(srcdir)/log.c'; fi`
1495bf
+
1495bf
+ipa_submit-tm.o: tm.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -MT ipa_submit-tm.o -MD -MP -MF $(DEPDIR)/ipa_submit-tm.Tpo -c -o ipa_submit-tm.o `test -f 'tm.c' || echo '$(srcdir)/'`tm.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ipa_submit-tm.Tpo $(DEPDIR)/ipa_submit-tm.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tm.c' object='ipa_submit-tm.o' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -c -o ipa_submit-tm.o `test -f 'tm.c' || echo '$(srcdir)/'`tm.c
1495bf
+
1495bf
+ipa_submit-tm.obj: tm.c
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -MT ipa_submit-tm.obj -MD -MP -MF $(DEPDIR)/ipa_submit-tm.Tpo -c -o ipa_submit-tm.obj `if test -f 'tm.c'; then $(CYGPATH_W) 'tm.c'; else $(CYGPATH_W) '$(srcdir)/tm.c'; fi`
1495bf
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ipa_submit-tm.Tpo $(DEPDIR)/ipa_submit-tm.Po
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tm.c' object='ipa_submit-tm.obj' libtool=no @AMDEPBACKSLASH@
1495bf
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1495bf
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipa_submit_CFLAGS) $(CFLAGS) -c -o ipa_submit-tm.obj `if test -f 'tm.c'; then $(CYGPATH_W) 'tm.c'; else $(CYGPATH_W) '$(srcdir)/tm.c'; fi`
1495bf
+
1495bf
 local_getcert-local-getcert.o: local-getcert.c
1495bf
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(local_getcert_CFLAGS) $(CFLAGS) -MT local_getcert-local-getcert.o -MD -MP -MF $(DEPDIR)/local_getcert-local-getcert.Tpo -c -o local_getcert-local-getcert.o `test -f 'local-getcert.c' || echo '$(srcdir)/'`local-getcert.c
1495bf
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/local_getcert-local-getcert.Tpo $(DEPDIR)/local_getcert-local-getcert.Po
1495bf
diff --git a/src/scep.c b/src/scep.c
1495bf
index 5dd362d..fff7ca8 100644
1495bf
--- a/src/scep.c
1495bf
+++ b/src/scep.c
1495bf
@@ -1,5 +1,5 @@
1495bf
 /*
1495bf
- * Copyright (C) 2009,2010,2011,2012,2013,2014,2015 Red Hat, Inc.
1495bf
+ * Copyright (C) 2009,2010,2011,2012,2013,2014,2015,2016 Red Hat, Inc.
1495bf
  * 
1495bf
  * This program is free software: you can redistribute it and/or modify
1495bf
  * it under the terms of the GNU General Public License as published by
1495bf
@@ -64,7 +64,7 @@
1495bf
 
1495bf
 #define OP_GET_CA_CAPS "GetCACaps"
1495bf
 #define OP_GET_CA_CERT "GetCACert"
1495bf
-#define OP_GET_CA_CHAIN "GetCAChain"
1495bf
+#define OP_GET_CA_CERT_CHAIN "GetCACertChain"
1495bf
 #define OP_GET_INITIAL_CERT "PKIOperation"
1495bf
 #define OP_PKCSREQ "PKIOperation"
1495bf
 enum known_ops {
1495bf
@@ -516,7 +516,7 @@ main(int argc, const char **argv)
1495bf
 		break;
1495bf
 	case op_get_ca_certs:
1495bf
 		/* Step two: request the chain. */
1495bf
-		params2 = talloc_asprintf(ctx, "operation=" OP_GET_CA_CHAIN "&message=%s", id);
1495bf
+		params2 = talloc_asprintf(ctx, "operation=" OP_GET_CA_CERT_CHAIN "&message=%s", id);
1495bf
 		break;
1495bf
 	case op_get_initial_cert:
1495bf
 		/* Step two: actually poll.  If we have multiple messages which
1495bf
diff --git a/systemd/Makefile.in b/systemd/Makefile.in
1495bf
index cecbbd3..06c438b 100644
1495bf
--- a/systemd/Makefile.in
1495bf
+++ b/systemd/Makefile.in
1495bf
@@ -1,7 +1,7 @@
1495bf
-# Makefile.in generated by automake 1.15 from Makefile.am.
1495bf
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
1495bf
 # @configure_input@
1495bf
 
1495bf
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
1495bf
 
1495bf
 # This Makefile.in is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
diff --git a/sysvinit/Makefile.in b/sysvinit/Makefile.in
1495bf
index cad70a6..85631ed 100644
1495bf
--- a/sysvinit/Makefile.in
1495bf
+++ b/sysvinit/Makefile.in
1495bf
@@ -1,7 +1,7 @@
1495bf
-# Makefile.in generated by automake 1.15 from Makefile.am.
1495bf
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
1495bf
 # @configure_input@
1495bf
 
1495bf
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
1495bf
 
1495bf
 # This Makefile.in is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
diff --git a/tests/Makefile.in b/tests/Makefile.in
1495bf
index 239af9a..1a339be 100644
1495bf
--- a/tests/Makefile.in
1495bf
+++ b/tests/Makefile.in
1495bf
@@ -1,7 +1,7 @@
1495bf
-# Makefile.in generated by automake 1.15 from Makefile.am.
1495bf
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
1495bf
 # @configure_input@
1495bf
 
1495bf
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
1495bf
 
1495bf
 # This Makefile.in is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
@@ -473,8 +473,6 @@ EXTRA_DIST = \
1495bf
 	008-certread/expected.out \
1495bf
 	009-oiddict/run.sh \
1495bf
 	009-oiddict/expected.out \
1495bf
-	010-iterate/run.sh \
1495bf
-	010-iterate/expected.out \
1495bf
 	011-dbinit/expected.out \
1495bf
 	011-dbinit/run.sh \
1495bf
 	011-dbinit-dbm/expected.out \
1495bf
@@ -561,18 +559,21 @@ EXTRA_DIST = \
1495bf
 	036-getcert/expected.out \
1495bf
 	036-getcert/run.sh \
1495bf
 	037-rekey2/expected.out \
1495bf
-	037-rekey2/run.sh
1495bf
+	037-rekey2/run.sh \
1495bf
+	038-ms-v2-template/expected.out \
1495bf
+	038-ms-v2-template/extract-extdata.py \
1495bf
+	038-ms-v2-template/run.sh
1495bf
 
1495bf
 subdirs = 001-keyiread 001-keyiread-rsa 002-keygen 002-keygen-rsa \
1495bf
 	003-csrgen 003-csrgen-rsa 004-selfsign 004-selfsign-rsa \
1495bf
 	005-dbusm 006-serial 007-certsave 008-certread 009-oiddict \
1495bf
-	010-iterate 011-dbinit 012-dbadd 013-enckey 014-prefs \
1495bf
-	015-lockedkey 016-dates 017-notoken 018-pembase 019-dparse \
1495bf
-	021-resume 022-base64 023-cadata 024-citerate 025-casave \
1495bf
-	026-local 027-hooks 028-dbus 029-canonize 030-rekey 031-pkcs7 \
1495bf
-	032-chain 033-scep 034-perms 035-json 036-getcert 037-rekey2 \
1495bf
-	$(am__append_1) $(am__append_2) $(am__append_3) \
1495bf
-	$(am__append_4)
1495bf
+	011-dbinit 012-dbadd 013-enckey 014-prefs 015-lockedkey \
1495bf
+	016-dates 017-notoken 018-pembase 019-dparse 021-resume \
1495bf
+	022-base64 023-cadata 024-citerate 025-casave 026-local \
1495bf
+	027-hooks 028-dbus 029-canonize 030-rekey 031-pkcs7 032-chain \
1495bf
+	033-scep 034-perms 035-json 036-getcert 037-rekey2 \
1495bf
+	038-ms-v2-template $(am__append_1) $(am__append_2) \
1495bf
+	$(am__append_3) $(am__append_4)
1495bf
 all: all-recursive
1495bf
 
1495bf
 .SUFFIXES:
1495bf
diff --git a/tests/tools/Makefile.in b/tests/tools/Makefile.in
1495bf
index c0565d2..4e77d61 100644
1495bf
--- a/tests/tools/Makefile.in
1495bf
+++ b/tests/tools/Makefile.in
1495bf
@@ -1,7 +1,7 @@
1495bf
-# Makefile.in generated by automake 1.15 from Makefile.am.
1495bf
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
1495bf
 # @configure_input@
1495bf
 
1495bf
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
1495bf
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
1495bf
 
1495bf
 # This Makefile.in is free software; the Free Software Foundation
1495bf
 # gives unlimited permission to copy and/or distribute it,
1495bf
-- 
1495bf
2.17.2
1495bf