autoreconf
authorSam Hartman <hartmans@painless-security.com>
Tue, 13 Dec 2011 20:59:22 +0000 (15:59 -0500)
committerSam Hartman <hartmans@painless-security.com>
Tue, 13 Dec 2011 20:59:22 +0000 (15:59 -0500)
Makefile.in
aclocal.m4
config.h.in
configure
doc/Makefile.in
schemas/Makefile.in
xmltooling/Makefile.in
xmltoolingtest/Makefile.in

index 49d0c80..0123610 100644 (file)
@@ -65,9 +65,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
-       $(srcdir)/Makefile.in $(srcdir)/Portfile.in \
-       $(srcdir)/config.h.in $(srcdir)/doxygen.am \
-       $(srcdir)/pkginfo.in $(srcdir)/xmltooling.spec.in \
+       $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+       $(srcdir)/doxygen.am $(srcdir)/xmltooling.spec.in \
        $(top_srcdir)/configure build-aux/config.guess \
        build-aux/config.sub build-aux/depcomp build-aux/install-sh \
        build-aux/ltmain.sh build-aux/missing
@@ -76,17 +75,17 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
        $(top_srcdir)/m4/acx_pthread.m4 \
        $(top_srcdir)/m4/ax_create_pkgconfig_info.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/libtool.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h $(top_builddir)/xmltooling/config_pub.h
-CONFIG_CLEAN_FILES = xmltooling.spec pkginfo Portfile
+CONFIG_CLEAN_FILES = xmltooling.spec
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
@@ -171,6 +170,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_ROOT = @BOOST_ROOT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -186,6 +187,7 @@ CXXTESTFLAGS = @CXXTESTFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
 DLLTOOL = @DLLTOOL@
 DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
 DSYMUTIL = @DSYMUTIL@
@@ -355,13 +357,12 @@ DISTCLEANFILES = \
 SUBDIRS = doc schemas @PACKAGE_NAME@ xmltoolingtest
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = @PACKAGE_NAME@.pc
-GENFILES = @PACKAGE_NAME@.spec pkginfo Portfile
+GENFILES = @PACKAGE_NAME@.spec
 EXTRA_DIST = $(DX_CONFIG) \
         cpp-@PACKAGE_NAME@.sln \
         config_win32.h \
         $(GENFILES) \
-        $(GENFILES:%=%.in) \
-        postinstall
+        $(GENFILES:%=%.in)
 
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -420,10 +421,6 @@ distclean-hdr:
        -rm -f config.h stamp-h1
 xmltooling.spec: $(top_builddir)/config.status $(srcdir)/xmltooling.spec.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
-pkginfo: $(top_builddir)/config.status $(srcdir)/pkginfo.in
-       cd $(top_builddir) && $(SHELL) ./config.status $@
-Portfile: $(top_builddir)/config.status $(srcdir)/Portfile.in
-       cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
        -rm -f *.lo
index f5072f6..12c776e 100644 (file)
@@ -952,6 +952,7 @@ AC_SUBST([am__untar])
 m4_include([m4/acinclude.m4])
 m4_include([m4/acx_pthread.m4])
 m4_include([m4/ax_create_pkgconfig_info.m4])
+m4_include([m4/boost.m4])
 m4_include([m4/doxygen.m4])
 m4_include([m4/libtool.m4])
 m4_include([m4/ltoptions.m4])
index 67aba39..5f2edb7 100644 (file)
@@ -1,5 +1,29 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* Defined if the requested minimum BOOST version is satisfied */
+#undef HAVE_BOOST
+
+/* Define to 1 if you have <boost/algorithm/string.hpp> */
+#undef HAVE_BOOST_ALGORITHM_STRING_HPP
+
+/* Define to 1 if you have <boost/bind.hpp> */
+#undef HAVE_BOOST_BIND_HPP
+
+/* Define to 1 if you have <boost/cast.hpp> */
+#undef HAVE_BOOST_CAST_HPP
+
+/* Define to 1 if you have <boost/lambda/lambda.hpp> */
+#undef HAVE_BOOST_LAMBDA_LAMBDA_HPP
+
+/* Define to 1 if you have <boost/lexical_cast.hpp> */
+#undef HAVE_BOOST_LEXICAL_CAST_HPP
+
+/* Define to 1 if you have <boost/ptr_container/ptr_vector.hpp> */
+#undef HAVE_BOOST_PTR_CONTAINER_PTR_VECTOR_HPP
+
+/* Define to 1 if you have <boost/tokenizer.hpp> */
+#undef HAVE_BOOST_TOKENIZER_HPP
+
 /* Define to 1 if C++ compiler supports covariant virtual methods. */
 #undef HAVE_COVARIANT_RETURNS
 
@@ -20,9 +44,6 @@
    std::iterator_traits. */
 #undef HAVE_ITERATOR_TRAITS
 
-/* Define to 1 if you have the `curl' library (-lcurl). */
-#undef HAVE_LIBCURL
-
 /* Define to 1 if you have the `dl' library (-ldl). */
 #undef HAVE_LIBDL
 
index 2777e33..8186205 100755 (executable)
--- a/configure
+++ b/configure
@@ -2,7 +2,7 @@
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.67 for xmltooling 1.5.
 #
-# Report bugs to <https://bugs.internet2.edu/>.
+# Report bugs to <https://issues.shibboleth.net/>.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -239,7 +239,7 @@ fi
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: https://bugs.internet2.edu/ about your system,
+$0: https://issues.shibboleth.net/ about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -564,7 +564,7 @@ PACKAGE_NAME='xmltooling'
 PACKAGE_TARNAME='xmltooling'
 PACKAGE_VERSION='1.5'
 PACKAGE_STRING='xmltooling 1.5'
-PACKAGE_BUGREPORT='https://bugs.internet2.edu/'
+PACKAGE_BUGREPORT='https://issues.shibboleth.net/'
 PACKAGE_URL=''
 
 ac_unique_file="xmltooling"
@@ -621,6 +621,9 @@ CURL_CONFIG
 PKG_CONFIG
 LOG4CPP_CONFIG
 LOG4SHIB_CONFIG
+BOOST_CPPFLAGS
+DISTCHECK_CONFIGURE_FLAGS
+BOOST_ROOT
 BUILD_PTHREAD_FALSE
 BUILD_PTHREAD_TRUE
 PTHREAD_CFLAGS
@@ -809,6 +812,7 @@ enable_doxygen_html
 enable_doxygen_ps
 enable_doxygen_pdf
 enable_debug
+with_boost
 with_log4shib
 with_log4cpp
 with_xerces
@@ -830,7 +834,8 @@ DOXYGEN_PAPER_SIZE
 CXX
 CXXFLAGS
 CCC
-CXXCPP'
+CXXCPP
+BOOST_ROOT'
 
 
 # Initialize some variables set by options.
@@ -1479,6 +1484,7 @@ Optional Packages:
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
                         (or the compiler's sysroot if not specified).
+  --with-boost=DIR        prefix of Boost [guess]
   --with-log4shib=PATH    where log4shib-config is installed
   --with-log4cpp=PATH     where log4cpp-config is installed
   --with-xerces=PATH      where xerces-c is installed
@@ -1501,11 +1507,12 @@ Some influential environment variables:
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
   CXXCPP      C++ preprocessor
+  BOOST_ROOT  Location of Boost installation
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <https://bugs.internet2.edu/>.
+Report bugs to <https://issues.shibboleth.net/>.
 _ACEOF
 ac_status=$?
 fi
@@ -2266,9 +2273,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ------------------------------------------ ##
-## Report this to https://bugs.internet2.edu/ ##
-## ------------------------------------------ ##"
+( $as_echo "## --------------------------------------------- ##
+## Report this to https://issues.shibboleth.net/ ##
+## --------------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
@@ -2357,9 +2364,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ------------------------------------------ ##
-## Report this to https://bugs.internet2.edu/ ##
-## ------------------------------------------ ##"
+( $as_echo "## --------------------------------------------- ##
+## Report this to https://issues.shibboleth.net/ ##
+## --------------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
@@ -13792,7 +13799,7 @@ fi
 
 ac_config_headers="$ac_config_headers config.h xmltooling/config_pub.h"
 
-ac_config_files="$ac_config_files xmltooling.spec pkginfo Portfile"
+ac_config_files="$ac_config_files xmltooling.spec"
 
 ac_config_files="$ac_config_files Makefile xmltooling/Makefile xmltoolingtest/Makefile schemas/Makefile doc/Makefile"
 
@@ -17869,17 +17876,20 @@ if test "$GCC" = "yes" ; then
 #        ])
     CFLAGS="-Wall $GCC_CFLAGS"
     CXXFLAGS="-Wall $GCC_CXXFLAGS"
-else
-# Fix for Sun Workshop compiler in debug mode, may be Sun case #6360993
-       case "${host_cpu}-${host_os}" in
-               *solaris*)
-                       if test "$CXX" = "CC" ; then
-                               CXXFLAGS="$CXXFLAGS -Qoption ccfe -stabs=no%dfltlit+no%dflthlp"
-                       fi
-               ;;
-       esac
 fi
 
+# Fix for Sun Workshop compiler in debug mode, may be Sun case #6360993
+# Also enables POSIX semantics for some functions.
+case "${host_cpu}-${host_os}" in
+    *solaris*)
+       CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS"
+       CXXFLAGS="$CXXFLAGS -D_POSIX_PTHREAD_SEMANTICS"
+       if test "$CXX" = "CC" ; then
+               CXXFLAGS="$CXXFLAGS -Qoption ccfe -stabs=no%dfltlit+no%dflthlp"
+       fi
+    ;;
+esac
+
 # Checks for typedefs, structures, and compiler characteristics.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
@@ -18567,6 +18577,390 @@ if test "x_$ac_cv_cxx_have_stl" != x_yes; then
 fi
 
 
+# Boost
+
+echo "$as_me: this is boost.m4 serial 16" >&5
+boost_save_IFS=$IFS
+boost_version_req=
+IFS=.
+set x $boost_version_req 0 0 0
+IFS=$boost_save_IFS
+shift
+boost_version_req=`expr "$1" '*' 100000 + "$2" '*' 100 + "$3"`
+boost_version_req_string=$1.$2.$3
+
+# Check whether --with-boost was given.
+if test "${with_boost+set}" = set; then :
+  withval=$with_boost;
+fi
+# If BOOST_ROOT is set and the user has not provided a value to
+# --with-boost, then treat BOOST_ROOT as if it the user supplied it.
+if test x"$BOOST_ROOT" != x; then
+  if test x"$with_boost" = x; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Detected BOOST_ROOT; continuing with --with-boost=$BOOST_ROOT" >&5
+$as_echo "$as_me: Detected BOOST_ROOT; continuing with --with-boost=$BOOST_ROOT" >&6;}
+    with_boost=$BOOST_ROOT
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Detected BOOST_ROOT=$BOOST_ROOT, but overridden by --with-boost=$with_boost" >&5
+$as_echo "$as_me: Detected BOOST_ROOT=$BOOST_ROOT, but overridden by --with-boost=$with_boost" >&6;}
+  fi
+fi
+DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS '--with-boost=$with_boost'"
+boost_save_CPPFLAGS=$CPPFLAGS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boost headers version >= $boost_version_req_string" >&5
+$as_echo_n "checking for Boost headers version >= $boost_version_req_string... " >&6; }
+if test "${boost_cv_inc_path+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  boost_cv_inc_path=no
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <boost/version.hpp>
+#if !defined BOOST_VERSION
+# error BOOST_VERSION is not defined
+#elif BOOST_VERSION < $boost_version_req
+# error Boost headers version < $boost_version_req
+#endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+    # If the user provided a value to --with-boost, use it and only it.
+    case $with_boost in #(
+      ''|yes) set x '' /opt/local/include /usr/local/include /opt/include \
+                 /usr/include C:/Boost/include;; #(
+      *)      set x "$with_boost/include" "$with_boost";;
+    esac
+    shift
+    for boost_dir
+    do
+    # Without --layout=system, Boost (or at least some versions) installs
+    # itself in <prefix>/include/boost-<version>.  This inner loop helps to
+    # find headers in such directories.
+    #
+    # Any ${boost_dir}/boost-x_xx directories are searched in reverse version
+    # order followed by ${boost_dir}.  The final '.' is a sentinel for
+    # searching $boost_dir" itself.  Entries are whitespace separated.
+    #
+    # I didn't indent this loop on purpose (to avoid over-indented code)
+    boost_layout_system_search_list=`cd "$boost_dir" 2>/dev/null \
+        && ls -1 | "${GREP}" '^boost-' | sort -rn -t- -k2 \
+        && echo .`
+    for boost_inc in $boost_layout_system_search_list
+    do
+      if test x"$boost_inc" != x.; then
+        boost_inc="$boost_dir/$boost_inc"
+      else
+        boost_inc="$boost_dir" # Uses sentinel in boost_layout_system_search_list
+      fi
+      if test x"$boost_inc" != x; then
+        # We are going to check whether the version of Boost installed
+        # in $boost_inc is usable by running a compilation that
+        # #includes it.  But if we pass a -I/some/path in which Boost
+        # is not installed, the compiler will just skip this -I and
+        # use other locations (either from CPPFLAGS, or from its list
+        # of system include directories).  As a result we would use
+        # header installed on the machine instead of the /some/path
+        # specified by the user.  So in that precise case (trying
+        # $boost_inc), make sure the version.hpp exists.
+        #
+        # Use test -e as there can be symlinks.
+        test -e "$boost_inc/boost/version.hpp" || continue
+        CPPFLAGS="$CPPFLAGS -I$boost_inc"
+      fi
+      if ac_fn_cxx_try_compile "$LINENO"; then :
+  boost_cv_inc_path=yes
+else
+  boost_cv_version=no
+fi
+rm -f core conftest.err conftest.$ac_objext
+      if test x"$boost_cv_inc_path" = xyes; then
+        if test x"$boost_inc" != x; then
+          boost_cv_inc_path=$boost_inc
+        fi
+        break 2
+      fi
+    done
+    done
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_inc_path" >&5
+$as_echo "$boost_cv_inc_path" >&6; }
+    case $boost_cv_inc_path in #(
+      no)
+        boost_errmsg="cannot find Boost headers version >= $boost_version_req_string"
+        as_fn_error $? "$boost_errmsg" "$LINENO" 5
+
+        ;;#(
+      yes)
+        BOOST_CPPFLAGS=
+        ;;#(
+      *)
+        BOOST_CPPFLAGS="-I$boost_cv_inc_path"
+        ;;
+    esac
+  if test x"$boost_cv_inc_path" != xno; then
+
+$as_echo "#define HAVE_BOOST 1" >>confdefs.h
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boost's header version" >&5
+$as_echo_n "checking for Boost's header version... " >&6; }
+if test "${boost_cv_lib_version+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <boost/version.hpp>
+boost_lib_version = BOOST_LIB_VERSION
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  tr -d '\r' |
+  $SED -n -e "/^boost_lib_version = /{s///;s/\"//g;p;q;}" >conftest.i 2>&1; then :
+  boost_cv_lib_version=`cat conftest.i`
+fi
+rm -rf conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_version" >&5
+$as_echo "$boost_cv_lib_version" >&6; }
+    # e.g. "134" for 1_34_1 or "135" for 1_35
+    boost_major_version=`echo "$boost_cv_lib_version" | $SED 's/_//;s/_.*//;s/ //'`
+    case $boost_major_version in #(
+      '' | *[!0-9]*)
+        as_fn_error $? "invalid value: boost_major_version=$boost_major_version" "$LINENO" 5
+        ;;
+    esac
+fi
+CPPFLAGS=$boost_save_CPPFLAGS
+
+if test x"$boost_cv_inc_path" = xno; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/bind.hpp" >&5
+$as_echo "$as_me: Boost not available, not searching for boost/bind.hpp" >&6;}
+else
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ac_fn_cxx_check_header_mongrel "$LINENO" "boost/bind.hpp" "ac_cv_header_boost_bind_hpp" "$ac_includes_default"
+if test "x$ac_cv_header_boost_bind_hpp" = x""yes; then :
+
+$as_echo "#define HAVE_BOOST_BIND_HPP 1" >>confdefs.h
+
+else
+  as_fn_error $? "cannot find boost/bind.hpp" "$LINENO" 5
+fi
+
+
+CPPFLAGS=$boost_save_CPPFLAGS
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+fi
+
+
+if test x"$boost_cv_inc_path" = xno; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/cast.hpp" >&5
+$as_echo "$as_me: Boost not available, not searching for boost/cast.hpp" >&6;}
+else
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ac_fn_cxx_check_header_mongrel "$LINENO" "boost/cast.hpp" "ac_cv_header_boost_cast_hpp" "$ac_includes_default"
+if test "x$ac_cv_header_boost_cast_hpp" = x""yes; then :
+
+$as_echo "#define HAVE_BOOST_CAST_HPP 1" >>confdefs.h
+
+else
+  as_fn_error $? "cannot find boost/cast.hpp" "$LINENO" 5
+fi
+
+
+CPPFLAGS=$boost_save_CPPFLAGS
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+fi
+
+if test x"$boost_cv_inc_path" = xno; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/lexical_cast.hpp" >&5
+$as_echo "$as_me: Boost not available, not searching for boost/lexical_cast.hpp" >&6;}
+else
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ac_fn_cxx_check_header_mongrel "$LINENO" "boost/lexical_cast.hpp" "ac_cv_header_boost_lexical_cast_hpp" "$ac_includes_default"
+if test "x$ac_cv_header_boost_lexical_cast_hpp" = x""yes; then :
+
+$as_echo "#define HAVE_BOOST_LEXICAL_CAST_HPP 1" >>confdefs.h
+
+else
+  as_fn_error $? "cannot find boost/lexical_cast.hpp" "$LINENO" 5
+fi
+
+
+CPPFLAGS=$boost_save_CPPFLAGS
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+fi
+
+
+
+if test x"$boost_cv_inc_path" = xno; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/lambda/lambda.hpp" >&5
+$as_echo "$as_me: Boost not available, not searching for boost/lambda/lambda.hpp" >&6;}
+else
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ac_fn_cxx_check_header_mongrel "$LINENO" "boost/lambda/lambda.hpp" "ac_cv_header_boost_lambda_lambda_hpp" "$ac_includes_default"
+if test "x$ac_cv_header_boost_lambda_lambda_hpp" = x""yes; then :
+
+$as_echo "#define HAVE_BOOST_LAMBDA_LAMBDA_HPP 1" >>confdefs.h
+
+else
+  as_fn_error $? "cannot find boost/lambda/lambda.hpp" "$LINENO" 5
+fi
+
+
+CPPFLAGS=$boost_save_CPPFLAGS
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+fi
+
+
+if test x"$boost_cv_inc_path" = xno; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/ptr_container/ptr_vector.hpp" >&5
+$as_echo "$as_me: Boost not available, not searching for boost/ptr_container/ptr_vector.hpp" >&6;}
+else
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ac_fn_cxx_check_header_mongrel "$LINENO" "boost/ptr_container/ptr_vector.hpp" "ac_cv_header_boost_ptr_container_ptr_vector_hpp" "$ac_includes_default"
+if test "x$ac_cv_header_boost_ptr_container_ptr_vector_hpp" = x""yes; then :
+
+$as_echo "#define HAVE_BOOST_PTR_CONTAINER_PTR_VECTOR_HPP 1" >>confdefs.h
+
+else
+  as_fn_error $? "cannot find boost/ptr_container/ptr_vector.hpp" "$LINENO" 5
+fi
+
+
+CPPFLAGS=$boost_save_CPPFLAGS
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+fi
+
+
+if test x"$boost_cv_inc_path" = xno; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/algorithm/string.hpp" >&5
+$as_echo "$as_me: Boost not available, not searching for boost/algorithm/string.hpp" >&6;}
+else
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ac_fn_cxx_check_header_mongrel "$LINENO" "boost/algorithm/string.hpp" "ac_cv_header_boost_algorithm_string_hpp" "$ac_includes_default"
+if test "x$ac_cv_header_boost_algorithm_string_hpp" = x""yes; then :
+
+$as_echo "#define HAVE_BOOST_ALGORITHM_STRING_HPP 1" >>confdefs.h
+
+else
+  as_fn_error $? "cannot find boost/algorithm/string.hpp" "$LINENO" 5
+fi
+
+
+CPPFLAGS=$boost_save_CPPFLAGS
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+fi
+
+
+
+if test x"$boost_cv_inc_path" = xno; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/tokenizer.hpp" >&5
+$as_echo "$as_me: Boost not available, not searching for boost/tokenizer.hpp" >&6;}
+else
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ac_fn_cxx_check_header_mongrel "$LINENO" "boost/tokenizer.hpp" "ac_cv_header_boost_tokenizer_hpp" "$ac_includes_default"
+if test "x$ac_cv_header_boost_tokenizer_hpp" = x""yes; then :
+
+$as_echo "#define HAVE_BOOST_TOKENIZER_HPP 1" >>confdefs.h
+
+else
+  as_fn_error $? "cannot find boost/tokenizer.hpp" "$LINENO" 5
+fi
+
+
+CPPFLAGS=$boost_save_CPPFLAGS
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+fi
+
+
+CPPFLAGS = "$BOOST_CPPFLAGS $CPPFLAGS"
+
 # are covariant methods allowed?
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -18664,8 +19058,7 @@ fi
 if test -f "${LOG4SHIB_CONFIG}" ; then
     LIBS="`${LOG4SHIB_CONFIG} --libs` $LIBS"
     CPPFLAGS="`${LOG4SHIB_CONFIG} --cflags` $CPPFLAGS"
-
-ac_fn_cxx_check_header_mongrel "$LINENO" "log4shib/CategoryStream.hh" "ac_cv_header_log4shib_CategoryStream_hh" "$ac_includes_default"
+    ac_fn_cxx_check_header_mongrel "$LINENO" "log4shib/CategoryStream.hh" "ac_cv_header_log4shib_CategoryStream_hh" "$ac_includes_default"
 if test "x$ac_cv_header_log4shib_CategoryStream_hh" = x""yes; then :
 
 else
 
 # Check whether --with-xerces was given.
 if test "${with_xerces+set}" = set; then :
-  withval=$with_xerces; if test x_$with_xerces != x_/usr; then
-        LDFLAGS="-L${with_xerces}/lib $LDFLAGS"
-        CPPFLAGS="-I${with_xerces}/include $CPPFLAGS"
-    fi
+  withval=$with_xerces;
+else
+  with_xerces=/usr
+fi
+
+if test x_$with_xerces != x_/usr; then
+    CPPFLAGS="-I${with_xerces}/include $CPPFLAGS"
+    LIBS="-L${with_xerces}/lib -lxerces-c $LIBS"
+else
+    LIBS="-lxerces-c $LIBS"
 fi
 
-LIBS="-lxerces-c $LIBS"
 ac_fn_cxx_check_header_mongrel "$LINENO" "xercesc/dom/DOM.hpp" "ac_cv_header_xercesc_dom_DOM_hpp" "$ac_includes_default"
 if test "x$ac_cv_header_xercesc_dom_DOM_hpp" = x""yes; then :
 
 
     if test x_$with_xmlsec != x_/usr; then
         CPPFLAGS="-I${with_xmlsec}/include $CPPFLAGS"
-        LDFLAGS="-L${with_xmlsec}/lib $LDFLAGS"
+        XMLSEC_LIBS="-L${with_xmlsec}/lib -lxml-security-c $XMLSEC_LIBS"
+    else
+        XMLSEC_LIBS="-lxml-security-c $XMLSEC_LIBS"
     fi
-    XMLSEC_LIBS="$XMLSEC_LIBS -lxml-security-c"
 
     # save and append master libs
     save_LIBS="$LIBS"
@@ -19398,53 +19797,24 @@ else
 fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_global_init in -lcurl" >&5
-$as_echo_n "checking for curl_global_init in -lcurl... " >&6; }
-if test "${ac_cv_lib_curl_curl_global_init+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcurl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    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 curl_global_init ();
+#include <curl/curl.h>
 int
 main ()
 {
-return curl_global_init ();
+curl_global_init(CURL_GLOBAL_ALL)
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_curl_curl_global_init=yes
-else
-  ac_cv_lib_curl_curl_global_init=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_curl_curl_global_init" >&5
-$as_echo "$ac_cv_lib_curl_curl_global_init" >&6; }
-if test "x$ac_cv_lib_curl_curl_global_init" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCURL 1
-_ACEOF
-
-  LIBS="-lcurl $LIBS"
 
 else
   as_fn_error $? "unable to link with libcurl" "$LINENO" 5
 fi
-
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURLOPT_SSL_CTX_FUNCTION in curl.h" >&5
 $as_echo_n "checking for CURLOPT_SSL_CTX_FUNCTION in curl.h... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -19461,7 +19831,8 @@ else
 fi
 rm -f conftest*
 
-    ac_fn_cxx_check_type "$LINENO" "curl_off_t" "ac_cv_type_curl_off_t" "$ac_includes_default"
+    ac_fn_cxx_check_type "$LINENO" "curl_off_t" "ac_cv_type_curl_off_t" "#include <curl/curl.h>
+"
 if test "x$ac_cv_type_curl_off_t" = x""yes; then :
 
 $as_echo "#define HAVE_CURL_OFF_T 1" >>confdefs.h
@@ -20433,7 +20804,7 @@ $config_headers
 Configuration commands:
 $config_commands
 
-Report bugs to <https://bugs.internet2.edu/>."
+Report bugs to <https://issues.shibboleth.net/>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -20972,8 +21343,6 @@ do
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "xmltooling/config_pub.h") CONFIG_HEADERS="$CONFIG_HEADERS xmltooling/config_pub.h" ;;
     "xmltooling.spec") CONFIG_FILES="$CONFIG_FILES xmltooling.spec" ;;
-    "pkginfo") CONFIG_FILES="$CONFIG_FILES pkginfo" ;;
-    "Portfile") CONFIG_FILES="$CONFIG_FILES Portfile" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "xmltooling/Makefile") CONFIG_FILES="$CONFIG_FILES xmltooling/Makefile" ;;
     "xmltoolingtest/Makefile") CONFIG_FILES="$CONFIG_FILES xmltoolingtest/Makefile" ;;
index 3b394ec..ec9bb8c 100644 (file)
@@ -40,10 +40,10 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
        $(top_srcdir)/m4/acx_pthread.m4 \
        $(top_srcdir)/m4/ax_create_pkgconfig_info.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/libtool.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -84,6 +84,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_ROOT = @BOOST_ROOT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -99,6 +101,7 @@ CXXTESTFLAGS = @CXXTESTFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
 DLLTOOL = @DLLTOOL@
 DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
 DSYMUTIL = @DSYMUTIL@
index 64c6369..4a65ab4 100644 (file)
@@ -40,10 +40,10 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
        $(top_srcdir)/m4/acx_pthread.m4 \
        $(top_srcdir)/m4/ax_create_pkgconfig_info.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/libtool.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -84,6 +84,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_ROOT = @BOOST_ROOT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -99,6 +101,7 @@ CXXTESTFLAGS = @CXXTESTFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
 DLLTOOL = @DLLTOOL@
 DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
 DSYMUTIL = @DSYMUTIL@
index 8acd304..441e33e 100644 (file)
@@ -46,10 +46,10 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
        $(top_srcdir)/m4/acx_pthread.m4 \
        $(top_srcdir)/m4/ax_create_pkgconfig_info.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/libtool.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -168,11 +168,13 @@ am__libxmltooling_la_SOURCES_DIST =  \
        security/impl/ChainingTrustEngine.cpp \
        security/impl/CredentialCriteria.cpp \
        security/impl/CredentialResolver.cpp \
+       security/impl/DummyCredentialResolver.cpp \
        security/impl/ExplicitKeyTrustEngine.cpp \
        security/impl/FilesystemCredentialResolver.cpp \
        security/impl/InlineKeyResolver.cpp \
        security/impl/KeyInfoResolver.cpp \
        security/impl/OpenSSLCryptoX509CRL.cpp \
+       security/impl/PKIXPathValidator.cpp \
        security/impl/SecurityHelper.cpp \
        security/impl/StaticPKIXTrustEngine.cpp \
        security/impl/TrustEngine.cpp \
@@ -201,9 +203,10 @@ am__objects_5 = Decrypter.lo EncryptedKeyResolver.lo Encrypter.lo \
        MemoryStorageService.lo AbstractPKIXTrustEngine.lo \
        BasicX509Credential.lo ChainingCredentialResolver.lo \
        ChainingTrustEngine.lo CredentialCriteria.lo \
-       CredentialResolver.lo ExplicitKeyTrustEngine.lo \
-       FilesystemCredentialResolver.lo InlineKeyResolver.lo \
-       KeyInfoResolver.lo OpenSSLCryptoX509CRL.lo SecurityHelper.lo \
+       CredentialResolver.lo DummyCredentialResolver.lo \
+       ExplicitKeyTrustEngine.lo FilesystemCredentialResolver.lo \
+       InlineKeyResolver.lo KeyInfoResolver.lo \
+       OpenSSLCryptoX509CRL.lo PKIXPathValidator.lo SecurityHelper.lo \
        StaticPKIXTrustEngine.lo TrustEngine.lo XSECCryptoX509CRL.lo \
        KeyInfoImpl.lo KeyInfoSchemaValidators.lo \
        SignatureValidator.lo XMLSecSignatureImpl.lo \
@@ -247,6 +250,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_ROOT = @BOOST_ROOT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -262,6 +267,7 @@ CXXTESTFLAGS = @CXXTESTFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
 DLLTOOL = @DLLTOOL@
 DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
 DSYMUTIL = @DSYMUTIL@
@@ -461,6 +467,9 @@ secinclude_HEADERS = \
        security/KeyInfoCredentialContext.h \
        security/KeyInfoResolver.h \
        security/OpenSSLCredential.h \
+       security/OpenSSLPathValidator.h \
+       security/PathValidator.h \
+       security/PKIXPathValidatorParams.h \
        security/SecurityHelper.h \
        security/SignatureTrustEngine.h \
        security/TrustEngine.h \
@@ -520,11 +529,13 @@ xmlsec_sources = \
        security/impl/ChainingTrustEngine.cpp \
        security/impl/CredentialCriteria.cpp \
        security/impl/CredentialResolver.cpp \
+       security/impl/DummyCredentialResolver.cpp \
        security/impl/ExplicitKeyTrustEngine.cpp \
        security/impl/FilesystemCredentialResolver.cpp \
        security/impl/InlineKeyResolver.cpp \
        security/impl/KeyInfoResolver.cpp \
        security/impl/OpenSSLCryptoX509CRL.cpp \
+       security/impl/PKIXPathValidator.cpp \
        security/impl/SecurityHelper.cpp \
        security/impl/StaticPKIXTrustEngine.cpp \
        security/impl/TrustEngine.cpp \
@@ -580,11 +591,11 @@ libxmltooling_lite_la_SOURCES = \
 
 libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE
 libxmltooling_lite_la_LDFLAGS = -version-info 6:0:0
-@BUILD_XMLSEC_TRUE@libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 6:0:0
 @BUILD_XMLSEC_TRUE@libxmltooling_la_SOURCES = \
 @BUILD_XMLSEC_TRUE@    ${common_sources} \
 @BUILD_XMLSEC_TRUE@    ${xmlsec_sources}
 
+@BUILD_XMLSEC_TRUE@libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 6:0:0
 EXTRA_DIST = \
     xmltooling.vcxproj \
     xmltooling-lite.vcxproj \
@@ -708,6 +719,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CurlURLInputStream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DateTime.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Decrypter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DummyCredentialResolver.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EncryptedKeyResolver.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Encrypter.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EncryptionImpl.Plo@am__quote@
@@ -725,6 +737,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NDC.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Namespace.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OpenSSLCryptoX509CRL.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PKIXPathValidator.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PThreads.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ParserPool.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PathResolver.Plo@am__quote@
@@ -1262,6 +1275,13 @@ CredentialResolver.lo: security/impl/CredentialResolver.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CredentialResolver.lo `test -f 'security/impl/CredentialResolver.cpp' || echo '$(srcdir)/'`security/impl/CredentialResolver.cpp
 
+DummyCredentialResolver.lo: security/impl/DummyCredentialResolver.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT DummyCredentialResolver.lo -MD -MP -MF $(DEPDIR)/DummyCredentialResolver.Tpo -c -o DummyCredentialResolver.lo `test -f 'security/impl/DummyCredentialResolver.cpp' || echo '$(srcdir)/'`security/impl/DummyCredentialResolver.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/DummyCredentialResolver.Tpo $(DEPDIR)/DummyCredentialResolver.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='security/impl/DummyCredentialResolver.cpp' object='DummyCredentialResolver.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o DummyCredentialResolver.lo `test -f 'security/impl/DummyCredentialResolver.cpp' || echo '$(srcdir)/'`security/impl/DummyCredentialResolver.cpp
+
 ExplicitKeyTrustEngine.lo: security/impl/ExplicitKeyTrustEngine.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ExplicitKeyTrustEngine.lo -MD -MP -MF $(DEPDIR)/ExplicitKeyTrustEngine.Tpo -c -o ExplicitKeyTrustEngine.lo `test -f 'security/impl/ExplicitKeyTrustEngine.cpp' || echo '$(srcdir)/'`security/impl/ExplicitKeyTrustEngine.cpp
 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/ExplicitKeyTrustEngine.Tpo $(DEPDIR)/ExplicitKeyTrustEngine.Plo
@@ -1297,6 +1317,13 @@ OpenSSLCryptoX509CRL.lo: security/impl/OpenSSLCryptoX509CRL.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o OpenSSLCryptoX509CRL.lo `test -f 'security/impl/OpenSSLCryptoX509CRL.cpp' || echo '$(srcdir)/'`security/impl/OpenSSLCryptoX509CRL.cpp
 
+PKIXPathValidator.lo: security/impl/PKIXPathValidator.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PKIXPathValidator.lo -MD -MP -MF $(DEPDIR)/PKIXPathValidator.Tpo -c -o PKIXPathValidator.lo `test -f 'security/impl/PKIXPathValidator.cpp' || echo '$(srcdir)/'`security/impl/PKIXPathValidator.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/PKIXPathValidator.Tpo $(DEPDIR)/PKIXPathValidator.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='security/impl/PKIXPathValidator.cpp' object='PKIXPathValidator.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PKIXPathValidator.lo `test -f 'security/impl/PKIXPathValidator.cpp' || echo '$(srcdir)/'`security/impl/PKIXPathValidator.cpp
+
 SecurityHelper.lo: security/impl/SecurityHelper.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SecurityHelper.lo -MD -MP -MF $(DEPDIR)/SecurityHelper.Tpo -c -o SecurityHelper.lo `test -f 'security/impl/SecurityHelper.cpp' || echo '$(srcdir)/'`security/impl/SecurityHelper.cpp
 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/SecurityHelper.Tpo $(DEPDIR)/SecurityHelper.Plo
index 852149e..a68526f 100644 (file)
@@ -37,16 +37,16 @@ build_triplet = @build@
 host_triplet = @host@
 @BUILD_UNITTEST_TRUE@bin_PROGRAMS = xmltoolingtest$(EXEEXT)
 subdir = xmltoolingtest
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+DIST_COMMON = $(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
        $(top_srcdir)/m4/acx_pthread.m4 \
        $(top_srcdir)/m4/ax_create_pkgconfig_info.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/libtool.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/doxygen.m4 \
+       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -61,6 +61,7 @@ PROGRAMS = $(bin_PROGRAMS)
 @BUILD_XMLSEC_TRUE@    xmltoolingtest-FilesystemCredentialResolverTest.$(OBJEXT) \
 @BUILD_XMLSEC_TRUE@    xmltoolingtest-InlineKeyResolverTest.$(OBJEXT) \
 @BUILD_XMLSEC_TRUE@    xmltoolingtest-MemoryStorageServiceTest.$(OBJEXT) \
+@BUILD_XMLSEC_TRUE@    xmltoolingtest-PKIXEngineTest.$(OBJEXT) \
 @BUILD_XMLSEC_TRUE@    xmltoolingtest-SecurityHelperTest.$(OBJEXT) \
 @BUILD_XMLSEC_TRUE@    xmltoolingtest-SignatureTest.$(OBJEXT)
 am__objects_2 = xmltoolingtest-ComplexXMLObjectTest.$(OBJEXT) \
@@ -96,6 +97,14 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        $(LDFLAGS) -o $@
 SOURCES = $(nodist_xmltoolingtest_SOURCES)
 DIST_SOURCES =
+am__noinst_HEADERS_DIST = XMLObjectBaseTestCase.h \
+       ComplexXMLObjectTest.h DateTimeTest.h ExceptionTest.h \
+       KeyInfoTest.h MarshallingTest.h NonVisibleNamespaceTest.h \
+       SOAPTest.h UnmarshallingTest.h TemplateEngineTest.h \
+       xmltoolingtest.h EncryptionTest.h \
+       FilesystemCredentialResolverTest.h InlineKeyResolverTest.h \
+       MemoryStorageServiceTest.h PKIXEngineTest.h \
+       SecurityHelperTest.h SignatureTest.h
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -107,6 +116,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_ROOT = @BOOST_ROOT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -122,6 +133,7 @@ CXXTESTFLAGS = @CXXTESTFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
 DLLTOOL = @DLLTOOL@
 DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
 DSYMUTIL = @DSYMUTIL@
@@ -266,6 +278,7 @@ AUTOMAKE_OPTIONS = foreign
 @BUILD_XMLSEC_TRUE@    FilesystemCredentialResolverTest.h \
 @BUILD_XMLSEC_TRUE@    InlineKeyResolverTest.h \
 @BUILD_XMLSEC_TRUE@    MemoryStorageServiceTest.h \
+@BUILD_XMLSEC_TRUE@    PKIXEngineTest.h \
 @BUILD_XMLSEC_TRUE@    SecurityHelperTest.h \
 @BUILD_XMLSEC_TRUE@    SignatureTest.h
 
@@ -283,12 +296,15 @@ xmltoolingtest_h = \
     ${xmlsec_sources}
 
 noinst_HEADERS = \
-    XMLObjectBaseTestCase.h
+    XMLObjectBaseTestCase.h \
+    $(xmltoolingtest_h)
 
 nodist_xmltoolingtest_SOURCES = $(xmltoolingtest_h:.h=.cpp)
-CLEANFILES = $(nodist_xmltoolingtest_SOURCES)
-EXTRA_DIST = xmltoolingtest.vcxproj xmltoolingtest.vcxproj.filters $(xmltoolingtest_h) data
-all: all-am
+@BUILD_UNITTEST_TRUE@BUILT_SOURCES = $(nodist_xmltoolingtest_SOURCES)
+@BUILD_UNITTEST_TRUE@CLEANFILES = $(nodist_xmltoolingtest_SOURCES)
+EXTRA_DIST = xmltoolingtest.vcxproj xmltoolingtest.vcxproj.filters data
+all: $(BUILT_SOURCES)
+       $(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
@@ -385,6 +401,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltoolingtest-MarshallingTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltoolingtest-MemoryStorageServiceTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltoolingtest-NonVisibleNamespaceTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltoolingtest-PKIXEngineTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltoolingtest-SOAPTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltoolingtest-SecurityHelperTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltoolingtest-SignatureTest.Po@am__quote@
@@ -609,6 +626,20 @@ xmltoolingtest-MemoryStorageServiceTest.obj: MemoryStorageServiceTest.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmltoolingtest_CXXFLAGS) $(CXXFLAGS) -c -o xmltoolingtest-MemoryStorageServiceTest.obj `if test -f 'MemoryStorageServiceTest.cpp'; then $(CYGPATH_W) 'MemoryStorageServiceTest.cpp'; else $(CYGPATH_W) '$(srcdir)/MemoryStorageServiceTest.cpp'; fi`
 
+xmltoolingtest-PKIXEngineTest.o: PKIXEngineTest.cpp
+@am__fastdepCXX_TRUE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmltoolingtest_CXXFLAGS) $(CXXFLAGS) -MT xmltoolingtest-PKIXEngineTest.o -MD -MP -MF $(DEPDIR)/xmltoolingtest-PKIXEngineTest.Tpo -c -o xmltoolingtest-PKIXEngineTest.o `test -f 'PKIXEngineTest.cpp' || echo '$(srcdir)/'`PKIXEngineTest.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/xmltoolingtest-PKIXEngineTest.Tpo $(DEPDIR)/xmltoolingtest-PKIXEngineTest.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='PKIXEngineTest.cpp' object='xmltoolingtest-PKIXEngineTest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmltoolingtest_CXXFLAGS) $(CXXFLAGS) -c -o xmltoolingtest-PKIXEngineTest.o `test -f 'PKIXEngineTest.cpp' || echo '$(srcdir)/'`PKIXEngineTest.cpp
+
+xmltoolingtest-PKIXEngineTest.obj: PKIXEngineTest.cpp
+@am__fastdepCXX_TRUE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmltoolingtest_CXXFLAGS) $(CXXFLAGS) -MT xmltoolingtest-PKIXEngineTest.obj -MD -MP -MF $(DEPDIR)/xmltoolingtest-PKIXEngineTest.Tpo -c -o xmltoolingtest-PKIXEngineTest.obj `if test -f 'PKIXEngineTest.cpp'; then $(CYGPATH_W) 'PKIXEngineTest.cpp'; else $(CYGPATH_W) '$(srcdir)/PKIXEngineTest.cpp'; fi`
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/xmltoolingtest-PKIXEngineTest.Tpo $(DEPDIR)/xmltoolingtest-PKIXEngineTest.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='PKIXEngineTest.cpp' object='xmltoolingtest-PKIXEngineTest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmltoolingtest_CXXFLAGS) $(CXXFLAGS) -c -o xmltoolingtest-PKIXEngineTest.obj `if test -f 'PKIXEngineTest.cpp'; then $(CYGPATH_W) 'PKIXEngineTest.cpp'; else $(CYGPATH_W) '$(srcdir)/PKIXEngineTest.cpp'; fi`
+
 xmltoolingtest-SecurityHelperTest.o: SecurityHelperTest.cpp
 @am__fastdepCXX_TRUE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmltoolingtest_CXXFLAGS) $(CXXFLAGS) -MT xmltoolingtest-SecurityHelperTest.o -MD -MP -MF $(DEPDIR)/xmltoolingtest-SecurityHelperTest.Tpo -c -o xmltoolingtest-SecurityHelperTest.o `test -f 'SecurityHelperTest.cpp' || echo '$(srcdir)/'`SecurityHelperTest.cpp
 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/xmltoolingtest-SecurityHelperTest.Tpo $(DEPDIR)/xmltoolingtest-SecurityHelperTest.Po
@@ -726,13 +757,15 @@ distdir: $(DISTFILES)
          fi; \
        done
 check-am: all-am
-check: check-am
+check: $(BUILT_SOURCES)
+       $(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
        for dir in "$(DESTDIR)$(bindir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
-install: install-am
+install: $(BUILT_SOURCES)
+       $(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -758,6 +791,7 @@ distclean-generic:
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
@@ -828,7 +862,7 @@ ps-am:
 
 uninstall-am: uninstall-binPROGRAMS
 
-.MAKE: install-am install-strip
+.MAKE: all check install install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
        clean-generic clean-libtool ctags distclean distclean-compile \
@@ -846,7 +880,7 @@ uninstall-am: uninstall-binPROGRAMS
 
 
 do-cxxtestgen:
-       if test $(HFILE) = "xmltoolingtest.h"; then \
+       if test "$(CPPFILE)" = "xmltoolingtest.cpp"; then \
                $(CXXTEST) --error-printer --have-eh --have-std --abort-on-fail -o $(CPPFILE) $(HFILE); \
        else \
                $(CXXTEST) --part --have-eh --have-std --abort-on-fail -o $(CPPFILE) $(HFILE); \