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

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