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

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