fix runtime problems with musl libc, add gnu_getopt for musl builds via configure magic

3 files changed, 7193 insertions, 11 deletions

diff --git a/package/cifs-utils/Makefile b/package/cifs-utils/Makefile
index 4798a03a8..77095eeac 100644
--- a/package/cifs-utils/Makefile
+++ b/package/cifs-utils/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		cifs-utils
 PKG_VERSION:=		6.1
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		f83ef48ab1154aa74dd4cf1c1202bf04
 PKG_DESCR:=		CIFS utilities
 PKG_SECTION:=		net/fs
diff --git a/package/cifs-utils/patches/autotools.patch b/package/cifs-utils/patches/autotools.patch
new file mode 100644
index 000000000..a1056a12d
--- /dev/null
+++ b/package/cifs-utils/patches/autotools.patch
@@ -0,0 +1,7192 @@
+diff -Nur cifs-utils-6.1.orig/aclocal.m4 cifs-utils-6.1/aclocal.m4
+--- cifs-utils-6.1.orig/aclocal.m4	2013-07-02 21:20:30.000000000 +0200
++++ cifs-utils-6.1/aclocal.m4	2013-10-05 18:12:37.000000000 +0200
+@@ -1,7 +1,8 @@
+-# generated automatically by aclocal 1.12.2 -*- Autoconf -*-
+-
+-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
++# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+ 
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
++# Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,48 +18,7 @@
+ [m4_warning([this file was generated for autoconf 2.69.
+ You have another version of autoconf.  It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
+-To do so, use the procedure documented by the package, typically 'autoreconf'.])])
+-
+-# libcap-ng.m4 - Checks for the libcap-ng support
+-# 	Copyright (c) 2009 Steve Grubb sgrubb@redhat.com
+-#
+-AC_DEFUN([LIBCAP_NG_PATH],
+-[
+-  AC_ARG_WITH(libcap-ng,
+-    [  --with-libcap-ng=[auto/yes/no]  Add Libcap-ng support [default=auto]],,
+-    with_libcap_ng=auto)
+-
+-  # Check for Libcap-ng API
+-  #
+-  # libcap-ng detection
+-
+-  if test x$with_libcap_ng = xno ; then
+-      have_libcap_ng=no;
+-  else
+-      # Start by checking for header file
+-      AC_CHECK_HEADER(cap-ng.h, capng_headers=yes, capng_headers=no)
+-
+-      # See if we have libcap-ng library
+-      AC_CHECK_LIB(cap-ng, capng_clear,
+-	         CAPNG_LDADD=-lcap-ng,)
+-
+-      # Check results are usable
+-      if test x$with_libcap_ng = xyes -a x$CAPNG_LDADD = x ; then
+-         AC_MSG_ERROR(libcap-ng support was requested and the library was not found)
+-      fi
+-      if test x$CAPNG_LDADD != x -a $capng_headers = no ; then
+-         AC_MSG_ERROR(libcap-ng libraries found but headers are missing)
+-      fi
+-  fi
+-  AC_SUBST(CAPNG_LDADD)
+-  AC_MSG_CHECKING(whether to use libcap-ng)
+-  if test x$CAPNG_LDADD != x ; then
+-      AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])
+-      AC_MSG_RESULT(yes)
+-  else
+-      AC_MSG_RESULT(no)
+-  fi
+-])
++To do so, use the procedure documented by the package, typically `autoreconf'.])])
+ 
+ # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+ # serial 1 (pkg-config-0.24)
+@@ -220,53 +180,14 @@
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+ 
+-
+-# PKG_INSTALLDIR(DIRECTORY)
+-# -------------------------
+-# Substitutes the variable pkgconfigdir as the location where a module
+-# should install pkg-config .pc files. By default the directory is
+-# $libdir/pkgconfig, but the default can be changed by passing
+-# DIRECTORY. The user can override through the --with-pkgconfigdir
+-# parameter.
+-AC_DEFUN([PKG_INSTALLDIR],
+-[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+-m4_pushdef([pkg_description],
+-    [pkg-config installation directory @<:@]pkg_default[@:>@])
+-AC_ARG_WITH([pkgconfigdir],
+-    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+-    [with_pkgconfigdir=]pkg_default)
+-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+-m4_popdef([pkg_default])
+-m4_popdef([pkg_description])
+-]) dnl PKG_INSTALLDIR
+-
+-
+-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+-# -------------------------
+-# Substitutes the variable noarch_pkgconfigdir as the location where a
+-# module should install arch-independent pkg-config .pc files. By
+-# default the directory is $datadir/pkgconfig, but the default can be
+-# changed by passing DIRECTORY. The user can override through the
+-# --with-noarch-pkgconfigdir parameter.
+-AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+-[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+-m4_pushdef([pkg_description],
+-    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+-AC_ARG_WITH([noarch-pkgconfigdir],
+-    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+-    [with_noarch_pkgconfigdir=]pkg_default)
+-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+-m4_popdef([pkg_default])
+-m4_popdef([pkg_description])
+-]) dnl PKG_NOARCH_INSTALLDIR
+-
+-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
++# Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 8
++# serial 1
+ 
+ # AM_AUTOMAKE_VERSION(VERSION)
+ # ----------------------------
+@@ -274,10 +195,10 @@
+ # generated from the m4 files accompanying Automake X.Y.
+ # (This private macro should not be called outside this file.)
+ AC_DEFUN([AM_AUTOMAKE_VERSION],
+-[am__api_version='1.12'
++[am__api_version='1.11'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version.  Point them to the right macro.
+-m4_if([$1], [1.12.2], [],
++m4_if([$1], [1.11.6], [],
+       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+ 
+@@ -293,24 +214,24 @@
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.12.2])dnl
++[AM_AUTOMAKE_VERSION([1.11.6])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+ 
+ # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+ 
+-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 2
++# serial 1
+ 
+ # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+-# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
++# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
++# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+ #
+ # Of course, Automake must honor this variable whenever it calls a
+ # tool from the auxiliary directory.  The problem is that $srcdir (and
+@@ -329,7 +250,7 @@
+ #
+ # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+ # are both prefixed by $srcdir.  In an in-source build this is usually
+-# harmless because $srcdir is '.', but things will broke when you
++# harmless because $srcdir is `.', but things will broke when you
+ # start a VPATH build or use an absolute $srcdir.
+ #
+ # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+@@ -355,21 +276,22 @@
+ 
+ # AM_CONDITIONAL                                            -*- Autoconf -*-
+ 
+-# Copyright (C) 1997-2012 Free Software Foundation, Inc.
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
++# Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 10
++# serial 9
+ 
+ # AM_CONDITIONAL(NAME, SHELL-CONDITION)
+ # -------------------------------------
+ # Define a conditional.
+ AC_DEFUN([AM_CONDITIONAL],
+-[AC_PREREQ([2.52])dnl
+- m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
++[AC_PREREQ(2.52)dnl
++ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
++	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+ AC_SUBST([$1_TRUE])dnl
+ AC_SUBST([$1_FALSE])dnl
+ _AM_SUBST_NOTMAKE([$1_TRUE])dnl
+@@ -388,15 +310,16 @@
+ Usually this means the macro was only invoked conditionally.]])
+ fi])])
+ 
+-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
++# 2010, 2011 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 17
++# serial 12
+ 
+-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+ # will think it sees a *use*, and therefore will trigger all it's
+ # C support machinery.  Also note that it means that autoscan, seeing
+@@ -406,7 +329,7 @@
+ # _AM_DEPENDENCIES(NAME)
+ # ----------------------
+ # See how the compiler implements dependency checking.
+-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
++# NAME is "CC", "CXX", "GCJ", or "OBJC".
+ # We try a few techniques and use that to set a single cache variable.
+ #
+ # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+@@ -419,13 +342,12 @@
+ AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+ AC_REQUIRE([AM_DEP_TRACK])dnl
+ 
+-m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+-      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+-      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+-      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+-      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+-      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+-                    [depcc="$$1"   am_compiler_list=])
++ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
++       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
++       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
++       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
++       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
++                   [depcc="$$1"   am_compiler_list=])
+ 
+ AC_CACHE_CHECK([dependency style of $depcc],
+                [am_cv_$1_dependencies_compiler_type],
+@@ -433,8 +355,8 @@
+   # We make a subdir and do the tests there.  Otherwise we can end up
+   # making bogus files that we don't know about and never remove.  For
+   # instance it was reported that on HP-UX the gcc test will end up
+-  # making a dummy file named 'D' -- because '-MD' means "put the output
+-  # in D".
++  # making a dummy file named `D' -- because `-MD' means `put the output
++  # in D'.
+   rm -rf conftest.dir
+   mkdir conftest.dir
+   # Copy depcomp to subdir because otherwise we won't find it if we're
+@@ -474,16 +396,16 @@
+     : > sub/conftest.c
+     for i in 1 2 3 4 5 6; do
+       echo '#include "conftst'$i'.h"' >> sub/conftest.c
+-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+-      # Solaris 10 /bin/sh.
+-      echo '/* dummy */' > sub/conftst$i.h
++      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++      # Solaris 8's {/usr,}/bin/sh.
++      touch sub/conftst$i.h
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
+-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+     # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle '-M -o', and we need to detect this.  Also, some Intel
+-    # versions had trouble with output in subdirs.
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
+     am__obj=sub/conftest.${OBJEXT-o}
+     am__minus_obj="-o $am__obj"
+     case $depmode in
+@@ -492,8 +414,8 @@
+       test "$am__universal" = false || continue
+       ;;
+     nosideeffect)
+-      # After this tag, mechanisms are not by side-effect, so they'll
+-      # only be used when explicitly requested.
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
+       if test "x$enable_dependency_tracking" = xyes; then
+ 	continue
+       else
+@@ -501,7 +423,7 @@
+       fi
+       ;;
+     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+-      # This compiler won't grok '-c -o', but also, the minuso test has
++      # This compiler won't grok `-c -o', but also, the minuso test has
+       # not run yet.  These depmodes are late enough in the game, and
+       # so weak that their functioning should not be impacted.
+       am__obj=conftest.${OBJEXT-o}
+@@ -549,7 +471,7 @@
+ # AM_SET_DEPDIR
+ # -------------
+ # Choose a directory name for dependency files.
+-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
++# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+ AC_DEFUN([AM_SET_DEPDIR],
+ [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+@@ -559,13 +481,9 @@
+ # AM_DEP_TRACK
+ # ------------
+ AC_DEFUN([AM_DEP_TRACK],
+-[AC_ARG_ENABLE([dependency-tracking], [dnl
+-AS_HELP_STRING(
+-  [--enable-dependency-tracking],
+-  [do not reject slow dependency extractors])
+-AS_HELP_STRING(
+-  [--disable-dependency-tracking],
+-  [speeds up one-time build])])
++[AC_ARG_ENABLE(dependency-tracking,
++[  --disable-dependency-tracking  speeds up one-time build
++  --enable-dependency-tracking   do not reject slow dependency extractors])
+ if test "x$enable_dependency_tracking" != xno; then
+   am_depcomp="$ac_aux_dir/depcomp"
+   AMDEPBACKSLASH='\'
+@@ -580,13 +498,14 @@
+ 
+ # Generate code to set up dependency tracking.              -*- Autoconf -*-
+ 
+-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
++# Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 6
++#serial 5
+ 
+ # _AM_OUTPUT_DEPENDENCY_COMMANDS
+ # ------------------------------
+@@ -605,7 +524,7 @@
+     # Strip MF so we end up with the name of the file.
+     mf=`echo "$mf" | sed -e 's/:.*$//'`
+     # Check whether this is an Automake generated Makefile or not.
+-    # We used to match only the files named 'Makefile.in', but
++    # We used to match only the files named `Makefile.in', but
+     # some people rename them; so instead we look at the file content.
+     # Grep'ing the first line is not enough: some people post-process
+     # each Makefile.in and add a new line on top of each file to say so.
+@@ -617,19 +536,21 @@
+       continue
+     fi
+     # Extract the definition of DEPDIR, am__include, and am__quote
+-    # from the Makefile without running 'make'.
++    # from the Makefile without running `make'.
+     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+     test -z "$DEPDIR" && continue
+     am__include=`sed -n 's/^am__include = //p' < "$mf"`
+     test -z "am__include" && continue
+     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++    # When using ansi2knr, U may be empty or an underscore; expand it
++    U=`sed -n 's/^U = //p' < "$mf"`
+     # Find all dependency output files, they are included files with
+     # $(DEPDIR) in their names.  We invoke sed twice because it is the
+     # simplest approach to changing $(DEPDIR) to its actual value in the
+     # expansion.
+     for file in `sed -n "
+       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
++	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+       # Make sure the directory exists.
+       test -f "$dirpart/$file" && continue
+       fdir=`AS_DIRNAME(["$file"])`
+@@ -647,7 +568,7 @@
+ # This macro should only be invoked once -- use via AC_REQUIRE.
+ #
+ # This code is only required when automatic dependency tracking
+-# is enabled.  FIXME.  This creates each '.P' file that we will
++# is enabled.  FIXME.  This creates each `.P' file that we will
+ # need in order to bootstrap the dependency handling code.
+ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+ [AC_CONFIG_COMMANDS([depfiles],
+@@ -657,13 +578,14 @@
+ 
+ # Do all the work for Automake.                             -*- Autoconf -*-
+ 
+-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 19
++# serial 16
+ 
+ # This macro actually does too much.  Some checks are only needed if
+ # your package does certain things.  But this isn't really a big deal.
+@@ -709,41 +631,31 @@
+ # Define the identity of the package.
+ dnl Distinguish between old-style and new-style calls.
+ m4_ifval([$2],
+-[AC_DIAGNOSE([obsolete],
+-[$0: two- and three-arguments forms are deprecated.  For more info, see:
+-http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation])
+-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+  AC_SUBST([PACKAGE], [$1])dnl
+  AC_SUBST([VERSION], [$2])],
+ [_AM_SET_OPTIONS([$1])dnl
+ dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+-m4_if(
+-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+-  [ok:ok],,
++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+ 
+ _AM_IF_OPTION([no-define],,
+-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+ 
+ # Some tools Automake needs.
+ AC_REQUIRE([AM_SANITY_CHECK])dnl
+ AC_REQUIRE([AC_ARG_PROGRAM])dnl
+-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+-AM_MISSING_PROG([AUTOCONF], [autoconf])
+-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+-AM_MISSING_PROG([AUTOHEADER], [autoheader])
+-AM_MISSING_PROG([MAKEINFO], [makeinfo])
++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
++AM_MISSING_PROG(AUTOCONF, autoconf)
++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
++AM_MISSING_PROG(AUTOHEADER, autoheader)
++AM_MISSING_PROG(MAKEINFO, makeinfo)
+ AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+-# For better backward compatibility.  To be removed once Automake 1.9.x
+-# dies out for good.  For more background, see:
+-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
++AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+ AC_REQUIRE([AC_PROG_AWK])dnl
+@@ -754,35 +666,28 @@
+ 			     [_AM_PROG_TAR([v7])])])
+ _AM_IF_OPTION([no-dependencies],,
+ [AC_PROVIDE_IFELSE([AC_PROG_CC],
+-		  [_AM_DEPENDENCIES([CC])],
+-		  [m4_define([AC_PROG_CC],
+-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
++		  [_AM_DEPENDENCIES(CC)],
++		  [define([AC_PROG_CC],
++			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ AC_PROVIDE_IFELSE([AC_PROG_CXX],
+-		  [_AM_DEPENDENCIES([CXX])],
+-		  [m4_define([AC_PROG_CXX],
+-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
++		  [_AM_DEPENDENCIES(CXX)],
++		  [define([AC_PROG_CXX],
++			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+-		  [_AM_DEPENDENCIES([OBJC])],
+-		  [m4_define([AC_PROG_OBJC],
+-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+-dnl Support for Objective C++ was only introduced in Autoconf 2.65,
+-dnl but we still cater to Autoconf 2.62.
+-m4_ifdef([AC_PROG_OBJCXX],
+-[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+-		  [_AM_DEPENDENCIES([OBJCXX])],
+-		  [m4_define([AC_PROG_OBJCXX],
+-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl
++		  [_AM_DEPENDENCIES(OBJC)],
++		  [define([AC_PROG_OBJC],
++			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ ])
+ _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+-dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the
+-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
++dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
++dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+ dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+ AC_CONFIG_COMMANDS_PRE(dnl
+ [m4_provide_if([_AM_COMPILER_EXEEXT],
+   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+ ])
+ 
+-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
++dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+ dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+ dnl mangled by Autoconf and run in a shell conditional statement.
+ m4_define([_AC_COMPILER_EXEEXT],
+@@ -810,13 +715,14 @@
+ done
+ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+ 
+-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
++# Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 8
++# serial 1
+ 
+ # AM_PROG_INSTALL_SH
+ # ------------------
+@@ -831,9 +737,9 @@
+     install_sh="\${SHELL} $am_aux_dir/install-sh"
+   esac
+ fi
+-AC_SUBST([install_sh])])
++AC_SUBST(install_sh)])
+ 
+-# Copyright (C) 2003-2012 Free Software Foundation, Inc.
++# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -856,13 +762,13 @@
+ 
+ # Check to see how 'make' treats includes.	            -*- Autoconf -*-
+ 
+-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 5
++# serial 4
+ 
+ # AM_MAKE_INCLUDE()
+ # -----------------
+@@ -881,7 +787,7 @@
+ _am_result=none
+ # First try GNU make style include.
+ echo "include confinc" > confmf
+-# Ignore all kinds of additional output from 'make'.
++# Ignore all kinds of additional output from `make'.
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+   am__include=include
+@@ -906,7 +812,8 @@
+ rm -f confinc confmf
+ ])
+ 
+-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
++# Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -942,13 +849,14 @@
+ 
+ # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+ 
+-# Copyright (C) 1997-2012 Free Software Foundation, Inc.
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
++# Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 7
++# serial 6
+ 
+ # AM_MISSING_PROG(NAME, PROGRAM)
+ # ------------------------------
+@@ -978,19 +886,49 @@
+   am_missing_run="$MISSING --run "
+ else
+   am_missing_run=
+-  AC_MSG_WARN(['missing' script is too old or missing])
++  AC_MSG_WARN([`missing' script is too old or missing])
+ fi
+ ])
+ 
++# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
++# Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 1
++
++# AM_PROG_MKDIR_P
++# ---------------
++# Check for `mkdir -p'.
++AC_DEFUN([AM_PROG_MKDIR_P],
++[AC_PREREQ([2.60])dnl
++AC_REQUIRE([AC_PROG_MKDIR_P])dnl
++dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
++dnl while keeping a definition of mkdir_p for backward compatibility.
++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
++dnl Makefile.ins that do not define MKDIR_P, so we do our own
++dnl adjustment using top_builddir (which is defined more often than
++dnl MKDIR_P).
++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
++case $mkdir_p in
++  [[\\/$]]* | ?:[[\\/]]*) ;;
++  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
++])
++
+ # Helper functions for option handling.                     -*- Autoconf -*-
+ 
+-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
++# Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 6
++# serial 5
+ 
+ # _AM_MANGLE_OPTION(NAME)
+ # -----------------------
+@@ -1001,7 +939,7 @@
+ # --------------------
+ # Set option NAME.  Presently that only means defining a flag for this option.
+ AC_DEFUN([_AM_SET_OPTION],
+-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
++[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+ 
+ # _AM_SET_OPTIONS(OPTIONS)
+ # ------------------------
+@@ -1017,18 +955,22 @@
+ 
+ # Check to make sure that the build environment is sane.    -*- Autoconf -*-
+ 
+-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
++# Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 9
++# serial 5
+ 
+ # AM_SANITY_CHECK
+ # ---------------
+ AC_DEFUN([AM_SANITY_CHECK],
+ [AC_MSG_CHECKING([whether build environment is sane])
++# Just in case
++sleep 1
++echo timestamp > conftest.file
+ # Reject unsafe characters in $srcdir or the absolute working directory
+ # name.  Accept space and tab only in the latter.
+ am_lf='
+@@ -1039,40 +981,32 @@
+ esac
+ case $srcdir in
+   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+-    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
++    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+ esac
+ 
+-# Do 'set' in a subshell so we don't clobber the current shell's
++# Do `set' in a subshell so we don't clobber the current shell's
+ # arguments.  Must try -L first in case configure is actually a
+ # symlink; some systems play weird games with the mod time of symlinks
+ # (eg FreeBSD returns the mod time of the symlink's containing
+ # directory).
+ if (
+-   am_has_slept=no
+-   for am_try in 1 2; do
+-     echo "timestamp, slept: $am_has_slept" > conftest.file
+-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+-     if test "$[*]" = "X"; then
+-	# -L didn't work.
+-	set X `ls -t "$srcdir/configure" conftest.file`
+-     fi
+-     if test "$[*]" != "X $srcdir/configure conftest.file" \
+-	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
+-
+-	# If neither matched, then we have a broken ls.  This can happen
+-	# if, for instance, CONFIG_SHELL is bash and it inherits a
+-	# broken ls alias from the environment.  This has actually
+-	# happened.  Such a system could not be considered "sane".
+-	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+-  alias in your environment])
+-     fi
+-     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+-       break
+-     fi
+-     # Just in case.
+-     sleep 1
+-     am_has_slept=yes
+-   done
++   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
++   if test "$[*]" = "X"; then
++      # -L didn't work.
++      set X `ls -t "$srcdir/configure" conftest.file`
++   fi
++   rm -f conftest.file
++   if test "$[*]" != "X $srcdir/configure conftest.file" \
++      && test "$[*]" != "X conftest.file $srcdir/configure"; then
++
++      # If neither matched, then we have a broken ls.  This can happen
++      # if, for instance, CONFIG_SHELL is bash and it inherits a
++      # broken ls alias from the environment.  This has actually
++      # happened.  Such a system could not be considered "sane".
++      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
++alias in your environment])
++   fi
++
+    test "$[2]" = conftest.file
+    )
+ then
+@@ -1082,55 +1016,39 @@
+    AC_MSG_ERROR([newly created file is older than distributed files!
+ Check your system clock])
+ fi
+-AC_MSG_RESULT([yes])
+-# If we didn't sleep, we still need to ensure time stamps of config.status and
+-# generated files are strictly newer.
+-am_sleep_pid=
+-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+-  ( sleep 1 ) &
+-  am_sleep_pid=$!
+-fi
+-AC_CONFIG_COMMANDS_PRE(
+-  [AC_MSG_CHECKING([that generated files are newer than configure])
+-   if test -n "$am_sleep_pid"; then
+-     # Hide warnings about reused PIDs.
+-     wait $am_sleep_pid 2>/dev/null
+-   fi
+-   AC_MSG_RESULT([done])])
+-rm -f conftest.file
+-])
++AC_MSG_RESULT(yes)])
+ 
+-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 2
++# serial 1
+ 
+ # AM_PROG_INSTALL_STRIP
+ # ---------------------
+-# One issue with vendor 'install' (even GNU) is that you can't
++# One issue with vendor `install' (even GNU) is that you can't
+ # specify the program used to strip binaries.  This is especially
+ # annoying in cross-compiling environments, where the build's strip
+ # is unlikely to handle the host's binaries.
+ # Fortunately install-sh will honor a STRIPPROG variable, so we
+-# always use install-sh in "make install-strip", and initialize
++# always use install-sh in `make install-strip', and initialize
+ # STRIPPROG with the value of the STRIP variable (set by the user).
+ AC_DEFUN([AM_PROG_INSTALL_STRIP],
+ [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+-# Installed binaries are usually stripped using 'strip' when the user
+-# run "make install-strip".  However 'strip' might not be the right
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'.  However `strip' might not be the right
+ # tool to use in cross-compilation environments, therefore Automake
+-# will honor the 'STRIP' environment variable to overrule this program.
+-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
++# will honor the `STRIP' environment variable to overrule this program.
++dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+ if test "$cross_compiling" != no; then
+   AC_CHECK_TOOL([STRIP], [strip], :)
+ fi
+ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+ 
+-# Copyright (C) 2006-2012 Free Software Foundation, Inc.
++# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -1151,18 +1069,18 @@
+ 
+ # Check how to create a tarball.                            -*- Autoconf -*-
+ 
+-# Copyright (C) 2004-2012 Free Software Foundation, Inc.
++# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 3
++# serial 2
+ 
+ # _AM_PROG_TAR(FORMAT)
+ # --------------------
+ # Check how to create a tarball in format FORMAT.
+-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
++# FORMAT should be one of `v7', `ustar', or `pax'.
+ #
+ # Substitute a variable $(am__tar) that is a command
+ # writing to stdout a FORMAT-tarball containing the directory
+@@ -1185,7 +1103,7 @@
+ _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+ _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+ # Do not fold the above two line into one, because Tru64 sh and
+-# Solaris sh will not grok spaces in the rhs of '-'.
++# Solaris sh will not grok spaces in the rhs of `-'.
+ for _am_tool in $_am_tools
+ do
+   case $_am_tool in
+diff -Nur cifs-utils-6.1.orig/autom4te.cache/output.0 cifs-utils-6.1/autom4te.cache/output.0
+--- cifs-utils-6.1.orig/autom4te.cache/output.0	2013-07-02 21:20:30.000000000 +0200
++++ cifs-utils-6.1/autom4te.cache/output.0	2013-10-05 18:12:37.000000000 +0200
+@@ -626,7 +626,6 @@
+ am__EXEEXT_TRUE
+ LTLIBOBJS
+ LIBCAP
+-CAPNG_LDADD
+ CONFIG_PLUGIN_FALSE
+ CONFIG_PLUGIN_TRUE
+ CONFIG_CIFSACL_FALSE
+@@ -646,14 +645,6 @@
+ RELRO_CFLAGS
+ PIE_CFLAGS
+ RT_LDADD
+-host_os
+-host_vendor
+-host_cpu
+-host
+-build_os
+-build_vendor
+-build_cpu
+-build
+ LIB@&t@OBJS
+ SED
+ EGREP
+@@ -751,7 +742,6 @@
+ enable_systemd
+ with_idmap_plugin
+ enable_dependency_tracking
+-with_libcap_ng
+ with_libcap
+ '
+       ac_precious_vars='build_alias
+@@ -1370,10 +1360,6 @@
+   --program-prefix=PREFIX            prepend PREFIX to installed program names
+   --program-suffix=SUFFIX            append SUFFIX to installed program names
+   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+-
+-System types:
+-  --build=BUILD     configure for building on BUILD [guessed]
+-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+ _ACEOF
+ fi
+ 
+@@ -1396,10 +1382,8 @@
+   --enable-cifsacl        Create get/set cifsacl binary @<:@default=yes@:>@
+   --enable-systemd        Enable systemd specific behavior for mount.cifs
+                           @<:@default=yes@:>@
+-  --enable-dependency-tracking 
+-                          do not reject slow dependency extractors
+-  --disable-dependency-tracking 
+-                          speeds up one-time build
++  --disable-dependency-tracking  speeds up one-time build
++  --enable-dependency-tracking   do not reject slow dependency extractors
+ 
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+@@ -1408,7 +1392,6 @@
+                           Define the path to the plugin that the idmapping
+                           infrastructure should use
+                           @<:@default=/etc/cifs-utils/idmap-plugin@:>@
+-  --with-libcap-ng=auto/yes/no  Add Libcap-ng support default=auto
+   --with-libcap    Add libcap support default=yes, if libcap-ng not available
+ 
+ Some influential environment variables:
+@@ -2323,7 +2306,7 @@
+ 
+ 
+ 
+-am__api_version='1.12'
++am__api_version='1.11'
+ 
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+@@ -2449,6 +2432,9 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+ $as_echo_n "checking whether build environment is sane... " >&6; }
++# Just in case
++sleep 1
++echo timestamp > conftest.file
+ # Reject unsafe characters in $srcdir or the absolute working directory
+ # name.  Accept space and tab only in the latter.
+ am_lf='
+@@ -2459,40 +2445,32 @@
+ esac
+ case $srcdir in
+   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+-    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
++    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ esac
+ 
+-# Do 'set' in a subshell so we don't clobber the current shell's
++# Do `set' in a subshell so we don't clobber the current shell's
+ # arguments.  Must try -L first in case configure is actually a
+ # symlink; some systems play weird games with the mod time of symlinks
+ # (eg FreeBSD returns the mod time of the symlink's containing
+ # directory).
+ if (
+-   am_has_slept=no
+-   for am_try in 1 2; do
+-     echo "timestamp, slept: $am_has_slept" > conftest.file
+-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+-     if test "$*" = "X"; then
+-	# -L didn't work.
+-	set X `ls -t "$srcdir/configure" conftest.file`
+-     fi
+-     if test "$*" != "X $srcdir/configure conftest.file" \
+-	&& test "$*" != "X conftest.file $srcdir/configure"; then
++   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
++   if test "$*" = "X"; then
++      # -L didn't work.
++      set X `ls -t "$srcdir/configure" conftest.file`
++   fi
++   rm -f conftest.file
++   if test "$*" != "X $srcdir/configure conftest.file" \
++      && test "$*" != "X conftest.file $srcdir/configure"; then
++
++      # If neither matched, then we have a broken ls.  This can happen
++      # if, for instance, CONFIG_SHELL is bash and it inherits a
++      # broken ls alias from the environment.  This has actually
++      # happened.  Such a system could not be considered "sane".
++      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
++alias in your environment" "$LINENO" 5
++   fi
+ 
+-	# If neither matched, then we have a broken ls.  This can happen
+-	# if, for instance, CONFIG_SHELL is bash and it inherits a
+-	# broken ls alias from the environment.  This has actually
+-	# happened.  Such a system could not be considered "sane".
+-	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+-  alias in your environment" "$LINENO" 5
+-     fi
+-     if test "$2" = conftest.file || test $am_try -eq 2; then
+-       break
+-     fi
+-     # Just in case.
+-     sleep 1
+-     am_has_slept=yes
+-   done
+    test "$2" = conftest.file
+    )
+ then
+@@ -2504,16 +2482,6 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-# If we didn't sleep, we still need to ensure time stamps of config.status and
+-# generated files are strictly newer.
+-am_sleep_pid=
+-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+-  ( sleep 1 ) &
+-  am_sleep_pid=$!
+-fi
+-
+-rm -f conftest.file
+-
+ test "$program_prefix" != NONE &&
+   program_transform_name="s&^&$program_prefix&;$program_transform_name"
+ # Use a double $ so make ignores it.
+@@ -2540,8 +2508,8 @@
+   am_missing_run="$MISSING --run "
+ else
+   am_missing_run=
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
++$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+ 
+ if test x"${install_sh}" != xset; then
+@@ -2553,10 +2521,10 @@
+   esac
+ fi
+ 
+-# Installed binaries are usually stripped using 'strip' when the user
+-# run "make install-strip".  However 'strip' might not be the right
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'.  However `strip' might not be the right
+ # tool to use in cross-compilation environments, therefore Automake
+-# will honor the 'STRIP' environment variable to overrule this program.
++# will honor the `STRIP' environment variable to overrule this program.
+ if test "$cross_compiling" != no; then
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+@@ -2695,6 +2663,12 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+ $as_echo "$MKDIR_P" >&6; }
+ 
++mkdir_p="$MKDIR_P"
++case $mkdir_p in
++  [\\/$]* | ?:[\\/]*) ;;
++  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
++
+ for ac_prog in gawk mawk nawk awk
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -2827,12 +2801,6 @@
+ 
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ 
+-# For better backward compatibility.  To be removed once Automake 1.9.x
+-# dies out for good.  For more background, see:
+-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+-mkdir_p='$(MKDIR_P)'
+-
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+ # Always define AMTAR for backward compatibility.  Yes, it's still used
+@@ -3735,7 +3703,7 @@
+ _am_result=none
+ # First try GNU make style include.
+ echo "include confinc" > confmf
+-# Ignore all kinds of additional output from 'make'.
++# Ignore all kinds of additional output from `make'.
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+   am__include=include
+@@ -3791,8 +3759,8 @@
+   # We make a subdir and do the tests there.  Otherwise we can end up
+   # making bogus files that we don't know about and never remove.  For
+   # instance it was reported that on HP-UX the gcc test will end up
+-  # making a dummy file named 'D' -- because '-MD' means "put the output
+-  # in D".
++  # making a dummy file named `D' -- because `-MD' means `put the output
++  # in D'.
+   rm -rf conftest.dir
+   mkdir conftest.dir
+   # Copy depcomp to subdir because otherwise we won't find it if we're
+@@ -3827,16 +3795,16 @@
+     : > sub/conftest.c
+     for i in 1 2 3 4 5 6; do
+       echo '#include "conftst'$i'.h"' >> sub/conftest.c
+-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+-      # Solaris 10 /bin/sh.
+-      echo '/* dummy */' > sub/conftst$i.h
++      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++      # Solaris 8's {/usr,}/bin/sh.
++      touch sub/conftst$i.h
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
+-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+     # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle '-M -o', and we need to detect this.  Also, some Intel
+-    # versions had trouble with output in subdirs.
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
+     am__obj=sub/conftest.${OBJEXT-o}
+     am__minus_obj="-o $am__obj"
+     case $depmode in
+@@ -3845,8 +3813,8 @@
+       test "$am__universal" = false || continue
+       ;;
+     nosideeffect)
+-      # After this tag, mechanisms are not by side-effect, so they'll
+-      # only be used when explicitly requested.
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
+       if test "x$enable_dependency_tracking" = xyes; then
+ 	continue
+       else
+@@ -3854,7 +3822,7 @@
+       fi
+       ;;
+     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+-      # This compiler won't grok '-c -o', but also, the minuso test has
++      # This compiler won't grok `-c -o', but also, the minuso test has
+       # not run yet.  These depmodes are late enough in the game, and
+       # so weak that their functioning should not be impacted.
+       am__obj=conftest.${OBJEXT-o}
+@@ -4827,346 +4795,76 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
+-$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
+-if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  rm -f conftest.sym conftest.file
+-echo >conftest.file
+-if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
+-  if test "$cross_compiling" = yes; then :
+-  ac_cv_func_lstat_dereferences_slashed_symlink=no
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-struct stat sbuf;
+-     /* Linux will dereference the symlink and fail, as required by POSIX.
+-	That is better in the sense that it means we will not
+-	have to compile and use the lstat wrapper.  */
+-     return lstat ("conftest.sym/", &sbuf) == 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  ac_cv_func_lstat_dereferences_slashed_symlink=yes
+-else
+-  ac_cv_func_lstat_dereferences_slashed_symlink=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+ 
+-else
+-  # If the `ln -s' command failed, then we probably don't even
+-  # have an lstat function.
+-  ac_cv_func_lstat_dereferences_slashed_symlink=no
+-fi
+-rm -f conftest.sym conftest.file
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
+-$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
+-
+-test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
+-  
+-cat >>confdefs.h <<_ACEOF
+-@%:@define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
+-_ACEOF
+-
+-
+-if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
+-  case " $LIB@&t@OBJS " in
+-  *" lstat.$ac_objext "* ) ;;
+-  *) LIB@&t@OBJS="$LIB@&t@OBJS lstat.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-for ac_header in stdlib.h
++# check for required functions
++for ac_func in alarm atexit endpwent getmntent getpass gettimeofday inet_ntop malloc memset realloc realpath setenv strchr strcmp strdup strerror strncasecmp strndup strnlen strpbrk strrchr strstr strtol strtoul tolower uname
+ do :
+-  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+-if test "x$ac_cv_header_stdlib_h" = xyes; then :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+-@%:@define HAVE_STDLIB_H 1
++@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+  
+-fi
+-
+-done
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
+-$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
+-if ${ac_cv_func_malloc_0_nonnull+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "$cross_compiling" = yes; then :
+-  ac_cv_func_malloc_0_nonnull=no
+ else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+-# include <stdlib.h>
+-#else
+-char *malloc ();
+-#endif
+-
+-int
+-main ()
+-{
+-return ! malloc (0);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  ac_cv_func_malloc_0_nonnull=yes
+-else
+-  ac_cv_func_malloc_0_nonnull=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
+-$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
+-if test $ac_cv_func_malloc_0_nonnull = yes; then :
+-  
+-$as_echo "@%:@define HAVE_MALLOC 1" >>confdefs.h
+-
+-else
+-  $as_echo "@%:@define HAVE_MALLOC 0" >>confdefs.h
+-
+-   case " $LIB@&t@OBJS " in
+-  *" malloc.$ac_objext "* ) ;;
+-  *) LIB@&t@OBJS="$LIB@&t@OBJS malloc.$ac_objext"
+- ;;
+-esac
+-
+-   
+-$as_echo "@%:@define malloc rpl_malloc" >>confdefs.h
+-
++  as_fn_error $? "necessary functions(s) not found" "$LINENO" 5
+ fi
++done
+ 
+ 
+-for ac_header in stdlib.h
++for ac_func in getopt_long
+ do :
+-  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+-if test "x$ac_cv_header_stdlib_h" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "getopt_long" "ac_cv_func_getopt_long"
++if test "x$ac_cv_func_getopt_long" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+-@%:@define HAVE_STDLIB_H 1
++@%:@define HAVE_GETOPT_LONG 1
+ _ACEOF
+  
++else
++  as_fn_error $? "getopt_long function not found" "$LINENO" 5
+ fi
+-
+ done
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5
+-$as_echo_n "checking for GNU libc compatible realloc... " >&6; }
+-if ${ac_cv_func_realloc_0_nonnull+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "$cross_compiling" = yes; then :
+-  ac_cv_func_realloc_0_nonnull=no
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if getopt_long is GNU specific" >&5
++$as_echo_n "checking if getopt_long is GNU specific... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+-# include <stdlib.h>
+-#else
+-char *realloc ();
+-#endif
+ 
++#include <features.h>
++#ifndef __GLIBC__
++#error No GNU extension
++#endif
++        
+ int
+ main ()
+ {
+-return ! realloc (0, 0);
++;
+   ;
+   return 0;
+ }
++    
+ _ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  ac_cv_func_realloc_0_nonnull=yes
+-else
+-  ac_cv_func_realloc_0_nonnull=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5
+-$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; }
+-if test $ac_cv_func_realloc_0_nonnull = yes; then :
++if ac_fn_c_try_cpp "$LINENO"; then :
+   
+-$as_echo "@%:@define HAVE_REALLOC 1" >>confdefs.h
+-
+-else
+-  $as_echo "@%:@define HAVE_REALLOC 0" >>confdefs.h
+-
+-   case " $LIB@&t@OBJS " in
+-  *" realloc.$ac_objext "* ) ;;
+-  *) LIB@&t@OBJS="$LIB@&t@OBJS realloc.$ac_objext"
+- ;;
+-esac
+-
+-   
+-$as_echo "@%:@define realloc rpl_realloc" >>confdefs.h
+-
+-fi
+-
+-
+-# Make sure we can run config.sub.
+-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+-$as_echo_n "checking build system type... " >&6; }
+-if ${ac_cv_build+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_build_alias=$build_alias
+-test "x$ac_build_alias" = x &&
+-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+-test "x$ac_build_alias" = x &&
+-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+-$as_echo "$ac_cv_build" >&6; }
+-case $ac_cv_build in
+-*-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+-esac
+-build=$ac_cv_build
+-ac_save_IFS=$IFS; IFS='-'
+-set x $ac_cv_build
+-shift
+-build_cpu=$1
+-build_vendor=$2
+-shift; shift
+-# Remember, the first character of IFS is used to create $*,
+-# except with old shells:
+-build_os=$*
+-IFS=$ac_save_IFS
+-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+-$as_echo_n "checking host system type... " >&6; }
+-if ${ac_cv_host+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "x$host_alias" = x; then
+-  ac_cv_host=$ac_cv_build
+-else
+-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+-$as_echo "$ac_cv_host" >&6; }
+-case $ac_cv_host in
+-*-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+-esac
+-host=$ac_cv_host
+-ac_save_IFS=$IFS; IFS='-'
+-set x $ac_cv_host
+-shift
+-host_cpu=$1
+-host_vendor=$2
+-shift; shift
+-# Remember, the first character of IFS is used to create $*,
+-# except with old shells:
+-host_os=$*
+-IFS=$ac_save_IFS
+-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+-
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strnlen" >&5
+-$as_echo_n "checking for working strnlen... " >&6; }
+-if ${ac_cv_func_strnlen_working+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "$cross_compiling" = yes; then :
+-  # Guess no on AIX systems, yes otherwise.
+-		case "$host_os" in
+-		  aix*) ac_cv_func_strnlen_working=no;;
+-		  *)    ac_cv_func_strnlen_working=yes;;
+-		esac
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-
+-#define S "foobar"
+-#define S_LEN (sizeof S - 1)
+-
+-  /* At least one implementation is buggy: that of AIX 4.3 would
+-     give strnlen (S, 1) == 3.  */
+-
+-  int i;
+-  for (i = 0; i < S_LEN + 1; ++i)
+-    {
+-      int expected = i <= S_LEN ? i : S_LEN;
+-      if (strnlen (S, i) != expected)
+-	return 1;
+-    }
+-  return 0;
++      
++$as_echo "@%:@define HAVE_GNU_GETOPT_LONG 1" >>confdefs.h
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  ac_cv_func_strnlen_working=yes
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++    
+ else
+-  ac_cv_func_strnlen_working=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strnlen_working" >&5
+-$as_echo "$ac_cv_func_strnlen_working" >&6; }
+-test $ac_cv_func_strnlen_working = no && case " $LIB@&t@OBJS " in
+-  *" strnlen.$ac_objext "* ) ;;
+-  *) LIB@&t@OBJS="$LIB@&t@OBJS strnlen.$ac_objext"
++  
++      case " $LIB@&t@OBJS " in
++  *" gnu_getopt.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS gnu_getopt.$ac_objext"
+  ;;
+ esac
+ 
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+-
+-# check for required functions
+-for ac_func in alarm atexit endpwent getmntent getpass gettimeofday inet_ntop memset realpath setenv strchr strcmp strdup strerror strncasecmp strndup strpbrk strrchr strstr strtol strtoul tolower uname
+-do :
+-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+-  cat >>confdefs.h <<_ACEOF
+-@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+- 
+-else
+-  as_fn_error $? "necessary functions(s) not found" "$LINENO" 5
+ fi
+-done
+-
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+ for ac_func in clock_gettime
+ do :
+@@ -5954,97 +5652,7 @@
+ fi
+ 
+ 
+-
+-  
+-@%:@ Check whether --with-libcap-ng was given.
+-if test "${with_libcap_ng+set}" = set; then :
+-  withval=$with_libcap_ng; 
+-else
+-  with_libcap_ng=auto
+-fi
+-
+-
+-  # Check for Libcap-ng API
+-  #
+-  # libcap-ng detection
+-
+-  if test x$with_libcap_ng = xno ; then
+-      have_libcap_ng=no;
+-  else
+-      # Start by checking for header file
+-      ac_fn_c_check_header_mongrel "$LINENO" "cap-ng.h" "ac_cv_header_cap_ng_h" "$ac_includes_default"
+-if test "x$ac_cv_header_cap_ng_h" = xyes; then :
+-  capng_headers=yes
+-else
+-  capng_headers=no
+-fi
+-
+-
+-
+-      # See if we have libcap-ng library
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for capng_clear in -lcap-ng" >&5
+-$as_echo_n "checking for capng_clear in -lcap-ng... " >&6; }
+-if ${ac_cv_lib_cap_ng_capng_clear+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcap-ng  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char capng_clear ();
+-int
+-main ()
+-{
+-return capng_clear ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_cap_ng_capng_clear=yes
+-else
+-  ac_cv_lib_cap_ng_capng_clear=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cap_ng_capng_clear" >&5
+-$as_echo "$ac_cv_lib_cap_ng_capng_clear" >&6; }
+-if test "x$ac_cv_lib_cap_ng_capng_clear" = xyes; then :
+-  CAPNG_LDADD=-lcap-ng
+-fi
+-
+-
+-      # Check results are usable
+-      if test x$with_libcap_ng = xyes -a x$CAPNG_LDADD = x ; then
+-         as_fn_error $? "libcap-ng support was requested and the library was not found" "$LINENO" 5
+-      fi
+-      if test x$CAPNG_LDADD != x -a $capng_headers = no ; then
+-         as_fn_error $? "libcap-ng libraries found but headers are missing" "$LINENO" 5
+-      fi
+-  fi
+-  
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use libcap-ng" >&5
+-$as_echo_n "checking whether to use libcap-ng... " >&6; }
+-  if test x$CAPNG_LDADD != x ; then
+-      
+-$as_echo "@%:@define HAVE_LIBCAP_NG 1" >>confdefs.h
+-
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-  else
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-  fi
+-
++LIBCAP_NG_PATH
+ 
+ if test "x$CAPNG_LDADD" = "x"; then
+ 	
+@@ -6253,14 +5861,6 @@
+ LTLIBOBJS=$ac_ltlibobjs
+ 
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+-$as_echo_n "checking that generated files are newer than configure... " >&6; }
+-   if test -n "$am_sleep_pid"; then
+-     # Hide warnings about reused PIDs.
+-     wait $am_sleep_pid 2>/dev/null
+-   fi
+-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+-$as_echo "done" >&6; }
+  if test -n "$EXEEXT"; then
+   am__EXEEXT_TRUE=
+   am__EXEEXT_FALSE='#'
+@@ -7504,7 +7104,7 @@
+     # Strip MF so we end up with the name of the file.
+     mf=`echo "$mf" | sed -e 's/:.*$//'`
+     # Check whether this is an Automake generated Makefile or not.
+-    # We used to match only the files named 'Makefile.in', but
++    # We used to match only the files named `Makefile.in', but
+     # some people rename them; so instead we look at the file content.
+     # Grep'ing the first line is not enough: some people post-process
+     # each Makefile.in and add a new line on top of each file to say so.
+@@ -7538,19 +7138,21 @@
+       continue
+     fi
+     # Extract the definition of DEPDIR, am__include, and am__quote
+-    # from the Makefile without running 'make'.
++    # from the Makefile without running `make'.
+     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+     test -z "$DEPDIR" && continue
+     am__include=`sed -n 's/^am__include = //p' < "$mf"`
+     test -z "am__include" && continue
+     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++    # When using ansi2knr, U may be empty or an underscore; expand it
++    U=`sed -n 's/^U = //p' < "$mf"`
+     # Find all dependency output files, they are included files with
+     # $(DEPDIR) in their names.  We invoke sed twice because it is the
+     # simplest approach to changing $(DEPDIR) to its actual value in the
+     # expansion.
+     for file in `sed -n "
+       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
++	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+       # Make sure the directory exists.
+       test -f "$dirpart/$file" && continue
+       fdir=`$as_dirname -- "$file" ||
+diff -Nur cifs-utils-6.1.orig/autom4te.cache/output.1 cifs-utils-6.1/autom4te.cache/output.1
+--- cifs-utils-6.1.orig/autom4te.cache/output.1	2013-07-02 21:20:33.000000000 +0200
++++ cifs-utils-6.1/autom4te.cache/output.1	2013-10-05 18:12:38.000000000 +0200
+@@ -626,7 +626,6 @@
+ am__EXEEXT_TRUE
+ LTLIBOBJS
+ LIBCAP
+-CAPNG_LDADD
+ CONFIG_PLUGIN_FALSE
+ CONFIG_PLUGIN_TRUE
+ CONFIG_CIFSACL_FALSE
+@@ -646,14 +645,6 @@
+ RELRO_CFLAGS
+ PIE_CFLAGS
+ RT_LDADD
+-host_os
+-host_vendor
+-host_cpu
+-host
+-build_os
+-build_vendor
+-build_cpu
+-build
+ LIB@&t@OBJS
+ SED
+ EGREP
+@@ -751,7 +742,6 @@
+ enable_systemd
+ with_idmap_plugin
+ enable_dependency_tracking
+-with_libcap_ng
+ with_libcap
+ '
+       ac_precious_vars='build_alias
+@@ -1370,10 +1360,6 @@
+   --program-prefix=PREFIX            prepend PREFIX to installed program names
+   --program-suffix=SUFFIX            append SUFFIX to installed program names
+   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+-
+-System types:
+-  --build=BUILD     configure for building on BUILD [guessed]
+-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+ _ACEOF
+ fi
+ 
+@@ -1396,10 +1382,8 @@
+   --enable-cifsacl        Create get/set cifsacl binary @<:@default=yes@:>@
+   --enable-systemd        Enable systemd specific behavior for mount.cifs
+                           @<:@default=yes@:>@
+-  --enable-dependency-tracking 
+-                          do not reject slow dependency extractors
+-  --disable-dependency-tracking 
+-                          speeds up one-time build
++  --disable-dependency-tracking  speeds up one-time build
++  --enable-dependency-tracking   do not reject slow dependency extractors
+ 
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+@@ -1408,7 +1392,6 @@
+                           Define the path to the plugin that the idmapping
+                           infrastructure should use
+                           @<:@default=/etc/cifs-utils/idmap-plugin@:>@
+-  --with-libcap-ng=auto/yes/no  Add Libcap-ng support default=auto
+   --with-libcap    Add libcap support default=yes, if libcap-ng not available
+ 
+ Some influential environment variables:
+@@ -2323,7 +2306,7 @@
+ 
+ 
+ 
+-am__api_version='1.12'
++am__api_version='1.11'
+ 
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+@@ -2449,6 +2432,9 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+ $as_echo_n "checking whether build environment is sane... " >&6; }
++# Just in case
++sleep 1
++echo timestamp > conftest.file
+ # Reject unsafe characters in $srcdir or the absolute working directory
+ # name.  Accept space and tab only in the latter.
+ am_lf='
+@@ -2459,40 +2445,32 @@
+ esac
+ case $srcdir in
+   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+-    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
++    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ esac
+ 
+-# Do 'set' in a subshell so we don't clobber the current shell's
++# Do `set' in a subshell so we don't clobber the current shell's
+ # arguments.  Must try -L first in case configure is actually a
+ # symlink; some systems play weird games with the mod time of symlinks
+ # (eg FreeBSD returns the mod time of the symlink's containing
+ # directory).
+ if (
+-   am_has_slept=no
+-   for am_try in 1 2; do
+-     echo "timestamp, slept: $am_has_slept" > conftest.file
+-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+-     if test "$*" = "X"; then
+-	# -L didn't work.
+-	set X `ls -t "$srcdir/configure" conftest.file`
+-     fi
+-     if test "$*" != "X $srcdir/configure conftest.file" \
+-	&& test "$*" != "X conftest.file $srcdir/configure"; then
++   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
++   if test "$*" = "X"; then
++      # -L didn't work.
++      set X `ls -t "$srcdir/configure" conftest.file`
++   fi
++   rm -f conftest.file
++   if test "$*" != "X $srcdir/configure conftest.file" \
++      && test "$*" != "X conftest.file $srcdir/configure"; then
++
++      # If neither matched, then we have a broken ls.  This can happen
++      # if, for instance, CONFIG_SHELL is bash and it inherits a
++      # broken ls alias from the environment.  This has actually
++      # happened.  Such a system could not be considered "sane".
++      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
++alias in your environment" "$LINENO" 5
++   fi
+ 
+-	# If neither matched, then we have a broken ls.  This can happen
+-	# if, for instance, CONFIG_SHELL is bash and it inherits a
+-	# broken ls alias from the environment.  This has actually
+-	# happened.  Such a system could not be considered "sane".
+-	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+-  alias in your environment" "$LINENO" 5
+-     fi
+-     if test "$2" = conftest.file || test $am_try -eq 2; then
+-       break
+-     fi
+-     # Just in case.
+-     sleep 1
+-     am_has_slept=yes
+-   done
+    test "$2" = conftest.file
+    )
+ then
+@@ -2504,16 +2482,6 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-# If we didn't sleep, we still need to ensure time stamps of config.status and
+-# generated files are strictly newer.
+-am_sleep_pid=
+-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+-  ( sleep 1 ) &
+-  am_sleep_pid=$!
+-fi
+-
+-rm -f conftest.file
+-
+ test "$program_prefix" != NONE &&
+   program_transform_name="s&^&$program_prefix&;$program_transform_name"
+ # Use a double $ so make ignores it.
+@@ -2540,8 +2508,8 @@
+   am_missing_run="$MISSING --run "
+ else
+   am_missing_run=
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
++$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+ 
+ if test x"${install_sh}" != xset; then
+@@ -2553,10 +2521,10 @@
+   esac
+ fi
+ 
+-# Installed binaries are usually stripped using 'strip' when the user
+-# run "make install-strip".  However 'strip' might not be the right
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'.  However `strip' might not be the right
+ # tool to use in cross-compilation environments, therefore Automake
+-# will honor the 'STRIP' environment variable to overrule this program.
++# will honor the `STRIP' environment variable to overrule this program.
+ if test "$cross_compiling" != no; then
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+@@ -2695,6 +2663,12 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+ $as_echo "$MKDIR_P" >&6; }
+ 
++mkdir_p="$MKDIR_P"
++case $mkdir_p in
++  [\\/$]* | ?:[\\/]*) ;;
++  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
++
+ for ac_prog in gawk mawk nawk awk
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -2827,12 +2801,6 @@
+ 
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ 
+-# For better backward compatibility.  To be removed once Automake 1.9.x
+-# dies out for good.  For more background, see:
+-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+-mkdir_p='$(MKDIR_P)'
+-
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+ # Always define AMTAR for backward compatibility.  Yes, it's still used
+@@ -3735,7 +3703,7 @@
+ _am_result=none
+ # First try GNU make style include.
+ echo "include confinc" > confmf
+-# Ignore all kinds of additional output from 'make'.
++# Ignore all kinds of additional output from `make'.
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+   am__include=include
+@@ -3791,8 +3759,8 @@
+   # We make a subdir and do the tests there.  Otherwise we can end up
+   # making bogus files that we don't know about and never remove.  For
+   # instance it was reported that on HP-UX the gcc test will end up
+-  # making a dummy file named 'D' -- because '-MD' means "put the output
+-  # in D".
++  # making a dummy file named `D' -- because `-MD' means `put the output
++  # in D'.
+   rm -rf conftest.dir
+   mkdir conftest.dir
+   # Copy depcomp to subdir because otherwise we won't find it if we're
+@@ -3827,16 +3795,16 @@
+     : > sub/conftest.c
+     for i in 1 2 3 4 5 6; do
+       echo '#include "conftst'$i'.h"' >> sub/conftest.c
+-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+-      # Solaris 10 /bin/sh.
+-      echo '/* dummy */' > sub/conftst$i.h
++      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++      # Solaris 8's {/usr,}/bin/sh.
++      touch sub/conftst$i.h
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
+-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+     # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle '-M -o', and we need to detect this.  Also, some Intel
+-    # versions had trouble with output in subdirs.
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
+     am__obj=sub/conftest.${OBJEXT-o}
+     am__minus_obj="-o $am__obj"
+     case $depmode in
+@@ -3845,8 +3813,8 @@
+       test "$am__universal" = false || continue
+       ;;
+     nosideeffect)
+-      # After this tag, mechanisms are not by side-effect, so they'll
+-      # only be used when explicitly requested.
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
+       if test "x$enable_dependency_tracking" = xyes; then
+ 	continue
+       else
+@@ -3854,7 +3822,7 @@
+       fi
+       ;;
+     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+-      # This compiler won't grok '-c -o', but also, the minuso test has
++      # This compiler won't grok `-c -o', but also, the minuso test has
+       # not run yet.  These depmodes are late enough in the game, and
+       # so weak that their functioning should not be impacted.
+       am__obj=conftest.${OBJEXT-o}
+@@ -4827,346 +4795,76 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
+-$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
+-if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  rm -f conftest.sym conftest.file
+-echo >conftest.file
+-if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
+-  if test "$cross_compiling" = yes; then :
+-  ac_cv_func_lstat_dereferences_slashed_symlink=no
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-struct stat sbuf;
+-     /* Linux will dereference the symlink and fail, as required by POSIX.
+-	That is better in the sense that it means we will not
+-	have to compile and use the lstat wrapper.  */
+-     return lstat ("conftest.sym/", &sbuf) == 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  ac_cv_func_lstat_dereferences_slashed_symlink=yes
+-else
+-  ac_cv_func_lstat_dereferences_slashed_symlink=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+ 
+-else
+-  # If the `ln -s' command failed, then we probably don't even
+-  # have an lstat function.
+-  ac_cv_func_lstat_dereferences_slashed_symlink=no
+-fi
+-rm -f conftest.sym conftest.file
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
+-$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
+-
+-test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
+-  
+-cat >>confdefs.h <<_ACEOF
+-@%:@define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
+-_ACEOF
+-
+-
+-if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
+-  case " $LIB@&t@OBJS " in
+-  *" lstat.$ac_objext "* ) ;;
+-  *) LIB@&t@OBJS="$LIB@&t@OBJS lstat.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-for ac_header in stdlib.h
++# check for required functions
++for ac_func in alarm atexit endpwent getmntent getpass gettimeofday inet_ntop malloc memset realloc realpath setenv strchr strcmp strdup strerror strncasecmp strndup strnlen strpbrk strrchr strstr strtol strtoul tolower uname
+ do :
+-  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+-if test "x$ac_cv_header_stdlib_h" = xyes; then :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+-@%:@define HAVE_STDLIB_H 1
++@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+  
+-fi
+-
+-done
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
+-$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
+-if ${ac_cv_func_malloc_0_nonnull+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "$cross_compiling" = yes; then :
+-  ac_cv_func_malloc_0_nonnull=no
+ else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+-# include <stdlib.h>
+-#else
+-char *malloc ();
+-#endif
+-
+-int
+-main ()
+-{
+-return ! malloc (0);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  ac_cv_func_malloc_0_nonnull=yes
+-else
+-  ac_cv_func_malloc_0_nonnull=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
+-$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
+-if test $ac_cv_func_malloc_0_nonnull = yes; then :
+-  
+-$as_echo "@%:@define HAVE_MALLOC 1" >>confdefs.h
+-
+-else
+-  $as_echo "@%:@define HAVE_MALLOC 0" >>confdefs.h
+-
+-   case " $LIB@&t@OBJS " in
+-  *" malloc.$ac_objext "* ) ;;
+-  *) LIB@&t@OBJS="$LIB@&t@OBJS malloc.$ac_objext"
+- ;;
+-esac
+-
+-   
+-$as_echo "@%:@define malloc rpl_malloc" >>confdefs.h
+-
++  as_fn_error $? "necessary functions(s) not found" "$LINENO" 5
+ fi
++done
+ 
+ 
+-for ac_header in stdlib.h
++for ac_func in getopt_long
+ do :
+-  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+-if test "x$ac_cv_header_stdlib_h" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "getopt_long" "ac_cv_func_getopt_long"
++if test "x$ac_cv_func_getopt_long" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+-@%:@define HAVE_STDLIB_H 1
++@%:@define HAVE_GETOPT_LONG 1
+ _ACEOF
+  
++else
++  as_fn_error $? "getopt_long function not found" "$LINENO" 5
+ fi
+-
+ done
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5
+-$as_echo_n "checking for GNU libc compatible realloc... " >&6; }
+-if ${ac_cv_func_realloc_0_nonnull+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "$cross_compiling" = yes; then :
+-  ac_cv_func_realloc_0_nonnull=no
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if getopt_long is GNU specific" >&5
++$as_echo_n "checking if getopt_long is GNU specific... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+-# include <stdlib.h>
+-#else
+-char *realloc ();
+-#endif
+ 
++#include <features.h>
++#ifndef __GLIBC__
++#error No GNU extension
++#endif
++        
+ int
+ main ()
+ {
+-return ! realloc (0, 0);
++;
+   ;
+   return 0;
+ }
++    
+ _ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  ac_cv_func_realloc_0_nonnull=yes
+-else
+-  ac_cv_func_realloc_0_nonnull=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5
+-$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; }
+-if test $ac_cv_func_realloc_0_nonnull = yes; then :
++if ac_fn_c_try_cpp "$LINENO"; then :
+   
+-$as_echo "@%:@define HAVE_REALLOC 1" >>confdefs.h
+-
+-else
+-  $as_echo "@%:@define HAVE_REALLOC 0" >>confdefs.h
+-
+-   case " $LIB@&t@OBJS " in
+-  *" realloc.$ac_objext "* ) ;;
+-  *) LIB@&t@OBJS="$LIB@&t@OBJS realloc.$ac_objext"
+- ;;
+-esac
+-
+-   
+-$as_echo "@%:@define realloc rpl_realloc" >>confdefs.h
+-
+-fi
+-
+-
+-# Make sure we can run config.sub.
+-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+-$as_echo_n "checking build system type... " >&6; }
+-if ${ac_cv_build+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_build_alias=$build_alias
+-test "x$ac_build_alias" = x &&
+-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+-test "x$ac_build_alias" = x &&
+-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+-$as_echo "$ac_cv_build" >&6; }
+-case $ac_cv_build in
+-*-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+-esac
+-build=$ac_cv_build
+-ac_save_IFS=$IFS; IFS='-'
+-set x $ac_cv_build
+-shift
+-build_cpu=$1
+-build_vendor=$2
+-shift; shift
+-# Remember, the first character of IFS is used to create $*,
+-# except with old shells:
+-build_os=$*
+-IFS=$ac_save_IFS
+-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+-$as_echo_n "checking host system type... " >&6; }
+-if ${ac_cv_host+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "x$host_alias" = x; then
+-  ac_cv_host=$ac_cv_build
+-else
+-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+-$as_echo "$ac_cv_host" >&6; }
+-case $ac_cv_host in
+-*-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+-esac
+-host=$ac_cv_host
+-ac_save_IFS=$IFS; IFS='-'
+-set x $ac_cv_host
+-shift
+-host_cpu=$1
+-host_vendor=$2
+-shift; shift
+-# Remember, the first character of IFS is used to create $*,
+-# except with old shells:
+-host_os=$*
+-IFS=$ac_save_IFS
+-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+-
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strnlen" >&5
+-$as_echo_n "checking for working strnlen... " >&6; }
+-if ${ac_cv_func_strnlen_working+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "$cross_compiling" = yes; then :
+-  # Guess no on AIX systems, yes otherwise.
+-		case "$host_os" in
+-		  aix*) ac_cv_func_strnlen_working=no;;
+-		  *)    ac_cv_func_strnlen_working=yes;;
+-		esac
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-
+-#define S "foobar"
+-#define S_LEN (sizeof S - 1)
+-
+-  /* At least one implementation is buggy: that of AIX 4.3 would
+-     give strnlen (S, 1) == 3.  */
+-
+-  int i;
+-  for (i = 0; i < S_LEN + 1; ++i)
+-    {
+-      int expected = i <= S_LEN ? i : S_LEN;
+-      if (strnlen (S, i) != expected)
+-	return 1;
+-    }
+-  return 0;
++      
++$as_echo "@%:@define HAVE_GNU_GETOPT_LONG 1" >>confdefs.h
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  ac_cv_func_strnlen_working=yes
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++    
+ else
+-  ac_cv_func_strnlen_working=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strnlen_working" >&5
+-$as_echo "$ac_cv_func_strnlen_working" >&6; }
+-test $ac_cv_func_strnlen_working = no && case " $LIB@&t@OBJS " in
+-  *" strnlen.$ac_objext "* ) ;;
+-  *) LIB@&t@OBJS="$LIB@&t@OBJS strnlen.$ac_objext"
++  
++      case " $LIB@&t@OBJS " in
++  *" gnu_getopt.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS gnu_getopt.$ac_objext"
+  ;;
+ esac
+ 
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+-
+-# check for required functions
+-for ac_func in alarm atexit endpwent getmntent getpass gettimeofday inet_ntop memset realpath setenv strchr strcmp strdup strerror strncasecmp strndup strpbrk strrchr strstr strtol strtoul tolower uname
+-do :
+-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+-  cat >>confdefs.h <<_ACEOF
+-@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+- 
+-else
+-  as_fn_error $? "necessary functions(s) not found" "$LINENO" 5
+ fi
+-done
+-
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+ for ac_func in clock_gettime
+ do :
+@@ -5954,97 +5652,7 @@
+ fi
+ 
+ 
+-
+-  
+-@%:@ Check whether --with-libcap-ng was given.
+-if test "${with_libcap_ng+set}" = set; then :
+-  withval=$with_libcap_ng; 
+-else
+-  with_libcap_ng=auto
+-fi
+-
+-
+-  # Check for Libcap-ng API
+-  #
+-  # libcap-ng detection
+-
+-  if test x$with_libcap_ng = xno ; then
+-      have_libcap_ng=no;
+-  else
+-      # Start by checking for header file
+-      ac_fn_c_check_header_mongrel "$LINENO" "cap-ng.h" "ac_cv_header_cap_ng_h" "$ac_includes_default"
+-if test "x$ac_cv_header_cap_ng_h" = xyes; then :
+-  capng_headers=yes
+-else
+-  capng_headers=no
+-fi
+-
+-
+-
+-      # See if we have libcap-ng library
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for capng_clear in -lcap-ng" >&5
+-$as_echo_n "checking for capng_clear in -lcap-ng... " >&6; }
+-if ${ac_cv_lib_cap_ng_capng_clear+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcap-ng  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char capng_clear ();
+-int
+-main ()
+-{
+-return capng_clear ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_cap_ng_capng_clear=yes
+-else
+-  ac_cv_lib_cap_ng_capng_clear=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cap_ng_capng_clear" >&5
+-$as_echo "$ac_cv_lib_cap_ng_capng_clear" >&6; }
+-if test "x$ac_cv_lib_cap_ng_capng_clear" = xyes; then :
+-  CAPNG_LDADD=-lcap-ng
+-fi
+-
+-
+-      # Check results are usable
+-      if test x$with_libcap_ng = xyes -a x$CAPNG_LDADD = x ; then
+-         as_fn_error $? "libcap-ng support was requested and the library was not found" "$LINENO" 5
+-      fi
+-      if test x$CAPNG_LDADD != x -a $capng_headers = no ; then
+-         as_fn_error $? "libcap-ng libraries found but headers are missing" "$LINENO" 5
+-      fi
+-  fi
+-  
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use libcap-ng" >&5
+-$as_echo_n "checking whether to use libcap-ng... " >&6; }
+-  if test x$CAPNG_LDADD != x ; then
+-      
+-$as_echo "@%:@define HAVE_LIBCAP_NG 1" >>confdefs.h
+-
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-  else
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-  fi
+-
++LIBCAP_NG_PATH
+ 
+ if test "x$CAPNG_LDADD" = "x"; then
+ 	
+@@ -6253,14 +5861,6 @@
+ LTLIBOBJS=$ac_ltlibobjs
+ 
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+-$as_echo_n "checking that generated files are newer than configure... " >&6; }
+-   if test -n "$am_sleep_pid"; then
+-     # Hide warnings about reused PIDs.
+-     wait $am_sleep_pid 2>/dev/null
+-   fi
+-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+-$as_echo "done" >&6; }
+  if test -n "$EXEEXT"; then
+   am__EXEEXT_TRUE=
+   am__EXEEXT_FALSE='#'
+@@ -7504,7 +7104,7 @@
+     # Strip MF so we end up with the name of the file.
+     mf=`echo "$mf" | sed -e 's/:.*$//'`
+     # Check whether this is an Automake generated Makefile or not.
+-    # We used to match only the files named 'Makefile.in', but
++    # We used to match only the files named `Makefile.in', but
+     # some people rename them; so instead we look at the file content.
+     # Grep'ing the first line is not enough: some people post-process
+     # each Makefile.in and add a new line on top of each file to say so.
+@@ -7538,19 +7138,21 @@
+       continue
+     fi
+     # Extract the definition of DEPDIR, am__include, and am__quote
+-    # from the Makefile without running 'make'.
++    # from the Makefile without running `make'.
+     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+     test -z "$DEPDIR" && continue
+     am__include=`sed -n 's/^am__include = //p' < "$mf"`
+     test -z "am__include" && continue
+     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++    # When using ansi2knr, U may be empty or an underscore; expand it
++    U=`sed -n 's/^U = //p' < "$mf"`
+     # Find all dependency output files, they are included files with
+     # $(DEPDIR) in their names.  We invoke sed twice because it is the
+     # simplest approach to changing $(DEPDIR) to its actual value in the
+     # expansion.
+     for file in `sed -n "
+       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
++	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+       # Make sure the directory exists.
+       test -f "$dirpart/$file" && continue
+       fdir=`$as_dirname -- "$file" ||
+diff -Nur cifs-utils-6.1.orig/autom4te.cache/requests cifs-utils-6.1/autom4te.cache/requests
+--- cifs-utils-6.1.orig/autom4te.cache/requests	2013-07-02 21:20:33.000000000 +0200
++++ cifs-utils-6.1/autom4te.cache/requests	2013-10-05 18:12:39.000000000 +0200
+@@ -1,4 +1,4 @@
+-# This file was generated.
++# This file was generated by Autom4te Sun Apr 29 21:48:16 UTC 2012.
+ # It contains the lists of macros which have been traced.
+ # It can be safely removed.
+ 
+@@ -11,26 +11,26 @@
+                       ],
+                       [
+                         '/usr/share/autoconf/autoconf/autoconf.m4f',
+-                        '/usr/share/aclocal/cap-ng.m4',
+                         '/usr/share/aclocal/pkg.m4',
+-                        '/usr/share/aclocal-1.12/amversion.m4',
+-                        '/usr/share/aclocal-1.12/auxdir.m4',
+-                        '/usr/share/aclocal-1.12/cond.m4',
+-                        '/usr/share/aclocal-1.12/depend.m4',
+-                        '/usr/share/aclocal-1.12/depout.m4',
+-                        '/usr/share/aclocal-1.12/init.m4',
+-                        '/usr/share/aclocal-1.12/install-sh.m4',
+-                        '/usr/share/aclocal-1.12/lead-dot.m4',
+-                        '/usr/share/aclocal-1.12/make.m4',
+-                        '/usr/share/aclocal-1.12/minuso.m4',
+-                        '/usr/share/aclocal-1.12/missing.m4',
+-                        '/usr/share/aclocal-1.12/options.m4',
+-                        '/usr/share/aclocal-1.12/runlog.m4',
+-                        '/usr/share/aclocal-1.12/sanity.m4',
+-                        '/usr/share/aclocal-1.12/silent.m4',
+-                        '/usr/share/aclocal-1.12/strip.m4',
+-                        '/usr/share/aclocal-1.12/substnot.m4',
+-                        '/usr/share/aclocal-1.12/tar.m4',
++                        '/usr/share/aclocal-1.11/amversion.m4',
++                        '/usr/share/aclocal-1.11/auxdir.m4',
++                        '/usr/share/aclocal-1.11/cond.m4',
++                        '/usr/share/aclocal-1.11/depend.m4',
++                        '/usr/share/aclocal-1.11/depout.m4',
++                        '/usr/share/aclocal-1.11/init.m4',
++                        '/usr/share/aclocal-1.11/install-sh.m4',
++                        '/usr/share/aclocal-1.11/lead-dot.m4',
++                        '/usr/share/aclocal-1.11/make.m4',
++                        '/usr/share/aclocal-1.11/minuso.m4',
++                        '/usr/share/aclocal-1.11/missing.m4',
++                        '/usr/share/aclocal-1.11/mkdirp.m4',
++                        '/usr/share/aclocal-1.11/options.m4',
++                        '/usr/share/aclocal-1.11/runlog.m4',
++                        '/usr/share/aclocal-1.11/sanity.m4',
++                        '/usr/share/aclocal-1.11/silent.m4',
++                        '/usr/share/aclocal-1.11/strip.m4',
++                        '/usr/share/aclocal-1.11/substnot.m4',
++                        '/usr/share/aclocal-1.11/tar.m4',
+                         'aclocal/idmap.m4',
+                         'aclocal/libcap.m4',
+                         'configure.ac'
+@@ -39,9 +39,9 @@
+                         'AC_TEST_WBC_IDMAP_BOTH' => 1,
+                         'm4_pattern_forbid' => 1,
+                         'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+-                        'PKG_INSTALLDIR' => 1,
+                         '_AM_SET_OPTION' => 1,
+                         'AC_DEFUN' => 1,
++                        'AM_PROG_MKDIR_P' => 1,
+                         'AM_INIT_AUTOMAKE' => 1,
+                         'AM_AUTOMAKE_VERSION' => 1,
+                         'AM_MISSING_HAS_RUN' => 1,
+@@ -56,7 +56,6 @@
+                         'PKG_CHECK_EXISTS' => 1,
+                         'AM_SILENT_RULES' => 1,
+                         'include' => 1,
+-                        'LIBCAP_NG_PATH' => 1,
+                         '_AM_PROG_TAR' => 1,
+                         'AM_AUX_DIR_EXPAND' => 1,
+                         'AM_DEP_TRACK' => 1,
+@@ -64,14 +63,13 @@
+                         'AM_RUN_LOG' => 1,
+                         '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                         '_AM_IF_OPTION' => 1,
+-                        'PKG_NOARCH_INSTALLDIR' => 1,
+                         '_AM_SUBST_NOTMAKE' => 1,
+-                        'AM_PROG_CC_C_O' => 1,
+                         'm4_pattern_allow' => 1,
+                         '_AM_AUTOCONF_VERSION' => 1,
++                        'AM_PROG_CC_C_O' => 1,
+                         '_AM_MANGLE_OPTION' => 1,
+-                        'AM_CONDITIONAL' => 1,
+                         'AM_SET_LEADING_DOT' => 1,
++                        'AM_CONDITIONAL' => 1,
+                         'AM_SET_DEPDIR' => 1,
+                         '_AM_DEPENDENCIES' => 1,
+                         'm4_include' => 1,
+@@ -108,7 +106,6 @@
+                         'AC_CANONICAL_HOST' => 1,
+                         'AC_FC_SRCEXT' => 1,
+                         'AC_PROG_LIBTOOL' => 1,
+-                        'AM_PROG_MKDIR_P' => 1,
+                         'AM_INIT_AUTOMAKE' => 1,
+                         'AC_CONFIG_SUBDIRS' => 1,
+                         'AM_PATH_GUILE' => 1,
+diff -Nur cifs-utils-6.1.orig/autom4te.cache/traces.0 cifs-utils-6.1/autom4te.cache/traces.0
+--- cifs-utils-6.1.orig/autom4te.cache/traces.0	2013-07-02 21:20:30.000000000 +0200
++++ cifs-utils-6.1/autom4te.cache/traces.0	2013-10-05 18:12:37.000000000 +0200
+@@ -1,39 +1,3 @@
+-m4trace:/usr/share/aclocal/cap-ng.m4:4: -1- AC_DEFUN([LIBCAP_NG_PATH], [
+-  AC_ARG_WITH(libcap-ng,
+-    [  --with-libcap-ng=[auto/yes/no]  Add Libcap-ng support [default=auto]],,
+-    with_libcap_ng=auto)
+-
+-  # Check for Libcap-ng API
+-  #
+-  # libcap-ng detection
+-
+-  if test x$with_libcap_ng = xno ; then
+-      have_libcap_ng=no;
+-  else
+-      # Start by checking for header file
+-      AC_CHECK_HEADER(cap-ng.h, capng_headers=yes, capng_headers=no)
+-
+-      # See if we have libcap-ng library
+-      AC_CHECK_LIB(cap-ng, capng_clear,
+-	         CAPNG_LDADD=-lcap-ng,)
+-
+-      # Check results are usable
+-      if test x$with_libcap_ng = xyes -a x$CAPNG_LDADD = x ; then
+-         AC_MSG_ERROR(libcap-ng support was requested and the library was not found)
+-      fi
+-      if test x$CAPNG_LDADD != x -a $capng_headers = no ; then
+-         AC_MSG_ERROR(libcap-ng libraries found but headers are missing)
+-      fi
+-  fi
+-  AC_SUBST(CAPNG_LDADD)
+-  AC_MSG_CHECKING(whether to use libcap-ng)
+-  if test x$CAPNG_LDADD != x ; then
+-      AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])
+-      AC_MSG_RESULT(yes)
+-  else
+-      AC_MSG_RESULT(no)
+-  fi
+-])
+ m4trace:/usr/share/aclocal/pkg.m4:27: -1- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+ m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+ m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+@@ -122,44 +86,24 @@
+ 	$3
+ fi[]dnl
+ ])
+-m4trace:/usr/share/aclocal/pkg.m4:169: -1- AC_DEFUN([PKG_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+-m4_pushdef([pkg_description],
+-    [pkg-config installation directory @<:@]pkg_default[@:>@])
+-AC_ARG_WITH([pkgconfigdir],
+-    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+-    [with_pkgconfigdir=]pkg_default)
+-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+-m4_popdef([pkg_default])
+-m4_popdef([pkg_description])
+-])
+-m4trace:/usr/share/aclocal/pkg.m4:189: -1- AC_DEFUN([PKG_NOARCH_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+-m4_pushdef([pkg_description],
+-    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+-AC_ARG_WITH([noarch-pkgconfigdir],
+-    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+-    [with_noarch_pkgconfigdir=]pkg_default)
+-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+-m4_popdef([pkg_default])
+-m4_popdef([pkg_description])
+-])
+-m4trace:/usr/share/aclocal-1.12/amversion.m4:16: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.12'
++m4trace:/usr/share/aclocal-1.11/amversion.m4:17: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.11'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version.  Point them to the right macro.
+-m4_if([$1], [1.12.2], [],
++m4_if([$1], [1.11.6], [],
+       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+-m4trace:/usr/share/aclocal-1.12/amversion.m4:35: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.12.2])dnl
++m4trace:/usr/share/aclocal-1.11/amversion.m4:36: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.11.6])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+-m4trace:/usr/share/aclocal-1.12/auxdir.m4:49: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [dnl Rely on autoconf to set up CDPATH properly.
++m4trace:/usr/share/aclocal-1.11/auxdir.m4:49: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [dnl Rely on autoconf to set up CDPATH properly.
+ AC_PREREQ([2.50])dnl
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+ ])
+-m4trace:/usr/share/aclocal-1.12/cond.m4:14: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ([2.52])dnl
+- m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
++m4trace:/usr/share/aclocal-1.11/cond.m4:15: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ(2.52)dnl
++ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
++	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+ AC_SUBST([$1_TRUE])dnl
+ AC_SUBST([$1_FALSE])dnl
+ _AM_SUBST_NOTMAKE([$1_TRUE])dnl
+@@ -177,18 +121,17 @@
+   AC_MSG_ERROR([[conditional "$1" was never defined.
+ Usually this means the macro was only invoked conditionally.]])
+ fi])])
+-m4trace:/usr/share/aclocal-1.12/depend.m4:27: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl
++m4trace:/usr/share/aclocal-1.11/depend.m4:28: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl
+ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+ AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+ AC_REQUIRE([AM_DEP_TRACK])dnl
+ 
+-m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+-      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+-      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+-      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+-      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+-      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+-                    [depcc="$$1"   am_compiler_list=])
++ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
++       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
++       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
++       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
++       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
++                   [depcc="$$1"   am_compiler_list=])
+ 
+ AC_CACHE_CHECK([dependency style of $depcc],
+                [am_cv_$1_dependencies_compiler_type],
+@@ -196,8 +139,8 @@
+   # We make a subdir and do the tests there.  Otherwise we can end up
+   # making bogus files that we don't know about and never remove.  For
+   # instance it was reported that on HP-UX the gcc test will end up
+-  # making a dummy file named 'D' -- because '-MD' means "put the output
+-  # in D".
++  # making a dummy file named `D' -- because `-MD' means `put the output
++  # in D'.
+   rm -rf conftest.dir
+   mkdir conftest.dir
+   # Copy depcomp to subdir because otherwise we won't find it if we're
+@@ -237,16 +180,16 @@
+     : > sub/conftest.c
+     for i in 1 2 3 4 5 6; do
+       echo '#include "conftst'$i'.h"' >> sub/conftest.c
+-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+-      # Solaris 10 /bin/sh.
+-      echo '/* dummy */' > sub/conftst$i.h
++      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++      # Solaris 8's {/usr,}/bin/sh.
++      touch sub/conftst$i.h
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
+-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+     # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle '-M -o', and we need to detect this.  Also, some Intel
+-    # versions had trouble with output in subdirs.
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
+     am__obj=sub/conftest.${OBJEXT-o}
+     am__minus_obj="-o $am__obj"
+     case $depmode in
+@@ -255,8 +198,8 @@
+       test "$am__universal" = false || continue
+       ;;
+     nosideeffect)
+-      # After this tag, mechanisms are not by side-effect, so they'll
+-      # only be used when explicitly requested.
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
+       if test "x$enable_dependency_tracking" = xyes; then
+ 	continue
+       else
+@@ -264,7 +207,7 @@
+       fi
+       ;;
+     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+-      # This compiler won't grok '-c -o', but also, the minuso test has
++      # This compiler won't grok `-c -o', but also, the minuso test has
+       # not run yet.  These depmodes are late enough in the game, and
+       # so weak that their functioning should not be impacted.
+       am__obj=conftest.${OBJEXT-o}
+@@ -307,16 +250,12 @@
+   test "x$enable_dependency_tracking" != xno \
+   && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+ ])
+-m4trace:/usr/share/aclocal-1.12/depend.m4:164: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
++m4trace:/usr/share/aclocal-1.11/depend.m4:164: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+ ])
+-m4trace:/usr/share/aclocal-1.12/depend.m4:172: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE([dependency-tracking], [dnl
+-AS_HELP_STRING(
+-  [--enable-dependency-tracking],
+-  [do not reject slow dependency extractors])
+-AS_HELP_STRING(
+-  [--disable-dependency-tracking],
+-  [speeds up one-time build])])
++m4trace:/usr/share/aclocal-1.11/depend.m4:172: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE(dependency-tracking,
++[  --disable-dependency-tracking  speeds up one-time build
++  --enable-dependency-tracking   do not reject slow dependency extractors])
+ if test "x$enable_dependency_tracking" != xno; then
+   am_depcomp="$ac_aux_dir/depcomp"
+   AMDEPBACKSLASH='\'
+@@ -328,7 +267,7 @@
+ AC_SUBST([am__nodep])dnl
+ _AM_SUBST_NOTMAKE([am__nodep])dnl
+ ])
+-m4trace:/usr/share/aclocal-1.12/depout.m4:13: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{
++m4trace:/usr/share/aclocal-1.11/depout.m4:14: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{
+   # Autoconf 2.62 quotes --file arguments for eval, but not when files
+   # are listed without --file.  Let's play safe and only enable the eval
+   # if we detect the quoting.
+@@ -342,7 +281,7 @@
+     # Strip MF so we end up with the name of the file.
+     mf=`echo "$mf" | sed -e 's/:.*$//'`
+     # Check whether this is an Automake generated Makefile or not.
+-    # We used to match only the files named 'Makefile.in', but
++    # We used to match only the files named `Makefile.in', but
+     # some people rename them; so instead we look at the file content.
+     # Grep'ing the first line is not enough: some people post-process
+     # each Makefile.in and add a new line on top of each file to say so.
+@@ -354,19 +293,21 @@
+       continue
+     fi
+     # Extract the definition of DEPDIR, am__include, and am__quote
+-    # from the Makefile without running 'make'.
++    # from the Makefile without running `make'.
+     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+     test -z "$DEPDIR" && continue
+     am__include=`sed -n 's/^am__include = //p' < "$mf"`
+     test -z "am__include" && continue
+     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++    # When using ansi2knr, U may be empty or an underscore; expand it
++    U=`sed -n 's/^U = //p' < "$mf"`
+     # Find all dependency output files, they are included files with
+     # $(DEPDIR) in their names.  We invoke sed twice because it is the
+     # simplest approach to changing $(DEPDIR) to its actual value in the
+     # expansion.
+     for file in `sed -n "
+       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
++	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+       # Make sure the directory exists.
+       test -f "$dirpart/$file" && continue
+       fdir=`AS_DIRNAME(["$file"])`
+@@ -377,11 +318,11 @@
+   done
+ }
+ ])
+-m4trace:/usr/share/aclocal-1.12/depout.m4:72: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles],
++m4trace:/usr/share/aclocal-1.11/depout.m4:75: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles],
+      [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+ ])
+-m4trace:/usr/share/aclocal-1.12/init.m4:25: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.62])dnl
++m4trace:/usr/share/aclocal-1.11/init.m4:26: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.62])dnl
+ dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+ dnl the ones we care about.
+ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+@@ -410,41 +351,31 @@
+ # Define the identity of the package.
+ dnl Distinguish between old-style and new-style calls.
+ m4_ifval([$2],
+-[AC_DIAGNOSE([obsolete],
+-[$0: two- and three-arguments forms are deprecated.  For more info, see:
+-http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation])
+-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+  AC_SUBST([PACKAGE], [$1])dnl
+  AC_SUBST([VERSION], [$2])],
+ [_AM_SET_OPTIONS([$1])dnl
+ dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+-m4_if(
+-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+-  [ok:ok],,
++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+ 
+ _AM_IF_OPTION([no-define],,
+-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+ 
+ # Some tools Automake needs.
+ AC_REQUIRE([AM_SANITY_CHECK])dnl
+ AC_REQUIRE([AC_ARG_PROGRAM])dnl
+-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+-AM_MISSING_PROG([AUTOCONF], [autoconf])
+-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+-AM_MISSING_PROG([AUTOHEADER], [autoheader])
+-AM_MISSING_PROG([MAKEINFO], [makeinfo])
++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
++AM_MISSING_PROG(AUTOCONF, autoconf)
++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
++AM_MISSING_PROG(AUTOHEADER, autoheader)
++AM_MISSING_PROG(MAKEINFO, makeinfo)
+ AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+-# For better backward compatibility.  To be removed once Automake 1.9.x
+-# dies out for good.  For more background, see:
+-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
++AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+ AC_REQUIRE([AC_PROG_AWK])dnl
+@@ -455,34 +386,27 @@
+ 			     [_AM_PROG_TAR([v7])])])
+ _AM_IF_OPTION([no-dependencies],,
+ [AC_PROVIDE_IFELSE([AC_PROG_CC],
+-		  [_AM_DEPENDENCIES([CC])],
+-		  [m4_define([AC_PROG_CC],
+-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
++		  [_AM_DEPENDENCIES(CC)],
++		  [define([AC_PROG_CC],
++			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ AC_PROVIDE_IFELSE([AC_PROG_CXX],
+-		  [_AM_DEPENDENCIES([CXX])],
+-		  [m4_define([AC_PROG_CXX],
+-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
++		  [_AM_DEPENDENCIES(CXX)],
++		  [define([AC_PROG_CXX],
++			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+-		  [_AM_DEPENDENCIES([OBJC])],
+-		  [m4_define([AC_PROG_OBJC],
+-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+-dnl Support for Objective C++ was only introduced in Autoconf 2.65,
+-dnl but we still cater to Autoconf 2.62.
+-m4_ifdef([AC_PROG_OBJCXX],
+-[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+-		  [_AM_DEPENDENCIES([OBJCXX])],
+-		  [m4_define([AC_PROG_OBJCXX],
+-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl
++		  [_AM_DEPENDENCIES(OBJC)],
++		  [define([AC_PROG_OBJC],
++			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ ])
+ _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+-dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the
+-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
++dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
++dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+ dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+ AC_CONFIG_COMMANDS_PRE(dnl
+ [m4_provide_if([_AM_COMPILER_EXEEXT],
+   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+ ])
+-m4trace:/usr/share/aclocal-1.12/init.m4:142: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers.
++m4trace:/usr/share/aclocal-1.11/init.m4:126: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers.
+ _am_arg=$1
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+@@ -494,7 +418,7 @@
+   esac
+ done
+ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+-m4trace:/usr/share/aclocal-1.12/install-sh.m4:13: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++m4trace:/usr/share/aclocal-1.11/install-sh.m4:14: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+ if test x"${install_sh}" != xset; then
+   case $am_aux_dir in
+   *\ * | *\	*)
+@@ -503,8 +427,8 @@
+     install_sh="\${SHELL} $am_aux_dir/install-sh"
+   esac
+ fi
+-AC_SUBST([install_sh])])
+-m4trace:/usr/share/aclocal-1.12/lead-dot.m4:12: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null
++AC_SUBST(install_sh)])
++m4trace:/usr/share/aclocal-1.11/lead-dot.m4:12: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null
+ mkdir .tst 2>/dev/null
+ if test -d .tst; then
+   am__leading_dot=.
+@@ -513,7 +437,7 @@
+ fi
+ rmdir .tst 2>/dev/null
+ AC_SUBST([am__leading_dot])])
+-m4trace:/usr/share/aclocal-1.12/make.m4:14: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make}
++m4trace:/usr/share/aclocal-1.11/make.m4:14: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make}
+ cat > confinc << 'END'
+ am__doit:
+ 	@echo this is the am__doit target
+@@ -526,7 +450,7 @@
+ _am_result=none
+ # First try GNU make style include.
+ echo "include confinc" > confmf
+-# Ignore all kinds of additional output from 'make'.
++# Ignore all kinds of additional output from `make'.
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+   am__include=include
+@@ -550,7 +474,7 @@
+ AC_MSG_RESULT([$_am_result])
+ rm -f confinc confmf
+ ])
+-m4trace:/usr/share/aclocal-1.12/minuso.m4:13: -1- AC_DEFUN([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC_C_O])dnl
++m4trace:/usr/share/aclocal-1.11/minuso.m4:14: -1- AC_DEFUN([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC_C_O])dnl
+ AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+ AC_REQUIRE_AUX_FILE([compile])dnl
+ # FIXME: we rely on the cache variable name because
+@@ -571,10 +495,10 @@
+ m4_define([AC_PROG_CC],
+           [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
+ ])
+-m4trace:/usr/share/aclocal-1.12/missing.m4:13: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN])
++m4trace:/usr/share/aclocal-1.11/missing.m4:14: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN])
+ $1=${$1-"${am_missing_run}$2"}
+ AC_SUBST($1)])
+-m4trace:/usr/share/aclocal-1.12/missing.m4:23: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++m4trace:/usr/share/aclocal-1.11/missing.m4:24: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+ AC_REQUIRE_AUX_FILE([missing])dnl
+ if test x"${MISSING+set}" != xset; then
+   case $am_aux_dir in
+@@ -589,19 +513,37 @@
+   am_missing_run="$MISSING --run "
+ else
+   am_missing_run=
+-  AC_MSG_WARN(['missing' script is too old or missing])
++  AC_MSG_WARN([`missing' script is too old or missing])
+ fi
+ ])
+-m4trace:/usr/share/aclocal-1.12/options.m4:13: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+-m4trace:/usr/share/aclocal-1.12/options.m4:19: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), [1])])
+-m4trace:/usr/share/aclocal-1.12/options.m4:25: -1- AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+-m4trace:/usr/share/aclocal-1.12/options.m4:31: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+-m4trace:/usr/share/aclocal-1.12/runlog.m4:14: -1- AC_DEFUN([AM_RUN_LOG], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
++m4trace:/usr/share/aclocal-1.11/mkdirp.m4:14: -1- AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl
++AC_REQUIRE([AC_PROG_MKDIR_P])dnl
++dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
++dnl while keeping a definition of mkdir_p for backward compatibility.
++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
++dnl Makefile.ins that do not define MKDIR_P, so we do our own
++dnl adjustment using top_builddir (which is defined more often than
++dnl MKDIR_P).
++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
++case $mkdir_p in
++  [[\\/$]]* | ?:[[\\/]]*) ;;
++  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
++])
++m4trace:/usr/share/aclocal-1.11/options.m4:14: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
++m4trace:/usr/share/aclocal-1.11/options.m4:20: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
++m4trace:/usr/share/aclocal-1.11/options.m4:26: -1- AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++m4trace:/usr/share/aclocal-1.11/options.m4:32: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
++m4trace:/usr/share/aclocal-1.11/runlog.m4:14: -1- AC_DEFUN([AM_RUN_LOG], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+    ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+    ac_status=$?
+    echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+    (exit $ac_status); }])
+-m4trace:/usr/share/aclocal-1.12/sanity.m4:13: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane])
++m4trace:/usr/share/aclocal-1.11/sanity.m4:14: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane])
++# Just in case
++sleep 1
++echo timestamp > conftest.file
+ # Reject unsafe characters in $srcdir or the absolute working directory
+ # name.  Accept space and tab only in the latter.
+ am_lf='
+@@ -612,40 +554,32 @@
+ esac
+ case $srcdir in
+   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+-    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
++    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+ esac
+ 
+-# Do 'set' in a subshell so we don't clobber the current shell's
++# Do `set' in a subshell so we don't clobber the current shell's
+ # arguments.  Must try -L first in case configure is actually a
+ # symlink; some systems play weird games with the mod time of symlinks
+ # (eg FreeBSD returns the mod time of the symlink's containing
+ # directory).
+ if (
+-   am_has_slept=no
+-   for am_try in 1 2; do
+-     echo "timestamp, slept: $am_has_slept" > conftest.file
+-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+-     if test "$[*]" = "X"; then
+-	# -L didn't work.
+-	set X `ls -t "$srcdir/configure" conftest.file`
+-     fi
+-     if test "$[*]" != "X $srcdir/configure conftest.file" \
+-	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
+-
+-	# If neither matched, then we have a broken ls.  This can happen
+-	# if, for instance, CONFIG_SHELL is bash and it inherits a
+-	# broken ls alias from the environment.  This has actually
+-	# happened.  Such a system could not be considered "sane".
+-	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+-  alias in your environment])
+-     fi
+-     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+-       break
+-     fi
+-     # Just in case.
+-     sleep 1
+-     am_has_slept=yes
+-   done
++   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
++   if test "$[*]" = "X"; then
++      # -L didn't work.
++      set X `ls -t "$srcdir/configure" conftest.file`
++   fi
++   rm -f conftest.file
++   if test "$[*]" != "X $srcdir/configure conftest.file" \
++      && test "$[*]" != "X conftest.file $srcdir/configure"; then
++
++      # If neither matched, then we have a broken ls.  This can happen
++      # if, for instance, CONFIG_SHELL is bash and it inherits a
++      # broken ls alias from the environment.  This has actually
++      # happened.  Such a system could not be considered "sane".
++      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
++alias in your environment])
++   fi
++
+    test "$[2]" = conftest.file
+    )
+ then
+@@ -655,38 +589,17 @@
+    AC_MSG_ERROR([newly created file is older than distributed files!
+ Check your system clock])
+ fi
+-AC_MSG_RESULT([yes])
+-# If we didn't sleep, we still need to ensure time stamps of config.status and
+-# generated files are strictly newer.
+-am_sleep_pid=
+-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+-  ( sleep 1 ) &
+-  am_sleep_pid=$!
+-fi
+-AC_CONFIG_COMMANDS_PRE(
+-  [AC_MSG_CHECKING([that generated files are newer than configure])
+-   if test -n "$am_sleep_pid"; then
+-     # Hide warnings about reused PIDs.
+-     wait $am_sleep_pid 2>/dev/null
+-   fi
+-   AC_MSG_RESULT([done])])
+-rm -f conftest.file
+-])
+-m4trace:/usr/share/aclocal-1.12/silent.m4:14: -1- AC_DEFUN([AM_SILENT_RULES], [AC_ARG_ENABLE([silent-rules], [dnl
+-AS_HELP_STRING(
+-  [--enable-silent-rules],
+-  [less verbose build output (undo: "make V=1")])
+-AS_HELP_STRING(
+-  [--disable-silent-rules],
+-  [verbose build output (undo: "make V=0")])dnl
+-])
+-case $enable_silent_rules in @%:@ (((
+-  yes) AM_DEFAULT_VERBOSITY=0;;
+-   no) AM_DEFAULT_VERBOSITY=1;;
+-    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
++AC_MSG_RESULT(yes)])
++m4trace:/usr/share/aclocal-1.11/silent.m4:14: -1- AC_DEFUN([AM_SILENT_RULES], [AC_ARG_ENABLE([silent-rules],
++[  --enable-silent-rules          less verbose build output (undo: `make V=1')
++  --disable-silent-rules         verbose build output (undo: `make V=0')])
++case $enable_silent_rules in
++yes) AM_DEFAULT_VERBOSITY=0;;
++no)  AM_DEFAULT_VERBOSITY=1;;
++*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+ esac
+ dnl
+-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
++dnl A few `make' implementations (e.g., NonStop OS and NextStep)
+ dnl do not support nested variable expansions.
+ dnl See automake bug#9928 and bug#10237.
+ am_make=${MAKE-make}
+@@ -704,7 +617,7 @@
+   am_cv_make_support_nested_variables=no
+ fi])
+ if test $am_cv_make_support_nested_variables = yes; then
+-  dnl Using '$V' instead of '$(V)' breaks IRIX make.
++  dnl Using `$V' instead of `$(V)' breaks IRIX make.
+   AM_V='$(V)'
+   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+ else
+@@ -720,20 +633,20 @@
+ AC_SUBST([AM_BACKSLASH])dnl
+ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+ ])
+-m4trace:/usr/share/aclocal-1.12/strip.m4:19: -1- AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+-# Installed binaries are usually stripped using 'strip' when the user
+-# run "make install-strip".  However 'strip' might not be the right
++m4trace:/usr/share/aclocal-1.11/strip.m4:19: -1- AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'.  However `strip' might not be the right
+ # tool to use in cross-compilation environments, therefore Automake
+-# will honor the 'STRIP' environment variable to overrule this program.
+-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
++# will honor the `STRIP' environment variable to overrule this program.
++dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+ if test "$cross_compiling" != no; then
+   AC_CHECK_TOOL([STRIP], [strip], :)
+ fi
+ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+-m4trace:/usr/share/aclocal-1.12/substnot.m4:14: -1- AC_DEFUN([_AM_SUBST_NOTMAKE])
+-m4trace:/usr/share/aclocal-1.12/substnot.m4:19: -1- AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+-m4trace:/usr/share/aclocal-1.12/tar.m4:24: -1- AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility.  Yes, it's still used
++m4trace:/usr/share/aclocal-1.11/substnot.m4:14: -1- AC_DEFUN([_AM_SUBST_NOTMAKE])
++m4trace:/usr/share/aclocal-1.11/substnot.m4:19: -1- AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
++m4trace:/usr/share/aclocal-1.11/tar.m4:24: -1- AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility.  Yes, it's still used
+ # in the wild :-(  We should find a proper way to deprecate it ...
+ AC_SUBST([AMTAR], ['$${TAR-tar}'])
+ m4_if([$1], [v7],
+@@ -745,7 +658,7 @@
+ _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+ _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+ # Do not fold the above two line into one, because Tru64 sh and
+-# Solaris sh will not grok spaces in the rhs of '-'.
++# Solaris sh will not grok spaces in the rhs of `-'.
+ for _am_tool in $_am_tools
+ do
+   case $_am_tool in
+@@ -954,7 +867,7 @@
+ m4trace:configure.ac:10: -1- AM_INIT_AUTOMAKE
+ m4trace:configure.ac:10: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
+ m4trace:configure.ac:10: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
+-m4trace:configure.ac:10: -1- AM_AUTOMAKE_VERSION([1.12.2])
++m4trace:configure.ac:10: -1- AM_AUTOMAKE_VERSION([1.11.6])
+ m4trace:configure.ac:10: -1- _AM_AUTOCONF_VERSION([2.69])
+ m4trace:configure.ac:10: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
+ m4trace:configure.ac:10: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
+@@ -965,8 +878,8 @@
+ m4trace:configure.ac:10: -1- _AM_SET_OPTIONS([])
+ m4trace:configure.ac:10: -1- m4_pattern_allow([^PACKAGE$])
+ m4trace:configure.ac:10: -1- m4_pattern_allow([^VERSION$])
+-m4trace:configure.ac:10: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])
++m4trace:configure.ac:10: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
+ m4trace:configure.ac:10: -2- _AM_MANGLE_OPTION([no-define])
+ m4trace:configure.ac:10: -1- m4_pattern_allow([^PACKAGE$])
+ m4trace:configure.ac:10: -1- m4_pattern_allow([^VERSION$])
+@@ -988,6 +901,7 @@
+ m4trace:configure.ac:10: -1- AM_PROG_INSTALL_STRIP
+ m4trace:configure.ac:10: -1- m4_pattern_allow([^STRIP$])
+ m4trace:configure.ac:10: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
++m4trace:configure.ac:10: -1- AM_PROG_MKDIR_P
+ m4trace:configure.ac:10: -1- m4_pattern_allow([^MKDIR_P$])
+ m4trace:configure.ac:10: -1- m4_pattern_allow([^mkdir_p$])
+ m4trace:configure.ac:10: -1- m4_pattern_allow([^AWK$])
+@@ -1004,24 +918,17 @@
+ m4trace:configure.ac:10: -1- m4_pattern_allow([^am__tar$])
+ m4trace:configure.ac:10: -1- m4_pattern_allow([^am__untar$])
+ m4trace:configure.ac:10: -1- _AM_IF_OPTION([no-dependencies], [], [AC_PROVIDE_IFELSE([AC_PROG_CC],
+-		  [_AM_DEPENDENCIES([CC])],
+-		  [m4_define([AC_PROG_CC],
+-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
++		  [_AM_DEPENDENCIES(CC)],
++		  [define([AC_PROG_CC],
++			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ AC_PROVIDE_IFELSE([AC_PROG_CXX],
+-		  [_AM_DEPENDENCIES([CXX])],
+-		  [m4_define([AC_PROG_CXX],
+-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
++		  [_AM_DEPENDENCIES(CXX)],
++		  [define([AC_PROG_CXX],
++			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+-		  [_AM_DEPENDENCIES([OBJC])],
+-		  [m4_define([AC_PROG_OBJC],
+-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+-dnl Support for Objective C++ was only introduced in Autoconf 2.65,
+-dnl but we still cater to Autoconf 2.62.
+-m4_ifdef([AC_PROG_OBJCXX],
+-[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+-		  [_AM_DEPENDENCIES([OBJCXX])],
+-		  [m4_define([AC_PROG_OBJCXX],
+-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl
++		  [_AM_DEPENDENCIES(OBJC)],
++		  [define([AC_PROG_OBJC],
++			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ ])
+ m4trace:configure.ac:10: -2- _AM_MANGLE_OPTION([no-dependencies])
+ m4trace:configure.ac:10: -1- _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])
+@@ -1130,46 +1037,28 @@
+ m4trace:configure.ac:89: -1- m4_pattern_allow([^HAVE_UINT32_T$])
+ m4trace:configure.ac:89: -1- m4_pattern_allow([^HAVE_UINT8_T$])
+ m4trace:configure.ac:92: -1- m4_pattern_allow([^HAVE_GETMNTENT$])
+-m4trace:configure.ac:93: -1- m4_pattern_allow([^LSTAT_FOLLOWS_SLASHED_SYMLINK$])
+-m4trace:configure.ac:93: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+-m4trace:configure.ac:94: -1- m4_pattern_allow([^HAVE_STDLIB_H$])
+-m4trace:configure.ac:94: -1- m4_pattern_allow([^HAVE_MALLOC$])
+-m4trace:configure.ac:94: -1- m4_pattern_allow([^HAVE_MALLOC$])
+-m4trace:configure.ac:94: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+-m4trace:configure.ac:94: -1- m4_pattern_allow([^malloc$])
+-m4trace:configure.ac:95: -1- m4_pattern_allow([^HAVE_STDLIB_H$])
+-m4trace:configure.ac:95: -1- m4_pattern_allow([^HAVE_REALLOC$])
+-m4trace:configure.ac:95: -1- m4_pattern_allow([^HAVE_REALLOC$])
+-m4trace:configure.ac:95: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+-m4trace:configure.ac:95: -1- m4_pattern_allow([^realloc$])
+-m4trace:configure.ac:96: -1- m4_pattern_allow([^build$])
+-m4trace:configure.ac:96: -1- m4_pattern_allow([^build_cpu$])
+-m4trace:configure.ac:96: -1- m4_pattern_allow([^build_vendor$])
+-m4trace:configure.ac:96: -1- m4_pattern_allow([^build_os$])
+-m4trace:configure.ac:96: -1- m4_pattern_allow([^host$])
+-m4trace:configure.ac:96: -1- m4_pattern_allow([^host_cpu$])
+-m4trace:configure.ac:96: -1- m4_pattern_allow([^host_vendor$])
+-m4trace:configure.ac:96: -1- m4_pattern_allow([^host_os$])
+-m4trace:configure.ac:96: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+-m4trace:configure.ac:101: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
+-m4trace:configure.ac:101: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
+-m4trace:configure.ac:101: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
+-m4trace:configure.ac:109: -1- m4_pattern_allow([^RT_LDADD$])
+-m4trace:configure.ac:115: -1- m4_pattern_allow([^HAVE_SYS_FSUID_H$])
+-m4trace:configure.ac:124: -1- m4_pattern_allow([^PIE_CFLAGS$])
+-m4trace:configure.ac:131: -1- m4_pattern_allow([^RELRO_CFLAGS$])
+-m4trace:configure.ac:154: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++m4trace:configure.ac:97: -1- m4_pattern_allow([^HAVE_GETOPT_LONG$])
++m4trace:configure.ac:99: -1- m4_pattern_allow([^HAVE_GNU_GETOPT_LONG$])
++m4trace:configure.ac:99: -1- m4_pattern_allow([^LIB@&t@OBJS$])
++m4trace:configure.ac:113: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
++m4trace:configure.ac:113: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
++m4trace:configure.ac:113: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
++m4trace:configure.ac:121: -1- m4_pattern_allow([^RT_LDADD$])
++m4trace:configure.ac:127: -1- m4_pattern_allow([^HAVE_SYS_FSUID_H$])
++m4trace:configure.ac:136: -1- m4_pattern_allow([^PIE_CFLAGS$])
++m4trace:configure.ac:143: -1- m4_pattern_allow([^RELRO_CFLAGS$])
++m4trace:configure.ac:166: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+ You should run autoupdate.], [../../lib/autoconf/general.m4:2614: AC_TRY_COMPILE is expanded from...
+ ../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
+ ../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
+ ../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
+-configure.ac:154: the top level])
+-m4trace:configure.ac:161: -1- m4_pattern_allow([^HAVE_KRB5_KEYBLOCK_KEYVALUE$])
+-m4trace:configure.ac:166: -1- m4_pattern_allow([^HAVE_TALLOC_H$])
+-m4trace:configure.ac:176: -1- m4_pattern_allow([^HAVE_KEYUTILS_H$])
+-m4trace:configure.ac:195: -1- m4_pattern_allow([^KRB5_LDADD$])
+-m4trace:configure.ac:199: -1- AC_TEST_WBCHL
+-m4trace:configure.ac:199: -1- PKG_CHECK_MODULES([WBCLIENT], [wbclient], [], [
++configure.ac:166: the top level])
++m4trace:configure.ac:173: -1- m4_pattern_allow([^HAVE_KRB5_KEYBLOCK_KEYVALUE$])
++m4trace:configure.ac:178: -1- m4_pattern_allow([^HAVE_TALLOC_H$])
++m4trace:configure.ac:188: -1- m4_pattern_allow([^HAVE_KEYUTILS_H$])
++m4trace:configure.ac:207: -1- m4_pattern_allow([^KRB5_LDADD$])
++m4trace:configure.ac:211: -1- AC_TEST_WBCHL
++m4trace:configure.ac:211: -1- PKG_CHECK_MODULES([WBCLIENT], [wbclient], [], [
+ 				if test "$enable_cifsidmap" = "yes"; then
+ 					AC_MSG_ERROR([wbclient.h not found, consider installing libwbclient-devel.])
+ 				else
+@@ -1183,67 +1072,64 @@
+ 					enable_cifsacl="no"
+ 				fi
+ 			])
+-m4trace:configure.ac:199: -1- PKG_PROG_PKG_CONFIG
+-m4trace:configure.ac:199: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+-m4trace:configure.ac:199: -1- m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+-m4trace:configure.ac:199: -1- m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+-m4trace:configure.ac:199: -1- m4_pattern_allow([^PKG_CONFIG$])
+-m4trace:configure.ac:199: -1- m4_pattern_allow([^PKG_CONFIG_PATH$])
+-m4trace:configure.ac:199: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
+-m4trace:configure.ac:199: -1- m4_pattern_allow([^PKG_CONFIG$])
+-m4trace:configure.ac:199: -1- m4_pattern_allow([^WBCLIENT_CFLAGS$])
+-m4trace:configure.ac:199: -1- m4_pattern_allow([^WBCLIENT_LIBS$])
+-m4trace:configure.ac:199: -1- PKG_CHECK_EXISTS([wbclient], [pkg_cv_[]WBCLIENT_CFLAGS=`$PKG_CONFIG --[]cflags "wbclient" 2>/dev/null`
++m4trace:configure.ac:211: -1- PKG_PROG_PKG_CONFIG
++m4trace:configure.ac:211: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4trace:configure.ac:211: -1- m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
++m4trace:configure.ac:211: -1- m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
++m4trace:configure.ac:211: -1- m4_pattern_allow([^PKG_CONFIG$])
++m4trace:configure.ac:211: -1- m4_pattern_allow([^PKG_CONFIG_PATH$])
++m4trace:configure.ac:211: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
++m4trace:configure.ac:211: -1- m4_pattern_allow([^PKG_CONFIG$])
++m4trace:configure.ac:211: -1- m4_pattern_allow([^WBCLIENT_CFLAGS$])
++m4trace:configure.ac:211: -1- m4_pattern_allow([^WBCLIENT_LIBS$])
++m4trace:configure.ac:211: -1- PKG_CHECK_EXISTS([wbclient], [pkg_cv_[]WBCLIENT_CFLAGS=`$PKG_CONFIG --[]cflags "wbclient" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
+-m4trace:configure.ac:199: -1- PKG_CHECK_EXISTS([wbclient], [pkg_cv_[]WBCLIENT_LIBS=`$PKG_CONFIG --[]libs "wbclient" 2>/dev/null`
++m4trace:configure.ac:211: -1- PKG_CHECK_EXISTS([wbclient], [pkg_cv_[]WBCLIENT_LIBS=`$PKG_CONFIG --[]libs "wbclient" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes])
+-m4trace:configure.ac:199: -1- _PKG_SHORT_ERRORS_SUPPORTED
+-m4trace:configure.ac:199: -1- m4_pattern_allow([^HAVE_LIBWBCLIENT$])
+-m4trace:configure.ac:199: -1- m4_pattern_allow([^HAVE_SYS_XATTR_H$])
+-m4trace:configure.ac:202: -1- AC_TEST_WBC_IDMAP_BOTH
+-m4trace:configure.ac:202: -2- m4_pattern_allow([^HAVE_WBC_ID_TYPE_BOTH$])
+-m4trace:configure.ac:205: -1- m4_pattern_allow([^HAVE_KEYUTILS_H$])
+-m4trace:configure.ac:223: -1- m4_pattern_allow([^HAVE_KRB5_AUTH_CON_GETSENDSUBKEY$])
+-m4trace:configure.ac:233: -1- m4_pattern_allow([^ENABLE_SYSTEMD$])
+-m4trace:configure.ac:237: -1- m4_pattern_allow([^HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE$])
+-m4trace:configure.ac:241: -1- AM_CONDITIONAL([CONFIG_CIFSUPCALL], [test "$enable_cifsupcall" != "no"])
+-m4trace:configure.ac:241: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_TRUE$])
+-m4trace:configure.ac:241: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_FALSE$])
+-m4trace:configure.ac:241: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_TRUE])
+-m4trace:configure.ac:241: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_FALSE])
+-m4trace:configure.ac:242: -1- AM_CONDITIONAL([CONFIG_CIFSCREDS], [test "$enable_cifscreds" != "no"])
+-m4trace:configure.ac:242: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_TRUE$])
+-m4trace:configure.ac:242: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_FALSE$])
+-m4trace:configure.ac:242: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_TRUE])
+-m4trace:configure.ac:242: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_FALSE])
+-m4trace:configure.ac:243: -1- AM_CONDITIONAL([CONFIG_CIFSIDMAP], [test "$enable_cifsidmap" != "no"])
+-m4trace:configure.ac:243: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_TRUE$])
+-m4trace:configure.ac:243: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_FALSE$])
+-m4trace:configure.ac:243: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_TRUE])
+-m4trace:configure.ac:243: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_FALSE])
+-m4trace:configure.ac:244: -1- AM_CONDITIONAL([CONFIG_CIFSACL], [test "$enable_cifsacl" != "no"])
+-m4trace:configure.ac:244: -1- m4_pattern_allow([^CONFIG_CIFSACL_TRUE$])
+-m4trace:configure.ac:244: -1- m4_pattern_allow([^CONFIG_CIFSACL_FALSE$])
+-m4trace:configure.ac:244: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_TRUE])
+-m4trace:configure.ac:244: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_FALSE])
+-m4trace:configure.ac:245: -1- AM_CONDITIONAL([CONFIG_PLUGIN], [test "$enable_cifsidmap" != "no" -o "$enable_cifsacl" != "no"])
+-m4trace:configure.ac:245: -1- m4_pattern_allow([^CONFIG_PLUGIN_TRUE$])
+-m4trace:configure.ac:245: -1- m4_pattern_allow([^CONFIG_PLUGIN_FALSE$])
+-m4trace:configure.ac:245: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_TRUE])
+-m4trace:configure.ac:245: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_FALSE])
+-m4trace:configure.ac:247: -1- LIBCAP_NG_PATH
+-m4trace:configure.ac:247: -1- m4_pattern_allow([^CAPNG_LDADD$])
+-m4trace:configure.ac:247: -1- m4_pattern_allow([^HAVE_LIBCAP_NG$])
+-m4trace:configure.ac:250: -1- AC_LIBCAP
+-m4trace:configure.ac:250: -1- m4_pattern_allow([^HAVE_SYS_CAPABILITY_H$])
+-m4trace:configure.ac:250: -1- m4_pattern_allow([^HAVE_LIBCAP$])
+-m4trace:configure.ac:250: -1- m4_pattern_allow([^LIBCAP$])
+-m4trace:configure.ac:252: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+-m4trace:configure.ac:252: -1- m4_pattern_allow([^LTLIBOBJS$])
+-m4trace:configure.ac:252: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+-m4trace:configure.ac:252: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+-m4trace:configure.ac:252: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+-m4trace:configure.ac:252: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+-m4trace:configure.ac:252: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+-m4trace:configure.ac:252: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
+-m4trace:configure.ac:252: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
++m4trace:configure.ac:211: -1- _PKG_SHORT_ERRORS_SUPPORTED
++m4trace:configure.ac:211: -1- m4_pattern_allow([^HAVE_LIBWBCLIENT$])
++m4trace:configure.ac:211: -1- m4_pattern_allow([^HAVE_SYS_XATTR_H$])
++m4trace:configure.ac:214: -1- AC_TEST_WBC_IDMAP_BOTH
++m4trace:configure.ac:214: -2- m4_pattern_allow([^HAVE_WBC_ID_TYPE_BOTH$])
++m4trace:configure.ac:217: -1- m4_pattern_allow([^HAVE_KEYUTILS_H$])
++m4trace:configure.ac:235: -1- m4_pattern_allow([^HAVE_KRB5_AUTH_CON_GETSENDSUBKEY$])
++m4trace:configure.ac:245: -1- m4_pattern_allow([^ENABLE_SYSTEMD$])
++m4trace:configure.ac:249: -1- m4_pattern_allow([^HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE$])
++m4trace:configure.ac:253: -1- AM_CONDITIONAL([CONFIG_CIFSUPCALL], [test "$enable_cifsupcall" != "no"])
++m4trace:configure.ac:253: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_TRUE$])
++m4trace:configure.ac:253: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_FALSE$])
++m4trace:configure.ac:253: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_TRUE])
++m4trace:configure.ac:253: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_FALSE])
++m4trace:configure.ac:254: -1- AM_CONDITIONAL([CONFIG_CIFSCREDS], [test "$enable_cifscreds" != "no"])
++m4trace:configure.ac:254: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_TRUE$])
++m4trace:configure.ac:254: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_FALSE$])
++m4trace:configure.ac:254: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_TRUE])
++m4trace:configure.ac:254: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_FALSE])
++m4trace:configure.ac:255: -1- AM_CONDITIONAL([CONFIG_CIFSIDMAP], [test "$enable_cifsidmap" != "no"])
++m4trace:configure.ac:255: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_TRUE$])
++m4trace:configure.ac:255: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_FALSE$])
++m4trace:configure.ac:255: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_TRUE])
++m4trace:configure.ac:255: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_FALSE])
++m4trace:configure.ac:256: -1- AM_CONDITIONAL([CONFIG_CIFSACL], [test "$enable_cifsacl" != "no"])
++m4trace:configure.ac:256: -1- m4_pattern_allow([^CONFIG_CIFSACL_TRUE$])
++m4trace:configure.ac:256: -1- m4_pattern_allow([^CONFIG_CIFSACL_FALSE$])
++m4trace:configure.ac:256: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_TRUE])
++m4trace:configure.ac:256: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_FALSE])
++m4trace:configure.ac:257: -1- AM_CONDITIONAL([CONFIG_PLUGIN], [test "$enable_cifsidmap" != "no" -o "$enable_cifsacl" != "no"])
++m4trace:configure.ac:257: -1- m4_pattern_allow([^CONFIG_PLUGIN_TRUE$])
++m4trace:configure.ac:257: -1- m4_pattern_allow([^CONFIG_PLUGIN_FALSE$])
++m4trace:configure.ac:257: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_TRUE])
++m4trace:configure.ac:257: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_FALSE])
++m4trace:configure.ac:262: -1- AC_LIBCAP
++m4trace:configure.ac:262: -1- m4_pattern_allow([^HAVE_SYS_CAPABILITY_H$])
++m4trace:configure.ac:262: -1- m4_pattern_allow([^HAVE_LIBCAP$])
++m4trace:configure.ac:262: -1- m4_pattern_allow([^LIBCAP$])
++m4trace:configure.ac:264: -1- m4_pattern_allow([^LIB@&t@OBJS$])
++m4trace:configure.ac:264: -1- m4_pattern_allow([^LTLIBOBJS$])
++m4trace:configure.ac:264: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
++m4trace:configure.ac:264: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
++m4trace:configure.ac:264: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
++m4trace:configure.ac:264: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
++m4trace:configure.ac:264: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
++m4trace:configure.ac:264: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
++m4trace:configure.ac:264: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
+diff -Nur cifs-utils-6.1.orig/autom4te.cache/traces.1 cifs-utils-6.1/autom4te.cache/traces.1
+--- cifs-utils-6.1.orig/autom4te.cache/traces.1	2013-07-02 21:20:33.000000000 +0200
++++ cifs-utils-6.1/autom4te.cache/traces.1	2013-10-05 18:12:38.000000000 +0200
+@@ -1,5 +1,5 @@
+-m4trace:aclocal.m4:1249: -1- m4_include([aclocal/idmap.m4])
+-m4trace:aclocal.m4:1250: -1- m4_include([aclocal/libcap.m4])
++m4trace:aclocal.m4:1167: -1- m4_include([aclocal/idmap.m4])
++m4trace:aclocal.m4:1168: -1- m4_include([aclocal/libcap.m4])
+ m4trace:configure.ac:4: -1- AC_INIT([cifs-utils], [6.1], [linux-cifs@vger.kernel.org], [cifs-utils], [https://wiki.samba.org/index.php/LinuxCIFS_utils])
+ m4trace:configure.ac:4: -1- m4_pattern_forbid([^_?A[CHUM]_])
+ m4trace:configure.ac:4: -1- m4_pattern_forbid([_AC_])
+@@ -152,7 +152,7 @@
+ m4trace:configure.ac:7: -1- AC_CONFIG_FILES([Makefile contrib/Makefile contrib/request-key.d/Makefile])
+ m4trace:configure.ac:10: -1- AM_INIT_AUTOMAKE
+ m4trace:configure.ac:10: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
+-m4trace:configure.ac:10: -1- AM_AUTOMAKE_VERSION([1.12.2])
++m4trace:configure.ac:10: -1- AM_AUTOMAKE_VERSION([1.11.6])
+ m4trace:configure.ac:10: -1- AC_REQUIRE_AUX_FILE([install-sh])
+ m4trace:configure.ac:10: -1- AC_SUBST([INSTALL_PROGRAM])
+ m4trace:configure.ac:10: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
+@@ -213,7 +213,7 @@
+ m4trace:configure.ac:10: -1- AC_SUBST([MKDIR_P])
+ m4trace:configure.ac:10: -1- AC_SUBST_TRACE([MKDIR_P])
+ m4trace:configure.ac:10: -1- m4_pattern_allow([^MKDIR_P$])
+-m4trace:configure.ac:10: -1- AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
++m4trace:configure.ac:10: -1- AC_SUBST([mkdir_p], ["$MKDIR_P"])
+ m4trace:configure.ac:10: -1- AC_SUBST_TRACE([mkdir_p])
+ m4trace:configure.ac:10: -1- m4_pattern_allow([^mkdir_p$])
+ m4trace:configure.ac:10: -1- AC_SUBST([AWK])
+@@ -494,365 +494,297 @@
+ m4trace:configure.ac:92: -1- m4_pattern_allow([^HAVE_GETMNTENT$])
+ m4trace:configure.ac:92: -1- AH_OUTPUT([HAVE_GETMNTENT], [/* Define to 1 if you have the `getmntent\' function. */
+ @%:@undef HAVE_GETMNTENT])
+-m4trace:configure.ac:93: -1- AC_DEFINE_TRACE_LITERAL([LSTAT_FOLLOWS_SLASHED_SYMLINK])
+-m4trace:configure.ac:93: -1- m4_pattern_allow([^LSTAT_FOLLOWS_SLASHED_SYMLINK$])
+-m4trace:configure.ac:93: -1- AH_OUTPUT([LSTAT_FOLLOWS_SLASHED_SYMLINK], [/* Define to 1 if `lstat\' dereferences a symlink specified with a trailing
+-   slash. */
+-@%:@undef LSTAT_FOLLOWS_SLASHED_SYMLINK])
+-m4trace:configure.ac:93: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS lstat.$ac_objext"])
+-m4trace:configure.ac:93: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+-m4trace:configure.ac:93: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+-m4trace:configure.ac:93: -1- AC_LIBSOURCE([lstat.c])
+-m4trace:configure.ac:94: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
+-@%:@undef HAVE_STDLIB_H])
+-m4trace:configure.ac:94: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDLIB_H])
+-m4trace:configure.ac:94: -1- m4_pattern_allow([^HAVE_STDLIB_H$])
+-m4trace:configure.ac:94: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MALLOC])
+-m4trace:configure.ac:94: -1- m4_pattern_allow([^HAVE_MALLOC$])
+-m4trace:configure.ac:94: -1- AH_OUTPUT([HAVE_MALLOC], [/* Define to 1 if your system has a GNU libc compatible `malloc\' function, and
+-   to 0 otherwise. */
+-@%:@undef HAVE_MALLOC])
+-m4trace:configure.ac:94: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MALLOC])
+-m4trace:configure.ac:94: -1- m4_pattern_allow([^HAVE_MALLOC$])
+-m4trace:configure.ac:94: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS malloc.$ac_objext"])
+-m4trace:configure.ac:94: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+-m4trace:configure.ac:94: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+-m4trace:configure.ac:94: -1- AC_LIBSOURCE([malloc.c])
+-m4trace:configure.ac:94: -1- AC_DEFINE_TRACE_LITERAL([malloc])
+-m4trace:configure.ac:94: -1- m4_pattern_allow([^malloc$])
+-m4trace:configure.ac:94: -1- AH_OUTPUT([malloc], [/* Define to rpl_malloc if the replacement function should be used. */
+-@%:@undef malloc])
+-m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
+-@%:@undef HAVE_STDLIB_H])
+-m4trace:configure.ac:95: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDLIB_H])
+-m4trace:configure.ac:95: -1- m4_pattern_allow([^HAVE_STDLIB_H$])
+-m4trace:configure.ac:95: -1- AC_DEFINE_TRACE_LITERAL([HAVE_REALLOC])
+-m4trace:configure.ac:95: -1- m4_pattern_allow([^HAVE_REALLOC$])
+-m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_REALLOC], [/* Define to 1 if your system has a GNU libc compatible `realloc\' function,
+-   and to 0 otherwise. */
+-@%:@undef HAVE_REALLOC])
+-m4trace:configure.ac:95: -1- AC_DEFINE_TRACE_LITERAL([HAVE_REALLOC])
+-m4trace:configure.ac:95: -1- m4_pattern_allow([^HAVE_REALLOC$])
+-m4trace:configure.ac:95: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS realloc.$ac_objext"])
+-m4trace:configure.ac:95: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+-m4trace:configure.ac:95: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+-m4trace:configure.ac:95: -1- AC_LIBSOURCE([realloc.c])
+-m4trace:configure.ac:95: -1- AC_DEFINE_TRACE_LITERAL([realloc])
+-m4trace:configure.ac:95: -1- m4_pattern_allow([^realloc$])
+-m4trace:configure.ac:95: -1- AH_OUTPUT([realloc], [/* Define to rpl_realloc if the replacement function should be used. */
+-@%:@undef realloc])
+-m4trace:configure.ac:96: -1- AC_CANONICAL_HOST
+-m4trace:configure.ac:96: -1- AC_CANONICAL_BUILD
+-m4trace:configure.ac:96: -1- AC_REQUIRE_AUX_FILE([config.sub])
+-m4trace:configure.ac:96: -1- AC_REQUIRE_AUX_FILE([config.guess])
+-m4trace:configure.ac:96: -1- AC_SUBST([build], [$ac_cv_build])
+-m4trace:configure.ac:96: -1- AC_SUBST_TRACE([build])
+-m4trace:configure.ac:96: -1- m4_pattern_allow([^build$])
+-m4trace:configure.ac:96: -1- AC_SUBST([build_cpu], [$[1]])
+-m4trace:configure.ac:96: -1- AC_SUBST_TRACE([build_cpu])
+-m4trace:configure.ac:96: -1- m4_pattern_allow([^build_cpu$])
+-m4trace:configure.ac:96: -1- AC_SUBST([build_vendor], [$[2]])
+-m4trace:configure.ac:96: -1- AC_SUBST_TRACE([build_vendor])
+-m4trace:configure.ac:96: -1- m4_pattern_allow([^build_vendor$])
+-m4trace:configure.ac:96: -1- AC_SUBST([build_os])
+-m4trace:configure.ac:96: -1- AC_SUBST_TRACE([build_os])
+-m4trace:configure.ac:96: -1- m4_pattern_allow([^build_os$])
+-m4trace:configure.ac:96: -1- AC_SUBST([host], [$ac_cv_host])
+-m4trace:configure.ac:96: -1- AC_SUBST_TRACE([host])
+-m4trace:configure.ac:96: -1- m4_pattern_allow([^host$])
+-m4trace:configure.ac:96: -1- AC_SUBST([host_cpu], [$[1]])
+-m4trace:configure.ac:96: -1- AC_SUBST_TRACE([host_cpu])
+-m4trace:configure.ac:96: -1- m4_pattern_allow([^host_cpu$])
+-m4trace:configure.ac:96: -1- AC_SUBST([host_vendor], [$[2]])
+-m4trace:configure.ac:96: -1- AC_SUBST_TRACE([host_vendor])
+-m4trace:configure.ac:96: -1- m4_pattern_allow([^host_vendor$])
+-m4trace:configure.ac:96: -1- AC_SUBST([host_os])
+-m4trace:configure.ac:96: -1- AC_SUBST_TRACE([host_os])
+-m4trace:configure.ac:96: -1- m4_pattern_allow([^host_os$])
+-m4trace:configure.ac:96: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS strnlen.$ac_objext"])
+-m4trace:configure.ac:96: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+-m4trace:configure.ac:96: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+-m4trace:configure.ac:96: -1- AC_LIBSOURCE([strnlen.c])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_ALARM], [/* Define to 1 if you have the `alarm\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_ALARM], [/* Define to 1 if you have the `alarm\' function. */
+ @%:@undef HAVE_ALARM])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_ATEXIT], [/* Define to 1 if you have the `atexit\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_ATEXIT], [/* Define to 1 if you have the `atexit\' function. */
+ @%:@undef HAVE_ATEXIT])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_ENDPWENT], [/* Define to 1 if you have the `endpwent\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_ENDPWENT], [/* Define to 1 if you have the `endpwent\' function. */
+ @%:@undef HAVE_ENDPWENT])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_GETMNTENT], [/* Define to 1 if you have the `getmntent\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_GETMNTENT], [/* Define to 1 if you have the `getmntent\' function. */
+ @%:@undef HAVE_GETMNTENT])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_GETPASS], [/* Define to 1 if you have the `getpass\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_GETPASS], [/* Define to 1 if you have the `getpass\' function. */
+ @%:@undef HAVE_GETPASS])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_GETTIMEOFDAY], [/* Define to 1 if you have the `gettimeofday\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_GETTIMEOFDAY], [/* Define to 1 if you have the `gettimeofday\' function. */
+ @%:@undef HAVE_GETTIMEOFDAY])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_INET_NTOP], [/* Define to 1 if you have the `inet_ntop\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_INET_NTOP], [/* Define to 1 if you have the `inet_ntop\' function. */
+ @%:@undef HAVE_INET_NTOP])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_MEMSET], [/* Define to 1 if you have the `memset\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_MALLOC], [/* Define to 1 if you have the `malloc\' function. */
++@%:@undef HAVE_MALLOC])
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_MEMSET], [/* Define to 1 if you have the `memset\' function. */
+ @%:@undef HAVE_MEMSET])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_REALPATH], [/* Define to 1 if you have the `realpath\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_REALLOC], [/* Define to 1 if you have the `realloc\' function. */
++@%:@undef HAVE_REALLOC])
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_REALPATH], [/* Define to 1 if you have the `realpath\' function. */
+ @%:@undef HAVE_REALPATH])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_SETENV], [/* Define to 1 if you have the `setenv\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_SETENV], [/* Define to 1 if you have the `setenv\' function. */
+ @%:@undef HAVE_SETENV])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_STRCHR], [/* Define to 1 if you have the `strchr\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_STRCHR], [/* Define to 1 if you have the `strchr\' function. */
+ @%:@undef HAVE_STRCHR])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_STRCMP], [/* Define to 1 if you have the `strcmp\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_STRCMP], [/* Define to 1 if you have the `strcmp\' function. */
+ @%:@undef HAVE_STRCMP])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_STRDUP], [/* Define to 1 if you have the `strdup\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_STRDUP], [/* Define to 1 if you have the `strdup\' function. */
+ @%:@undef HAVE_STRDUP])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_STRERROR], [/* Define to 1 if you have the `strerror\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_STRERROR], [/* Define to 1 if you have the `strerror\' function. */
+ @%:@undef HAVE_STRERROR])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_STRNCASECMP], [/* Define to 1 if you have the `strncasecmp\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_STRNCASECMP], [/* Define to 1 if you have the `strncasecmp\' function. */
+ @%:@undef HAVE_STRNCASECMP])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_STRNDUP], [/* Define to 1 if you have the `strndup\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_STRNDUP], [/* Define to 1 if you have the `strndup\' function. */
+ @%:@undef HAVE_STRNDUP])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_STRPBRK], [/* Define to 1 if you have the `strpbrk\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_STRNLEN], [/* Define to 1 if you have the `strnlen\' function. */
++@%:@undef HAVE_STRNLEN])
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_STRPBRK], [/* Define to 1 if you have the `strpbrk\' function. */
+ @%:@undef HAVE_STRPBRK])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_STRRCHR], [/* Define to 1 if you have the `strrchr\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_STRRCHR], [/* Define to 1 if you have the `strrchr\' function. */
+ @%:@undef HAVE_STRRCHR])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_STRSTR], [/* Define to 1 if you have the `strstr\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_STRSTR], [/* Define to 1 if you have the `strstr\' function. */
+ @%:@undef HAVE_STRSTR])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_STRTOL], [/* Define to 1 if you have the `strtol\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_STRTOL], [/* Define to 1 if you have the `strtol\' function. */
+ @%:@undef HAVE_STRTOL])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_STRTOUL], [/* Define to 1 if you have the `strtoul\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_STRTOUL], [/* Define to 1 if you have the `strtoul\' function. */
+ @%:@undef HAVE_STRTOUL])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_TOLOWER], [/* Define to 1 if you have the `tolower\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_TOLOWER], [/* Define to 1 if you have the `tolower\' function. */
+ @%:@undef HAVE_TOLOWER])
+-m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_UNAME], [/* Define to 1 if you have the `uname\' function. */
++m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_UNAME], [/* Define to 1 if you have the `uname\' function. */
+ @%:@undef HAVE_UNAME])
+-m4trace:configure.ac:101: -1- AH_OUTPUT([HAVE_CLOCK_GETTIME], [/* Define to 1 if you have the `clock_gettime\' function. */
++m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_GETOPT_LONG], [/* Define to 1 if you have the `getopt_long\' function. */
++@%:@undef HAVE_GETOPT_LONG])
++m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETOPT_LONG])
++m4trace:configure.ac:97: -1- m4_pattern_allow([^HAVE_GETOPT_LONG$])
++m4trace:configure.ac:99: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GNU_GETOPT_LONG])
++m4trace:configure.ac:99: -1- m4_pattern_allow([^HAVE_GNU_GETOPT_LONG$])
++m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_GNU_GETOPT_LONG], [/* Whether getopt_long has GNU extensions */
++@%:@undef HAVE_GNU_GETOPT_LONG])
++m4trace:configure.ac:99: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS gnu_getopt.$ac_objext"])
++m4trace:configure.ac:99: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
++m4trace:configure.ac:99: -1- m4_pattern_allow([^LIB@&t@OBJS$])
++m4trace:configure.ac:99: -1- AC_LIBSOURCE([gnu_getopt.c])
++m4trace:configure.ac:113: -1- AH_OUTPUT([HAVE_CLOCK_GETTIME], [/* Define to 1 if you have the `clock_gettime\' function. */
+ @%:@undef HAVE_CLOCK_GETTIME])
+-m4trace:configure.ac:101: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CLOCK_GETTIME])
+-m4trace:configure.ac:101: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
+-m4trace:configure.ac:101: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CLOCK_GETTIME])
+-m4trace:configure.ac:101: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
+-m4trace:configure.ac:101: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CLOCK_GETTIME])
+-m4trace:configure.ac:101: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
+-m4trace:configure.ac:101: -1- AH_OUTPUT([HAVE_CLOCK_GETTIME], [/* Whether the clock_gettime func is there */
++m4trace:configure.ac:113: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CLOCK_GETTIME])
++m4trace:configure.ac:113: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
++m4trace:configure.ac:113: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CLOCK_GETTIME])
++m4trace:configure.ac:113: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
++m4trace:configure.ac:113: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CLOCK_GETTIME])
++m4trace:configure.ac:113: -1- m4_pattern_allow([^HAVE_CLOCK_GETTIME$])
++m4trace:configure.ac:113: -1- AH_OUTPUT([HAVE_CLOCK_GETTIME], [/* Whether the clock_gettime func is there */
+ @%:@undef HAVE_CLOCK_GETTIME])
+-m4trace:configure.ac:109: -1- AC_SUBST([RT_LDADD])
+-m4trace:configure.ac:109: -1- AC_SUBST_TRACE([RT_LDADD])
+-m4trace:configure.ac:109: -1- m4_pattern_allow([^RT_LDADD$])
+-m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_ARPA_INET_H], [/* Define to 1 if you have the <arpa/inet.h> header file. */
++m4trace:configure.ac:121: -1- AC_SUBST([RT_LDADD])
++m4trace:configure.ac:121: -1- AC_SUBST_TRACE([RT_LDADD])
++m4trace:configure.ac:121: -1- m4_pattern_allow([^RT_LDADD$])
++m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_ARPA_INET_H], [/* Define to 1 if you have the <arpa/inet.h> header file. */
+ @%:@undef HAVE_ARPA_INET_H])
+-m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_CTYPE_H], [/* Define to 1 if you have the <ctype.h> header file. */
++m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_CTYPE_H], [/* Define to 1 if you have the <ctype.h> header file. */
+ @%:@undef HAVE_CTYPE_H])
+-m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_FCNTL_H], [/* Define to 1 if you have the <fcntl.h> header file. */
++m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_FCNTL_H], [/* Define to 1 if you have the <fcntl.h> header file. */
+ @%:@undef HAVE_FCNTL_H])
+-m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
++m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
+ @%:@undef HAVE_INTTYPES_H])
+-m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_LIMITS_H], [/* Define to 1 if you have the <limits.h> header file. */
++m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_LIMITS_H], [/* Define to 1 if you have the <limits.h> header file. */
+ @%:@undef HAVE_LIMITS_H])
+-m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_MNTENT_H], [/* Define to 1 if you have the <mntent.h> header file. */
++m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_MNTENT_H], [/* Define to 1 if you have the <mntent.h> header file. */
+ @%:@undef HAVE_MNTENT_H])
+-m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_NETDB_H], [/* Define to 1 if you have the <netdb.h> header file. */
++m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_NETDB_H], [/* Define to 1 if you have the <netdb.h> header file. */
+ @%:@undef HAVE_NETDB_H])
+-m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_STDDEF_H], [/* Define to 1 if you have the <stddef.h> header file. */
++m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_STDDEF_H], [/* Define to 1 if you have the <stddef.h> header file. */
+ @%:@undef HAVE_STDDEF_H])
+-m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
++m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
+ @%:@undef HAVE_STDINT_H])
+-m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_STDBOOL_H], [/* Define to 1 if you have the <stdbool.h> header file. */
++m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_STDBOOL_H], [/* Define to 1 if you have the <stdbool.h> header file. */
+ @%:@undef HAVE_STDBOOL_H])
+-m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
++m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
+ @%:@undef HAVE_STDLIB_H])
+-m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_STDIO_H], [/* Define to 1 if you have the <stdio.h> header file. */
++m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_STDIO_H], [/* Define to 1 if you have the <stdio.h> header file. */
+ @%:@undef HAVE_STDIO_H])
+-m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
++m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
+ @%:@undef HAVE_ERRNO_H])
+-m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
++m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
+ @%:@undef HAVE_STRING_H])
+-m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
++m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
+ @%:@undef HAVE_STRINGS_H])
+-m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_SYS_MOUNT_H], [/* Define to 1 if you have the <sys/mount.h> header file. */
++m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_SYS_MOUNT_H], [/* Define to 1 if you have the <sys/mount.h> header file. */
+ @%:@undef HAVE_SYS_MOUNT_H])
+-m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */
++m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */
+ @%:@undef HAVE_SYS_PARAM_H])
+-m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_SYS_SOCKET_H], [/* Define to 1 if you have the <sys/socket.h> header file. */
++m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_SYS_SOCKET_H], [/* Define to 1 if you have the <sys/socket.h> header file. */
+ @%:@undef HAVE_SYS_SOCKET_H])
+-m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define to 1 if you have the <sys/time.h> header file. */
++m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define to 1 if you have the <sys/time.h> header file. */
+ @%:@undef HAVE_SYS_TIME_H])
+-m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_SYSLOG_H], [/* Define to 1 if you have the <syslog.h> header file. */
++m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_SYSLOG_H], [/* Define to 1 if you have the <syslog.h> header file. */
+ @%:@undef HAVE_SYSLOG_H])
+-m4trace:configure.ac:112: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
++m4trace:configure.ac:124: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
+ @%:@undef HAVE_UNISTD_H])
+-m4trace:configure.ac:115: -1- AH_OUTPUT([HAVE_SYS_FSUID_H], [/* Define to 1 if you have the <sys/fsuid.h> header file. */
++m4trace:configure.ac:127: -1- AH_OUTPUT([HAVE_SYS_FSUID_H], [/* Define to 1 if you have the <sys/fsuid.h> header file. */
+ @%:@undef HAVE_SYS_FSUID_H])
+-m4trace:configure.ac:115: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_FSUID_H])
+-m4trace:configure.ac:115: -1- m4_pattern_allow([^HAVE_SYS_FSUID_H$])
+-m4trace:configure.ac:124: -1- AC_SUBST([PIE_CFLAGS])
+-m4trace:configure.ac:124: -1- AC_SUBST_TRACE([PIE_CFLAGS])
+-m4trace:configure.ac:124: -1- m4_pattern_allow([^PIE_CFLAGS$])
+-m4trace:configure.ac:131: -1- AC_SUBST([RELRO_CFLAGS])
+-m4trace:configure.ac:131: -1- AC_SUBST_TRACE([RELRO_CFLAGS])
+-m4trace:configure.ac:131: -1- m4_pattern_allow([^RELRO_CFLAGS$])
+-m4trace:configure.ac:134: -1- AH_OUTPUT([HAVE_KRB5_H], [/* Define to 1 if you have the <krb5.h> header file. */
++m4trace:configure.ac:127: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_FSUID_H])
++m4trace:configure.ac:127: -1- m4_pattern_allow([^HAVE_SYS_FSUID_H$])
++m4trace:configure.ac:136: -1- AC_SUBST([PIE_CFLAGS])
++m4trace:configure.ac:136: -1- AC_SUBST_TRACE([PIE_CFLAGS])
++m4trace:configure.ac:136: -1- m4_pattern_allow([^PIE_CFLAGS$])
++m4trace:configure.ac:143: -1- AC_SUBST([RELRO_CFLAGS])
++m4trace:configure.ac:143: -1- AC_SUBST_TRACE([RELRO_CFLAGS])
++m4trace:configure.ac:143: -1- m4_pattern_allow([^RELRO_CFLAGS$])
++m4trace:configure.ac:146: -1- AH_OUTPUT([HAVE_KRB5_H], [/* Define to 1 if you have the <krb5.h> header file. */
+ @%:@undef HAVE_KRB5_H])
+-m4trace:configure.ac:134: -1- AH_OUTPUT([HAVE_KRB5_KRB5_H], [/* Define to 1 if you have the <krb5/krb5.h> header file. */
++m4trace:configure.ac:146: -1- AH_OUTPUT([HAVE_KRB5_KRB5_H], [/* Define to 1 if you have the <krb5/krb5.h> header file. */
+ @%:@undef HAVE_KRB5_KRB5_H])
+-m4trace:configure.ac:154: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++m4trace:configure.ac:166: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+ You should run autoupdate.], [../../lib/autoconf/general.m4:2614: AC_TRY_COMPILE is expanded from...
+ ../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
+ ../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
+ ../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
+-configure.ac:154: the top level])
+-m4trace:configure.ac:161: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KRB5_KEYBLOCK_KEYVALUE])
+-m4trace:configure.ac:161: -1- m4_pattern_allow([^HAVE_KRB5_KEYBLOCK_KEYVALUE$])
+-m4trace:configure.ac:161: -1- AH_OUTPUT([HAVE_KRB5_KEYBLOCK_KEYVALUE], [/* Whether the krb5_keyblock struct has a keyvalue property */
++configure.ac:166: the top level])
++m4trace:configure.ac:173: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KRB5_KEYBLOCK_KEYVALUE])
++m4trace:configure.ac:173: -1- m4_pattern_allow([^HAVE_KRB5_KEYBLOCK_KEYVALUE$])
++m4trace:configure.ac:173: -1- AH_OUTPUT([HAVE_KRB5_KEYBLOCK_KEYVALUE], [/* Whether the krb5_keyblock struct has a keyvalue property */
+ @%:@undef HAVE_KRB5_KEYBLOCK_KEYVALUE])
+-m4trace:configure.ac:166: -1- AH_OUTPUT([HAVE_TALLOC_H], [/* Define to 1 if you have the <talloc.h> header file. */
++m4trace:configure.ac:178: -1- AH_OUTPUT([HAVE_TALLOC_H], [/* Define to 1 if you have the <talloc.h> header file. */
+ @%:@undef HAVE_TALLOC_H])
+-m4trace:configure.ac:166: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TALLOC_H])
+-m4trace:configure.ac:166: -1- m4_pattern_allow([^HAVE_TALLOC_H$])
+-m4trace:configure.ac:176: -1- AH_OUTPUT([HAVE_KEYUTILS_H], [/* Define to 1 if you have the <keyutils.h> header file. */
++m4trace:configure.ac:178: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TALLOC_H])
++m4trace:configure.ac:178: -1- m4_pattern_allow([^HAVE_TALLOC_H$])
++m4trace:configure.ac:188: -1- AH_OUTPUT([HAVE_KEYUTILS_H], [/* Define to 1 if you have the <keyutils.h> header file. */
+ @%:@undef HAVE_KEYUTILS_H])
+-m4trace:configure.ac:176: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KEYUTILS_H])
+-m4trace:configure.ac:176: -1- m4_pattern_allow([^HAVE_KEYUTILS_H$])
+-m4trace:configure.ac:195: -1- AC_SUBST([KRB5_LDADD])
+-m4trace:configure.ac:195: -1- AC_SUBST_TRACE([KRB5_LDADD])
+-m4trace:configure.ac:195: -1- m4_pattern_allow([^KRB5_LDADD$])
+-m4trace:configure.ac:199: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+-m4trace:configure.ac:199: -1- m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+-m4trace:configure.ac:199: -1- m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+-m4trace:configure.ac:199: -1- AC_SUBST([PKG_CONFIG])
+-m4trace:configure.ac:199: -1- AC_SUBST_TRACE([PKG_CONFIG])
+-m4trace:configure.ac:199: -1- m4_pattern_allow([^PKG_CONFIG$])
+-m4trace:configure.ac:199: -1- AC_SUBST([PKG_CONFIG_PATH])
+-m4trace:configure.ac:199: -1- AC_SUBST_TRACE([PKG_CONFIG_PATH])
+-m4trace:configure.ac:199: -1- m4_pattern_allow([^PKG_CONFIG_PATH$])
+-m4trace:configure.ac:199: -1- AC_SUBST([PKG_CONFIG_LIBDIR])
+-m4trace:configure.ac:199: -1- AC_SUBST_TRACE([PKG_CONFIG_LIBDIR])
+-m4trace:configure.ac:199: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
+-m4trace:configure.ac:199: -1- AC_SUBST([PKG_CONFIG])
+-m4trace:configure.ac:199: -1- AC_SUBST_TRACE([PKG_CONFIG])
+-m4trace:configure.ac:199: -1- m4_pattern_allow([^PKG_CONFIG$])
+-m4trace:configure.ac:199: -1- AC_SUBST([WBCLIENT_CFLAGS])
+-m4trace:configure.ac:199: -1- AC_SUBST_TRACE([WBCLIENT_CFLAGS])
+-m4trace:configure.ac:199: -1- m4_pattern_allow([^WBCLIENT_CFLAGS$])
+-m4trace:configure.ac:199: -1- AC_SUBST([WBCLIENT_LIBS])
+-m4trace:configure.ac:199: -1- AC_SUBST_TRACE([WBCLIENT_LIBS])
+-m4trace:configure.ac:199: -1- m4_pattern_allow([^WBCLIENT_LIBS$])
+-m4trace:configure.ac:199: -1- AH_OUTPUT([HAVE_LIBWBCLIENT], [/* Define to 1 if you have the `wbclient\' library (-lwbclient). */
++m4trace:configure.ac:188: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KEYUTILS_H])
++m4trace:configure.ac:188: -1- m4_pattern_allow([^HAVE_KEYUTILS_H$])
++m4trace:configure.ac:207: -1- AC_SUBST([KRB5_LDADD])
++m4trace:configure.ac:207: -1- AC_SUBST_TRACE([KRB5_LDADD])
++m4trace:configure.ac:207: -1- m4_pattern_allow([^KRB5_LDADD$])
++m4trace:configure.ac:211: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4trace:configure.ac:211: -1- m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
++m4trace:configure.ac:211: -1- m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
++m4trace:configure.ac:211: -1- AC_SUBST([PKG_CONFIG])
++m4trace:configure.ac:211: -1- AC_SUBST_TRACE([PKG_CONFIG])
++m4trace:configure.ac:211: -1- m4_pattern_allow([^PKG_CONFIG$])
++m4trace:configure.ac:211: -1- AC_SUBST([PKG_CONFIG_PATH])
++m4trace:configure.ac:211: -1- AC_SUBST_TRACE([PKG_CONFIG_PATH])
++m4trace:configure.ac:211: -1- m4_pattern_allow([^PKG_CONFIG_PATH$])
++m4trace:configure.ac:211: -1- AC_SUBST([PKG_CONFIG_LIBDIR])
++m4trace:configure.ac:211: -1- AC_SUBST_TRACE([PKG_CONFIG_LIBDIR])
++m4trace:configure.ac:211: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
++m4trace:configure.ac:211: -1- AC_SUBST([PKG_CONFIG])
++m4trace:configure.ac:211: -1- AC_SUBST_TRACE([PKG_CONFIG])
++m4trace:configure.ac:211: -1- m4_pattern_allow([^PKG_CONFIG$])
++m4trace:configure.ac:211: -1- AC_SUBST([WBCLIENT_CFLAGS])
++m4trace:configure.ac:211: -1- AC_SUBST_TRACE([WBCLIENT_CFLAGS])
++m4trace:configure.ac:211: -1- m4_pattern_allow([^WBCLIENT_CFLAGS$])
++m4trace:configure.ac:211: -1- AC_SUBST([WBCLIENT_LIBS])
++m4trace:configure.ac:211: -1- AC_SUBST_TRACE([WBCLIENT_LIBS])
++m4trace:configure.ac:211: -1- m4_pattern_allow([^WBCLIENT_LIBS$])
++m4trace:configure.ac:211: -1- AH_OUTPUT([HAVE_LIBWBCLIENT], [/* Define to 1 if you have the `wbclient\' library (-lwbclient). */
+ @%:@undef HAVE_LIBWBCLIENT])
+-m4trace:configure.ac:199: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBWBCLIENT])
+-m4trace:configure.ac:199: -1- m4_pattern_allow([^HAVE_LIBWBCLIENT$])
+-m4trace:configure.ac:199: -1- AH_OUTPUT([HAVE_SYS_XATTR_H], [/* Define to 1 if you have the <sys/xattr.h> header file. */
++m4trace:configure.ac:211: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBWBCLIENT])
++m4trace:configure.ac:211: -1- m4_pattern_allow([^HAVE_LIBWBCLIENT$])
++m4trace:configure.ac:211: -1- AH_OUTPUT([HAVE_SYS_XATTR_H], [/* Define to 1 if you have the <sys/xattr.h> header file. */
+ @%:@undef HAVE_SYS_XATTR_H])
+-m4trace:configure.ac:199: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_XATTR_H])
+-m4trace:configure.ac:199: -1- m4_pattern_allow([^HAVE_SYS_XATTR_H$])
+-m4trace:configure.ac:202: -2- AC_DEFINE_TRACE_LITERAL([HAVE_WBC_ID_TYPE_BOTH])
+-m4trace:configure.ac:202: -2- m4_pattern_allow([^HAVE_WBC_ID_TYPE_BOTH$])
+-m4trace:configure.ac:202: -2- AH_OUTPUT([HAVE_WBC_ID_TYPE_BOTH], [/* Does wbclient.h have a WBC_ID_TYPE_BOTH enum? */
++m4trace:configure.ac:211: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_XATTR_H])
++m4trace:configure.ac:211: -1- m4_pattern_allow([^HAVE_SYS_XATTR_H$])
++m4trace:configure.ac:214: -2- AC_DEFINE_TRACE_LITERAL([HAVE_WBC_ID_TYPE_BOTH])
++m4trace:configure.ac:214: -2- m4_pattern_allow([^HAVE_WBC_ID_TYPE_BOTH$])
++m4trace:configure.ac:214: -2- AH_OUTPUT([HAVE_WBC_ID_TYPE_BOTH], [/* Does wbclient.h have a WBC_ID_TYPE_BOTH enum? */
+ @%:@undef HAVE_WBC_ID_TYPE_BOTH])
+-m4trace:configure.ac:205: -1- AH_OUTPUT([HAVE_KEYUTILS_H], [/* Define to 1 if you have the <keyutils.h> header file. */
++m4trace:configure.ac:217: -1- AH_OUTPUT([HAVE_KEYUTILS_H], [/* Define to 1 if you have the <keyutils.h> header file. */
+ @%:@undef HAVE_KEYUTILS_H])
+-m4trace:configure.ac:205: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KEYUTILS_H])
+-m4trace:configure.ac:205: -1- m4_pattern_allow([^HAVE_KEYUTILS_H$])
+-m4trace:configure.ac:223: -1- AH_OUTPUT([HAVE_KRB5_AUTH_CON_GETSENDSUBKEY], [/* Define to 1 if you have the `krb5_auth_con_getsendsubkey\' function. */
++m4trace:configure.ac:217: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KEYUTILS_H])
++m4trace:configure.ac:217: -1- m4_pattern_allow([^HAVE_KEYUTILS_H$])
++m4trace:configure.ac:235: -1- AH_OUTPUT([HAVE_KRB5_AUTH_CON_GETSENDSUBKEY], [/* Define to 1 if you have the `krb5_auth_con_getsendsubkey\' function. */
+ @%:@undef HAVE_KRB5_AUTH_CON_GETSENDSUBKEY])
+-m4trace:configure.ac:223: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KRB5_AUTH_CON_GETSENDSUBKEY])
+-m4trace:configure.ac:223: -1- m4_pattern_allow([^HAVE_KRB5_AUTH_CON_GETSENDSUBKEY$])
+-m4trace:configure.ac:228: -1- AH_OUTPUT([HAVE_KRB5_PRINCIPAL_GET_REALM], [/* Define to 1 if you have the `krb5_principal_get_realm\' function. */
++m4trace:configure.ac:235: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KRB5_AUTH_CON_GETSENDSUBKEY])
++m4trace:configure.ac:235: -1- m4_pattern_allow([^HAVE_KRB5_AUTH_CON_GETSENDSUBKEY$])
++m4trace:configure.ac:240: -1- AH_OUTPUT([HAVE_KRB5_PRINCIPAL_GET_REALM], [/* Define to 1 if you have the `krb5_principal_get_realm\' function. */
+ @%:@undef HAVE_KRB5_PRINCIPAL_GET_REALM])
+-m4trace:configure.ac:228: -1- AH_OUTPUT([HAVE_KRB5_FREE_UNPARSED_NAME], [/* Define to 1 if you have the `krb5_free_unparsed_name\' function. */
++m4trace:configure.ac:240: -1- AH_OUTPUT([HAVE_KRB5_FREE_UNPARSED_NAME], [/* Define to 1 if you have the `krb5_free_unparsed_name\' function. */
+ @%:@undef HAVE_KRB5_FREE_UNPARSED_NAME])
+-m4trace:configure.ac:229: -1- AH_OUTPUT([HAVE_KRB5_AUTH_CON_SETADDRS], [/* Define to 1 if you have the `krb5_auth_con_setaddrs\' function. */
++m4trace:configure.ac:241: -1- AH_OUTPUT([HAVE_KRB5_AUTH_CON_SETADDRS], [/* Define to 1 if you have the `krb5_auth_con_setaddrs\' function. */
+ @%:@undef HAVE_KRB5_AUTH_CON_SETADDRS])
+-m4trace:configure.ac:229: -1- AH_OUTPUT([HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE], [/* Define to 1 if you have the `krb5_auth_con_set_req_cksumtype\' function. */
++m4trace:configure.ac:241: -1- AH_OUTPUT([HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE], [/* Define to 1 if you have the `krb5_auth_con_set_req_cksumtype\' function. */
+ @%:@undef HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE])
+-m4trace:configure.ac:233: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_SYSTEMD])
+-m4trace:configure.ac:233: -1- m4_pattern_allow([^ENABLE_SYSTEMD$])
+-m4trace:configure.ac:233: -1- AH_OUTPUT([ENABLE_SYSTEMD], [/* Enable systemd specific behavior for mount.cifs */
++m4trace:configure.ac:245: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_SYSTEMD])
++m4trace:configure.ac:245: -1- m4_pattern_allow([^ENABLE_SYSTEMD$])
++m4trace:configure.ac:245: -1- AH_OUTPUT([ENABLE_SYSTEMD], [/* Enable systemd specific behavior for mount.cifs */
+ @%:@undef ENABLE_SYSTEMD])
+-m4trace:configure.ac:237: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE])
+-m4trace:configure.ac:237: -1- m4_pattern_allow([^HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE$])
+-m4trace:configure.ac:237: -1- AH_OUTPUT([HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE], [/* Define to 1 if you have the declaration of
++m4trace:configure.ac:249: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE])
++m4trace:configure.ac:249: -1- m4_pattern_allow([^HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE$])
++m4trace:configure.ac:249: -1- AH_OUTPUT([HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE], [/* Define to 1 if you have the declaration of
+    `krb5_auth_con_set_req_cksumtype\', and to 0 if you don\'t. */
+ @%:@undef HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE])
+-m4trace:configure.ac:241: -1- AM_CONDITIONAL([CONFIG_CIFSUPCALL], [test "$enable_cifsupcall" != "no"])
+-m4trace:configure.ac:241: -1- AC_SUBST([CONFIG_CIFSUPCALL_TRUE])
+-m4trace:configure.ac:241: -1- AC_SUBST_TRACE([CONFIG_CIFSUPCALL_TRUE])
+-m4trace:configure.ac:241: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_TRUE$])
+-m4trace:configure.ac:241: -1- AC_SUBST([CONFIG_CIFSUPCALL_FALSE])
+-m4trace:configure.ac:241: -1- AC_SUBST_TRACE([CONFIG_CIFSUPCALL_FALSE])
+-m4trace:configure.ac:241: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_FALSE$])
+-m4trace:configure.ac:241: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_TRUE])
+-m4trace:configure.ac:241: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_FALSE])
+-m4trace:configure.ac:242: -1- AM_CONDITIONAL([CONFIG_CIFSCREDS], [test "$enable_cifscreds" != "no"])
+-m4trace:configure.ac:242: -1- AC_SUBST([CONFIG_CIFSCREDS_TRUE])
+-m4trace:configure.ac:242: -1- AC_SUBST_TRACE([CONFIG_CIFSCREDS_TRUE])
+-m4trace:configure.ac:242: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_TRUE$])
+-m4trace:configure.ac:242: -1- AC_SUBST([CONFIG_CIFSCREDS_FALSE])
+-m4trace:configure.ac:242: -1- AC_SUBST_TRACE([CONFIG_CIFSCREDS_FALSE])
+-m4trace:configure.ac:242: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_FALSE$])
+-m4trace:configure.ac:242: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_TRUE])
+-m4trace:configure.ac:242: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_FALSE])
+-m4trace:configure.ac:243: -1- AM_CONDITIONAL([CONFIG_CIFSIDMAP], [test "$enable_cifsidmap" != "no"])
+-m4trace:configure.ac:243: -1- AC_SUBST([CONFIG_CIFSIDMAP_TRUE])
+-m4trace:configure.ac:243: -1- AC_SUBST_TRACE([CONFIG_CIFSIDMAP_TRUE])
+-m4trace:configure.ac:243: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_TRUE$])
+-m4trace:configure.ac:243: -1- AC_SUBST([CONFIG_CIFSIDMAP_FALSE])
+-m4trace:configure.ac:243: -1- AC_SUBST_TRACE([CONFIG_CIFSIDMAP_FALSE])
+-m4trace:configure.ac:243: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_FALSE$])
+-m4trace:configure.ac:243: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_TRUE])
+-m4trace:configure.ac:243: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_FALSE])
+-m4trace:configure.ac:244: -1- AM_CONDITIONAL([CONFIG_CIFSACL], [test "$enable_cifsacl" != "no"])
+-m4trace:configure.ac:244: -1- AC_SUBST([CONFIG_CIFSACL_TRUE])
+-m4trace:configure.ac:244: -1- AC_SUBST_TRACE([CONFIG_CIFSACL_TRUE])
+-m4trace:configure.ac:244: -1- m4_pattern_allow([^CONFIG_CIFSACL_TRUE$])
+-m4trace:configure.ac:244: -1- AC_SUBST([CONFIG_CIFSACL_FALSE])
+-m4trace:configure.ac:244: -1- AC_SUBST_TRACE([CONFIG_CIFSACL_FALSE])
+-m4trace:configure.ac:244: -1- m4_pattern_allow([^CONFIG_CIFSACL_FALSE$])
+-m4trace:configure.ac:244: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_TRUE])
+-m4trace:configure.ac:244: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_FALSE])
+-m4trace:configure.ac:245: -1- AM_CONDITIONAL([CONFIG_PLUGIN], [test "$enable_cifsidmap" != "no" -o "$enable_cifsacl" != "no"])
+-m4trace:configure.ac:245: -1- AC_SUBST([CONFIG_PLUGIN_TRUE])
+-m4trace:configure.ac:245: -1- AC_SUBST_TRACE([CONFIG_PLUGIN_TRUE])
+-m4trace:configure.ac:245: -1- m4_pattern_allow([^CONFIG_PLUGIN_TRUE$])
+-m4trace:configure.ac:245: -1- AC_SUBST([CONFIG_PLUGIN_FALSE])
+-m4trace:configure.ac:245: -1- AC_SUBST_TRACE([CONFIG_PLUGIN_FALSE])
+-m4trace:configure.ac:245: -1- m4_pattern_allow([^CONFIG_PLUGIN_FALSE$])
+-m4trace:configure.ac:245: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_TRUE])
+-m4trace:configure.ac:245: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_FALSE])
+-m4trace:configure.ac:247: -1- AC_SUBST([CAPNG_LDADD])
+-m4trace:configure.ac:247: -1- AC_SUBST_TRACE([CAPNG_LDADD])
+-m4trace:configure.ac:247: -1- m4_pattern_allow([^CAPNG_LDADD$])
+-m4trace:configure.ac:247: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCAP_NG])
+-m4trace:configure.ac:247: -1- m4_pattern_allow([^HAVE_LIBCAP_NG$])
+-m4trace:configure.ac:247: -1- AH_OUTPUT([HAVE_LIBCAP_NG], [/* libcap-ng support */
+-@%:@undef HAVE_LIBCAP_NG])
+-m4trace:configure.ac:250: -1- AH_OUTPUT([HAVE_SYS_CAPABILITY_H], [/* Define to 1 if you have the <sys/capability.h> header file. */
++m4trace:configure.ac:253: -1- AM_CONDITIONAL([CONFIG_CIFSUPCALL], [test "$enable_cifsupcall" != "no"])
++m4trace:configure.ac:253: -1- AC_SUBST([CONFIG_CIFSUPCALL_TRUE])
++m4trace:configure.ac:253: -1- AC_SUBST_TRACE([CONFIG_CIFSUPCALL_TRUE])
++m4trace:configure.ac:253: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_TRUE$])
++m4trace:configure.ac:253: -1- AC_SUBST([CONFIG_CIFSUPCALL_FALSE])
++m4trace:configure.ac:253: -1- AC_SUBST_TRACE([CONFIG_CIFSUPCALL_FALSE])
++m4trace:configure.ac:253: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_FALSE$])
++m4trace:configure.ac:253: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_TRUE])
++m4trace:configure.ac:253: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_FALSE])
++m4trace:configure.ac:254: -1- AM_CONDITIONAL([CONFIG_CIFSCREDS], [test "$enable_cifscreds" != "no"])
++m4trace:configure.ac:254: -1- AC_SUBST([CONFIG_CIFSCREDS_TRUE])
++m4trace:configure.ac:254: -1- AC_SUBST_TRACE([CONFIG_CIFSCREDS_TRUE])
++m4trace:configure.ac:254: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_TRUE$])
++m4trace:configure.ac:254: -1- AC_SUBST([CONFIG_CIFSCREDS_FALSE])
++m4trace:configure.ac:254: -1- AC_SUBST_TRACE([CONFIG_CIFSCREDS_FALSE])
++m4trace:configure.ac:254: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_FALSE$])
++m4trace:configure.ac:254: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_TRUE])
++m4trace:configure.ac:254: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_FALSE])
++m4trace:configure.ac:255: -1- AM_CONDITIONAL([CONFIG_CIFSIDMAP], [test "$enable_cifsidmap" != "no"])
++m4trace:configure.ac:255: -1- AC_SUBST([CONFIG_CIFSIDMAP_TRUE])
++m4trace:configure.ac:255: -1- AC_SUBST_TRACE([CONFIG_CIFSIDMAP_TRUE])
++m4trace:configure.ac:255: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_TRUE$])
++m4trace:configure.ac:255: -1- AC_SUBST([CONFIG_CIFSIDMAP_FALSE])
++m4trace:configure.ac:255: -1- AC_SUBST_TRACE([CONFIG_CIFSIDMAP_FALSE])
++m4trace:configure.ac:255: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_FALSE$])
++m4trace:configure.ac:255: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_TRUE])
++m4trace:configure.ac:255: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_FALSE])
++m4trace:configure.ac:256: -1- AM_CONDITIONAL([CONFIG_CIFSACL], [test "$enable_cifsacl" != "no"])
++m4trace:configure.ac:256: -1- AC_SUBST([CONFIG_CIFSACL_TRUE])
++m4trace:configure.ac:256: -1- AC_SUBST_TRACE([CONFIG_CIFSACL_TRUE])
++m4trace:configure.ac:256: -1- m4_pattern_allow([^CONFIG_CIFSACL_TRUE$])
++m4trace:configure.ac:256: -1- AC_SUBST([CONFIG_CIFSACL_FALSE])
++m4trace:configure.ac:256: -1- AC_SUBST_TRACE([CONFIG_CIFSACL_FALSE])
++m4trace:configure.ac:256: -1- m4_pattern_allow([^CONFIG_CIFSACL_FALSE$])
++m4trace:configure.ac:256: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_TRUE])
++m4trace:configure.ac:256: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_FALSE])
++m4trace:configure.ac:257: -1- AM_CONDITIONAL([CONFIG_PLUGIN], [test "$enable_cifsidmap" != "no" -o "$enable_cifsacl" != "no"])
++m4trace:configure.ac:257: -1- AC_SUBST([CONFIG_PLUGIN_TRUE])
++m4trace:configure.ac:257: -1- AC_SUBST_TRACE([CONFIG_PLUGIN_TRUE])
++m4trace:configure.ac:257: -1- m4_pattern_allow([^CONFIG_PLUGIN_TRUE$])
++m4trace:configure.ac:257: -1- AC_SUBST([CONFIG_PLUGIN_FALSE])
++m4trace:configure.ac:257: -1- AC_SUBST_TRACE([CONFIG_PLUGIN_FALSE])
++m4trace:configure.ac:257: -1- m4_pattern_allow([^CONFIG_PLUGIN_FALSE$])
++m4trace:configure.ac:257: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_TRUE])
++m4trace:configure.ac:257: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_FALSE])
++m4trace:configure.ac:262: -1- AH_OUTPUT([HAVE_SYS_CAPABILITY_H], [/* Define to 1 if you have the <sys/capability.h> header file. */
+ @%:@undef HAVE_SYS_CAPABILITY_H])
+-m4trace:configure.ac:250: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_CAPABILITY_H])
+-m4trace:configure.ac:250: -1- m4_pattern_allow([^HAVE_SYS_CAPABILITY_H$])
+-m4trace:configure.ac:250: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCAP])
+-m4trace:configure.ac:250: -1- m4_pattern_allow([^HAVE_LIBCAP$])
+-m4trace:configure.ac:250: -1- AH_OUTPUT([HAVE_LIBCAP], [/* Define if libcap exists */
++m4trace:configure.ac:262: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_CAPABILITY_H])
++m4trace:configure.ac:262: -1- m4_pattern_allow([^HAVE_SYS_CAPABILITY_H$])
++m4trace:configure.ac:262: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCAP])
++m4trace:configure.ac:262: -1- m4_pattern_allow([^HAVE_LIBCAP$])
++m4trace:configure.ac:262: -1- AH_OUTPUT([HAVE_LIBCAP], [/* Define if libcap exists */
+ @%:@undef HAVE_LIBCAP])
+-m4trace:configure.ac:250: -1- AC_SUBST([LIBCAP])
+-m4trace:configure.ac:250: -1- AC_SUBST_TRACE([LIBCAP])
+-m4trace:configure.ac:250: -1- m4_pattern_allow([^LIBCAP$])
+-m4trace:configure.ac:252: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+-m4trace:configure.ac:252: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+-m4trace:configure.ac:252: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+-m4trace:configure.ac:252: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+-m4trace:configure.ac:252: -1- AC_SUBST_TRACE([LTLIBOBJS])
+-m4trace:configure.ac:252: -1- m4_pattern_allow([^LTLIBOBJS$])
+-m4trace:configure.ac:252: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+-m4trace:configure.ac:252: -1- AC_SUBST([am__EXEEXT_TRUE])
+-m4trace:configure.ac:252: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
+-m4trace:configure.ac:252: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+-m4trace:configure.ac:252: -1- AC_SUBST([am__EXEEXT_FALSE])
+-m4trace:configure.ac:252: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
+-m4trace:configure.ac:252: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+-m4trace:configure.ac:252: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+-m4trace:configure.ac:252: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+-m4trace:configure.ac:252: -1- AC_SUBST_TRACE([top_builddir])
+-m4trace:configure.ac:252: -1- AC_SUBST_TRACE([top_build_prefix])
+-m4trace:configure.ac:252: -1- AC_SUBST_TRACE([srcdir])
+-m4trace:configure.ac:252: -1- AC_SUBST_TRACE([abs_srcdir])
+-m4trace:configure.ac:252: -1- AC_SUBST_TRACE([top_srcdir])
+-m4trace:configure.ac:252: -1- AC_SUBST_TRACE([abs_top_srcdir])
+-m4trace:configure.ac:252: -1- AC_SUBST_TRACE([builddir])
+-m4trace:configure.ac:252: -1- AC_SUBST_TRACE([abs_builddir])
+-m4trace:configure.ac:252: -1- AC_SUBST_TRACE([abs_top_builddir])
+-m4trace:configure.ac:252: -1- AC_SUBST_TRACE([INSTALL])
+-m4trace:configure.ac:252: -1- AC_SUBST_TRACE([MKDIR_P])
++m4trace:configure.ac:262: -1- AC_SUBST([LIBCAP])
++m4trace:configure.ac:262: -1- AC_SUBST_TRACE([LIBCAP])
++m4trace:configure.ac:262: -1- m4_pattern_allow([^LIBCAP$])
++m4trace:configure.ac:264: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
++m4trace:configure.ac:264: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
++m4trace:configure.ac:264: -1- m4_pattern_allow([^LIB@&t@OBJS$])
++m4trace:configure.ac:264: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
++m4trace:configure.ac:264: -1- AC_SUBST_TRACE([LTLIBOBJS])
++m4trace:configure.ac:264: -1- m4_pattern_allow([^LTLIBOBJS$])
++m4trace:configure.ac:264: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
++m4trace:configure.ac:264: -1- AC_SUBST([am__EXEEXT_TRUE])
++m4trace:configure.ac:264: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
++m4trace:configure.ac:264: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
++m4trace:configure.ac:264: -1- AC_SUBST([am__EXEEXT_FALSE])
++m4trace:configure.ac:264: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
++m4trace:configure.ac:264: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
++m4trace:configure.ac:264: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
++m4trace:configure.ac:264: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
++m4trace:configure.ac:264: -1- AC_SUBST_TRACE([top_builddir])
++m4trace:configure.ac:264: -1- AC_SUBST_TRACE([top_build_prefix])
++m4trace:configure.ac:264: -1- AC_SUBST_TRACE([srcdir])
++m4trace:configure.ac:264: -1- AC_SUBST_TRACE([abs_srcdir])
++m4trace:configure.ac:264: -1- AC_SUBST_TRACE([top_srcdir])
++m4trace:configure.ac:264: -1- AC_SUBST_TRACE([abs_top_srcdir])
++m4trace:configure.ac:264: -1- AC_SUBST_TRACE([builddir])
++m4trace:configure.ac:264: -1- AC_SUBST_TRACE([abs_builddir])
++m4trace:configure.ac:264: -1- AC_SUBST_TRACE([abs_top_builddir])
++m4trace:configure.ac:264: -1- AC_SUBST_TRACE([INSTALL])
++m4trace:configure.ac:264: -1- AC_SUBST_TRACE([MKDIR_P])
+diff -Nur cifs-utils-6.1.orig/cifscreds.c cifs-utils-6.1/cifscreds.c
+--- cifs-utils-6.1.orig/cifscreds.c	2013-07-02 21:13:33.000000000 +0200
++++ cifs-utils-6.1/cifscreds.c	2013-10-05 18:12:29.000000000 +0200
+@@ -27,7 +27,13 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <keyutils.h>
++#ifdef HAVE_GNU_GETOPT_LONG
+ #include <getopt.h>
++#else
++#include "gnu_getopt.h"
++#define getopt_long gnu_getopt_long
++#define option gnu_option
++#endif
+ #include <errno.h>
+ #include "mount.h"
+ #include "resolve_host.h"
+diff -Nur cifs-utils-6.1.orig/cifs.idmap.c cifs-utils-6.1/cifs.idmap.c
+--- cifs-utils-6.1.orig/cifs.idmap.c	2013-07-02 21:13:33.000000000 +0200
++++ cifs-utils-6.1/cifs.idmap.c	2013-10-05 18:12:29.000000000 +0200
+@@ -27,7 +27,13 @@
+ #endif /* HAVE_CONFIG_H */
+ 
+ #include <string.h>
++#ifdef HAVE_GNU_GETOPT_LONG
+ #include <getopt.h>
++#else
++#include "gnu_getopt.h"
++#define getopt_long gnu_getopt_long
++#define option gnu_option
++#endif
+ #include <syslog.h>
+ #include <dirent.h>
+ #include <sys/types.h>
+diff -Nur cifs-utils-6.1.orig/cifs.upcall.c cifs-utils-6.1/cifs.upcall.c
+--- cifs-utils-6.1.orig/cifs.upcall.c	2013-07-02 21:13:33.000000000 +0200
++++ cifs-utils-6.1/cifs.upcall.c	2013-10-05 18:12:29.000000000 +0200
+@@ -30,7 +30,13 @@
+ #endif /* HAVE_CONFIG_H */
+ 
+ #include <string.h>
++#ifdef HAVE_GNU_GETOPT_LONG
+ #include <getopt.h>
++#else
++#include "gnu_getopt.h"
++#define getopt_long gnu_getopt_long
++#define option gnu_option
++#endif
+ #ifdef HAVE_KRB5_KRB5_H
+ #include <krb5/krb5.h>
+ #elif defined(HAVE_KRB5_H)
+diff -Nur cifs-utils-6.1.orig/compile cifs-utils-6.1/compile
+--- cifs-utils-6.1.orig/compile	2013-07-02 21:20:33.000000000 +0200
++++ cifs-utils-6.1/compile	2013-10-05 18:12:39.000000000 +0200
+@@ -3,7 +3,8 @@
+ 
+ scriptversion=2012-03-05.13; # UTC
+ 
+-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
++# Software Foundation, Inc.
+ # Written by Tom Tromey <tromey@cygnus.com>.
+ #
+ # This program is free software; you can redistribute it and/or modify
+diff -Nur cifs-utils-6.1.orig/config.h.in cifs-utils-6.1/config.h.in
+--- cifs-utils-6.1.orig/config.h.in	2013-07-02 21:20:32.000000000 +0200
++++ cifs-utils-6.1/config.h.in	2013-10-05 18:12:38.000000000 +0200
+@@ -34,12 +34,18 @@
+ /* Define to 1 if you have the `getmntent' function. */
+ #undef HAVE_GETMNTENT
+ 
++/* Define to 1 if you have the `getopt_long' function. */
++#undef HAVE_GETOPT_LONG
++
+ /* Define to 1 if you have the `getpass' function. */
+ #undef HAVE_GETPASS
+ 
+ /* Define to 1 if you have the `gettimeofday' function. */
+ #undef HAVE_GETTIMEOFDAY
+ 
++/* Whether getopt_long has GNU extensions */
++#undef HAVE_GNU_GETOPT_LONG
++
+ /* Define to 1 if you have the `inet_ntop' function. */
+ #undef HAVE_INET_NTOP
+ 
+@@ -76,17 +82,13 @@
+ /* Define if libcap exists */
+ #undef HAVE_LIBCAP
+ 
+-/* libcap-ng support */
+-#undef HAVE_LIBCAP_NG
+-
+ /* Define to 1 if you have the `wbclient' library (-lwbclient). */
+ #undef HAVE_LIBWBCLIENT
+ 
+ /* Define to 1 if you have the <limits.h> header file. */
+ #undef HAVE_LIMITS_H
+ 
+-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+-   to 0 otherwise. */
++/* Define to 1 if you have the `malloc' function. */
+ #undef HAVE_MALLOC
+ 
+ /* Define to 1 if you have the <memory.h> header file. */
+@@ -104,8 +106,7 @@
+ /* Define to 1 if the system has the type `ptrdiff_t'. */
+ #undef HAVE_PTRDIFF_T
+ 
+-/* Define to 1 if your system has a GNU libc compatible `realloc' function,
+-   and to 0 otherwise. */
++/* Define to 1 if you have the `realloc' function. */
+ #undef HAVE_REALLOC
+ 
+ /* Define to 1 if you have the `realpath' function. */
+@@ -156,6 +157,9 @@
+ /* Define to 1 if you have the `strndup' function. */
+ #undef HAVE_STRNDUP
+ 
++/* Define to 1 if you have the `strnlen' function. */
++#undef HAVE_STRNLEN
++
+ /* Define to 1 if you have the `strpbrk' function. */
+ #undef HAVE_STRPBRK
+ 
+@@ -229,10 +233,6 @@
+    symlink to real plugin) */
+ #undef IDMAP_PLUGIN_PATH
+ 
+-/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
+-   slash. */
+-#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
+-
+ /* Define to 1 if your C compiler doesn't accept -c and -o together. */
+ #undef NO_MINUS_C_MINUS_O
+ 
+@@ -298,18 +298,12 @@
+ /* Define to `int' if <sys/types.h> doesn't define. */
+ #undef gid_t
+ 
+-/* Define to rpl_malloc if the replacement function should be used. */
+-#undef malloc
+-
+ /* Define to `long int' if <sys/types.h> does not define. */
+ #undef off_t
+ 
+ /* Define to `int' if <sys/types.h> does not define. */
+ #undef pid_t
+ 
+-/* Define to rpl_realloc if the replacement function should be used. */
+-#undef realloc
+-
+ /* Define to `unsigned int' if <sys/types.h> does not define. */
+ #undef size_t
+ 
+diff -Nur cifs-utils-6.1.orig/config.h.in~ cifs-utils-6.1/config.h.in~
+--- cifs-utils-6.1.orig/config.h.in~	1970-01-01 01:00:00.000000000 +0100
++++ cifs-utils-6.1/config.h.in~	2013-07-02 21:20:32.000000000 +0200
+@@ -0,0 +1,317 @@
++/* config.h.in.  Generated from configure.ac by autoheader.  */
++
++/* Enable systemd specific behavior for mount.cifs */
++#undef ENABLE_SYSTEMD
++
++/* Define to 1 if you have the `alarm' function. */
++#undef HAVE_ALARM
++
++/* Define to 1 if you have the <arpa/inet.h> header file. */
++#undef HAVE_ARPA_INET_H
++
++/* Define to 1 if you have the `atexit' function. */
++#undef HAVE_ATEXIT
++
++/* Whether the clock_gettime func is there */
++#undef HAVE_CLOCK_GETTIME
++
++/* Define to 1 if you have the <ctype.h> header file. */
++#undef HAVE_CTYPE_H
++
++/* Define to 1 if you have the declaration of
++   `krb5_auth_con_set_req_cksumtype', and to 0 if you don't. */
++#undef HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE
++
++/* Define to 1 if you have the `endpwent' function. */
++#undef HAVE_ENDPWENT
++
++/* Define to 1 if you have the <errno.h> header file. */
++#undef HAVE_ERRNO_H
++
++/* Define to 1 if you have the <fcntl.h> header file. */
++#undef HAVE_FCNTL_H
++
++/* Define to 1 if you have the `getmntent' function. */
++#undef HAVE_GETMNTENT
++
++/* Define to 1 if you have the `getpass' function. */
++#undef HAVE_GETPASS
++
++/* Define to 1 if you have the `gettimeofday' function. */
++#undef HAVE_GETTIMEOFDAY
++
++/* Define to 1 if you have the `inet_ntop' function. */
++#undef HAVE_INET_NTOP
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++#undef HAVE_INTTYPES_H
++
++/* Define to 1 if you have the <keyutils.h> header file. */
++#undef HAVE_KEYUTILS_H
++
++/* Define to 1 if you have the `krb5_auth_con_getsendsubkey' function. */
++#undef HAVE_KRB5_AUTH_CON_GETSENDSUBKEY
++
++/* Define to 1 if you have the `krb5_auth_con_setaddrs' function. */
++#undef HAVE_KRB5_AUTH_CON_SETADDRS
++
++/* Define to 1 if you have the `krb5_auth_con_set_req_cksumtype' function. */
++#undef HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE
++
++/* Define to 1 if you have the `krb5_free_unparsed_name' function. */
++#undef HAVE_KRB5_FREE_UNPARSED_NAME
++
++/* Define to 1 if you have the <krb5.h> header file. */
++#undef HAVE_KRB5_H
++
++/* Whether the krb5_keyblock struct has a keyvalue property */
++#undef HAVE_KRB5_KEYBLOCK_KEYVALUE
++
++/* Define to 1 if you have the <krb5/krb5.h> header file. */
++#undef HAVE_KRB5_KRB5_H
++
++/* Define to 1 if you have the `krb5_principal_get_realm' function. */
++#undef HAVE_KRB5_PRINCIPAL_GET_REALM
++
++/* Define if libcap exists */
++#undef HAVE_LIBCAP
++
++/* libcap-ng support */
++#undef HAVE_LIBCAP_NG
++
++/* Define to 1 if you have the `wbclient' library (-lwbclient). */
++#undef HAVE_LIBWBCLIENT
++
++/* Define to 1 if you have the <limits.h> header file. */
++#undef HAVE_LIMITS_H
++
++/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
++   to 0 otherwise. */
++#undef HAVE_MALLOC
++
++/* Define to 1 if you have the <memory.h> header file. */
++#undef HAVE_MEMORY_H
++
++/* Define to 1 if you have the `memset' function. */
++#undef HAVE_MEMSET
++
++/* Define to 1 if you have the <mntent.h> header file. */
++#undef HAVE_MNTENT_H
++
++/* Define to 1 if you have the <netdb.h> header file. */
++#undef HAVE_NETDB_H
++
++/* Define to 1 if the system has the type `ptrdiff_t'. */
++#undef HAVE_PTRDIFF_T
++
++/* Define to 1 if your system has a GNU libc compatible `realloc' function,
++   and to 0 otherwise. */
++#undef HAVE_REALLOC
++
++/* Define to 1 if you have the `realpath' function. */
++#undef HAVE_REALPATH
++
++/* Define to 1 if you have the `setenv' function. */
++#undef HAVE_SETENV
++
++/* Define to 1 if the system has the type `ssize_t'. */
++#undef HAVE_SSIZE_T
++
++/* Define to 1 if you have the <stdbool.h> header file. */
++#undef HAVE_STDBOOL_H
++
++/* Define to 1 if you have the <stddef.h> header file. */
++#undef HAVE_STDDEF_H
++
++/* Define to 1 if you have the <stdint.h> header file. */
++#undef HAVE_STDINT_H
++
++/* Define to 1 if you have the <stdio.h> header file. */
++#undef HAVE_STDIO_H
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#undef HAVE_STDLIB_H
++
++/* Define to 1 if you have the `strchr' function. */
++#undef HAVE_STRCHR
++
++/* Define to 1 if you have the `strcmp' function. */
++#undef HAVE_STRCMP
++
++/* Define to 1 if you have the `strdup' function. */
++#undef HAVE_STRDUP
++
++/* Define to 1 if you have the `strerror' function. */
++#undef HAVE_STRERROR
++
++/* Define to 1 if you have the <strings.h> header file. */
++#undef HAVE_STRINGS_H
++
++/* Define to 1 if you have the <string.h> header file. */
++#undef HAVE_STRING_H
++
++/* Define to 1 if you have the `strncasecmp' function. */
++#undef HAVE_STRNCASECMP
++
++/* Define to 1 if you have the `strndup' function. */
++#undef HAVE_STRNDUP
++
++/* Define to 1 if you have the `strpbrk' function. */
++#undef HAVE_STRPBRK
++
++/* Define to 1 if you have the `strrchr' function. */
++#undef HAVE_STRRCHR
++
++/* Define to 1 if you have the `strstr' function. */
++#undef HAVE_STRSTR
++
++/* Define to 1 if you have the `strtol' function. */
++#undef HAVE_STRTOL
++
++/* Define to 1 if you have the `strtoul' function. */
++#undef HAVE_STRTOUL
++
++/* Define to 1 if you have the <syslog.h> header file. */
++#undef HAVE_SYSLOG_H
++
++/* Define to 1 if you have the <sys/capability.h> header file. */
++#undef HAVE_SYS_CAPABILITY_H
++
++/* Define to 1 if you have the <sys/fsuid.h> header file. */
++#undef HAVE_SYS_FSUID_H
++
++/* Define to 1 if you have the <sys/mount.h> header file. */
++#undef HAVE_SYS_MOUNT_H
++
++/* Define to 1 if you have the <sys/param.h> header file. */
++#undef HAVE_SYS_PARAM_H
++
++/* Define to 1 if you have the <sys/socket.h> header file. */
++#undef HAVE_SYS_SOCKET_H
++
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#undef HAVE_SYS_STAT_H
++
++/* Define to 1 if you have the <sys/time.h> header file. */
++#undef HAVE_SYS_TIME_H
++
++/* Define to 1 if you have the <sys/types.h> header file. */
++#undef HAVE_SYS_TYPES_H
++
++/* Define to 1 if you have the <sys/xattr.h> header file. */
++#undef HAVE_SYS_XATTR_H
++
++/* Define to 1 if you have the <talloc.h> header file. */
++#undef HAVE_TALLOC_H
++
++/* Define to 1 if you have the `tolower' function. */
++#undef HAVE_TOLOWER
++
++/* Define to 1 if the system has the type `uint32_t'. */
++#undef HAVE_UINT32_T
++
++/* Define to 1 if the system has the type `uint8_t'. */
++#undef HAVE_UINT8_T
++
++/* Define to 1 if you have the `uname' function. */
++#undef HAVE_UNAME
++
++/* Define to 1 if you have the <unistd.h> header file. */
++#undef HAVE_UNISTD_H
++
++/* Does wbclient.h have a WBC_ID_TYPE_BOTH enum? */
++#undef HAVE_WBC_ID_TYPE_BOTH
++
++/* Define to 1 if the system has the type `_Bool'. */
++#undef HAVE__BOOL
++
++/* Location of plugin that ID mapping infrastructure should use. (usually a
++   symlink to real plugin) */
++#undef IDMAP_PLUGIN_PATH
++
++/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
++   slash. */
++#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
++
++/* Define to 1 if your C compiler doesn't accept -c and -o together. */
++#undef NO_MINUS_C_MINUS_O
++
++/* Name of package */
++#undef PACKAGE
++
++/* Define to the address where bug reports for this package should be sent. */
++#undef PACKAGE_BUGREPORT
++
++/* Define to the full name of this package. */
++#undef PACKAGE_NAME
++
++/* Define to the full name and version of this package. */
++#undef PACKAGE_STRING
++
++/* Define to the one symbol short name of this package. */
++#undef PACKAGE_TARNAME
++
++/* Define to the home page for this package. */
++#undef PACKAGE_URL
++
++/* Define to the version of this package. */
++#undef PACKAGE_VERSION
++
++/* Define to 1 if you have the ANSI C header files. */
++#undef STDC_HEADERS
++
++/* Enable extensions on AIX 3, Interix.  */
++#ifndef _ALL_SOURCE
++# undef _ALL_SOURCE
++#endif
++/* Enable GNU extensions on systems that have them.  */
++#ifndef _GNU_SOURCE
++# undef _GNU_SOURCE
++#endif
++/* Enable threading extensions on Solaris.  */
++#ifndef _POSIX_PTHREAD_SEMANTICS
++# undef _POSIX_PTHREAD_SEMANTICS
++#endif
++/* Enable extensions on HP NonStop.  */
++#ifndef _TANDEM_SOURCE
++# undef _TANDEM_SOURCE
++#endif
++/* Enable general extensions on Solaris.  */
++#ifndef __EXTENSIONS__
++# undef __EXTENSIONS__
++#endif
++
++
++/* Version number of package */
++#undef VERSION
++
++/* Define to 1 if on MINIX. */
++#undef _MINIX
++
++/* Define to 2 if the system does not provide POSIX.1 features except with
++   this defined. */
++#undef _POSIX_1_SOURCE
++
++/* Define to 1 if you need to in order for `stat' and other things to work. */
++#undef _POSIX_SOURCE
++
++/* Define to `int' if <sys/types.h> doesn't define. */
++#undef gid_t
++
++/* Define to rpl_malloc if the replacement function should be used. */
++#undef malloc
++
++/* Define to `long int' if <sys/types.h> does not define. */
++#undef off_t
++
++/* Define to `int' if <sys/types.h> does not define. */
++#undef pid_t
++
++/* Define to rpl_realloc if the replacement function should be used. */
++#undef realloc
++
++/* Define to `unsigned int' if <sys/types.h> does not define. */
++#undef size_t
++
++/* Define to `int' if <sys/types.h> doesn't define. */
++#undef uid_t
+diff -Nur cifs-utils-6.1.orig/configure cifs-utils-6.1/configure
+--- cifs-utils-6.1.orig/configure	2013-07-02 21:20:31.000000000 +0200
++++ cifs-utils-6.1/configure	2013-10-05 18:12:38.000000000 +0200
+@@ -626,7 +626,6 @@
+ am__EXEEXT_TRUE
+ LTLIBOBJS
+ LIBCAP
+-CAPNG_LDADD
+ CONFIG_PLUGIN_FALSE
+ CONFIG_PLUGIN_TRUE
+ CONFIG_CIFSACL_FALSE
+@@ -646,14 +645,6 @@
+ RELRO_CFLAGS
+ PIE_CFLAGS
+ RT_LDADD
+-host_os
+-host_vendor
+-host_cpu
+-host
+-build_os
+-build_vendor
+-build_cpu
+-build
+ LIBOBJS
+ SED
+ EGREP
+@@ -751,7 +742,6 @@
+ enable_systemd
+ with_idmap_plugin
+ enable_dependency_tracking
+-with_libcap_ng
+ with_libcap
+ '
+       ac_precious_vars='build_alias
+@@ -1370,10 +1360,6 @@
+   --program-prefix=PREFIX            prepend PREFIX to installed program names
+   --program-suffix=SUFFIX            append SUFFIX to installed program names
+   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+-
+-System types:
+-  --build=BUILD     configure for building on BUILD [guessed]
+-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+ _ACEOF
+ fi
+ 
+@@ -1396,10 +1382,8 @@
+   --enable-cifsacl        Create get/set cifsacl binary [default=yes]
+   --enable-systemd        Enable systemd specific behavior for mount.cifs
+                           [default=yes]
+-  --enable-dependency-tracking
+-                          do not reject slow dependency extractors
+-  --disable-dependency-tracking
+-                          speeds up one-time build
++  --disable-dependency-tracking  speeds up one-time build
++  --enable-dependency-tracking   do not reject slow dependency extractors
+ 
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+@@ -1408,7 +1392,6 @@
+                           Define the path to the plugin that the idmapping
+                           infrastructure should use
+                           [default=/etc/cifs-utils/idmap-plugin]
+-  --with-libcap-ng=auto/yes/no  Add Libcap-ng support default=auto
+   --with-libcap    Add libcap support default=yes, if libcap-ng not available
+ 
+ Some influential environment variables:
+@@ -2323,7 +2306,7 @@
+ 
+ 
+ 
+-am__api_version='1.12'
++am__api_version='1.11'
+ 
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+@@ -2449,6 +2432,9 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+ $as_echo_n "checking whether build environment is sane... " >&6; }
++# Just in case
++sleep 1
++echo timestamp > conftest.file
+ # Reject unsafe characters in $srcdir or the absolute working directory
+ # name.  Accept space and tab only in the latter.
+ am_lf='
+@@ -2459,40 +2445,32 @@
+ esac
+ case $srcdir in
+   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+-    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
++    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ esac
+ 
+-# Do 'set' in a subshell so we don't clobber the current shell's
++# Do `set' in a subshell so we don't clobber the current shell's
+ # arguments.  Must try -L first in case configure is actually a
+ # symlink; some systems play weird games with the mod time of symlinks
+ # (eg FreeBSD returns the mod time of the symlink's containing
+ # directory).
+ if (
+-   am_has_slept=no
+-   for am_try in 1 2; do
+-     echo "timestamp, slept: $am_has_slept" > conftest.file
+-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+-     if test "$*" = "X"; then
+-	# -L didn't work.
+-	set X `ls -t "$srcdir/configure" conftest.file`
+-     fi
+-     if test "$*" != "X $srcdir/configure conftest.file" \
+-	&& test "$*" != "X conftest.file $srcdir/configure"; then
++   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
++   if test "$*" = "X"; then
++      # -L didn't work.
++      set X `ls -t "$srcdir/configure" conftest.file`
++   fi
++   rm -f conftest.file
++   if test "$*" != "X $srcdir/configure conftest.file" \
++      && test "$*" != "X conftest.file $srcdir/configure"; then
++
++      # If neither matched, then we have a broken ls.  This can happen
++      # if, for instance, CONFIG_SHELL is bash and it inherits a
++      # broken ls alias from the environment.  This has actually
++      # happened.  Such a system could not be considered "sane".
++      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
++alias in your environment" "$LINENO" 5
++   fi
+ 
+-	# If neither matched, then we have a broken ls.  This can happen
+-	# if, for instance, CONFIG_SHELL is bash and it inherits a
+-	# broken ls alias from the environment.  This has actually
+-	# happened.  Such a system could not be considered "sane".
+-	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+-  alias in your environment" "$LINENO" 5
+-     fi
+-     if test "$2" = conftest.file || test $am_try -eq 2; then
+-       break
+-     fi
+-     # Just in case.
+-     sleep 1
+-     am_has_slept=yes
+-   done
+    test "$2" = conftest.file
+    )
+ then
+@@ -2504,16 +2482,6 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-# If we didn't sleep, we still need to ensure time stamps of config.status and
+-# generated files are strictly newer.
+-am_sleep_pid=
+-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+-  ( sleep 1 ) &
+-  am_sleep_pid=$!
+-fi
+-
+-rm -f conftest.file
+-
+ test "$program_prefix" != NONE &&
+   program_transform_name="s&^&$program_prefix&;$program_transform_name"
+ # Use a double $ so make ignores it.
+@@ -2540,8 +2508,8 @@
+   am_missing_run="$MISSING --run "
+ else
+   am_missing_run=
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
++$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+ 
+ if test x"${install_sh}" != xset; then
+@@ -2553,10 +2521,10 @@
+   esac
+ fi
+ 
+-# Installed binaries are usually stripped using 'strip' when the user
+-# run "make install-strip".  However 'strip' might not be the right
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'.  However `strip' might not be the right
+ # tool to use in cross-compilation environments, therefore Automake
+-# will honor the 'STRIP' environment variable to overrule this program.
++# will honor the `STRIP' environment variable to overrule this program.
+ if test "$cross_compiling" != no; then
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+@@ -2695,6 +2663,12 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+ $as_echo "$MKDIR_P" >&6; }
+ 
++mkdir_p="$MKDIR_P"
++case $mkdir_p in
++  [\\/$]* | ?:[\\/]*) ;;
++  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
++
+ for ac_prog in gawk mawk nawk awk
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -2827,12 +2801,6 @@
+ 
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ 
+-# For better backward compatibility.  To be removed once Automake 1.9.x
+-# dies out for good.  For more background, see:
+-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+-mkdir_p='$(MKDIR_P)'
+-
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+ # Always define AMTAR for backward compatibility.  Yes, it's still used
+@@ -3735,7 +3703,7 @@
+ _am_result=none
+ # First try GNU make style include.
+ echo "include confinc" > confmf
+-# Ignore all kinds of additional output from 'make'.
++# Ignore all kinds of additional output from `make'.
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+   am__include=include
+@@ -3791,8 +3759,8 @@
+   # We make a subdir and do the tests there.  Otherwise we can end up
+   # making bogus files that we don't know about and never remove.  For
+   # instance it was reported that on HP-UX the gcc test will end up
+-  # making a dummy file named 'D' -- because '-MD' means "put the output
+-  # in D".
++  # making a dummy file named `D' -- because `-MD' means `put the output
++  # in D'.
+   rm -rf conftest.dir
+   mkdir conftest.dir
+   # Copy depcomp to subdir because otherwise we won't find it if we're
+@@ -3827,16 +3795,16 @@
+     : > sub/conftest.c
+     for i in 1 2 3 4 5 6; do
+       echo '#include "conftst'$i'.h"' >> sub/conftest.c
+-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+-      # Solaris 10 /bin/sh.
+-      echo '/* dummy */' > sub/conftst$i.h
++      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++      # Solaris 8's {/usr,}/bin/sh.
++      touch sub/conftst$i.h
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
+-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+     # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle '-M -o', and we need to detect this.  Also, some Intel
+-    # versions had trouble with output in subdirs.
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
+     am__obj=sub/conftest.${OBJEXT-o}
+     am__minus_obj="-o $am__obj"
+     case $depmode in
+@@ -3845,8 +3813,8 @@
+       test "$am__universal" = false || continue
+       ;;
+     nosideeffect)
+-      # After this tag, mechanisms are not by side-effect, so they'll
+-      # only be used when explicitly requested.
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
+       if test "x$enable_dependency_tracking" = xyes; then
+ 	continue
+       else
+@@ -3854,7 +3822,7 @@
+       fi
+       ;;
+     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+-      # This compiler won't grok '-c -o', but also, the minuso test has
++      # This compiler won't grok `-c -o', but also, the minuso test has
+       # not run yet.  These depmodes are late enough in the game, and
+       # so weak that their functioning should not be impacted.
+       am__obj=conftest.${OBJEXT-o}
+@@ -4827,346 +4795,76 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
+-$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
+-if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  rm -f conftest.sym conftest.file
+-echo >conftest.file
+-if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
+-  if test "$cross_compiling" = yes; then :
+-  ac_cv_func_lstat_dereferences_slashed_symlink=no
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-struct stat sbuf;
+-     /* Linux will dereference the symlink and fail, as required by POSIX.
+-	That is better in the sense that it means we will not
+-	have to compile and use the lstat wrapper.  */
+-     return lstat ("conftest.sym/", &sbuf) == 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  ac_cv_func_lstat_dereferences_slashed_symlink=yes
+-else
+-  ac_cv_func_lstat_dereferences_slashed_symlink=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-else
+-  # If the `ln -s' command failed, then we probably don't even
+-  # have an lstat function.
+-  ac_cv_func_lstat_dereferences_slashed_symlink=no
+-fi
+-rm -f conftest.sym conftest.file
+ 
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
+-$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
+-
+-test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
+-
+-cat >>confdefs.h <<_ACEOF
+-#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
+-_ACEOF
+-
+-
+-if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
+-  case " $LIBOBJS " in
+-  *" lstat.$ac_objext "* ) ;;
+-  *) LIBOBJS="$LIBOBJS lstat.$ac_objext"
+- ;;
+-esac
+-
+-fi
+-
+-for ac_header in stdlib.h
++# check for required functions
++for ac_func in alarm atexit endpwent getmntent getpass gettimeofday inet_ntop malloc memset realloc realpath setenv strchr strcmp strdup strerror strncasecmp strndup strnlen strpbrk strrchr strstr strtol strtoul tolower uname
+ do :
+-  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+-if test "x$ac_cv_header_stdlib_h" = xyes; then :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+-#define HAVE_STDLIB_H 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
+-$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
+-if ${ac_cv_func_malloc_0_nonnull+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "$cross_compiling" = yes; then :
+-  ac_cv_func_malloc_0_nonnull=no
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+-# include <stdlib.h>
+-#else
+-char *malloc ();
+-#endif
+-
+-int
+-main ()
+-{
+-return ! malloc (0);
+-  ;
+-  return 0;
+-}
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  ac_cv_func_malloc_0_nonnull=yes
+-else
+-  ac_cv_func_malloc_0_nonnull=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
+-$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
+-if test $ac_cv_func_malloc_0_nonnull = yes; then :
+-
+-$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
+ 
+ else
+-  $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
+-
+-   case " $LIBOBJS " in
+-  *" malloc.$ac_objext "* ) ;;
+-  *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
+- ;;
+-esac
+-
+-
+-$as_echo "#define malloc rpl_malloc" >>confdefs.h
+-
++  as_fn_error $? "necessary functions(s) not found" "$LINENO" 5
+ fi
++done
+ 
+ 
+-for ac_header in stdlib.h
++for ac_func in getopt_long
+ do :
+-  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+-if test "x$ac_cv_header_stdlib_h" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "getopt_long" "ac_cv_func_getopt_long"
++if test "x$ac_cv_func_getopt_long" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define HAVE_STDLIB_H 1
++#define HAVE_GETOPT_LONG 1
+ _ACEOF
+ 
++else
++  as_fn_error $? "getopt_long function not found" "$LINENO" 5
+ fi
+-
+ done
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5
+-$as_echo_n "checking for GNU libc compatible realloc... " >&6; }
+-if ${ac_cv_func_realloc_0_nonnull+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "$cross_compiling" = yes; then :
+-  ac_cv_func_realloc_0_nonnull=no
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if getopt_long is GNU specific" >&5
++$as_echo_n "checking if getopt_long is GNU specific... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+-# include <stdlib.h>
+-#else
+-char *realloc ();
++
++#include <features.h>
++#ifndef __GLIBC__
++#error No GNU extension
+ #endif
+ 
+ int
+ main ()
+ {
+-return ! realloc (0, 0);
++;
+   ;
+   return 0;
+ }
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  ac_cv_func_realloc_0_nonnull=yes
+-else
+-  ac_cv_func_realloc_0_nonnull=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5
+-$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; }
+-if test $ac_cv_func_realloc_0_nonnull = yes; then :
+-
+-$as_echo "#define HAVE_REALLOC 1" >>confdefs.h
+-
+-else
+-  $as_echo "#define HAVE_REALLOC 0" >>confdefs.h
+-
+-   case " $LIBOBJS " in
+-  *" realloc.$ac_objext "* ) ;;
+-  *) LIBOBJS="$LIBOBJS realloc.$ac_objext"
+- ;;
+-esac
+-
+-
+-$as_echo "#define realloc rpl_realloc" >>confdefs.h
+-
+-fi
+ 
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
+ 
+-# Make sure we can run config.sub.
+-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+-$as_echo_n "checking build system type... " >&6; }
+-if ${ac_cv_build+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_build_alias=$build_alias
+-test "x$ac_build_alias" = x &&
+-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+-test "x$ac_build_alias" = x &&
+-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+-$as_echo "$ac_cv_build" >&6; }
+-case $ac_cv_build in
+-*-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+-esac
+-build=$ac_cv_build
+-ac_save_IFS=$IFS; IFS='-'
+-set x $ac_cv_build
+-shift
+-build_cpu=$1
+-build_vendor=$2
+-shift; shift
+-# Remember, the first character of IFS is used to create $*,
+-# except with old shells:
+-build_os=$*
+-IFS=$ac_save_IFS
+-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+-$as_echo_n "checking host system type... " >&6; }
+-if ${ac_cv_host+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "x$host_alias" = x; then
+-  ac_cv_host=$ac_cv_build
+-else
+-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+-$as_echo "$ac_cv_host" >&6; }
+-case $ac_cv_host in
+-*-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+-esac
+-host=$ac_cv_host
+-ac_save_IFS=$IFS; IFS='-'
+-set x $ac_cv_host
+-shift
+-host_cpu=$1
+-host_vendor=$2
+-shift; shift
+-# Remember, the first character of IFS is used to create $*,
+-# except with old shells:
+-host_os=$*
+-IFS=$ac_save_IFS
+-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+-
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strnlen" >&5
+-$as_echo_n "checking for working strnlen... " >&6; }
+-if ${ac_cv_func_strnlen_working+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "$cross_compiling" = yes; then :
+-  # Guess no on AIX systems, yes otherwise.
+-		case "$host_os" in
+-		  aix*) ac_cv_func_strnlen_working=no;;
+-		  *)    ac_cv_func_strnlen_working=yes;;
+-		esac
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-
+-#define S "foobar"
+-#define S_LEN (sizeof S - 1)
+ 
+-  /* At least one implementation is buggy: that of AIX 4.3 would
+-     give strnlen (S, 1) == 3.  */
++$as_echo "#define HAVE_GNU_GETOPT_LONG 1" >>confdefs.h
+ 
+-  int i;
+-  for (i = 0; i < S_LEN + 1; ++i)
+-    {
+-      int expected = i <= S_LEN ? i : S_LEN;
+-      if (strnlen (S, i) != expected)
+-	return 1;
+-    }
+-  return 0;
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  ac_cv_func_strnlen_working=yes
+ else
+-  ac_cv_func_strnlen_working=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+ 
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strnlen_working" >&5
+-$as_echo "$ac_cv_func_strnlen_working" >&6; }
+-test $ac_cv_func_strnlen_working = no && case " $LIBOBJS " in
+-  *" strnlen.$ac_objext "* ) ;;
+-  *) LIBOBJS="$LIBOBJS strnlen.$ac_objext"
++      case " $LIBOBJS " in
++  *" gnu_getopt.$ac_objext "* ) ;;
++  *) LIBOBJS="$LIBOBJS gnu_getopt.$ac_objext"
+  ;;
+ esac
+ 
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+-
+-# check for required functions
+-for ac_func in alarm atexit endpwent getmntent getpass gettimeofday inet_ntop memset realpath setenv strchr strcmp strdup strerror strncasecmp strndup strpbrk strrchr strstr strtol strtoul tolower uname
+-do :
+-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-else
+-  as_fn_error $? "necessary functions(s) not found" "$LINENO" 5
+ fi
+-done
+-
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+ for ac_func in clock_gettime
+ do :
+@@ -5954,97 +5652,7 @@
+ fi
+ 
+ 
+-
+-
+-# Check whether --with-libcap-ng was given.
+-if test "${with_libcap_ng+set}" = set; then :
+-  withval=$with_libcap_ng;
+-else
+-  with_libcap_ng=auto
+-fi
+-
+-
+-  # Check for Libcap-ng API
+-  #
+-  # libcap-ng detection
+-
+-  if test x$with_libcap_ng = xno ; then
+-      have_libcap_ng=no;
+-  else
+-      # Start by checking for header file
+-      ac_fn_c_check_header_mongrel "$LINENO" "cap-ng.h" "ac_cv_header_cap_ng_h" "$ac_includes_default"
+-if test "x$ac_cv_header_cap_ng_h" = xyes; then :
+-  capng_headers=yes
+-else
+-  capng_headers=no
+-fi
+-
+-
+-
+-      # See if we have libcap-ng library
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for capng_clear in -lcap-ng" >&5
+-$as_echo_n "checking for capng_clear in -lcap-ng... " >&6; }
+-if ${ac_cv_lib_cap_ng_capng_clear+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcap-ng  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char capng_clear ();
+-int
+-main ()
+-{
+-return capng_clear ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_cap_ng_capng_clear=yes
+-else
+-  ac_cv_lib_cap_ng_capng_clear=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cap_ng_capng_clear" >&5
+-$as_echo "$ac_cv_lib_cap_ng_capng_clear" >&6; }
+-if test "x$ac_cv_lib_cap_ng_capng_clear" = xyes; then :
+-  CAPNG_LDADD=-lcap-ng
+-fi
+-
+-
+-      # Check results are usable
+-      if test x$with_libcap_ng = xyes -a x$CAPNG_LDADD = x ; then
+-         as_fn_error $? "libcap-ng support was requested and the library was not found" "$LINENO" 5
+-      fi
+-      if test x$CAPNG_LDADD != x -a $capng_headers = no ; then
+-         as_fn_error $? "libcap-ng libraries found but headers are missing" "$LINENO" 5
+-      fi
+-  fi
+-
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use libcap-ng" >&5
+-$as_echo_n "checking whether to use libcap-ng... " >&6; }
+-  if test x$CAPNG_LDADD != x ; then
+-
+-$as_echo "#define HAVE_LIBCAP_NG 1" >>confdefs.h
+-
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-  else
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-  fi
+-
++LIBCAP_NG_PATH
+ 
+ if test "x$CAPNG_LDADD" = "x"; then
+ 
+@@ -6253,14 +5861,6 @@
+ LTLIBOBJS=$ac_ltlibobjs
+ 
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+-$as_echo_n "checking that generated files are newer than configure... " >&6; }
+-   if test -n "$am_sleep_pid"; then
+-     # Hide warnings about reused PIDs.
+-     wait $am_sleep_pid 2>/dev/null
+-   fi
+-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+-$as_echo "done" >&6; }
+  if test -n "$EXEEXT"; then
+   am__EXEEXT_TRUE=
+   am__EXEEXT_FALSE='#'
+@@ -7504,7 +7104,7 @@
+     # Strip MF so we end up with the name of the file.
+     mf=`echo "$mf" | sed -e 's/:.*$//'`
+     # Check whether this is an Automake generated Makefile or not.
+-    # We used to match only the files named 'Makefile.in', but
++    # We used to match only the files named `Makefile.in', but
+     # some people rename them; so instead we look at the file content.
+     # Grep'ing the first line is not enough: some people post-process
+     # each Makefile.in and add a new line on top of each file to say so.
+@@ -7538,19 +7138,21 @@
+       continue
+     fi
+     # Extract the definition of DEPDIR, am__include, and am__quote
+-    # from the Makefile without running 'make'.
++    # from the Makefile without running `make'.
+     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+     test -z "$DEPDIR" && continue
+     am__include=`sed -n 's/^am__include = //p' < "$mf"`
+     test -z "am__include" && continue
+     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++    # When using ansi2knr, U may be empty or an underscore; expand it
++    U=`sed -n 's/^U = //p' < "$mf"`
+     # Find all dependency output files, they are included files with
+     # $(DEPDIR) in their names.  We invoke sed twice because it is the
+     # simplest approach to changing $(DEPDIR) to its actual value in the
+     # expansion.
+     for file in `sed -n "
+       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
++	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+       # Make sure the directory exists.
+       test -f "$dirpart/$file" && continue
+       fdir=`$as_dirname -- "$file" ||
+diff -Nur cifs-utils-6.1.orig/configure.ac cifs-utils-6.1/configure.ac
+--- cifs-utils-6.1.orig/configure.ac	2013-07-02 21:13:33.000000000 +0200
++++ cifs-utils-6.1/configure.ac	2013-10-05 18:12:29.000000000 +0200
+@@ -90,13 +90,25 @@
+ 
+ # Checks for library functions.
+ AC_FUNC_GETMNTENT
+-AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
+-AC_FUNC_MALLOC
+-AC_FUNC_REALLOC
+-AC_FUNC_STRNLEN
+ 
+ # check for required functions
+-AC_CHECK_FUNCS([alarm atexit endpwent getmntent getpass gettimeofday inet_ntop memset realpath setenv strchr strcmp strdup strerror strncasecmp strndup strpbrk strrchr strstr strtol strtoul tolower uname], , [AC_MSG_ERROR([necessary functions(s) not found])])
++AC_CHECK_FUNCS([alarm atexit endpwent getmntent getpass gettimeofday inet_ntop malloc memset realloc realpath setenv strchr strcmp strdup strerror strncasecmp strndup strnlen strpbrk strrchr strstr strtol strtoul tolower uname], , [AC_MSG_ERROR([necessary functions(s) not found])])
++
++AC_CHECK_FUNCS([getopt_long], , [AC_MSG_ERROR([getopt_long function not found])])
++AC_MSG_CHECKING([if getopt_long is GNU specific])
++AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
++#include <features.h>
++#ifndef __GLIBC__
++#error No GNU extension
++#endif
++        ]],[[;]])
++    ],[
++      AC_DEFINE(HAVE_GNU_GETOPT_LONG, 1, [Whether getopt_long has GNU extensions])
++      AC_MSG_RESULT([yes])
++    ],[
++      AC_LIBOBJ([gnu_getopt])
++      AC_MSG_RESULT([no])
++])
+ 
+ AC_CHECK_FUNCS(clock_gettime, [], [
+   AC_CHECK_LIB(rt, clock_gettime, [
+diff -Nur cifs-utils-6.1.orig/contrib/Makefile.in cifs-utils-6.1/contrib/Makefile.in
+--- cifs-utils-6.1.orig/contrib/Makefile.in	2013-07-02 21:20:33.000000000 +0200
++++ cifs-utils-6.1/contrib/Makefile.in	2013-10-05 18:12:39.000000000 +0200
+@@ -1,8 +1,9 @@
+-# Makefile.in generated by automake 1.12.2 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+-
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -47,8 +48,6 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
+ subdir = contrib
+ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -114,7 +113,6 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-CAPNG_LDADD = @CAPNG_LDADD@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+@@ -176,22 +174,14 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
+ build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
+ host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+ htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+@@ -252,12 +242,12 @@
+ $(am__aclocal_m4_deps):
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+-# into them and run 'make' without going through this Makefile.
+-# To change the values of 'make' variables: instead of editing Makefiles,
+-# (1) if the variable is set in 'config.status', edit 'config.status'
+-#     (which will cause the Makefiles to be regenerated when you run 'make');
+-# (2) otherwise, pass the desired values on the 'make' command line.
+-$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
++# into them and run `make' without going through this Makefile.
++# To change the values of `make' variables: instead of editing Makefiles,
++# (1) if the variable is set in `config.status', edit `config.status'
++#     (which will cause the Makefiles to be regenerated when you run `make');
++# (2) otherwise, pass the desired values on the `make' command line.
++$(RECURSIVE_TARGETS):
+ 	@fail= failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -267,11 +257,7 @@
+ 	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+-	case "$@" in \
+-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+-	  *) list='$(SUBDIRS)' ;; \
+-	esac; \
+-	for subdir in $$list; do \
++	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  echo "Making $$target in $$subdir"; \
+ 	  if test "$$subdir" = "."; then \
+ 	    dot_seen=yes; \
+@@ -285,6 +271,37 @@
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
++
++$(RECURSIVE_CLEAN_TARGETS):
++	@fail= failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
++	dot_seen=no; \
++	case "$@" in \
++	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
++	  *) list='$(SUBDIRS)' ;; \
++	esac; \
++	rev=''; for subdir in $$list; do \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
++	done; \
++	rev="$$rev ."; \
++	target=`echo $@ | sed s/-recursive//`; \
++	for subdir in $$rev; do \
++	  echo "Making $$target in $$subdir"; \
++	  if test "$$subdir" = "."; then \
++	    local_target="$$target-am"; \
++	  else \
++	    local_target="$$target"; \
++	  fi; \
++	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++	  || eval $$failcom; \
++	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+@@ -293,10 +310,6 @@
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+-cscopelist-recursive:
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
+-	done
+ 
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -360,20 +373,6 @@
+ 	  && $(am__cd) $(top_srcdir) \
+ 	  && gtags -i $(GTAGS_ARGS) "$$here"
+ 
+-cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
+-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+-	case "$(srcdir)" in \
+-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+-	  *) sdir=$(subdir)/$(srcdir) ;; \
+-	esac; \
+-	for i in $$list; do \
+-	  if test -f "$$i"; then \
+-	    echo "$(subdir)/$$i"; \
+-	  else \
+-	    echo "$$sdir/$$i"; \
+-	  fi; \
+-	done >> $(top_builddir)/cscope.files
+-
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+@@ -533,22 +532,21 @@
+ 
+ uninstall-am:
+ 
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
+-	cscopelist-recursive ctags-recursive install-am install-strip \
+-	tags-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
++	install-am install-strip tags-recursive
+ 
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+-	all all-am check check-am clean clean-generic cscopelist \
+-	cscopelist-recursive ctags ctags-recursive distclean \
+-	distclean-generic distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-data \
+-	install-data-am install-dvi install-dvi-am install-exec \
+-	install-exec-am install-html install-html-am install-info \
+-	install-info-am install-man install-pdf install-pdf-am \
+-	install-ps install-ps-am install-strip installcheck \
+-	installcheck-am installdirs installdirs-am maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
++	all all-am check check-am clean clean-generic ctags \
++	ctags-recursive distclean distclean-generic distclean-tags \
++	distdir dvi dvi-am html html-am info info-am install \
++	install-am install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-info install-info-am install-man \
++	install-pdf install-pdf-am install-ps install-ps-am \
++	install-strip installcheck installcheck-am installdirs \
++	installdirs-am maintainer-clean maintainer-clean-generic \
++	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
++	tags-recursive uninstall uninstall-am
+ 
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+diff -Nur cifs-utils-6.1.orig/contrib/request-key.d/Makefile.in cifs-utils-6.1/contrib/request-key.d/Makefile.in
+--- cifs-utils-6.1.orig/contrib/request-key.d/Makefile.in	2013-07-02 21:20:33.000000000 +0200
++++ cifs-utils-6.1/contrib/request-key.d/Makefile.in	2013-10-05 18:12:39.000000000 +0200
+@@ -1,8 +1,9 @@
+-# Makefile.in generated by automake 1.12.2 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+-
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -48,8 +49,6 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
+ subdir = contrib/request-key.d
+ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -76,7 +75,6 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-CAPNG_LDADD = @CAPNG_LDADD@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+@@ -138,22 +136,14 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
+ build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
+ host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+ htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+@@ -218,8 +208,6 @@
+ ctags: CTAGS
+ CTAGS:
+ 
+-cscope cscopelist:
+-
+ 
+ distdir: $(DISTFILES)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+diff -Nur cifs-utils-6.1.orig/depcomp cifs-utils-6.1/depcomp
+--- cifs-utils-6.1.orig/depcomp	2013-07-02 21:20:33.000000000 +0200
++++ cifs-utils-6.1/depcomp	2013-10-05 18:12:39.000000000 +0200
+@@ -3,7 +3,8 @@
+ 
+ scriptversion=2012-03-27.16; # UTC
+ 
+-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
++# 2011, 2012 Free Software Foundation, Inc.
+ 
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+diff -Nur cifs-utils-6.1.orig/getcifsacl.c cifs-utils-6.1/getcifsacl.c
+--- cifs-utils-6.1.orig/getcifsacl.c	2013-07-02 21:13:33.000000000 +0200
++++ cifs-utils-6.1/getcifsacl.c	2013-10-05 18:12:29.000000000 +0200
+@@ -24,7 +24,13 @@
+ #endif /* HAVE_CONFIG_H */
+ 
+ #include <string.h>
++#ifdef HAVE_GNU_GETOPT_LONG
+ #include <getopt.h>
++#else
++#include "gnu_getopt.h"
++#define getopt_long gnu_getopt_long
++#define option gnu_option
++#endif
+ #include <stdint.h>
+ #include <stdbool.h>
+ #include <unistd.h>
+diff -Nur cifs-utils-6.1.orig/gnu_getopt.c cifs-utils-6.1/gnu_getopt.c
+--- cifs-utils-6.1.orig/gnu_getopt.c	1970-01-01 01:00:00.000000000 +0100
++++ cifs-utils-6.1/gnu_getopt.c	2013-10-05 18:12:29.000000000 +0200
+@@ -0,0 +1,656 @@
++/*	$OpenBSD: getopt_long.c,v 1.21 2006/09/22 17:22:05 millert Exp $	*/
++/*	$NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $	*/
++
++/*
++ * Copyright (c) 2002 Todd C. Miller <Todd.Miller@courtesan.com>
++ * Copyright (c) 2012 William Pitcock
++ * Copyright (c) 2012 rofl0r
++ *
++ * Permission to use, copy, modify, and distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ *
++ * Sponsored in part by the Defense Advanced Research Projects
++ * Agency (DARPA) and Air Force Research Laboratory, Air Force
++ * Materiel Command, USAF, under agreement number F39502-99-1-0512.
++ */
++/*-
++ * Copyright (c) 2000 The NetBSD Foundation, Inc.
++ * All rights reserved.
++ *
++ * This code is derived from software contributed to The NetBSD Foundation
++ * by Dieter Baron and Thomas Klausner.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. All advertising materials mentioning features or use of this software
++ *    must display the following acknowledgement:
++ *        This product includes software developed by the NetBSD
++ *        Foundation, Inc. and its contributors.
++ * 4. Neither the name of The NetBSD Foundation nor the names of its
++ *    contributors may be used to endorse or promote products derived
++ *    from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
++ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
++ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
++ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++ * POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#include "gnu_getopt.h"
++
++#include <errno.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++//#if HAVE_STRICT_MODE > 0
++#if 1
++# define GNU_COMPATIBLE		/* Be more compatible, configure's use us! */
++#endif
++
++#if 0
++int	gnu_opterr = 1;		/* if error message should be printed */
++int	gnu_optind = 1;		/* index into parent argv vector */
++int	gnu_optopt = '?';		/* character checked for validity */
++int	gnu_optreset;		/* reset getopt */
++char    *gnu_optarg;		/* argument associated with option */
++#else
++// TODO: check whether it has an effect that musl's optopt is not initialized to '?'
++#include <getopt.h>
++#define gnu_opterr opterr
++#define gnu_optind optind
++#define gnu_optopt optopt
++#define gnu_optreset optreset
++#define gnu_optarg optarg
++int optreset;
++#endif
++char* argv0 = NULL;
++
++#define PRINT_ERROR	((gnu_opterr) && (*options != ':'))
++
++#define FLAG_PERMUTE	0x01	/* permute non-options to the end of argv */
++#define FLAG_ALLARGS	0x02	/* treat non-options as args to option "-1" */
++#define FLAG_LONGONLY	0x04	/* operate as getopt_long_only */
++
++/* return values */
++#define	BADCH		(int)'?'
++#define	BADARG		((*options == ':') ? (int)':' : (int)'?')
++#define	INORDER 	(int)1
++
++#define	EMSG		""
++
++#ifdef GNU_COMPATIBLE
++#define NO_PREFIX	(-1)
++#define D_PREFIX	0
++#define DD_PREFIX	1
++#define W_PREFIX	2
++#endif
++
++static int getopt_internal(int, char * const *, const char *,
++			   const struct gnu_option *, int *, int);
++static int parse_long_options(char * const *, const char *,
++			      const struct gnu_option *, int *, int, int);
++static int gcd(int, int);
++static void permute_args(int, int, int, char * const *);
++
++static char *place = EMSG; /* option letter processing */
++
++/* XXX: set gnu_optreset to 1 rather than these two */
++static int nonopt_start = -1; /* first non option argument (for permute) */
++static int nonopt_end = -1;   /* first option after non options (for permute) */
++
++/* Error messages */
++static const char recargchar[] = "option requires an argument -- %c";
++static const char illoptchar[] = "illegal option -- %c"; /* From P1003.2 */
++#ifdef GNU_COMPATIBLE
++static int dash_prefix = NO_PREFIX;
++static const char gnuoptchar[] = "invalid option -- %c";
++
++static const char recargstring[] = "option `%s%s' requires an argument";
++static const char ambig[] = "option `%s%.*s' is ambiguous";
++static const char noarg[] = "option `%s%.*s' doesn't allow an argument";
++static const char illoptstring[] = "unrecognized option `%s%s'";
++#else
++static const char recargstring[] = "option requires an argument -- %s";
++static const char ambig[] = "ambiguous option -- %.*s";
++static const char noarg[] = "option doesn't take an argument -- %.*s";
++static const char illoptstring[] = "unknown option -- %s";
++#endif
++
++/*
++ * Compute the greatest common divisor of a and b.
++ */
++static int
++gcd(int a, int b)
++{
++	int c;
++
++	c = a % b;
++	while (c != 0) {
++		a = b;
++		b = c;
++		c = a % b;
++	}
++
++	return (b);
++}
++
++/*
++ * Exchange the block from nonopt_start to nonopt_end with the block
++ * from nonopt_end to opt_end (keeping the same order of arguments
++ * in each block).
++ */
++static void
++permute_args(int panonopt_start, int panonopt_end, int opt_end,
++	char * const *nargv)
++{
++	int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
++	char *swap;
++
++	/*
++	 * compute lengths of blocks and number and size of cycles
++	 */
++	nnonopts = panonopt_end - panonopt_start;
++	nopts = opt_end - panonopt_end;
++	ncycle = gcd(nnonopts, nopts);
++	cyclelen = (opt_end - panonopt_start) / ncycle;
++
++	for (i = 0; i < ncycle; i++) {
++		cstart = panonopt_end+i;
++		pos = cstart;
++		for (j = 0; j < cyclelen; j++) {
++			if (pos >= panonopt_end)
++				pos -= nnonopts;
++			else
++				pos += nopts;
++			swap = nargv[pos];
++			/* LINTED const cast */
++			((char **) nargv)[pos] = nargv[cstart];
++			/* LINTED const cast */
++			((char **)nargv)[cstart] = swap;
++		}
++	}
++}
++
++/*
++ * parse_long_options --
++ *	Parse long options in argc/argv argument vector.
++ * Returns -1 if short_too is set and the option does not match long_options.
++ */
++static int
++parse_long_options(char * const *nargv, const char *options,
++	const struct gnu_option *long_options, int *idx, int short_too, int flags)
++{
++	char *current_argv, *has_equal;
++#ifdef GNU_COMPATIBLE
++	char *current_dash;
++#endif
++	size_t current_argv_len;
++	int i, match, exact_match, second_partial_match;
++
++	current_argv = place;
++#ifdef GNU_COMPATIBLE
++	switch (dash_prefix) {
++		case D_PREFIX:
++			current_dash = "-";
++			break;
++		case DD_PREFIX:
++			current_dash = "--";
++			break;
++		case W_PREFIX:
++			current_dash = "-W ";
++			break;
++		default:
++			current_dash = "";
++			break;
++	}
++#endif
++	match = -1;
++	exact_match = 0;
++	second_partial_match = 0;
++
++	gnu_optind++;
++
++	if ((has_equal = strchr(current_argv, '=')) != NULL) {
++		/* argument found (--option=arg) */
++		current_argv_len = has_equal - current_argv;
++		has_equal++;
++	} else
++		current_argv_len = strlen(current_argv);
++
++	for (i = 0; long_options[i].name; i++) {
++		/* find matching long option */
++		if (strncmp(current_argv, long_options[i].name,
++		    current_argv_len))
++			continue;
++
++		if (strlen(long_options[i].name) == current_argv_len) {
++			/* exact match */
++			match = i;
++			exact_match = 1;
++			break;
++		}
++		/*
++		 * If this is a known short option, don't allow
++		 * a partial match of a single character.
++		 */
++		if (short_too && current_argv_len == 1)
++			continue;
++
++		if (match == -1)        /* first partial match */
++			match = i;
++		else if ((flags & FLAG_LONGONLY) ||
++			 long_options[i].has_arg !=
++			     long_options[match].has_arg ||
++			 long_options[i].flag != long_options[match].flag ||
++			 long_options[i].val != long_options[match].val)
++			second_partial_match = 1;
++	}
++	if (!exact_match && second_partial_match) {
++		/* ambiguous abbreviation */
++		if (PRINT_ERROR) {
++			fprintf(stderr, "pkgconf: ");
++			fprintf(stderr, ambig,
++#ifdef GNU_COMPATIBLE
++			     current_dash,
++#endif
++			     (int)current_argv_len,
++			     current_argv);
++			fprintf(stderr, "\n");
++		}
++		gnu_optopt = 0;
++		return (BADCH);
++	}
++	if (match != -1) {		/* option found */
++		if (long_options[match].has_arg == no_argument
++		    && has_equal) {
++			if (PRINT_ERROR) {
++				fprintf(stderr, "pkgconf: ");
++				fprintf(stderr, noarg,
++#ifdef GNU_COMPATIBLE
++				     current_dash,
++#endif
++				     (int)current_argv_len,
++				     current_argv);
++				fprintf(stderr, "\n");
++			}
++			/*
++			 * XXX: GNU sets gnu_optopt to val regardless of flag
++			 */
++			if (long_options[match].flag == NULL)
++				gnu_optopt = long_options[match].val;
++			else
++				gnu_optopt = 0;
++#ifdef GNU_COMPATIBLE
++			return (BADCH);
++#else
++			return (BADARG);
++#endif
++		}
++		if (long_options[match].has_arg == required_argument ||
++		    long_options[match].has_arg == optional_argument) {
++			if (has_equal)
++				gnu_optarg = has_equal;
++			else if (long_options[match].has_arg ==
++			    required_argument) {
++				/*
++				 * optional argument doesn't use next nargv
++				 */
++				gnu_optarg = nargv[gnu_optind++];
++			}
++		}
++		if ((long_options[match].has_arg == required_argument)
++		    && (gnu_optarg == NULL)) {
++			/*
++			 * Missing argument; leading ':' indicates no error
++			 * should be generated.
++			 */
++			if (PRINT_ERROR) {
++				fprintf(stderr, "pkgconf: ");
++				fprintf(stderr, recargstring,
++#ifdef GNU_COMPATIBLE
++				    current_dash,
++#endif
++				    current_argv);
++				fprintf(stderr, "\n");
++			}
++			/*
++			 * XXX: GNU sets gnu_optopt to val regardless of flag
++			 */
++			if (long_options[match].flag == NULL)
++				gnu_optopt = long_options[match].val;
++			else
++				gnu_optopt = 0;
++			--gnu_optind;
++			return (BADARG);
++		}
++	} else {			/* unknown option */
++		if (short_too) {
++			--gnu_optind;
++			return (-1);
++		}
++		if (PRINT_ERROR) {
++			fprintf(stderr, "pkgconf: ");
++			fprintf(stderr, illoptstring,
++#ifdef GNU_COMPATIBLE
++			      current_dash,
++#endif
++			      current_argv);
++			fprintf(stderr, "\n");
++		}
++		gnu_optopt = 0;
++		return (BADCH);
++	}
++	if (idx)
++		*idx = match;
++	if (long_options[match].flag) {
++		*long_options[match].flag |= long_options[match].val;
++		return (0);
++	} else
++		return (long_options[match].val);
++}
++
++/*
++ * getopt_internal --
++ *	Parse argc/argv argument vector.  Called by user level routines.
++ */
++static int
++getopt_internal(int nargc, char * const *nargv, const char *options,
++	const struct gnu_option *long_options, int *idx, int flags)
++{
++	char *oli;				/* option letter list index */
++	int optchar, short_too;
++	int posixly_correct;	/* no static, can be changed on the fly */
++	
++	if(!argv0) argv0 = nargv[0];
++
++	if (options == NULL)
++		return (-1);
++
++	/*
++	 * Disable GNU extensions if POSIXLY_CORRECT is set or options
++	 * string begins with a '+'.
++	 */
++	posixly_correct = (getenv("POSIXLY_CORRECT") != NULL);
++#ifdef GNU_COMPATIBLE
++	if (*options == '-')
++		flags |= FLAG_ALLARGS;
++	else if (posixly_correct || *options == '+')
++		flags &= ~FLAG_PERMUTE;
++#else
++	if (posixly_correct || *options == '+')
++		flags &= ~FLAG_PERMUTE;
++	else if (*options == '-')
++		flags |= FLAG_ALLARGS;
++#endif
++#if HAVE_STRICT_MODE >= 1
++	flags &= ~FLAG_PERMUTE;
++#endif
++	if (*options == '+' || *options == '-')
++		options++;
++
++	/*
++	 * XXX Some GNU programs (like cvs) set gnu_optind to 0 instead of
++	 * XXX using gnu_optreset.  Work around this braindamage.
++	 */
++	if (gnu_optind == 0)
++		gnu_optind = gnu_optreset = 1;
++
++	gnu_optarg = NULL;
++	if (gnu_optreset)
++		nonopt_start = nonopt_end = -1;
++start:
++	if (gnu_optreset || !*place) {		/* update scanning pointer */
++		gnu_optreset = 0;
++		if (gnu_optind >= nargc) {          /* end of argument vector */
++			place = EMSG;
++			if (nonopt_end != -1) {
++				/* do permutation, if we have to */
++				permute_args(nonopt_start, nonopt_end,
++				    gnu_optind, nargv);
++				gnu_optind -= nonopt_end - nonopt_start;
++			}
++			else if (nonopt_start != -1) {
++				/*
++				 * If we skipped non-options, set gnu_optind
++				 * to the first of them.
++				 */
++				gnu_optind = nonopt_start;
++			}
++			nonopt_start = nonopt_end = -1;
++			return (-1);
++		}
++		if (*(place = nargv[gnu_optind]) != '-' ||
++#ifdef GNU_COMPATIBLE
++		    place[1] == '\0') {
++#else
++		    (place[1] == '\0' && strchr(options, '-') == NULL)) {
++#endif
++			place = EMSG;		/* found non-option */
++			if (flags & FLAG_ALLARGS) {
++				/*
++				 * GNU extension:
++				 * return non-option as argument to option 1
++				 */
++				gnu_optarg = nargv[gnu_optind++];
++				return (INORDER);
++			}
++			if (!(flags & FLAG_PERMUTE)) {
++				/*
++				 * If no permutation wanted, stop parsing
++				 * at first non-option.
++				 */
++				return (-1);
++			}
++			/* do permutation */
++			if (nonopt_start == -1)
++				nonopt_start = gnu_optind;
++			else if (nonopt_end != -1) {
++				permute_args(nonopt_start, nonopt_end,
++				    gnu_optind, nargv);
++				nonopt_start = gnu_optind -
++				    (nonopt_end - nonopt_start);
++				nonopt_end = -1;
++			}
++			gnu_optind++;
++			/* process next argument */
++			goto start;
++		}
++		if (nonopt_start != -1 && nonopt_end == -1)
++			nonopt_end = gnu_optind;
++
++		/*
++		 * If we have "-" do nothing, if "--" we are done.
++		 */
++		if (place[1] != '\0' && *++place == '-' && place[1] == '\0') {
++			gnu_optind++;
++			place = EMSG;
++			/*
++			 * We found an option (--), so if we skipped
++			 * non-options, we have to permute.
++			 */
++			if (nonopt_end != -1) {
++				permute_args(nonopt_start, nonopt_end,
++				    gnu_optind, nargv);
++				gnu_optind -= nonopt_end - nonopt_start;
++			}
++			nonopt_start = nonopt_end = -1;
++			return (-1);
++		}
++	}
++
++	/*
++	 * Check long options if:
++	 *  1) we were passed some
++	 *  2) the arg is not just "-"
++	 *  3) either the arg starts with -- we are getopt_long_only()
++	 */
++	if (long_options != NULL && place != nargv[gnu_optind] &&
++	    (*place == '-' || (flags & FLAG_LONGONLY))) {
++		short_too = 0;
++#ifdef GNU_COMPATIBLE
++		dash_prefix = D_PREFIX;
++#endif
++		if (*place == '-') {
++			place++;		/* --foo long option */
++#ifdef GNU_COMPATIBLE
++			dash_prefix = DD_PREFIX;
++#endif
++		} else if (*place != ':' && strchr(options, *place) != NULL)
++			short_too = 1;		/* could be short option too */
++
++		optchar = parse_long_options(nargv, options, long_options,
++		    idx, short_too, flags);
++		if (optchar != -1) {
++			place = EMSG;
++			return (optchar);
++		}
++	}
++
++	if ((optchar = (int)*place++) == (int)':' ||
++	    (optchar == (int)'-' && *place != '\0') ||
++	    (oli = strchr(options, optchar)) == NULL) {
++		/*
++		 * If the user specified "-" and  '-' isn't listed in
++		 * options, return -1 (non-option) as per POSIX.
++		 * Otherwise, it is an unknown option character (or ':').
++		 */
++		if (optchar == (int)'-' && *place == '\0')
++			return (-1);
++		if (!*place)
++			++gnu_optind;
++#ifdef GNU_COMPATIBLE
++		if (PRINT_ERROR) {
++			fprintf(stderr, "%s: ", argv0);
++			fprintf(stderr, posixly_correct ? illoptchar : gnuoptchar,
++					optchar);
++			fprintf(stderr, "\n");
++		}
++#else
++		if (PRINT_ERROR) {
++			fprintf(stderr, "%s: ", argv0);
++			fprintf(stderr, illoptchar, optchar);
++			fprintf(stderr, "\n");
++		}
++#endif
++		gnu_optopt = optchar;
++		return (BADCH);
++	}
++	if (long_options != NULL && optchar == 'W' && oli[1] == ';') {
++		/* -W long-option */
++		if (*place)			/* no space */
++			/* NOTHING */;
++		else if (++gnu_optind >= nargc) {	/* no arg */
++			place = EMSG;
++			if (PRINT_ERROR) {
++				fprintf(stderr, "%s: ", argv0);
++				fprintf(stderr, recargchar, optchar);
++				fprintf(stderr, "\n");
++			}
++			gnu_optopt = optchar;
++			return (BADARG);
++		} else				/* white space */
++			place = nargv[gnu_optind];
++#ifdef GNU_COMPATIBLE
++		dash_prefix = W_PREFIX;
++#endif
++		optchar = parse_long_options(nargv, options, long_options,
++		    idx, 0, flags);
++		place = EMSG;
++		return (optchar);
++	}
++	if (*++oli != ':') {			/* doesn't take argument */
++		if (!*place)
++			++gnu_optind;
++	} else {				/* takes (optional) argument */
++		gnu_optarg = NULL;
++		if (*place)			/* no white space */
++			gnu_optarg = place;
++		else if (oli[1] != ':') {	/* arg not optional */
++			if (++gnu_optind >= nargc) {	/* no arg */
++				place = EMSG;
++				if (PRINT_ERROR) {
++					fprintf(stderr, "%s: ", argv0);
++					fprintf(stderr, recargchar, optchar);
++					fprintf(stderr, "\n");
++				}
++				gnu_optopt = optchar;
++				return (BADARG);
++			} else
++				gnu_optarg = nargv[gnu_optind];
++		}
++		place = EMSG;
++		++gnu_optind;
++	}
++	/* dump back option letter */
++	return (optchar);
++}
++
++/*
++ * getopt --
++ *	Parse argc/argv argument vector.
++ *
++ * [eventually this will replace the BSD getopt]
++ */
++int
++gnu_getopt(int nargc, char * const *nargv, const char *options)
++{
++
++	/*
++	 * We don't pass FLAG_PERMUTE to getopt_internal() since
++	 * the BSD getopt(3) (unlike GNU) has never done this.
++	 *
++	 * Furthermore, since many privileged programs call getopt()
++	 * before dropping privileges it makes sense to keep things
++	 * as simple (and bug-free) as possible.
++	 */
++	return (getopt_internal(nargc, nargv, options, NULL, NULL, FLAG_PERMUTE));
++}
++
++/*
++ * getopt_long --
++ *	Parse argc/argv argument vector.
++ */
++int
++gnu_getopt_long(int nargc, char * const *nargv, const char *options,
++	const struct gnu_option *long_options, int *idx)
++{
++
++	return (getopt_internal(nargc, nargv, options, long_options, idx,
++	    FLAG_PERMUTE));
++}
++
++/*
++ * getopt_long_only --
++ *	Parse argc/argv argument vector.
++ */
++int
++gnu_getopt_long_only(int nargc, char * const *nargv, const char *options,
++	const struct gnu_option *long_options, int *idx)
++{
++
++	return (getopt_internal(nargc, nargv, options, long_options, idx,
++	    FLAG_PERMUTE|FLAG_LONGONLY));
++}
+diff -Nur cifs-utils-6.1.orig/gnu_getopt.h cifs-utils-6.1/gnu_getopt.h
+--- cifs-utils-6.1.orig/gnu_getopt.h	1970-01-01 01:00:00.000000000 +0100
++++ cifs-utils-6.1/gnu_getopt.h	2013-10-05 18:12:29.000000000 +0200
+@@ -0,0 +1,70 @@
++/*	$NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $	*/
++/*	$FreeBSD$ */
++
++/*-
++ * Copyright (c) 2000 The NetBSD Foundation, Inc.
++ * All rights reserved.
++ *
++ * This code is derived from software contributed to The NetBSD Foundation
++ * by Dieter Baron and Thomas Klausner.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
++ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
++ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
++ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++ * POSSIBILITY OF SUCH DAMAGE.
++ */
++
++
++#ifndef _GNU_GETOPT_LONG_H_
++#define _GNU_GETOPT_LONG_H_
++
++/*
++ * GNU-like getopt_long()/getopt_long_only() with 4.4BSD optreset extension.
++ * getopt() is declared here too for GNU programs.
++ */
++#define no_argument        0
++#define required_argument  1
++#define optional_argument  2
++
++struct gnu_option {
++	/* name of long option */
++	const char *name;
++	/*
++	 * one of no_argument, required_argument, and optional_argument:
++	 * whether option takes an argument
++	 */
++	int has_arg;
++	/* if not NULL, set *flag to val when option found */
++	int *flag;
++	/* if flag not NULL, value to set *flag to; else return value */
++	int val;
++};
++
++int	gnu_getopt_long(int, char * const *, const char *,
++	const struct gnu_option *, int *);
++int	gnu_getopt_long_only(int, char * const *, const char *,
++	const struct gnu_option *, int *);
++int	gnu_getopt(int, char * const [], const char *);
++
++#if 0
++extern char *gnu_optarg;			/* getopt(3) external variables */
++extern int gnu_optind, gnu_opterr, gnu_optopt;
++extern int gnu_optreset;			/* getopt(3) external variable */
++#endif
++#endif
+diff -Nur cifs-utils-6.1.orig/INSTALL cifs-utils-6.1/INSTALL
+--- cifs-utils-6.1.orig/INSTALL	2013-07-02 21:20:33.000000000 +0200
++++ cifs-utils-6.1/INSTALL	2013-10-05 18:12:39.000000000 +0200
+@@ -1,7 +1,7 @@
+ Installation Instructions
+ *************************
+ 
+-Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
++Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+ Inc.
+ 
+    Copying and distribution of this file, with or without modification,
+@@ -309,10 +309,9 @@
+ overridden in the site shell script).
+ 
+ Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+-an Autoconf limitation.  Until the limitation is lifted, you can use
+-this workaround:
++an Autoconf bug.  Until the bug is fixed you can use this workaround:
+ 
+-     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
++     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+ 
+ `configure' Invocation
+ ======================
+@@ -368,3 +367,4 @@
+ 
+ `configure' also accepts some other, not widely useful, options.  Run
+ `configure --help' for more details.
++
+diff -Nur cifs-utils-6.1.orig/install-sh cifs-utils-6.1/install-sh
+--- cifs-utils-6.1.orig/install-sh	2013-07-02 21:20:33.000000000 +0200
++++ cifs-utils-6.1/install-sh	2013-10-05 18:12:39.000000000 +0200
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # install - install a program, script, or datafile
+ 
+-scriptversion=2011-11-20.07; # UTC
++scriptversion=2011-01-19.21; # UTC
+ 
+ # This originates from X11R5 (mit/util/scripts/install.sh), which was
+ # later released in X11R6 (xc/config/util/install.sh) with the
+@@ -35,7 +35,7 @@
+ # FSF changes to this file are in the public domain.
+ #
+ # Calling this script install-sh is preferred over install.sh, to prevent
+-# 'make' implicit rules from creating a file called install from it
++# `make' implicit rules from creating a file called install from it
+ # when there is no Makefile.
+ #
+ # This script is compatible with the BSD install script, but was written
+@@ -156,7 +156,7 @@
+     -s) stripcmd=$stripprog;;
+ 
+     -t) dst_arg=$2
+-	# Protect names problematic for 'test' and other utilities.
++	# Protect names problematic for `test' and other utilities.
+ 	case $dst_arg in
+ 	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ 	esac
+@@ -190,7 +190,7 @@
+     fi
+     shift # arg
+     dst_arg=$arg
+-    # Protect names problematic for 'test' and other utilities.
++    # Protect names problematic for `test' and other utilities.
+     case $dst_arg in
+       -* | [=\(\)!]) dst_arg=./$dst_arg;;
+     esac
+@@ -202,7 +202,7 @@
+     echo "$0: no input file specified." >&2
+     exit 1
+   fi
+-  # It's OK to call 'install-sh -d' without argument.
++  # It's OK to call `install-sh -d' without argument.
+   # This can happen when creating conditional directories.
+   exit 0
+ fi
+@@ -240,7 +240,7 @@
+ 
+ for src
+ do
+-  # Protect names problematic for 'test' and other utilities.
++  # Protect names problematic for `test' and other utilities.
+   case $src in
+     -* | [=\(\)!]) src=./$src;;
+   esac
+@@ -354,7 +354,7 @@
+ 	      if test -z "$dir_arg" || {
+ 		   # Check for POSIX incompatibilities with -m.
+ 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+-		   # other-writable bit of parent directory when it shouldn't.
++		   # other-writeable bit of parent directory when it shouldn't.
+ 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ 		   case $ls_ld_tmpdir in
+diff -Nur cifs-utils-6.1.orig/Makefile.am cifs-utils-6.1/Makefile.am
+--- cifs-utils-6.1.orig/Makefile.am	2013-07-02 21:13:33.000000000 +0200
++++ cifs-utils-6.1/Makefile.am	2013-10-05 18:12:29.000000000 +0200
+@@ -4,7 +4,7 @@
+ root_sbindir = $(ROOTSBINDIR)
+ root_sbin_PROGRAMS = mount.cifs
+ mount_cifs_SOURCES = mount.cifs.c mtab.c resolve_host.c util.c
+-mount_cifs_LDADD = $(LIBCAP) $(CAPNG_LDADD) $(RT_LDADD)
++mount_cifs_LDADD = $(LIBCAP) $(CAPNG_LDADD) $(RT_LDADD) $(LIBOBJS)
+ 
+ man_MANS = mount.cifs.8
+ include_HEADERS = cifsidmap.h
+@@ -16,7 +16,7 @@
+ if CONFIG_CIFSUPCALL
+ sbin_PROGRAMS += cifs.upcall
+ cifs_upcall_SOURCES = cifs.upcall.c data_blob.c asn1.c spnego.c
+-cifs_upcall_LDADD = -ltalloc -lkeyutils $(KRB5_LDADD)
++cifs_upcall_LDADD = -ltalloc -lkeyutils $(KRB5_LDADD) $(LIBOBJS)
+ man_MANS += cifs.upcall.8
+ 
+ #
+@@ -35,14 +35,14 @@
+ if CONFIG_CIFSCREDS
+ bin_PROGRAMS += cifscreds
+ cifscreds_SOURCES = cifscreds.c resolve_host.c util.c
+-cifscreds_LDADD = -lkeyutils
++cifscreds_LDADD = -lkeyutils $(LIBOBJS)
+ man_MANS += cifscreds.1
+ endif
+ 
+ if CONFIG_CIFSIDMAP
+ sbin_PROGRAMS += cifs.idmap
+ cifs_idmap_SOURCES = cifs.idmap.c idmap_plugin.c
+-cifs_idmap_LDADD = -lkeyutils -ldl
++cifs_idmap_LDADD = -lkeyutils -ldl $(LIBOBJS)
+ man_MANS += cifs.idmap.8
+ 
+ cifs.idmap.8: cifs.idmap.8.in
+@@ -57,7 +57,7 @@
+ if CONFIG_CIFSACL
+ bin_PROGRAMS += getcifsacl
+ getcifsacl_SOURCES = getcifsacl.c idmap_plugin.c
+-getcifsacl_LDADD = -ldl
++getcifsacl_LDADD = -ldl $(LIBOBJS)
+ man_MANS += getcifsacl.1
+ 
+ getcifsacl.1: getcifsacl.1.in
+diff -Nur cifs-utils-6.1.orig/Makefile.in cifs-utils-6.1/Makefile.in
+--- cifs-utils-6.1.orig/Makefile.in	2013-07-02 21:20:33.000000000 +0200
++++ cifs-utils-6.1/Makefile.in	2013-10-05 18:12:39.000000000 +0200
+@@ -1,8 +1,9 @@
+-# Makefile.in generated by automake 1.12.2 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+-
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -49,8 +50,6 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
+-host_triplet = @host@
+ root_sbin_PROGRAMS = mount.cifs$(EXEEXT)
+ bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
+ sbin_PROGRAMS = $(am__EXEEXT_3) $(am__EXEEXT_4)
+@@ -69,7 +68,7 @@
+ 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ 	$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
+ 	ChangeLog INSTALL NEWS compile config.guess config.sub depcomp \
+-	install-sh missing
++	gnu_getopt.c install-sh missing
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/aclocal/idmap.m4 \
+ 	$(top_srcdir)/aclocal/libcap.m4 $(top_srcdir)/configure.ac
+@@ -96,7 +95,7 @@
+ @CONFIG_CIFSIDMAP_TRUE@am_cifs_idmap_OBJECTS = cifs.idmap.$(OBJEXT) \
+ @CONFIG_CIFSIDMAP_TRUE@	idmap_plugin.$(OBJEXT)
+ cifs_idmap_OBJECTS = $(am_cifs_idmap_OBJECTS)
+-cifs_idmap_DEPENDENCIES =
++@CONFIG_CIFSIDMAP_TRUE@cifs_idmap_DEPENDENCIES = $(LIBOBJS)
+ am__cifs_upcall_SOURCES_DIST = cifs.upcall.c data_blob.c asn1.c \
+ 	spnego.c
+ @CONFIG_CIFSUPCALL_TRUE@am_cifs_upcall_OBJECTS =  \
+@@ -106,17 +105,17 @@
+ cifs_upcall_OBJECTS = $(am_cifs_upcall_OBJECTS)
+ am__DEPENDENCIES_1 =
+ @CONFIG_CIFSUPCALL_TRUE@cifs_upcall_DEPENDENCIES =  \
+-@CONFIG_CIFSUPCALL_TRUE@	$(am__DEPENDENCIES_1)
++@CONFIG_CIFSUPCALL_TRUE@	$(am__DEPENDENCIES_1) $(LIBOBJS)
+ am__cifscreds_SOURCES_DIST = cifscreds.c resolve_host.c util.c
+ @CONFIG_CIFSCREDS_TRUE@am_cifscreds_OBJECTS = cifscreds.$(OBJEXT) \
+ @CONFIG_CIFSCREDS_TRUE@	resolve_host.$(OBJEXT) util.$(OBJEXT)
+ cifscreds_OBJECTS = $(am_cifscreds_OBJECTS)
+-cifscreds_DEPENDENCIES =
++@CONFIG_CIFSCREDS_TRUE@cifscreds_DEPENDENCIES = $(LIBOBJS)
+ am__getcifsacl_SOURCES_DIST = getcifsacl.c idmap_plugin.c
+ @CONFIG_CIFSACL_TRUE@am_getcifsacl_OBJECTS = getcifsacl.$(OBJEXT) \
+ @CONFIG_CIFSACL_TRUE@	idmap_plugin.$(OBJEXT)
+ getcifsacl_OBJECTS = $(am_getcifsacl_OBJECTS)
+-getcifsacl_DEPENDENCIES =
++@CONFIG_CIFSACL_TRUE@getcifsacl_DEPENDENCIES = $(LIBOBJS)
+ idmapwb_so_SOURCES = idmapwb.c
+ idmapwb_so_OBJECTS = idmapwb.$(OBJEXT)
+ idmapwb_so_LDADD = $(LDADD)
+@@ -124,7 +123,7 @@
+ 	resolve_host.$(OBJEXT) util.$(OBJEXT)
+ mount_cifs_OBJECTS = $(am_mount_cifs_OBJECTS)
+ mount_cifs_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
++	$(LIBOBJS)
+ am__setcifsacl_SOURCES_DIST = setcifsacl.c idmap_plugin.c
+ @CONFIG_CIFSACL_TRUE@am_setcifsacl_OBJECTS = setcifsacl.$(OBJEXT) \
+ @CONFIG_CIFSACL_TRUE@	idmap_plugin.$(OBJEXT)
+@@ -193,10 +192,9 @@
+   distclean-recursive maintainer-clean-recursive
+ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ 	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+-	cscope distdir dist dist-all distcheck
++	distdir dist dist-all distcheck
+ ETAGS = etags
+ CTAGS = ctags
+-CSCOPE = cscope
+ DIST_SUBDIRS = $(SUBDIRS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+@@ -207,7 +205,6 @@
+       && rm -rf "$(distdir)" \
+       || { sleep 5 && rm -rf "$(distdir)"; }; \
+   else :; fi
+-am__post_remove_distdir = $(am__remove_distdir)
+ am__relativize = \
+   dir0=`pwd`; \
+   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+@@ -235,7 +232,6 @@
+   reldir="$$dir2"
+ DIST_ARCHIVES = $(distdir).tar.gz
+ GZIP_ENV = --best
+-DIST_TARGETS = dist-gzip
+ distuninstallcheck_listfiles = find . -type f -print
+ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+@@ -246,7 +242,6 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-CAPNG_LDADD = @CAPNG_LDADD@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+@@ -308,22 +303,14 @@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+-build = @build@
+ build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+-host = @host@
+ host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+ htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+@@ -352,18 +339,18 @@
+ ACLOCAL_AMFLAGS = -I aclocal
+ root_sbindir = $(ROOTSBINDIR)
+ mount_cifs_SOURCES = mount.cifs.c mtab.c resolve_host.c util.c
+-mount_cifs_LDADD = $(LIBCAP) $(CAPNG_LDADD) $(RT_LDADD)
++mount_cifs_LDADD = $(LIBCAP) $(CAPNG_LDADD) $(RT_LDADD) $(LIBOBJS)
+ man_MANS = mount.cifs.8 $(am__append_2) $(am__append_4) \
+ 	$(am__append_6) $(am__append_8) $(am__append_9)
+ include_HEADERS = cifsidmap.h
+ @CONFIG_CIFSUPCALL_TRUE@cifs_upcall_SOURCES = cifs.upcall.c data_blob.c asn1.c spnego.c
+-@CONFIG_CIFSUPCALL_TRUE@cifs_upcall_LDADD = -ltalloc -lkeyutils $(KRB5_LDADD)
++@CONFIG_CIFSUPCALL_TRUE@cifs_upcall_LDADD = -ltalloc -lkeyutils $(KRB5_LDADD) $(LIBOBJS)
+ @CONFIG_CIFSCREDS_TRUE@cifscreds_SOURCES = cifscreds.c resolve_host.c util.c
+-@CONFIG_CIFSCREDS_TRUE@cifscreds_LDADD = -lkeyutils
++@CONFIG_CIFSCREDS_TRUE@cifscreds_LDADD = -lkeyutils $(LIBOBJS)
+ @CONFIG_CIFSIDMAP_TRUE@cifs_idmap_SOURCES = cifs.idmap.c idmap_plugin.c
+-@CONFIG_CIFSIDMAP_TRUE@cifs_idmap_LDADD = -lkeyutils -ldl
++@CONFIG_CIFSIDMAP_TRUE@cifs_idmap_LDADD = -lkeyutils -ldl $(LIBOBJS)
+ @CONFIG_CIFSACL_TRUE@getcifsacl_SOURCES = getcifsacl.c idmap_plugin.c
+-@CONFIG_CIFSACL_TRUE@getcifsacl_LDADD = -ldl
++@CONFIG_CIFSACL_TRUE@getcifsacl_LDADD = -ldl $(LIBOBJS)
+ @CONFIG_CIFSACL_TRUE@setcifsacl_SOURCES = setcifsacl.c idmap_plugin.c
+ @CONFIG_CIFSACL_TRUE@setcifsacl_LDADD = -ldl
+ @CONFIG_PLUGIN_TRUE@plugindir = $(pkglibdir)
+@@ -610,6 +597,7 @@
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gnu_getopt.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cifs.idmap.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cifs.upcall.Po@am__quote@
+@@ -747,12 +735,12 @@
+ 	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+-# into them and run 'make' without going through this Makefile.
+-# To change the values of 'make' variables: instead of editing Makefiles,
+-# (1) if the variable is set in 'config.status', edit 'config.status'
+-#     (which will cause the Makefiles to be regenerated when you run 'make');
+-# (2) otherwise, pass the desired values on the 'make' command line.
+-$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
++# into them and run `make' without going through this Makefile.
++# To change the values of `make' variables: instead of editing Makefiles,
++# (1) if the variable is set in `config.status', edit `config.status'
++#     (which will cause the Makefiles to be regenerated when you run `make');
++# (2) otherwise, pass the desired values on the `make' command line.
++$(RECURSIVE_TARGETS):
+ 	@fail= failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+@@ -762,11 +750,7 @@
+ 	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+-	case "$@" in \
+-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+-	  *) list='$(SUBDIRS)' ;; \
+-	esac; \
+-	for subdir in $$list; do \
++	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  echo "Making $$target in $$subdir"; \
+ 	  if test "$$subdir" = "."; then \
+ 	    dot_seen=yes; \
+@@ -780,6 +764,37 @@
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
++
++$(RECURSIVE_CLEAN_TARGETS):
++	@fail= failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
++	dot_seen=no; \
++	case "$@" in \
++	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
++	  *) list='$(SUBDIRS)' ;; \
++	esac; \
++	rev=''; for subdir in $$list; do \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
++	done; \
++	rev="$$rev ."; \
++	target=`echo $@ | sed s/-recursive//`; \
++	for subdir in $$rev; do \
++	  echo "Making $$target in $$subdir"; \
++	  if test "$$subdir" = "."; then \
++	    local_target="$$target-am"; \
++	  else \
++	    local_target="$$target"; \
++	  fi; \
++	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++	  || eval $$failcom; \
++	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+@@ -788,10 +803,6 @@
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+-cscopelist-recursive:
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
+-	done
+ 
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -855,32 +866,8 @@
+ 	  && $(am__cd) $(top_srcdir) \
+ 	  && gtags -i $(GTAGS_ARGS) "$$here"
+ 
+-cscope: cscope.files
+-	test ! -s cscope.files \
+-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+-
+-clean-cscope:
+-	-rm -f cscope.files
+-
+-cscope.files: clean-cscope cscopelist-recursive cscopelist
+-
+-cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
+-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+-	case "$(srcdir)" in \
+-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+-	  *) sdir=$(subdir)/$(srcdir) ;; \
+-	esac; \
+-	for i in $$list; do \
+-	  if test -f "$$i"; then \
+-	    echo "$(subdir)/$$i"; \
+-	  else \
+-	    echo "$$sdir/$$i"; \
+-	  fi; \
+-	done >> $(top_builddir)/cscope.files
+-
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
+ 
+ distdir: $(DISTFILES)
+ 	@list='$(MANS)'; if test -n "$$list"; then \
+@@ -889,10 +876,10 @@
+ 	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+ 	  if test -n "$$list" && \
+ 	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+-	    echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \
++	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+ 	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
+ 	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+-	    echo "       typically 'make maintainer-clean' will remove them" >&2; \
++	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
+ 	    exit 1; \
+ 	  else :; fi; \
+ 	else :; fi
+@@ -961,36 +948,40 @@
+ 	|| chmod -R a+r "$(distdir)"
+ dist-gzip: distdir
+ 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+-	$(am__post_remove_distdir)
++	$(am__remove_distdir)
+ 
+ dist-bzip2: distdir
+ 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+-	$(am__post_remove_distdir)
++	$(am__remove_distdir)
+ 
+ dist-lzip: distdir
+ 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+-	$(am__post_remove_distdir)
++	$(am__remove_distdir)
++
++dist-lzma: distdir
++	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
++	$(am__remove_distdir)
+ 
+ dist-xz: distdir
+ 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+-	$(am__post_remove_distdir)
++	$(am__remove_distdir)
+ 
+ dist-tarZ: distdir
+ 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+-	$(am__post_remove_distdir)
++	$(am__remove_distdir)
+ 
+ dist-shar: distdir
+ 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+-	$(am__post_remove_distdir)
++	$(am__remove_distdir)
+ 
+ dist-zip: distdir
+ 	-rm -f $(distdir).zip
+ 	zip -rq $(distdir).zip $(distdir)
+-	$(am__post_remove_distdir)
++	$(am__remove_distdir)
+ 
+-dist dist-all:
+-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+-	$(am__post_remove_distdir)
++dist dist-all: distdir
++	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++	$(am__remove_distdir)
+ 
+ # This target untars the dist file and tries a VPATH configuration.  Then
+ # it guarantees that the distribution is self-contained by making another
+@@ -1001,6 +992,8 @@
+ 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ 	*.tar.bz2*) \
+ 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
++	*.tar.lzma*) \
++	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ 	*.tar.lz*) \
+ 	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+ 	*.tar.xz*) \
+@@ -1046,7 +1039,7 @@
+ 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+ 	  && cd "$$am__cwd" \
+ 	  || exit 1
+-	$(am__post_remove_distdir)
++	$(am__remove_distdir)
+ 	@(echo "$(distdir) archives ready for distribution: "; \
+ 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+ 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+@@ -1122,7 +1115,7 @@
+ 
+ distclean: distclean-recursive
+ 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+-	-rm -rf ./$(DEPDIR)
++	-rm -rf $(DEPDIR) ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+ 	distclean-hdr distclean-tags
+@@ -1171,7 +1164,7 @@
+ maintainer-clean: maintainer-clean-recursive
+ 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ 	-rm -rf $(top_srcdir)/autom4te.cache
+-	-rm -rf ./$(DEPDIR)
++	-rm -rf $(DEPDIR) ./$(DEPDIR)
+ 	-rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+ 
+@@ -1194,29 +1187,27 @@
+ uninstall-man: uninstall-man1 uninstall-man8
+ 
+ .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+-	cscopelist-recursive ctags-recursive install-am install-strip \
+-	tags-recursive
++	ctags-recursive install-am install-strip tags-recursive
+ 
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ 	all all-am am--refresh check check-am clean clean-binPROGRAMS \
+-	clean-cscope clean-generic clean-local clean-pluginPROGRAMS \
+-	clean-root_sbinPROGRAMS clean-sbinPROGRAMS cscope cscopelist \
+-	cscopelist-recursive ctags ctags-recursive dist dist-all \
+-	dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \
+-	dist-zip distcheck distclean distclean-compile \
+-	distclean-generic distclean-hdr distclean-tags distcleancheck \
+-	distdir distuninstallcheck dvi dvi-am html html-am info \
+-	info-am install install-am install-binPROGRAMS install-data \
+-	install-data-am install-dvi install-dvi-am install-exec \
+-	install-exec-am install-html install-html-am \
+-	install-includeHEADERS install-info install-info-am \
+-	install-man install-man1 install-man8 install-pdf \
+-	install-pdf-am install-pluginPROGRAMS install-ps install-ps-am \
+-	install-root_sbinPROGRAMS install-sbinPROGRAMS install-strip \
+-	installcheck installcheck-am installdirs installdirs-am \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+-	tags tags-recursive uninstall uninstall-am \
++	clean-generic clean-local clean-pluginPROGRAMS \
++	clean-root_sbinPROGRAMS clean-sbinPROGRAMS ctags \
++	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-lzip \
++	dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
++	distclean distclean-compile distclean-generic distclean-hdr \
++	distclean-tags distcleancheck distdir distuninstallcheck dvi \
++	dvi-am html html-am info info-am install install-am \
++	install-binPROGRAMS install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-includeHEADERS install-info \
++	install-info-am install-man install-man1 install-man8 \
++	install-pdf install-pdf-am install-pluginPROGRAMS install-ps \
++	install-ps-am install-root_sbinPROGRAMS install-sbinPROGRAMS \
++	install-strip installcheck installcheck-am installdirs \
++	installdirs-am maintainer-clean maintainer-clean-generic \
++	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
++	ps ps-am tags tags-recursive uninstall uninstall-am \
+ 	uninstall-binPROGRAMS uninstall-includeHEADERS uninstall-man \
+ 	uninstall-man1 uninstall-man8 uninstall-pluginPROGRAMS \
+ 	uninstall-root_sbinPROGRAMS uninstall-sbinPROGRAMS
+diff -Nur cifs-utils-6.1.orig/missing cifs-utils-6.1/missing
+--- cifs-utils-6.1.orig/missing	2013-07-02 21:20:33.000000000 +0200
++++ cifs-utils-6.1/missing	2013-10-05 18:12:39.000000000 +0200
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # Common stub for a few missing GNU programs while installing.
+ 
+-scriptversion=2012-01-06.18; # UTC
++scriptversion=2012-01-06.13; # UTC
+ 
+-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
++# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+ 
+ # This program is free software; you can redistribute it and/or modify
+@@ -25,7 +26,7 @@
+ # the same distribution terms that you use for the rest of that program.
+ 
+ if test $# -eq 0; then
+-  echo 1>&2 "Try '$0 --help' for more information"
++  echo 1>&2 "Try \`$0 --help' for more information"
+   exit 1
+ fi
+ 
+@@ -33,7 +34,7 @@
+ sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+ sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+ 
+-# In the cases where this matters, 'missing' is being run in the
++# In the cases where this matters, `missing' is being run in the
+ # srcdir already.
+ if test -f configure.ac; then
+   configure_ac=configure.ac
+@@ -64,7 +65,7 @@
+     echo "\
+ $0 [OPTION]... PROGRAM [ARGUMENT]...
+ 
+-Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
++Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+ error status if there is no known handling for PROGRAM.
+ 
+ Options:
+@@ -73,20 +74,20 @@
+   --run           try to run the given command, and emulate it if it fails
+ 
+ Supported PROGRAM values:
+-  aclocal      touch file 'aclocal.m4'
+-  autoconf     touch file 'configure'
+-  autoheader   touch file 'config.h.in'
++  aclocal      touch file \`aclocal.m4'
++  autoconf     touch file \`configure'
++  autoheader   touch file \`config.h.in'
+   autom4te     touch the output file, or create a stub one
+-  automake     touch all 'Makefile.in' files
+-  bison        create 'y.tab.[ch]', if possible, from existing .[ch]
+-  flex         create 'lex.yy.c', if possible, from existing .c
++  automake     touch all \`Makefile.in' files
++  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
++  flex         create \`lex.yy.c', if possible, from existing .c
+   help2man     touch the output file
+-  lex          create 'lex.yy.c', if possible, from existing .c
++  lex          create \`lex.yy.c', if possible, from existing .c
+   makeinfo     touch the output file
+-  yacc         create 'y.tab.[ch]', if possible, from existing .[ch]
++  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+ 
+-Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+-'g' are ignored when checking the name.
++Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
++\`g' are ignored when checking the name.
+ 
+ Send bug reports to <bug-automake@gnu.org>."
+     exit $?
+@@ -98,8 +99,8 @@
+     ;;
+ 
+   -*)
+-    echo 1>&2 "$0: Unknown '$1' option"
+-    echo 1>&2 "Try '$0 --help' for more information"
++    echo 1>&2 "$0: Unknown \`$1' option"
++    echo 1>&2 "Try \`$0 --help' for more information"
+     exit 1
+     ;;
+ 
+@@ -126,7 +127,7 @@
+        exit 1
+     elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+        # Could not run --version or --help.  This is probably someone
+-       # running '$TOOL --version' or '$TOOL --help' to check whether
++       # running `$TOOL --version' or `$TOOL --help' to check whether
+        # $TOOL exists and not knowing $TOOL uses missing.
+        exit 1
+     fi
+@@ -138,27 +139,27 @@
+ case $program in
+   aclocal*)
+     echo 1>&2 "\
+-WARNING: '$1' is $msg.  You should only need it if
+-         you modified 'acinclude.m4' or '${configure_ac}'.  You might want
+-         to install the Automake and Perl packages.  Grab them from
++WARNING: \`$1' is $msg.  You should only need it if
++         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
++         to install the \`Automake' and \`Perl' packages.  Grab them from
+          any GNU archive site."
+     touch aclocal.m4
+     ;;
+ 
+   autoconf*)
+     echo 1>&2 "\
+-WARNING: '$1' is $msg.  You should only need it if
+-         you modified '${configure_ac}'.  You might want to install the
+-         Autoconf and GNU m4 packages.  Grab them from any GNU
++WARNING: \`$1' is $msg.  You should only need it if
++         you modified \`${configure_ac}'.  You might want to install the
++         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+          archive site."
+     touch configure
+     ;;
+ 
+   autoheader*)
+     echo 1>&2 "\
+-WARNING: '$1' is $msg.  You should only need it if
+-         you modified 'acconfig.h' or '${configure_ac}'.  You might want
+-         to install the Autoconf and GNU m4 packages.  Grab them
++WARNING: \`$1' is $msg.  You should only need it if
++         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
++         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+          from any GNU archive site."
+     files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+     test -z "$files" && files="config.h"
+@@ -175,9 +176,9 @@
+ 
+   automake*)
+     echo 1>&2 "\
+-WARNING: '$1' is $msg.  You should only need it if
+-         you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'.
+-         You might want to install the Automake and Perl packages.
++WARNING: \`$1' is $msg.  You should only need it if
++         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
++         You might want to install the \`Automake' and \`Perl' packages.
+          Grab them from any GNU archive site."
+     find . -type f -name Makefile.am -print |
+ 	   sed 's/\.am$/.in/' |
+@@ -186,10 +187,10 @@
+ 
+   autom4te*)
+     echo 1>&2 "\
+-WARNING: '$1' is needed, but is $msg.
++WARNING: \`$1' is needed, but is $msg.
+          You might have modified some files without having the
+          proper tools for further handling them.
+-         You can get '$1' as part of Autoconf from any GNU
++         You can get \`$1' as part of \`Autoconf' from any GNU
+          archive site."
+ 
+     file=`echo "$*" | sed -n "$sed_output"`
+@@ -209,10 +210,10 @@
+ 
+   bison*|yacc*)
+     echo 1>&2 "\
+-WARNING: '$1' $msg.  You should only need it if
+-         you modified a '.y' file.  You may need the Bison package
++WARNING: \`$1' $msg.  You should only need it if
++         you modified a \`.y' file.  You may need the \`Bison' package
+          in order for those modifications to take effect.  You can get
+-         Bison from any GNU archive site."
++         \`Bison' from any GNU archive site."
+     rm -f y.tab.c y.tab.h
+     if test $# -ne 1; then
+         eval LASTARG=\${$#}
+@@ -239,10 +240,10 @@
+ 
+   lex*|flex*)
+     echo 1>&2 "\
+-WARNING: '$1' is $msg.  You should only need it if
+-         you modified a '.l' file.  You may need the Flex package
++WARNING: \`$1' is $msg.  You should only need it if
++         you modified a \`.l' file.  You may need the \`Flex' package
+          in order for those modifications to take effect.  You can get
+-         Flex from any GNU archive site."
++         \`Flex' from any GNU archive site."
+     rm -f lex.yy.c
+     if test $# -ne 1; then
+         eval LASTARG=\${$#}
+@@ -262,10 +263,10 @@
+ 
+   help2man*)
+     echo 1>&2 "\
+-WARNING: '$1' is $msg.  You should only need it if
++WARNING: \`$1' is $msg.  You should only need it if
+ 	 you modified a dependency of a manual page.  You may need the
+-	 Help2man package in order for those modifications to take
+-	 effect.  You can get Help2man from any GNU archive site."
++	 \`Help2man' package in order for those modifications to take
++	 effect.  You can get \`Help2man' from any GNU archive site."
+ 
+     file=`echo "$*" | sed -n "$sed_output"`
+     test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+@@ -280,12 +281,12 @@
+ 
+   makeinfo*)
+     echo 1>&2 "\
+-WARNING: '$1' is $msg.  You should only need it if
+-         you modified a '.texi' or '.texinfo' file, or any other file
++WARNING: \`$1' is $msg.  You should only need it if
++         you modified a \`.texi' or \`.texinfo' file, or any other file
+          indirectly affecting the aspect of the manual.  The spurious
+-         call might also be the consequence of using a buggy 'make' (AIX,
+-         DU, IRIX).  You might want to install the Texinfo package or
+-         the GNU make package.  Grab either from any GNU archive site."
++         call might also be the consequence of using a buggy \`make' (AIX,
++         DU, IRIX).  You might want to install the \`Texinfo' package or
++         the \`GNU make' package.  Grab either from any GNU archive site."
+     # The file to touch is that specified with -o ...
+     file=`echo "$*" | sed -n "$sed_output"`
+     test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+@@ -309,12 +310,12 @@
+ 
+   *)
+     echo 1>&2 "\
+-WARNING: '$1' is needed, and is $msg.
++WARNING: \`$1' is needed, and is $msg.
+          You might have modified some files without having the
+-         proper tools for further handling them.  Check the 'README' file,
++         proper tools for further handling them.  Check the \`README' file,
+          it often tells you about the needed prerequisites for installing
+          this package.  You may also peek at any GNU archive site, in case
+-         some other package would contain this missing '$1' program."
++         some other package would contain this missing \`$1' program."
+     exit 1
+     ;;
+ esac
+diff -Nur cifs-utils-6.1.orig/mount.cifs.c cifs-utils-6.1/mount.cifs.c
+--- cifs-utils-6.1.orig/mount.cifs.c	2013-07-02 21:13:33.000000000 +0200
++++ cifs-utils-6.1/mount.cifs.c	2013-10-05 18:12:29.000000000 +0200
+@@ -34,7 +34,13 @@
+ #include <sys/utsname.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
++#ifdef HAVE_GNU_GETOPT_LONG
+ #include <getopt.h>
++#else
++#include "gnu_getopt.h"
++#define getopt_long gnu_getopt_long
++#define option gnu_option
++#endif
+ #include <errno.h>
+ #include <netdb.h>
+ #include <string.h>
+diff -Nur cifs-utils-6.1.orig/mtab.c cifs-utils-6.1/mtab.c
+--- cifs-utils-6.1.orig/mtab.c	2013-07-02 21:13:33.000000000 +0200
++++ cifs-utils-6.1/mtab.c	2013-10-05 18:12:29.000000000 +0200
+@@ -36,6 +36,7 @@
+ #include <time.h>
+ #include <fcntl.h>
+ #include <mntent.h>
++#include <paths.h>
+ #include <stdlib.h>
+ #include <signal.h>
+ #include "mount.h"
diff --git a/package/cifs-utils/patches/patch-mtab_c b/package/cifs-utils/patches/patch-mtab_c
deleted file mode 100644
index dbbd27317..000000000
--- a/package/cifs-utils/patches/patch-mtab_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- cifs-utils-6.0.orig/mtab.c	2013-03-25 15:52:05.000000000 +0100
-+++ cifs-utils-6.0/mtab.c	2013-09-18 10:52:53.000000000 +0200
-@@ -36,6 +36,7 @@
- #include <time.h>
- #include <fcntl.h>
- #include <mntent.h>
-+#include <paths.h>
- #include <stdlib.h>
- #include <signal.h>
- #include "mount.h"