[Fedora-directory-commits] adminutil Makefile.am, 1.4, 1.5 autogen.sh, 1.1, 1.2 configure.ac, 1.4, 1.5 aclocal.m4, 1.5, 1.6 configure, 1.5, 1.6 missing, 1.4, 1.5 install-sh, 1.4, 1.5 depcomp, 1.4, 1.5 config.sub, 1.4, 1.5 config.guess, 1.4, 1.5 compile, 1.4, 1.5 Makefile.in, 1.5, 1.6

Richard Allen Megginson (rmeggins) fedora-directory-commits at redhat.com
Thu Jun 21 21:28:03 UTC 2007


Author: rmeggins

Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22616/adminutil

Modified Files:
	Makefile.am autogen.sh configure.ac aclocal.m4 configure 
	missing install-sh depcomp config.sub config.guess compile 
	Makefile.in 
Log Message:
Resolves: bug 245208
Bug Description: adminutil: Solaris port for 1.1
Reviewed by: nkinder (Thanks!)
Fix Description: There are several problems with building/running adminutil on Solaris.  The biggest is that ICU introduces a dependency on C++.  Solaris requires linking with the C++ libraries and that also requires using C++ to link as well.  This means using the CXXLINK macro.  However, automake will only generate this macro if it detects a C++ source file in Makefile.am.  So, we have to introduce a dummy.cpp file to force automake to generate the CXXLINK macro, then use that to link the shared libraries.
Accept automake version 1.10 or later.
Look for mozldap6 first, then mozldap.
Platforms tested: Solaris 9 64bit
Flag Day: Yes - autotool file change
Doc impact: no



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminutil/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am	25 May 2007 22:55:54 -0000	1.4
+++ Makefile.am	21 Jun 2007 21:27:59 -0000	1.5
@@ -1,6 +1,9 @@
 # look for included m4 files in the ./m4/ directory
 ACLOCAL_AMFLAGS = -I m4
 
+LIBCSTD=@LIBCSTD@
+LIBCRUN=@LIBCRUN@
+
 #------------------------
 # Compiler Flags
 #------------------------
@@ -20,7 +23,7 @@
 if enable_tests
 SASL_LINK = @sasl_lib@ -lsasl2
 endif
-ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata
+ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata $(LIBCSTD) $(LIBCRUN)
 
 #------------------------
 # Build Products
@@ -28,6 +31,14 @@
 lib_LTLIBRARIES = libadminutil.la libadmsslutil.la
 pkgdata_DATA = root.res en.res en_US.res
 
+# this is just a dummy to make automake define
+# the CXXLINK macro
+if CXXLINK_REQUIRED
+noinst_PROGRAMS = dummy
+dummy_SOURCES = lib/dummy.cpp
+dummy_LINK = $(CXXLINK)
+endif
+
 if enable_tests
 check_PROGRAMS = retrieveSIE retrieveSIEssl psetread psetreadssl psetwrite
 TESTS = retrieveSIE retrieveSIEssl psetread psetreadssl psetwrite
@@ -114,6 +125,9 @@
 libadminutil_la_CPPFLAGS =  $(AM_CPPFLAGS) @nspr_inc@ @ldapsdk_inc@ @icu_inc@
 libadminutil_la_LIBADD =  $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
 libadminutil_la_LDFLAGS = -version-number $(subst .,:,$(PACKAGE_VERSION))
+if CXXLINK_REQUIRED
+libadminutil_la_LINK = $(CXXLINK)
+endif
 
 #------------------------
 # libadmsslutil
@@ -129,3 +143,6 @@
 libadmsslutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nspr_inc@ @ldapsdk_inc@ @icu_inc@
 libadmsslutil_la_LIBADD = libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
 libadmsslutil_la_LDFLAGS = -version-number $(subst .,:,$(PACKAGE_VERSION))
+if CXXLINK_REQUIRED
+libadmsslutil_la_LINK = $(CXXLINK)
+endif


Index: autogen.sh
===================================================================
RCS file: /cvs/dirsec/adminutil/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autogen.sh	30 Oct 2006 19:25:16 -0000	1.1
+++ autogen.sh	21 Jun 2007 21:28:00 -0000	1.2
@@ -33,6 +33,9 @@
 # Check automake version
 AM_VERSION=`automake --version | grep '^automake' | sed 's/.*) *//'`
 case $AM_VERSION in
+1.1*)
+    echo "Found automake version $AM_VERSION"
+    ;; # ok
 '' | 0.* | 1.[0-8]* | 1.9.[0-1]* )
     echo "You must have automake version 1.9.2 or later installed (found version $AM_VERSION)."
     exit 1


Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminutil/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configure.ac	25 May 2007 22:55:54 -0000	1.4
+++ configure.ac	21 Jun 2007 21:28:00 -0000	1.5
@@ -45,6 +45,7 @@
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([setrlimit endpwent ftruncate getcwd gethostbyname inet_ntoa localtime_r memmove memset mkdir munmap putenv rmdir socket strcasecmp strchr strcspn strdup strerror strncasecmp strpbrk strrchr strstr strtol tzset])
 
+CXXLINK_REQUIRED=0
 # Deal with platform dependent defines
 case $host in
   *-*-linux*)
@@ -62,6 +63,12 @@
   sparc-sun-solaris*)
     platform_defs="-DXP_UNIX"
     platform="solaris"
+dnl Cstd and Crun are required to link any C++ related code (ICU)
+    LIBCSTD=-lCstd
+    AC_SUBST([LIBCSTD], [$LIBCSTD])
+    LIBCRUN=-lCrun
+    AC_SUBST([LIBCRUN], [$LIBCRUN])
+    CXXLINK_REQUIRED=1
     ;;
   *)
     platform_defs=""
@@ -69,6 +76,7 @@
     ;;
 esac
 AC_SUBST([platform_defs])
+AM_CONDITIONAL(CXXLINK_REQUIRED,test "$CXXLINK_REQUIRED" = 1)
 
 AC_MSG_CHECKING(for --enable-debug)
 AC_ARG_ENABLE(debug,


Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/adminutil/aclocal.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aclocal.m4	25 May 2007 22:55:54 -0000	1.5
+++ aclocal.m4	21 Jun 2007 21:28:00 -0000	1.6
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# 2005, 2006  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.
@@ -11,6 +11,11 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_if(m4_PACKAGE_VERSION, [2.60],,
+[m4_fatal([this file was generated for autoconf 2.60.
+You have another version of autoconf.  If you want to use that,
+you should regenerate the build system entirely.], [63])])
+
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
 # serial 48 AC_PROG_LIBTOOL
@@ -1578,27 +1583,10 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-    if AC_TRY_EVAL(ac_compile); then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
-
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -4305,9 +4293,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$_LT_AC_TAGVAR(GCC, $1)
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -4441,11 +4426,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -4457,7 +4442,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -4537,7 +4522,7 @@
 link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -6373,7 +6358,6 @@
     done
   done
 done
-IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6406,11 +6390,10 @@
 done
 ])
 SED=$lt_cv_path_SED
-AC_SUBST([SED])
 AC_MSG_RESULT([$SED])
 ])
 
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -6420,14 +6403,29 @@
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+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.10], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -6484,14 +6482,14 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
 # 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 8
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -6500,8 +6498,10 @@
 [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])
-AC_SUBST([$1_FALSE])
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -6515,15 +6515,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 # 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 9
 
 # 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,
@@ -6551,6 +6550,7 @@
 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=])
 
@@ -6616,6 +6616,7 @@
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -6668,7 +6669,8 @@
   AMDEPBACKSLASH='\'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -6693,8 +6695,9 @@
   # 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.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -6741,8 +6744,8 @@
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -6765,16 +6768,20 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.60])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
 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
 AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
 fi
 
 # test whether we have cygpath
@@ -6794,6 +6801,9 @@
  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], 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
 
@@ -6829,6 +6839,10 @@
                   [_AM_DEPENDENCIES(CXX)],
                   [define([AC_PROG_CXX],
                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES(OBJC)],
+                  [define([AC_PROG_OBJC],
+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
 ])
 
@@ -6864,7 +6878,7 @@
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -6969,13 +6983,14 @@
 rm -f confinc confmf
 ])
 
-# Copyright (C) 1999, 2000, 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
+# 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 5
 
 # AM_PROG_CC_C_O
 # --------------
@@ -6983,6 +6998,7 @@
 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
 # there is no other way.
 set dummy $CC
@@ -6995,18 +7011,22 @@
    # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
    CC="$am_aux_dir/compile $CC"
 fi
+dnl Make sure AC_PROG_CC is never called again, or it will override our
+dnl setting of CC.
+m4_define([AC_PROG_CC],
+          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
 ])
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
 # 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 4
+# serial 5
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -7022,6 +7042,7 @@
 # If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
@@ -7032,7 +7053,7 @@
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -7040,60 +7061,23 @@
 
 # AM_PROG_MKDIR_P
 # ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
+# Check for `mkdir -p'.
 AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([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 -*-
 
@@ -7205,9 +7189,21 @@
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
+# Copyright (C) 2006  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.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
 # Check how to create a tarball.                            -*- Autoconf -*-
 
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.5 -r 1.6 configure
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminutil/configure,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configure	25 May 2007 22:55:54 -0000	1.5
+++ configure	21 Jun 2007 21:28:00 -0000	1.6
@@ -1,10 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for adminutil 1.1.1.
+# Generated by GNU Autoconf 2.60 for adminutil 1.1.1.
 #
 # Report bugs to <http://bugzilla.redhat.com/>.
 #
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -18,11 +19,35 @@
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
 DUALCASE=1; export DUALCASE # for MKS sh
 
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   as_unset=unset
@@ -31,8 +56,43 @@
 fi
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
 # Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
@@ -46,18 +106,19 @@
   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
-    $as_unset $as_var
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   fi
 done
 
 # Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
@@ -65,157 +126,386 @@
 
 
 # Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# CDPATH.
+$as_unset CDPATH
 
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+if test "x$CONFIG_SHELL" = x; then
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+
+  if test $as_have_required = yes && 	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
[...15838 lines suppressed...]
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
+  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
 
 
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
   # 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.
@@ -25052,20 +26696,32 @@
   # 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.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`(dirname "$mf") 2>/dev/null ||
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+    dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
 	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
   else
     continue
   fi
@@ -25087,53 +26743,79 @@
        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
     # Make sure the directory exists.
     test -f "$dirpart/$file" && continue
-    fdir=`(dirname "$file") 2>/dev/null ||
+    fdir=`$as_dirname -- "$file" ||
 $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$file" : 'X\(//\)[^/]' \| \
 	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    { if $as_mkdir_p; then
-    mkdir -p $dirpart/$fdir
-  else
-    as_dir=$dirpart/$fdir
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    { as_dir=$dirpart/$fdir
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
     as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
     done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
-
     # echo "creating $dirpart/$file"
     echo '# dummy' > "$dirpart/$file"
   done
 done
  ;;
+
   esac
-done
-_ACEOF
+done # for ac_tag
 
-cat >>$CONFIG_STATUS <<\_ACEOF
 
 { (exit 0); exit 0; }
 _ACEOF


Index: missing
===================================================================
RCS file: /cvs/dirsec/adminutil/missing,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- missing	25 May 2007 22:55:54 -0000	1.4
+++ missing	21 Jun 2007 21:28:00 -0000	1.5
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
 
@@ -33,6 +33,8 @@
 fi
 
 run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
@@ -44,7 +46,7 @@
 
 msg="missing on your system"
 
-case "$1" in
+case $1 in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
@@ -77,6 +79,7 @@
   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
@@ -106,7 +109,7 @@
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
 # the program).
-case "$1" in
+case $1 in
   lex|yacc)
     # Not GNU programs, they don't have --version.
     ;;
@@ -135,7 +138,7 @@
 
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case "$1" in
+case $1 in
   aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@@ -164,7 +167,7 @@
     test -z "$files" && files="config.h"
     touch_files=
     for f in $files; do
-      case "$f" in
+      case $f in
       *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
       *) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
          You can get \`$1' as part of \`Autoconf' from any GNU
          archive site."
 
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -f "$file"; then
 	touch $file
     else
@@ -214,25 +217,25 @@
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f y.tab.h ]; then
+    if test ! -f y.tab.h; then
 	echo >y.tab.h
     fi
-    if [ ! -f y.tab.c ]; then
+    if test ! -f y.tab.c; then
 	echo 'main() { return 0; }' >y.tab.c
     fi
     ;;
@@ -244,18 +247,18 @@
          in order for those modifications to take effect.  You can get
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f lex.yy.c ]; then
+    if test ! -f lex.yy.c; then
 	echo 'main() { return 0; }' >lex.yy.c
     fi
     ;;
@@ -267,11 +270,9 @@
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
 
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
 	touch $file
     else
 	test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
          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 's/.*-o \([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -z "$file"; then
       # ... or it is the one specified with @setfilename ...
       infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* \([^ ]*\) *$/\1/
+	  p
+	  q
+	}' $infile`
       # ... or it is derived from the source name (dir/f.texi becomes f.info)
       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
     fi
@@ -317,13 +324,13 @@
     fi
     firstarg="$1"
     if shift; then
-	case "$firstarg" in
+	case $firstarg in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
-	case "$firstarg" in
+	case $firstarg in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 0


Index: install-sh
===================================================================
RCS file: /cvs/dirsec/adminutil/install-sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- install-sh	25 May 2007 22:55:54 -0000	1.4
+++ install-sh	21 Jun 2007 21:28:00 -0000	1.5
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2005-05-14.22
+scriptversion=2006-10-14.15
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,15 +39,24 @@
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
 
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit="${DOITPROG-}"
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
 
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
 
 mvprog="${MVPROG-mv}"
 cpprog="${CPPROG-cp}"
@@ -58,7 +67,13 @@
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
 
-chmodcmd="$chmodprog 0755"
+posix_glob=
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chmodcmd=$chmodprog
 chowncmd=
 chgrpcmd=
 stripcmd=
@@ -95,7 +110,7 @@
   CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
 "
 
-while test -n "$1"; do
+while test $# -ne 0; do
   case $1 in
     -c) shift
         continue;;
@@ -111,9 +126,15 @@
 
     --help) echo "$usage"; exit $?;;
 
-    -m) chmodcmd="$chmodprog $2"
+    -m) mode=$2
         shift
         shift
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
         continue;;
 
     -o) chowncmd="$chownprog $2"
@@ -136,25 +157,33 @@
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
+    --)	shift
 	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
   esac
 done
 
-if test -z "$1"; then
+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dstarg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dstarg"
+      shift # fnord
+    fi
+    shift # arg
+    dstarg=$arg
+  done
+fi
+
+if test $# -eq 0; then
   if test -z "$dir_arg"; then
     echo "$0: no input file specified." >&2
     exit 1
@@ -164,6 +193,33 @@
   exit 0
 fi
 
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
 for src
 do
   # Protect names starting with `-'.
@@ -173,15 +229,11 @@
 
   if test -n "$dir_arg"; then
     dst=$src
-    src=
-
-    if test -d "$dst"; then
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
   else
+
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
     # might cause directories to be created, which would be especially bad
     # if $src (and thus $dsttmp) contains '*'.
@@ -208,53 +260,188 @@
 	echo "$0: $dstarg: Is a directory" >&2
 	exit 1
       fi
-      dst=$dst/`basename "$src"`
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
     fi
   fi
 
-  # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-
-  # Make sure that the destination directory exists.
+  obsolete_mkdir_used=false
 
-  # Skip lots of stat calls in the usual case.
-  if test ! -d "$dstdir"; then
-    defaultIFS='
-	 '
-    IFS="${IFS-$defaultIFS}"
-
-    oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
-    IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
-    IFS=$oIFS
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      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-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
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
 
-    pathcomp=
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
 
-    while test $# -ne 0 ; do
-      pathcomp=$pathcomp$1
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix=/ ;;
+	-*) prefix=./ ;;
+	*)  prefix= ;;
+      esac
+
+      case $posix_glob in
+        '')
+	  if (set -f) 2>/dev/null; then
+	    posix_glob=true
+	  else
+	    posix_glob=false
+	  fi ;;
+      esac
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob && set -f
+      set fnord $dstdir
       shift
-      if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp"
-	# mkdir can fail with a `File exist' error in case several
-	# install-sh are creating the directory concurrently.  This
-	# is OK.
-	test -d "$pathcomp" || exit
+      $posix_glob && set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
       fi
-      pathcomp=$pathcomp/
-    done
+    fi
   fi
 
   if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
   else
-    dstfile=`basename "$dst"`
 
     # Make a couple of temp file names in the proper directory.
     dsttmp=$dstdir/_inst.$$_
@@ -262,10 +449,9 @@
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
 
     # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -276,10 +462,10 @@
     { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
       && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
       && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+      && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
 
     # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
       || {
 	   # The rename failed, perhaps because mv can't rename something else
 	   # to itself, or perhaps because mv is so ancient that it does not
@@ -291,11 +477,12 @@
 	   # reasons.  In this case, the final cleanup might fail but the new
 	   # file should still install successfully.
 	   {
-	     if test -f "$dstdir/$dstfile"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	     if test -f "$dst"; then
+	       $doit $rmcmd -f "$dst" 2>/dev/null \
+	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
 	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 echo "$0: cannot unlink or rename $dst" >&2
 		 (exit 1); exit 1
 	       }
 	     else
@@ -304,16 +491,13 @@
 	   } &&
 
 	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	   $doit $mvcmd "$dsttmp" "$dst"
 	 }
-    }
-  fi || { (exit 1); exit 1; }
-done
+    } || exit 1
 
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit 0
-}
+    trap '' 0
+  fi
+done
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)


Index: depcomp
===================================================================
RCS file: /cvs/dirsec/adminutil/depcomp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- depcomp	25 May 2007 22:55:54 -0000	1.4
+++ depcomp	21 Jun 2007 21:28:00 -0000	1.5
@@ -1,9 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2005-07-09.11
+scriptversion=2006-10-15.18
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 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
@@ -91,7 +92,20 @@
 ## gcc 3 implements dependency tracking that does exactly what
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
   stat=$?
   if test $stat -eq 0; then :
   else
@@ -276,6 +290,46 @@
   rm -f "$tmpdepfile"
   ;;
 
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add `dependent.h:' lines.
+    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+  else
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
 tru64)
    # The Tru64 compiler uses -MD to generate dependencies as a side
    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -288,13 +342,13 @@
 
    if test "$libtool" = yes; then
       # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
+      # static library.  This mechanism is used in libtool 1.4 series to
       # handle both shared and static libraries in a single compilation.
       # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
       #
       # With libtool 1.5 this exception was removed, and libtool now
       # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # compilations output dependencies in $dir.libs/$base.o.d and
       # in $dir$base.o.d.  We have to check for both files, because
       # one of the two compilations can be disabled.  We should prefer
       # $dir$base.o.d over $dir.libs/$base.o.d because the latter is


Index: config.sub
===================================================================
RCS file: /cvs/dirsec/adminutil/config.sub,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config.sub	25 May 2007 22:55:54 -0000	1.4
+++ config.sub	21 Jun 2007 21:28:00 -0000	1.5
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2005-07-08'
+timestamp='2006-09-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -119,8 +120,9 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -171,6 +173,10 @@
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -187,6 +193,10 @@
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -231,7 +241,7 @@
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
@@ -239,7 +249,8 @@
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -257,28 +268,27 @@
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| ms1 \
+	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m32c)
-		basic_machine=$basic_machine-unknown
-		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -286,6 +296,9 @@
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -305,7 +318,7 @@
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
+	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
@@ -316,7 +329,7 @@
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -336,31 +349,30 @@
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| ms1-* \
+	| mt-* \
 	| msp430-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
-	m32c-*)
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -696,6 +708,9 @@
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -803,6 +818,12 @@
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -859,6 +880,10 @@
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -885,6 +910,10 @@
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -1101,7 +1130,7 @@
 	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1174,21 +1203,23 @@
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku*)
+	      | -skyos* | -haiku* | -rdos* | -toppers*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1340,6 +1371,12 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1349,9 +1386,9 @@
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20


Index: config.guess
===================================================================
RCS file: /cvs/dirsec/adminutil/config.guess,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config.guess	25 May 2007 22:55:54 -0000	1.4
+++ config.guess	21 Jun 2007 21:28:00 -0000	1.5
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2005-07-08'
+timestamp='2006-07-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -106,7 +107,7 @@
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -206,8 +207,11 @@
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -764,7 +768,14 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -779,8 +790,11 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+    x86:Interix*:[3456]*)
+	echo i586-pc-interix${UNAME_RELEASE}
+	exit ;;
+    EM64T:Interix*:[3456]*)
+	echo x86_64-unknown-interix${UNAME_RELEASE}
 	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -794,7 +808,7 @@
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit ;;
-    amd64:CYGWIN*:*:*)
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 	echo x86_64-unknown-cygwin
 	exit ;;
     p*:CYGWIN*:*)
@@ -817,6 +831,9 @@
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
 	exit ;;
@@ -851,7 +868,11 @@
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
@@ -870,9 +891,16 @@
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
 	exit ;;
@@ -916,6 +944,9 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
@@ -961,7 +992,7 @@
 	LIBC=gnulibc1
 	# endif
 	#else
-	#ifdef __INTEL_COMPILER
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -971,7 +1002,11 @@
 	LIBC=dietlibc
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
 	test x"${LIBC}" != x && {
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
@@ -1182,7 +1217,6 @@
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
-	    *86) UNAME_PROCESSOR=i686 ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1261,6 +1295,9 @@
     i*86:skyos:*:*)
 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
 	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2




Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminutil/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.in	25 May 2007 22:55:54 -0000	1.5
+++ Makefile.in	21 Jun 2007 21:28:00 -0000	1.6
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -15,15 +15,12 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -37,15 +34,19 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+ at CXXLINK_REQUIRED_TRUE@noinst_PROGRAMS = dummy$(EXEEXT)
 @enable_tests_TRUE at check_PROGRAMS = retrieveSIE$(EXEEXT) \
 @enable_tests_TRUE@	retrieveSIEssl$(EXEEXT) psetread$(EXEEXT) \
 @enable_tests_TRUE@	psetreadssl$(EXEEXT) psetwrite$(EXEEXT)
+ at enable_tests_TRUE@TESTS = retrieveSIE$(EXEEXT) \
+ at enable_tests_TRUE@	retrieveSIEssl$(EXEEXT) psetread$(EXEEXT) \
+ at enable_tests_TRUE@	psetreadssl$(EXEEXT) psetwrite$(EXEEXT)
+subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/adminutil.pc.in \
 	$(top_srcdir)/configure \
 	$(top_srcdir)/lib/libadminutil/genrb_wrapper.in NEWS compile \
 	config.guess config.sub depcomp install-sh ltmain.sh missing
-subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/nspr.m4 $(top_srcdir)/m4/nss.m4 \
 	$(top_srcdir)/m4/mozldap.m4 $(top_srcdir)/m4/sasl.m4 \
@@ -54,7 +55,7 @@
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES = adminutil.pc lib/libadminutil/genrb_wrapper
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -69,9 +70,10 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 libadminutil_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
 am__dirstamp = $(am__leading_dot)dirstamp
 am_libadminutil_la_OBJECTS =  \
 	lib/libadminutil/libadminutil_la-acclanglist.lo \
@@ -87,7 +89,7 @@
 libadminutil_la_OBJECTS = $(am_libadminutil_la_OBJECTS)
 libadmsslutil_la_DEPENDENCIES = libadminutil.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
 am_libadmsslutil_la_OBJECTS =  \
 	lib/libadmsslutil/libadmsslutil_la-admsslutil.lo \
 	lib/libadmsslutil/libadmsslutil_la-certmgt.lo \
@@ -97,53 +99,69 @@
 	lib/libadmsslutil/libadmsslutil_la-sslerror.lo \
 	lib/libadmsslutil/libadmsslutil_la-uginfossl.lo
 libadmsslutil_la_OBJECTS = $(am_libadmsslutil_la_OBJECTS)
+PROGRAMS = $(noinst_PROGRAMS)
+am__dummy_SOURCES_DIST = lib/dummy.cpp
+ at CXXLINK_REQUIRED_TRUE@am_dummy_OBJECTS = lib/dummy.$(OBJEXT)
+dummy_OBJECTS = $(am_dummy_OBJECTS)
+dummy_LDADD = $(LDADD)
 am__psetread_SOURCES_DIST = tests/psetread.c
 @enable_tests_TRUE at am_psetread_OBJECTS =  \
 @enable_tests_TRUE@	tests/psetread-psetread.$(OBJEXT)
 psetread_OBJECTS = $(am_psetread_OBJECTS)
- at enable_tests_TRUE@am__DEPENDENCIES_2 = libadmsslutil.la \
+ at enable_tests_TRUE@am__DEPENDENCIES_3 = libadmsslutil.la \
 @enable_tests_TRUE@	libadminutil.la $(am__DEPENDENCIES_1) \
 @enable_tests_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- at enable_tests_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- at enable_tests_TRUE@psetread_DEPENDENCIES = $(am__DEPENDENCIES_2)
+ at enable_tests_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+ at enable_tests_TRUE@psetread_DEPENDENCIES = $(am__DEPENDENCIES_3)
 am__psetreadssl_SOURCES_DIST = tests/psetreadssl.c
 @enable_tests_TRUE at am_psetreadssl_OBJECTS =  \
 @enable_tests_TRUE@	tests/psetreadssl-psetreadssl.$(OBJEXT)
 psetreadssl_OBJECTS = $(am_psetreadssl_OBJECTS)
- at enable_tests_TRUE@psetreadssl_DEPENDENCIES = $(am__DEPENDENCIES_2)
+ at enable_tests_TRUE@psetreadssl_DEPENDENCIES = $(am__DEPENDENCIES_3)
 am__psetwrite_SOURCES_DIST = tests/psetwrite.c
 @enable_tests_TRUE at am_psetwrite_OBJECTS =  \
 @enable_tests_TRUE@	tests/psetwrite-psetwrite.$(OBJEXT)
 psetwrite_OBJECTS = $(am_psetwrite_OBJECTS)
- at enable_tests_TRUE@psetwrite_DEPENDENCIES = $(am__DEPENDENCIES_2)
+ at enable_tests_TRUE@psetwrite_DEPENDENCIES = $(am__DEPENDENCIES_3)
 am__retrieveSIE_SOURCES_DIST = tests/retrieveSIE.c
 @enable_tests_TRUE at am_retrieveSIE_OBJECTS =  \
 @enable_tests_TRUE@	tests/retrieveSIE-retrieveSIE.$(OBJEXT)
 retrieveSIE_OBJECTS = $(am_retrieveSIE_OBJECTS)
- at enable_tests_TRUE@retrieveSIE_DEPENDENCIES = $(am__DEPENDENCIES_2)
+ at enable_tests_TRUE@retrieveSIE_DEPENDENCIES = $(am__DEPENDENCIES_3)
 am__retrieveSIEssl_SOURCES_DIST = tests/retrieveSIEssl.c
 @enable_tests_TRUE at am_retrieveSIEssl_OBJECTS = tests/retrieveSIEssl-retrieveSIEssl.$(OBJEXT)
 retrieveSIEssl_OBJECTS = $(am_retrieveSIEssl_OBJECTS)
 @enable_tests_TRUE at retrieveSIEssl_DEPENDENCIES =  \
- at enable_tests_TRUE@	$(am__DEPENDENCIES_2)
-DEFAULT_INCLUDES = -I. -I$(srcdir)
+ at enable_tests_TRUE@	$(am__DEPENDENCIES_3)
+DEFAULT_INCLUDES = -I. at am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libadminutil_la_SOURCES) $(libadmsslutil_la_SOURCES) \
-	$(psetread_SOURCES) $(psetreadssl_SOURCES) \
+	$(dummy_SOURCES) $(psetread_SOURCES) $(psetreadssl_SOURCES) \
 	$(psetwrite_SOURCES) $(retrieveSIE_SOURCES) \
 	$(retrieveSIEssl_SOURCES)
 DIST_SOURCES = $(libadminutil_la_SOURCES) $(libadmsslutil_la_SOURCES) \
-	$(am__psetread_SOURCES_DIST) $(am__psetreadssl_SOURCES_DIST) \
-	$(am__psetwrite_SOURCES_DIST) $(am__retrieveSIE_SOURCES_DIST) \
+	$(am__dummy_SOURCES_DIST) $(am__psetread_SOURCES_DIST) \
+	$(am__psetreadssl_SOURCES_DIST) $(am__psetwrite_SOURCES_DIST) \
+	$(am__retrieveSIE_SOURCES_DIST) \
 	$(am__retrieveSIEssl_SOURCES_DIST)
 adminincDATA_INSTALL = $(INSTALL_DATA)
 admsslincDATA_INSTALL = $(INSTALL_DATA)
@@ -165,8 +183,6 @@
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -193,21 +209,24 @@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+GREP = @GREP@
 ICU_CONFIG = @ICU_CONFIG@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
+LIBCRUN = @LIBCRUN@
+LIBCSTD = @LIBCSTD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -218,23 +237,17 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
-SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WINNT_FALSE = @WINNT_FALSE@
-WINNT_TRUE = @WINNT_TRUE@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -246,16 +259,19 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 debug_defs = @debug_defs@
-enable_tests_FALSE = @enable_tests_FALSE@
-enable_tests_TRUE = @enable_tests_TRUE@
+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@
 icu_bin = @icu_bin@
 icu_inc = @icu_inc@
 icu_lib = @icu_lib@
@@ -268,6 +284,7 @@
 ldapsdk_libdir = @ldapsdk_libdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
@@ -278,15 +295,20 @@
 nss_lib = @nss_lib@
 nss_libdir = @nss_libdir@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 platform_defs = @platform_defs@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sasl_inc = @sasl_inc@
 sasl_lib = @sasl_lib@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 # look for included m4 files in the ./m4/ directory
 ACLOCAL_AMFLAGS = -I m4
@@ -308,14 +330,15 @@
 NSS_LINK = @nss_lib@ -lssl3 -lnss3 -lsoftokn3
 LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lldap60 -lprldap60 -lldif60
 @enable_tests_TRUE at SASL_LINK = @sasl_lib@ -lsasl2
-ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata
+ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata $(LIBCSTD) $(LIBCRUN)
 
 #------------------------
 # Build Products
 #------------------------
 lib_LTLIBRARIES = libadminutil.la libadmsslutil.la
 pkgdata_DATA = root.res en.res en_US.res
- at enable_tests_TRUE@TESTS = retrieveSIE retrieveSIEssl psetread psetreadssl psetwrite
+ at CXXLINK_REQUIRED_TRUE@dummy_SOURCES = lib/dummy.cpp
+ at CXXLINK_REQUIRED_TRUE@dummy_LINK = $(CXXLINK)
 @enable_tests_TRUE at TEST_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include @nspr_inc@ @ldapsdk_inc@ @icu_inc@
 @enable_tests_TRUE at TEST_LDADD = libadmsslutil.la libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
 @enable_tests_TRUE at retrieveSIE_SOURCES = tests/retrieveSIE.c
@@ -379,6 +402,7 @@
 libadminutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nspr_inc@ @ldapsdk_inc@ @icu_inc@
 libadminutil_la_LIBADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
 libadminutil_la_LDFLAGS = -version-number $(subst .,:,$(PACKAGE_VERSION))
+ at CXXLINK_REQUIRED_TRUE@libadminutil_la_LINK = $(CXXLINK)
 
 #------------------------
 # libadmsslutil
@@ -394,10 +418,11 @@
 libadmsslutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nspr_inc@ @ldapsdk_inc@ @icu_inc@
 libadmsslutil_la_LIBADD = libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
 libadmsslutil_la_LDFLAGS = -version-number $(subst .,:,$(PACKAGE_VERSION))
+ at CXXLINK_REQUIRED_TRUE@libadmsslutil_la_LINK = $(CXXLINK)
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .cpp .lo .o .obj
 am--refresh:
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -437,7 +462,7 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -448,7 +473,7 @@
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
@@ -463,10 +488,10 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 lib/libadminutil/$(am__dirstamp):
-	@$(mkdir_p) lib/libadminutil
+	@$(MKDIR_P) lib/libadminutil
 	@: > lib/libadminutil/$(am__dirstamp)
 lib/libadminutil/$(DEPDIR)/$(am__dirstamp):
-	@$(mkdir_p) lib/libadminutil/$(DEPDIR)
+	@$(MKDIR_P) lib/libadminutil/$(DEPDIR)
 	@: > lib/libadminutil/$(DEPDIR)/$(am__dirstamp)
 lib/libadminutil/libadminutil_la-acclanglist.lo:  \
 	lib/libadminutil/$(am__dirstamp) \
@@ -499,12 +524,12 @@
 	lib/libadminutil/$(am__dirstamp) \
 	lib/libadminutil/$(DEPDIR)/$(am__dirstamp)
 libadminutil.la: $(libadminutil_la_OBJECTS) $(libadminutil_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libadminutil_la_LDFLAGS) $(libadminutil_la_OBJECTS) $(libadminutil_la_LIBADD) $(LIBS)
+	$(libadminutil_la_LINK) -rpath $(libdir) $(libadminutil_la_OBJECTS) $(libadminutil_la_LIBADD) $(LIBS)
 lib/libadmsslutil/$(am__dirstamp):
-	@$(mkdir_p) lib/libadmsslutil
+	@$(MKDIR_P) lib/libadmsslutil
 	@: > lib/libadmsslutil/$(am__dirstamp)
 lib/libadmsslutil/$(DEPDIR)/$(am__dirstamp):
-	@$(mkdir_p) lib/libadmsslutil/$(DEPDIR)
+	@$(MKDIR_P) lib/libadmsslutil/$(DEPDIR)
 	@: > lib/libadmsslutil/$(DEPDIR)/$(am__dirstamp)
 lib/libadmsslutil/libadmsslutil_la-admsslutil.lo:  \
 	lib/libadmsslutil/$(am__dirstamp) \
@@ -528,7 +553,7 @@
 	lib/libadmsslutil/$(am__dirstamp) \
 	lib/libadmsslutil/$(DEPDIR)/$(am__dirstamp)
 libadmsslutil.la: $(libadmsslutil_la_OBJECTS) $(libadmsslutil_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libadmsslutil_la_LDFLAGS) $(libadmsslutil_la_OBJECTS) $(libadmsslutil_la_LIBADD) $(LIBS)
+	$(libadmsslutil_la_LINK) -rpath $(libdir) $(libadmsslutil_la_OBJECTS) $(libadmsslutil_la_LIBADD) $(LIBS)
 
 clean-checkPROGRAMS:
 	@list='$(check_PROGRAMS)'; for p in $$list; do \
@@ -536,40 +561,58 @@
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+lib/$(am__dirstamp):
+	@$(MKDIR_P) lib
+	@: > lib/$(am__dirstamp)
+lib/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) lib/$(DEPDIR)
+	@: > lib/$(DEPDIR)/$(am__dirstamp)
+lib/dummy.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp)
+dummy$(EXEEXT): $(dummy_OBJECTS) $(dummy_DEPENDENCIES) 
+	@rm -f dummy$(EXEEXT)
+	$(dummy_LINK) $(dummy_OBJECTS) $(dummy_LDADD) $(LIBS)
 tests/$(am__dirstamp):
-	@$(mkdir_p) tests
+	@$(MKDIR_P) tests
 	@: > tests/$(am__dirstamp)
 tests/$(DEPDIR)/$(am__dirstamp):
-	@$(mkdir_p) tests/$(DEPDIR)
+	@$(MKDIR_P) tests/$(DEPDIR)
 	@: > tests/$(DEPDIR)/$(am__dirstamp)
 tests/psetread-psetread.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
 psetread$(EXEEXT): $(psetread_OBJECTS) $(psetread_DEPENDENCIES) 
 	@rm -f psetread$(EXEEXT)
-	$(LINK) $(psetread_LDFLAGS) $(psetread_OBJECTS) $(psetread_LDADD) $(LIBS)
+	$(LINK) $(psetread_OBJECTS) $(psetread_LDADD) $(LIBS)
 tests/psetreadssl-psetreadssl.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
 psetreadssl$(EXEEXT): $(psetreadssl_OBJECTS) $(psetreadssl_DEPENDENCIES) 
 	@rm -f psetreadssl$(EXEEXT)
-	$(LINK) $(psetreadssl_LDFLAGS) $(psetreadssl_OBJECTS) $(psetreadssl_LDADD) $(LIBS)
+	$(LINK) $(psetreadssl_OBJECTS) $(psetreadssl_LDADD) $(LIBS)
 tests/psetwrite-psetwrite.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
 psetwrite$(EXEEXT): $(psetwrite_OBJECTS) $(psetwrite_DEPENDENCIES) 
 	@rm -f psetwrite$(EXEEXT)
-	$(LINK) $(psetwrite_LDFLAGS) $(psetwrite_OBJECTS) $(psetwrite_LDADD) $(LIBS)
+	$(LINK) $(psetwrite_OBJECTS) $(psetwrite_LDADD) $(LIBS)
 tests/retrieveSIE-retrieveSIE.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
 retrieveSIE$(EXEEXT): $(retrieveSIE_OBJECTS) $(retrieveSIE_DEPENDENCIES) 
 	@rm -f retrieveSIE$(EXEEXT)
-	$(LINK) $(retrieveSIE_LDFLAGS) $(retrieveSIE_OBJECTS) $(retrieveSIE_LDADD) $(LIBS)
+	$(LINK) $(retrieveSIE_OBJECTS) $(retrieveSIE_LDADD) $(LIBS)
 tests/retrieveSIEssl-retrieveSIEssl.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
 retrieveSIEssl$(EXEEXT): $(retrieveSIEssl_OBJECTS) $(retrieveSIEssl_DEPENDENCIES) 
 	@rm -f retrieveSIEssl$(EXEEXT)
-	$(LINK) $(retrieveSIEssl_LDFLAGS) $(retrieveSIEssl_OBJECTS) $(retrieveSIEssl_LDADD) $(LIBS)
+	$(LINK) $(retrieveSIEssl_OBJECTS) $(retrieveSIEssl_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
+	-rm -f lib/dummy.$(OBJEXT)
 	-rm -f lib/libadminutil/libadminutil_la-acclanglist.$(OBJEXT)
 	-rm -f lib/libadminutil/libadminutil_la-acclanglist.lo
 	-rm -f lib/libadminutil/libadminutil_la-admutil.$(OBJEXT)
@@ -613,6 +656,7 @@
 distclean-compile:
 	-rm -f *.tab.c
 
+ at AMDEP_TRUE@@am__include@ @am__quote at lib/$(DEPDIR)/dummy.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at lib/libadminutil/$(DEPDIR)/libadminutil_la-acclanglist.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at lib/libadminutil/$(DEPDIR)/libadminutil_la-admutil.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at lib/libadminutil/$(DEPDIR)/libadminutil_la-distadm.Plo at am__quote@
@@ -637,218 +681,242 @@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/retrieveSIEssl-retrieveSIEssl.Po at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
- at am__fastdepCC_TRUE@	then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	mv -f $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- at am__fastdepCC_TRUE@	then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	mv -f $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
- at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
- at am__fastdepCC_TRUE@	then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	mv -f $$depbase.Tpo $$depbase.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 lib/libadminutil/libadminutil_la-acclanglist.lo: lib/libadminutil/acclanglist.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadminutil/libadminutil_la-acclanglist.lo -MD -MP -MF "lib/libadminutil/$(DEPDIR)/libadminutil_la-acclanglist.Tpo" -c -o lib/libadminutil/libadminutil_la-acclanglist.lo `test -f 'lib/libadminutil/acclanglist.c' || echo '$(srcdir)/'`lib/libadminutil/acclanglist.c; \
- at am__fastdepCC_TRUE@	then mv -f "lib/libadminutil/$(DEPDIR)/libadminutil_la-acclanglist.Tpo" "lib/libadminutil/$(DEPDIR)/libadminutil_la-acclanglist.Plo"; else rm -f "lib/libadminutil/$(DEPDIR)/libadminutil_la-acclanglist.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadminutil/libadminutil_la-acclanglist.lo -MD -MP -MF lib/libadminutil/$(DEPDIR)/libadminutil_la-acclanglist.Tpo -c -o lib/libadminutil/libadminutil_la-acclanglist.lo `test -f 'lib/libadminutil/acclanglist.c' || echo '$(srcdir)/'`lib/libadminutil/acclanglist.c
+ at am__fastdepCC_TRUE@	mv -f lib/libadminutil/$(DEPDIR)/libadminutil_la-acclanglist.Tpo lib/libadminutil/$(DEPDIR)/libadminutil_la-acclanglist.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib/libadminutil/acclanglist.c' object='lib/libadminutil/libadminutil_la-acclanglist.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadminutil/libadminutil_la-acclanglist.lo `test -f 'lib/libadminutil/acclanglist.c' || echo '$(srcdir)/'`lib/libadminutil/acclanglist.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadminutil/libadminutil_la-acclanglist.lo `test -f 'lib/libadminutil/acclanglist.c' || echo '$(srcdir)/'`lib/libadminutil/acclanglist.c
 
 lib/libadminutil/libadminutil_la-admutil.lo: lib/libadminutil/admutil.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadminutil/libadminutil_la-admutil.lo -MD -MP -MF "lib/libadminutil/$(DEPDIR)/libadminutil_la-admutil.Tpo" -c -o lib/libadminutil/libadminutil_la-admutil.lo `test -f 'lib/libadminutil/admutil.c' || echo '$(srcdir)/'`lib/libadminutil/admutil.c; \
- at am__fastdepCC_TRUE@	then mv -f "lib/libadminutil/$(DEPDIR)/libadminutil_la-admutil.Tpo" "lib/libadminutil/$(DEPDIR)/libadminutil_la-admutil.Plo"; else rm -f "lib/libadminutil/$(DEPDIR)/libadminutil_la-admutil.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadminutil/libadminutil_la-admutil.lo -MD -MP -MF lib/libadminutil/$(DEPDIR)/libadminutil_la-admutil.Tpo -c -o lib/libadminutil/libadminutil_la-admutil.lo `test -f 'lib/libadminutil/admutil.c' || echo '$(srcdir)/'`lib/libadminutil/admutil.c
+ at am__fastdepCC_TRUE@	mv -f lib/libadminutil/$(DEPDIR)/libadminutil_la-admutil.Tpo lib/libadminutil/$(DEPDIR)/libadminutil_la-admutil.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib/libadminutil/admutil.c' object='lib/libadminutil/libadminutil_la-admutil.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadminutil/libadminutil_la-admutil.lo `test -f 'lib/libadminutil/admutil.c' || echo '$(srcdir)/'`lib/libadminutil/admutil.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadminutil/libadminutil_la-admutil.lo `test -f 'lib/libadminutil/admutil.c' || echo '$(srcdir)/'`lib/libadminutil/admutil.c
 
 lib/libadminutil/libadminutil_la-distadm.lo: lib/libadminutil/distadm.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadminutil/libadminutil_la-distadm.lo -MD -MP -MF "lib/libadminutil/$(DEPDIR)/libadminutil_la-distadm.Tpo" -c -o lib/libadminutil/libadminutil_la-distadm.lo `test -f 'lib/libadminutil/distadm.c' || echo '$(srcdir)/'`lib/libadminutil/distadm.c; \
- at am__fastdepCC_TRUE@	then mv -f "lib/libadminutil/$(DEPDIR)/libadminutil_la-distadm.Tpo" "lib/libadminutil/$(DEPDIR)/libadminutil_la-distadm.Plo"; else rm -f "lib/libadminutil/$(DEPDIR)/libadminutil_la-distadm.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadminutil/libadminutil_la-distadm.lo -MD -MP -MF lib/libadminutil/$(DEPDIR)/libadminutil_la-distadm.Tpo -c -o lib/libadminutil/libadminutil_la-distadm.lo `test -f 'lib/libadminutil/distadm.c' || echo '$(srcdir)/'`lib/libadminutil/distadm.c
+ at am__fastdepCC_TRUE@	mv -f lib/libadminutil/$(DEPDIR)/libadminutil_la-distadm.Tpo lib/libadminutil/$(DEPDIR)/libadminutil_la-distadm.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib/libadminutil/distadm.c' object='lib/libadminutil/libadminutil_la-distadm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadminutil/libadminutil_la-distadm.lo `test -f 'lib/libadminutil/distadm.c' || echo '$(srcdir)/'`lib/libadminutil/distadm.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadminutil/libadminutil_la-distadm.lo `test -f 'lib/libadminutil/distadm.c' || echo '$(srcdir)/'`lib/libadminutil/distadm.c
 
 lib/libadminutil/libadminutil_la-errRpt.lo: lib/libadminutil/errRpt.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadminutil/libadminutil_la-errRpt.lo -MD -MP -MF "lib/libadminutil/$(DEPDIR)/libadminutil_la-errRpt.Tpo" -c -o lib/libadminutil/libadminutil_la-errRpt.lo `test -f 'lib/libadminutil/errRpt.c' || echo '$(srcdir)/'`lib/libadminutil/errRpt.c; \
- at am__fastdepCC_TRUE@	then mv -f "lib/libadminutil/$(DEPDIR)/libadminutil_la-errRpt.Tpo" "lib/libadminutil/$(DEPDIR)/libadminutil_la-errRpt.Plo"; else rm -f "lib/libadminutil/$(DEPDIR)/libadminutil_la-errRpt.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadminutil/libadminutil_la-errRpt.lo -MD -MP -MF lib/libadminutil/$(DEPDIR)/libadminutil_la-errRpt.Tpo -c -o lib/libadminutil/libadminutil_la-errRpt.lo `test -f 'lib/libadminutil/errRpt.c' || echo '$(srcdir)/'`lib/libadminutil/errRpt.c
+ at am__fastdepCC_TRUE@	mv -f lib/libadminutil/$(DEPDIR)/libadminutil_la-errRpt.Tpo lib/libadminutil/$(DEPDIR)/libadminutil_la-errRpt.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib/libadminutil/errRpt.c' object='lib/libadminutil/libadminutil_la-errRpt.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadminutil/libadminutil_la-errRpt.lo `test -f 'lib/libadminutil/errRpt.c' || echo '$(srcdir)/'`lib/libadminutil/errRpt.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadminutil/libadminutil_la-errRpt.lo `test -f 'lib/libadminutil/errRpt.c' || echo '$(srcdir)/'`lib/libadminutil/errRpt.c
 
 lib/libadminutil/libadminutil_la-form_post.lo: lib/libadminutil/form_post.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadminutil/libadminutil_la-form_post.lo -MD -MP -MF "lib/libadminutil/$(DEPDIR)/libadminutil_la-form_post.Tpo" -c -o lib/libadminutil/libadminutil_la-form_post.lo `test -f 'lib/libadminutil/form_post.c' || echo '$(srcdir)/'`lib/libadminutil/form_post.c; \
- at am__fastdepCC_TRUE@	then mv -f "lib/libadminutil/$(DEPDIR)/libadminutil_la-form_post.Tpo" "lib/libadminutil/$(DEPDIR)/libadminutil_la-form_post.Plo"; else rm -f "lib/libadminutil/$(DEPDIR)/libadminutil_la-form_post.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadminutil/libadminutil_la-form_post.lo -MD -MP -MF lib/libadminutil/$(DEPDIR)/libadminutil_la-form_post.Tpo -c -o lib/libadminutil/libadminutil_la-form_post.lo `test -f 'lib/libadminutil/form_post.c' || echo '$(srcdir)/'`lib/libadminutil/form_post.c
+ at am__fastdepCC_TRUE@	mv -f lib/libadminutil/$(DEPDIR)/libadminutil_la-form_post.Tpo lib/libadminutil/$(DEPDIR)/libadminutil_la-form_post.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib/libadminutil/form_post.c' object='lib/libadminutil/libadminutil_la-form_post.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadminutil/libadminutil_la-form_post.lo `test -f 'lib/libadminutil/form_post.c' || echo '$(srcdir)/'`lib/libadminutil/form_post.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadminutil/libadminutil_la-form_post.lo `test -f 'lib/libadminutil/form_post.c' || echo '$(srcdir)/'`lib/libadminutil/form_post.c
 
 lib/libadminutil/libadminutil_la-psetc.lo: lib/libadminutil/psetc.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadminutil/libadminutil_la-psetc.lo -MD -MP -MF "lib/libadminutil/$(DEPDIR)/libadminutil_la-psetc.Tpo" -c -o lib/libadminutil/libadminutil_la-psetc.lo `test -f 'lib/libadminutil/psetc.c' || echo '$(srcdir)/'`lib/libadminutil/psetc.c; \
- at am__fastdepCC_TRUE@	then mv -f "lib/libadminutil/$(DEPDIR)/libadminutil_la-psetc.Tpo" "lib/libadminutil/$(DEPDIR)/libadminutil_la-psetc.Plo"; else rm -f "lib/libadminutil/$(DEPDIR)/libadminutil_la-psetc.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadminutil/libadminutil_la-psetc.lo -MD -MP -MF lib/libadminutil/$(DEPDIR)/libadminutil_la-psetc.Tpo -c -o lib/libadminutil/libadminutil_la-psetc.lo `test -f 'lib/libadminutil/psetc.c' || echo '$(srcdir)/'`lib/libadminutil/psetc.c
+ at am__fastdepCC_TRUE@	mv -f lib/libadminutil/$(DEPDIR)/libadminutil_la-psetc.Tpo lib/libadminutil/$(DEPDIR)/libadminutil_la-psetc.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib/libadminutil/psetc.c' object='lib/libadminutil/libadminutil_la-psetc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadminutil/libadminutil_la-psetc.lo `test -f 'lib/libadminutil/psetc.c' || echo '$(srcdir)/'`lib/libadminutil/psetc.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadminutil/libadminutil_la-psetc.lo `test -f 'lib/libadminutil/psetc.c' || echo '$(srcdir)/'`lib/libadminutil/psetc.c
 
 lib/libadminutil/libadminutil_la-resource.lo: lib/libadminutil/resource.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadminutil/libadminutil_la-resource.lo -MD -MP -MF "lib/libadminutil/$(DEPDIR)/libadminutil_la-resource.Tpo" -c -o lib/libadminutil/libadminutil_la-resource.lo `test -f 'lib/libadminutil/resource.c' || echo '$(srcdir)/'`lib/libadminutil/resource.c; \
- at am__fastdepCC_TRUE@	then mv -f "lib/libadminutil/$(DEPDIR)/libadminutil_la-resource.Tpo" "lib/libadminutil/$(DEPDIR)/libadminutil_la-resource.Plo"; else rm -f "lib/libadminutil/$(DEPDIR)/libadminutil_la-resource.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadminutil/libadminutil_la-resource.lo -MD -MP -MF lib/libadminutil/$(DEPDIR)/libadminutil_la-resource.Tpo -c -o lib/libadminutil/libadminutil_la-resource.lo `test -f 'lib/libadminutil/resource.c' || echo '$(srcdir)/'`lib/libadminutil/resource.c
+ at am__fastdepCC_TRUE@	mv -f lib/libadminutil/$(DEPDIR)/libadminutil_la-resource.Tpo lib/libadminutil/$(DEPDIR)/libadminutil_la-resource.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib/libadminutil/resource.c' object='lib/libadminutil/libadminutil_la-resource.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadminutil/libadminutil_la-resource.lo `test -f 'lib/libadminutil/resource.c' || echo '$(srcdir)/'`lib/libadminutil/resource.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadminutil/libadminutil_la-resource.lo `test -f 'lib/libadminutil/resource.c' || echo '$(srcdir)/'`lib/libadminutil/resource.c
 
 lib/libadminutil/libadminutil_la-srvutil.lo: lib/libadminutil/srvutil.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadminutil/libadminutil_la-srvutil.lo -MD -MP -MF "lib/libadminutil/$(DEPDIR)/libadminutil_la-srvutil.Tpo" -c -o lib/libadminutil/libadminutil_la-srvutil.lo `test -f 'lib/libadminutil/srvutil.c' || echo '$(srcdir)/'`lib/libadminutil/srvutil.c; \
- at am__fastdepCC_TRUE@	then mv -f "lib/libadminutil/$(DEPDIR)/libadminutil_la-srvutil.Tpo" "lib/libadminutil/$(DEPDIR)/libadminutil_la-srvutil.Plo"; else rm -f "lib/libadminutil/$(DEPDIR)/libadminutil_la-srvutil.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadminutil/libadminutil_la-srvutil.lo -MD -MP -MF lib/libadminutil/$(DEPDIR)/libadminutil_la-srvutil.Tpo -c -o lib/libadminutil/libadminutil_la-srvutil.lo `test -f 'lib/libadminutil/srvutil.c' || echo '$(srcdir)/'`lib/libadminutil/srvutil.c
+ at am__fastdepCC_TRUE@	mv -f lib/libadminutil/$(DEPDIR)/libadminutil_la-srvutil.Tpo lib/libadminutil/$(DEPDIR)/libadminutil_la-srvutil.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib/libadminutil/srvutil.c' object='lib/libadminutil/libadminutil_la-srvutil.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadminutil/libadminutil_la-srvutil.lo `test -f 'lib/libadminutil/srvutil.c' || echo '$(srcdir)/'`lib/libadminutil/srvutil.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadminutil/libadminutil_la-srvutil.lo `test -f 'lib/libadminutil/srvutil.c' || echo '$(srcdir)/'`lib/libadminutil/srvutil.c
 
 lib/libadminutil/libadminutil_la-strlist.lo: lib/libadminutil/strlist.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadminutil/libadminutil_la-strlist.lo -MD -MP -MF "lib/libadminutil/$(DEPDIR)/libadminutil_la-strlist.Tpo" -c -o lib/libadminutil/libadminutil_la-strlist.lo `test -f 'lib/libadminutil/strlist.c' || echo '$(srcdir)/'`lib/libadminutil/strlist.c; \
- at am__fastdepCC_TRUE@	then mv -f "lib/libadminutil/$(DEPDIR)/libadminutil_la-strlist.Tpo" "lib/libadminutil/$(DEPDIR)/libadminutil_la-strlist.Plo"; else rm -f "lib/libadminutil/$(DEPDIR)/libadminutil_la-strlist.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadminutil/libadminutil_la-strlist.lo -MD -MP -MF lib/libadminutil/$(DEPDIR)/libadminutil_la-strlist.Tpo -c -o lib/libadminutil/libadminutil_la-strlist.lo `test -f 'lib/libadminutil/strlist.c' || echo '$(srcdir)/'`lib/libadminutil/strlist.c
+ at am__fastdepCC_TRUE@	mv -f lib/libadminutil/$(DEPDIR)/libadminutil_la-strlist.Tpo lib/libadminutil/$(DEPDIR)/libadminutil_la-strlist.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib/libadminutil/strlist.c' object='lib/libadminutil/libadminutil_la-strlist.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadminutil/libadminutil_la-strlist.lo `test -f 'lib/libadminutil/strlist.c' || echo '$(srcdir)/'`lib/libadminutil/strlist.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadminutil/libadminutil_la-strlist.lo `test -f 'lib/libadminutil/strlist.c' || echo '$(srcdir)/'`lib/libadminutil/strlist.c
 
 lib/libadminutil/libadminutil_la-uginfo.lo: lib/libadminutil/uginfo.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadminutil/libadminutil_la-uginfo.lo -MD -MP -MF "lib/libadminutil/$(DEPDIR)/libadminutil_la-uginfo.Tpo" -c -o lib/libadminutil/libadminutil_la-uginfo.lo `test -f 'lib/libadminutil/uginfo.c' || echo '$(srcdir)/'`lib/libadminutil/uginfo.c; \
- at am__fastdepCC_TRUE@	then mv -f "lib/libadminutil/$(DEPDIR)/libadminutil_la-uginfo.Tpo" "lib/libadminutil/$(DEPDIR)/libadminutil_la-uginfo.Plo"; else rm -f "lib/libadminutil/$(DEPDIR)/libadminutil_la-uginfo.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadminutil/libadminutil_la-uginfo.lo -MD -MP -MF lib/libadminutil/$(DEPDIR)/libadminutil_la-uginfo.Tpo -c -o lib/libadminutil/libadminutil_la-uginfo.lo `test -f 'lib/libadminutil/uginfo.c' || echo '$(srcdir)/'`lib/libadminutil/uginfo.c
+ at am__fastdepCC_TRUE@	mv -f lib/libadminutil/$(DEPDIR)/libadminutil_la-uginfo.Tpo lib/libadminutil/$(DEPDIR)/libadminutil_la-uginfo.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib/libadminutil/uginfo.c' object='lib/libadminutil/libadminutil_la-uginfo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadminutil/libadminutil_la-uginfo.lo `test -f 'lib/libadminutil/uginfo.c' || echo '$(srcdir)/'`lib/libadminutil/uginfo.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadminutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadminutil/libadminutil_la-uginfo.lo `test -f 'lib/libadminutil/uginfo.c' || echo '$(srcdir)/'`lib/libadminutil/uginfo.c
 
 lib/libadmsslutil/libadmsslutil_la-admsslutil.lo: lib/libadmsslutil/admsslutil.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadmsslutil/libadmsslutil_la-admsslutil.lo -MD -MP -MF "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-admsslutil.Tpo" -c -o lib/libadmsslutil/libadmsslutil_la-admsslutil.lo `test -f 'lib/libadmsslutil/admsslutil.c' || echo '$(srcdir)/'`lib/libadmsslutil/admsslutil.c; \
- at am__fastdepCC_TRUE@	then mv -f "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-admsslutil.Tpo" "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-admsslutil.Plo"; else rm -f "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-admsslutil.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadmsslutil/libadmsslutil_la-admsslutil.lo -MD -MP -MF lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-admsslutil.Tpo -c -o lib/libadmsslutil/libadmsslutil_la-admsslutil.lo `test -f 'lib/libadmsslutil/admsslutil.c' || echo '$(srcdir)/'`lib/libadmsslutil/admsslutil.c
+ at am__fastdepCC_TRUE@	mv -f lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-admsslutil.Tpo lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-admsslutil.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib/libadmsslutil/admsslutil.c' object='lib/libadmsslutil/libadmsslutil_la-admsslutil.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadmsslutil/libadmsslutil_la-admsslutil.lo `test -f 'lib/libadmsslutil/admsslutil.c' || echo '$(srcdir)/'`lib/libadmsslutil/admsslutil.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadmsslutil/libadmsslutil_la-admsslutil.lo `test -f 'lib/libadmsslutil/admsslutil.c' || echo '$(srcdir)/'`lib/libadmsslutil/admsslutil.c
 
 lib/libadmsslutil/libadmsslutil_la-certmgt.lo: lib/libadmsslutil/certmgt.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadmsslutil/libadmsslutil_la-certmgt.lo -MD -MP -MF "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-certmgt.Tpo" -c -o lib/libadmsslutil/libadmsslutil_la-certmgt.lo `test -f 'lib/libadmsslutil/certmgt.c' || echo '$(srcdir)/'`lib/libadmsslutil/certmgt.c; \
- at am__fastdepCC_TRUE@	then mv -f "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-certmgt.Tpo" "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-certmgt.Plo"; else rm -f "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-certmgt.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadmsslutil/libadmsslutil_la-certmgt.lo -MD -MP -MF lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-certmgt.Tpo -c -o lib/libadmsslutil/libadmsslutil_la-certmgt.lo `test -f 'lib/libadmsslutil/certmgt.c' || echo '$(srcdir)/'`lib/libadmsslutil/certmgt.c
+ at am__fastdepCC_TRUE@	mv -f lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-certmgt.Tpo lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-certmgt.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib/libadmsslutil/certmgt.c' object='lib/libadmsslutil/libadmsslutil_la-certmgt.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadmsslutil/libadmsslutil_la-certmgt.lo `test -f 'lib/libadmsslutil/certmgt.c' || echo '$(srcdir)/'`lib/libadmsslutil/certmgt.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadmsslutil/libadmsslutil_la-certmgt.lo `test -f 'lib/libadmsslutil/certmgt.c' || echo '$(srcdir)/'`lib/libadmsslutil/certmgt.c
 
 lib/libadmsslutil/libadmsslutil_la-psetcssl.lo: lib/libadmsslutil/psetcssl.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadmsslutil/libadmsslutil_la-psetcssl.lo -MD -MP -MF "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-psetcssl.Tpo" -c -o lib/libadmsslutil/libadmsslutil_la-psetcssl.lo `test -f 'lib/libadmsslutil/psetcssl.c' || echo '$(srcdir)/'`lib/libadmsslutil/psetcssl.c; \
- at am__fastdepCC_TRUE@	then mv -f "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-psetcssl.Tpo" "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-psetcssl.Plo"; else rm -f "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-psetcssl.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadmsslutil/libadmsslutil_la-psetcssl.lo -MD -MP -MF lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-psetcssl.Tpo -c -o lib/libadmsslutil/libadmsslutil_la-psetcssl.lo `test -f 'lib/libadmsslutil/psetcssl.c' || echo '$(srcdir)/'`lib/libadmsslutil/psetcssl.c
+ at am__fastdepCC_TRUE@	mv -f lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-psetcssl.Tpo lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-psetcssl.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib/libadmsslutil/psetcssl.c' object='lib/libadmsslutil/libadmsslutil_la-psetcssl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadmsslutil/libadmsslutil_la-psetcssl.lo `test -f 'lib/libadmsslutil/psetcssl.c' || echo '$(srcdir)/'`lib/libadmsslutil/psetcssl.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadmsslutil/libadmsslutil_la-psetcssl.lo `test -f 'lib/libadmsslutil/psetcssl.c' || echo '$(srcdir)/'`lib/libadmsslutil/psetcssl.c
 
 lib/libadmsslutil/libadmsslutil_la-secpwd.lo: lib/libadmsslutil/secpwd.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadmsslutil/libadmsslutil_la-secpwd.lo -MD -MP -MF "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-secpwd.Tpo" -c -o lib/libadmsslutil/libadmsslutil_la-secpwd.lo `test -f 'lib/libadmsslutil/secpwd.c' || echo '$(srcdir)/'`lib/libadmsslutil/secpwd.c; \
- at am__fastdepCC_TRUE@	then mv -f "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-secpwd.Tpo" "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-secpwd.Plo"; else rm -f "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-secpwd.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadmsslutil/libadmsslutil_la-secpwd.lo -MD -MP -MF lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-secpwd.Tpo -c -o lib/libadmsslutil/libadmsslutil_la-secpwd.lo `test -f 'lib/libadmsslutil/secpwd.c' || echo '$(srcdir)/'`lib/libadmsslutil/secpwd.c
+ at am__fastdepCC_TRUE@	mv -f lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-secpwd.Tpo lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-secpwd.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib/libadmsslutil/secpwd.c' object='lib/libadmsslutil/libadmsslutil_la-secpwd.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadmsslutil/libadmsslutil_la-secpwd.lo `test -f 'lib/libadmsslutil/secpwd.c' || echo '$(srcdir)/'`lib/libadmsslutil/secpwd.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadmsslutil/libadmsslutil_la-secpwd.lo `test -f 'lib/libadmsslutil/secpwd.c' || echo '$(srcdir)/'`lib/libadmsslutil/secpwd.c
 
 lib/libadmsslutil/libadmsslutil_la-srvutilssl.lo: lib/libadmsslutil/srvutilssl.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadmsslutil/libadmsslutil_la-srvutilssl.lo -MD -MP -MF "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-srvutilssl.Tpo" -c -o lib/libadmsslutil/libadmsslutil_la-srvutilssl.lo `test -f 'lib/libadmsslutil/srvutilssl.c' || echo '$(srcdir)/'`lib/libadmsslutil/srvutilssl.c; \
- at am__fastdepCC_TRUE@	then mv -f "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-srvutilssl.Tpo" "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-srvutilssl.Plo"; else rm -f "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-srvutilssl.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadmsslutil/libadmsslutil_la-srvutilssl.lo -MD -MP -MF lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-srvutilssl.Tpo -c -o lib/libadmsslutil/libadmsslutil_la-srvutilssl.lo `test -f 'lib/libadmsslutil/srvutilssl.c' || echo '$(srcdir)/'`lib/libadmsslutil/srvutilssl.c
+ at am__fastdepCC_TRUE@	mv -f lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-srvutilssl.Tpo lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-srvutilssl.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib/libadmsslutil/srvutilssl.c' object='lib/libadmsslutil/libadmsslutil_la-srvutilssl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadmsslutil/libadmsslutil_la-srvutilssl.lo `test -f 'lib/libadmsslutil/srvutilssl.c' || echo '$(srcdir)/'`lib/libadmsslutil/srvutilssl.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadmsslutil/libadmsslutil_la-srvutilssl.lo `test -f 'lib/libadmsslutil/srvutilssl.c' || echo '$(srcdir)/'`lib/libadmsslutil/srvutilssl.c
 
 lib/libadmsslutil/libadmsslutil_la-sslerror.lo: lib/libadmsslutil/sslerror.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadmsslutil/libadmsslutil_la-sslerror.lo -MD -MP -MF "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-sslerror.Tpo" -c -o lib/libadmsslutil/libadmsslutil_la-sslerror.lo `test -f 'lib/libadmsslutil/sslerror.c' || echo '$(srcdir)/'`lib/libadmsslutil/sslerror.c; \
- at am__fastdepCC_TRUE@	then mv -f "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-sslerror.Tpo" "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-sslerror.Plo"; else rm -f "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-sslerror.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadmsslutil/libadmsslutil_la-sslerror.lo -MD -MP -MF lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-sslerror.Tpo -c -o lib/libadmsslutil/libadmsslutil_la-sslerror.lo `test -f 'lib/libadmsslutil/sslerror.c' || echo '$(srcdir)/'`lib/libadmsslutil/sslerror.c
+ at am__fastdepCC_TRUE@	mv -f lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-sslerror.Tpo lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-sslerror.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib/libadmsslutil/sslerror.c' object='lib/libadmsslutil/libadmsslutil_la-sslerror.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadmsslutil/libadmsslutil_la-sslerror.lo `test -f 'lib/libadmsslutil/sslerror.c' || echo '$(srcdir)/'`lib/libadmsslutil/sslerror.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadmsslutil/libadmsslutil_la-sslerror.lo `test -f 'lib/libadmsslutil/sslerror.c' || echo '$(srcdir)/'`lib/libadmsslutil/sslerror.c
 
 lib/libadmsslutil/libadmsslutil_la-uginfossl.lo: lib/libadmsslutil/uginfossl.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadmsslutil/libadmsslutil_la-uginfossl.lo -MD -MP -MF "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-uginfossl.Tpo" -c -o lib/libadmsslutil/libadmsslutil_la-uginfossl.lo `test -f 'lib/libadmsslutil/uginfossl.c' || echo '$(srcdir)/'`lib/libadmsslutil/uginfossl.c; \
- at am__fastdepCC_TRUE@	then mv -f "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-uginfossl.Tpo" "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-uginfossl.Plo"; else rm -f "lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-uginfossl.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadmsslutil/libadmsslutil_la-uginfossl.lo -MD -MP -MF lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-uginfossl.Tpo -c -o lib/libadmsslutil/libadmsslutil_la-uginfossl.lo `test -f 'lib/libadmsslutil/uginfossl.c' || echo '$(srcdir)/'`lib/libadmsslutil/uginfossl.c
+ at am__fastdepCC_TRUE@	mv -f lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-uginfossl.Tpo lib/libadmsslutil/$(DEPDIR)/libadmsslutil_la-uginfossl.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib/libadmsslutil/uginfossl.c' object='lib/libadmsslutil/libadmsslutil_la-uginfossl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadmsslutil/libadmsslutil_la-uginfossl.lo `test -f 'lib/libadmsslutil/uginfossl.c' || echo '$(srcdir)/'`lib/libadmsslutil/uginfossl.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libadmsslutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/libadmsslutil/libadmsslutil_la-uginfossl.lo `test -f 'lib/libadmsslutil/uginfossl.c' || echo '$(srcdir)/'`lib/libadmsslutil/uginfossl.c
 
 tests/psetread-psetread.o: tests/psetread.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(psetread_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/psetread-psetread.o -MD -MP -MF "tests/$(DEPDIR)/psetread-psetread.Tpo" -c -o tests/psetread-psetread.o `test -f 'tests/psetread.c' || echo '$(srcdir)/'`tests/psetread.c; \
- at am__fastdepCC_TRUE@	then mv -f "tests/$(DEPDIR)/psetread-psetread.Tpo" "tests/$(DEPDIR)/psetread-psetread.Po"; else rm -f "tests/$(DEPDIR)/psetread-psetread.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(psetread_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/psetread-psetread.o -MD -MP -MF tests/$(DEPDIR)/psetread-psetread.Tpo -c -o tests/psetread-psetread.o `test -f 'tests/psetread.c' || echo '$(srcdir)/'`tests/psetread.c
+ at am__fastdepCC_TRUE@	mv -f tests/$(DEPDIR)/psetread-psetread.Tpo tests/$(DEPDIR)/psetread-psetread.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/psetread.c' object='tests/psetread-psetread.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(psetread_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/psetread-psetread.o `test -f 'tests/psetread.c' || echo '$(srcdir)/'`tests/psetread.c
 
 tests/psetread-psetread.obj: tests/psetread.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(psetread_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/psetread-psetread.obj -MD -MP -MF "tests/$(DEPDIR)/psetread-psetread.Tpo" -c -o tests/psetread-psetread.obj `if test -f 'tests/psetread.c'; then $(CYGPATH_W) 'tests/psetread.c'; else $(CYGPATH_W) '$(srcdir)/tests/psetread.c'; fi`; \
- at am__fastdepCC_TRUE@	then mv -f "tests/$(DEPDIR)/psetread-psetread.Tpo" "tests/$(DEPDIR)/psetread-psetread.Po"; else rm -f "tests/$(DEPDIR)/psetread-psetread.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(psetread_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/psetread-psetread.obj -MD -MP -MF tests/$(DEPDIR)/psetread-psetread.Tpo -c -o tests/psetread-psetread.obj `if test -f 'tests/psetread.c'; then $(CYGPATH_W) 'tests/psetread.c'; else $(CYGPATH_W) '$(srcdir)/tests/psetread.c'; fi`
+ at am__fastdepCC_TRUE@	mv -f tests/$(DEPDIR)/psetread-psetread.Tpo tests/$(DEPDIR)/psetread-psetread.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/psetread.c' object='tests/psetread-psetread.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(psetread_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/psetread-psetread.obj `if test -f 'tests/psetread.c'; then $(CYGPATH_W) 'tests/psetread.c'; else $(CYGPATH_W) '$(srcdir)/tests/psetread.c'; fi`
 
 tests/psetreadssl-psetreadssl.o: tests/psetreadssl.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(psetreadssl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/psetreadssl-psetreadssl.o -MD -MP -MF "tests/$(DEPDIR)/psetreadssl-psetreadssl.Tpo" -c -o tests/psetreadssl-psetreadssl.o `test -f 'tests/psetreadssl.c' || echo '$(srcdir)/'`tests/psetreadssl.c; \
- at am__fastdepCC_TRUE@	then mv -f "tests/$(DEPDIR)/psetreadssl-psetreadssl.Tpo" "tests/$(DEPDIR)/psetreadssl-psetreadssl.Po"; else rm -f "tests/$(DEPDIR)/psetreadssl-psetreadssl.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(psetreadssl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/psetreadssl-psetreadssl.o -MD -MP -MF tests/$(DEPDIR)/psetreadssl-psetreadssl.Tpo -c -o tests/psetreadssl-psetreadssl.o `test -f 'tests/psetreadssl.c' || echo '$(srcdir)/'`tests/psetreadssl.c
+ at am__fastdepCC_TRUE@	mv -f tests/$(DEPDIR)/psetreadssl-psetreadssl.Tpo tests/$(DEPDIR)/psetreadssl-psetreadssl.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/psetreadssl.c' object='tests/psetreadssl-psetreadssl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(psetreadssl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/psetreadssl-psetreadssl.o `test -f 'tests/psetreadssl.c' || echo '$(srcdir)/'`tests/psetreadssl.c
 
 tests/psetreadssl-psetreadssl.obj: tests/psetreadssl.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(psetreadssl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/psetreadssl-psetreadssl.obj -MD -MP -MF "tests/$(DEPDIR)/psetreadssl-psetreadssl.Tpo" -c -o tests/psetreadssl-psetreadssl.obj `if test -f 'tests/psetreadssl.c'; then $(CYGPATH_W) 'tests/psetreadssl.c'; else $(CYGPATH_W) '$(srcdir)/tests/psetreadssl.c'; fi`; \
- at am__fastdepCC_TRUE@	then mv -f "tests/$(DEPDIR)/psetreadssl-psetreadssl.Tpo" "tests/$(DEPDIR)/psetreadssl-psetreadssl.Po"; else rm -f "tests/$(DEPDIR)/psetreadssl-psetreadssl.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(psetreadssl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/psetreadssl-psetreadssl.obj -MD -MP -MF tests/$(DEPDIR)/psetreadssl-psetreadssl.Tpo -c -o tests/psetreadssl-psetreadssl.obj `if test -f 'tests/psetreadssl.c'; then $(CYGPATH_W) 'tests/psetreadssl.c'; else $(CYGPATH_W) '$(srcdir)/tests/psetreadssl.c'; fi`
+ at am__fastdepCC_TRUE@	mv -f tests/$(DEPDIR)/psetreadssl-psetreadssl.Tpo tests/$(DEPDIR)/psetreadssl-psetreadssl.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/psetreadssl.c' object='tests/psetreadssl-psetreadssl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(psetreadssl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/psetreadssl-psetreadssl.obj `if test -f 'tests/psetreadssl.c'; then $(CYGPATH_W) 'tests/psetreadssl.c'; else $(CYGPATH_W) '$(srcdir)/tests/psetreadssl.c'; fi`
 
 tests/psetwrite-psetwrite.o: tests/psetwrite.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(psetwrite_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/psetwrite-psetwrite.o -MD -MP -MF "tests/$(DEPDIR)/psetwrite-psetwrite.Tpo" -c -o tests/psetwrite-psetwrite.o `test -f 'tests/psetwrite.c' || echo '$(srcdir)/'`tests/psetwrite.c; \
- at am__fastdepCC_TRUE@	then mv -f "tests/$(DEPDIR)/psetwrite-psetwrite.Tpo" "tests/$(DEPDIR)/psetwrite-psetwrite.Po"; else rm -f "tests/$(DEPDIR)/psetwrite-psetwrite.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(psetwrite_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/psetwrite-psetwrite.o -MD -MP -MF tests/$(DEPDIR)/psetwrite-psetwrite.Tpo -c -o tests/psetwrite-psetwrite.o `test -f 'tests/psetwrite.c' || echo '$(srcdir)/'`tests/psetwrite.c
+ at am__fastdepCC_TRUE@	mv -f tests/$(DEPDIR)/psetwrite-psetwrite.Tpo tests/$(DEPDIR)/psetwrite-psetwrite.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/psetwrite.c' object='tests/psetwrite-psetwrite.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(psetwrite_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/psetwrite-psetwrite.o `test -f 'tests/psetwrite.c' || echo '$(srcdir)/'`tests/psetwrite.c
 
 tests/psetwrite-psetwrite.obj: tests/psetwrite.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(psetwrite_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/psetwrite-psetwrite.obj -MD -MP -MF "tests/$(DEPDIR)/psetwrite-psetwrite.Tpo" -c -o tests/psetwrite-psetwrite.obj `if test -f 'tests/psetwrite.c'; then $(CYGPATH_W) 'tests/psetwrite.c'; else $(CYGPATH_W) '$(srcdir)/tests/psetwrite.c'; fi`; \
- at am__fastdepCC_TRUE@	then mv -f "tests/$(DEPDIR)/psetwrite-psetwrite.Tpo" "tests/$(DEPDIR)/psetwrite-psetwrite.Po"; else rm -f "tests/$(DEPDIR)/psetwrite-psetwrite.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(psetwrite_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/psetwrite-psetwrite.obj -MD -MP -MF tests/$(DEPDIR)/psetwrite-psetwrite.Tpo -c -o tests/psetwrite-psetwrite.obj `if test -f 'tests/psetwrite.c'; then $(CYGPATH_W) 'tests/psetwrite.c'; else $(CYGPATH_W) '$(srcdir)/tests/psetwrite.c'; fi`
+ at am__fastdepCC_TRUE@	mv -f tests/$(DEPDIR)/psetwrite-psetwrite.Tpo tests/$(DEPDIR)/psetwrite-psetwrite.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/psetwrite.c' object='tests/psetwrite-psetwrite.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(psetwrite_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/psetwrite-psetwrite.obj `if test -f 'tests/psetwrite.c'; then $(CYGPATH_W) 'tests/psetwrite.c'; else $(CYGPATH_W) '$(srcdir)/tests/psetwrite.c'; fi`
 
 tests/retrieveSIE-retrieveSIE.o: tests/retrieveSIE.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(retrieveSIE_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/retrieveSIE-retrieveSIE.o -MD -MP -MF "tests/$(DEPDIR)/retrieveSIE-retrieveSIE.Tpo" -c -o tests/retrieveSIE-retrieveSIE.o `test -f 'tests/retrieveSIE.c' || echo '$(srcdir)/'`tests/retrieveSIE.c; \
- at am__fastdepCC_TRUE@	then mv -f "tests/$(DEPDIR)/retrieveSIE-retrieveSIE.Tpo" "tests/$(DEPDIR)/retrieveSIE-retrieveSIE.Po"; else rm -f "tests/$(DEPDIR)/retrieveSIE-retrieveSIE.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(retrieveSIE_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/retrieveSIE-retrieveSIE.o -MD -MP -MF tests/$(DEPDIR)/retrieveSIE-retrieveSIE.Tpo -c -o tests/retrieveSIE-retrieveSIE.o `test -f 'tests/retrieveSIE.c' || echo '$(srcdir)/'`tests/retrieveSIE.c
+ at am__fastdepCC_TRUE@	mv -f tests/$(DEPDIR)/retrieveSIE-retrieveSIE.Tpo tests/$(DEPDIR)/retrieveSIE-retrieveSIE.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/retrieveSIE.c' object='tests/retrieveSIE-retrieveSIE.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(retrieveSIE_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/retrieveSIE-retrieveSIE.o `test -f 'tests/retrieveSIE.c' || echo '$(srcdir)/'`tests/retrieveSIE.c
 
 tests/retrieveSIE-retrieveSIE.obj: tests/retrieveSIE.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(retrieveSIE_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/retrieveSIE-retrieveSIE.obj -MD -MP -MF "tests/$(DEPDIR)/retrieveSIE-retrieveSIE.Tpo" -c -o tests/retrieveSIE-retrieveSIE.obj `if test -f 'tests/retrieveSIE.c'; then $(CYGPATH_W) 'tests/retrieveSIE.c'; else $(CYGPATH_W) '$(srcdir)/tests/retrieveSIE.c'; fi`; \
- at am__fastdepCC_TRUE@	then mv -f "tests/$(DEPDIR)/retrieveSIE-retrieveSIE.Tpo" "tests/$(DEPDIR)/retrieveSIE-retrieveSIE.Po"; else rm -f "tests/$(DEPDIR)/retrieveSIE-retrieveSIE.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(retrieveSIE_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/retrieveSIE-retrieveSIE.obj -MD -MP -MF tests/$(DEPDIR)/retrieveSIE-retrieveSIE.Tpo -c -o tests/retrieveSIE-retrieveSIE.obj `if test -f 'tests/retrieveSIE.c'; then $(CYGPATH_W) 'tests/retrieveSIE.c'; else $(CYGPATH_W) '$(srcdir)/tests/retrieveSIE.c'; fi`
+ at am__fastdepCC_TRUE@	mv -f tests/$(DEPDIR)/retrieveSIE-retrieveSIE.Tpo tests/$(DEPDIR)/retrieveSIE-retrieveSIE.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/retrieveSIE.c' object='tests/retrieveSIE-retrieveSIE.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(retrieveSIE_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/retrieveSIE-retrieveSIE.obj `if test -f 'tests/retrieveSIE.c'; then $(CYGPATH_W) 'tests/retrieveSIE.c'; else $(CYGPATH_W) '$(srcdir)/tests/retrieveSIE.c'; fi`
 
 tests/retrieveSIEssl-retrieveSIEssl.o: tests/retrieveSIEssl.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(retrieveSIEssl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/retrieveSIEssl-retrieveSIEssl.o -MD -MP -MF "tests/$(DEPDIR)/retrieveSIEssl-retrieveSIEssl.Tpo" -c -o tests/retrieveSIEssl-retrieveSIEssl.o `test -f 'tests/retrieveSIEssl.c' || echo '$(srcdir)/'`tests/retrieveSIEssl.c; \
- at am__fastdepCC_TRUE@	then mv -f "tests/$(DEPDIR)/retrieveSIEssl-retrieveSIEssl.Tpo" "tests/$(DEPDIR)/retrieveSIEssl-retrieveSIEssl.Po"; else rm -f "tests/$(DEPDIR)/retrieveSIEssl-retrieveSIEssl.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(retrieveSIEssl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/retrieveSIEssl-retrieveSIEssl.o -MD -MP -MF tests/$(DEPDIR)/retrieveSIEssl-retrieveSIEssl.Tpo -c -o tests/retrieveSIEssl-retrieveSIEssl.o `test -f 'tests/retrieveSIEssl.c' || echo '$(srcdir)/'`tests/retrieveSIEssl.c
+ at am__fastdepCC_TRUE@	mv -f tests/$(DEPDIR)/retrieveSIEssl-retrieveSIEssl.Tpo tests/$(DEPDIR)/retrieveSIEssl-retrieveSIEssl.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/retrieveSIEssl.c' object='tests/retrieveSIEssl-retrieveSIEssl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(retrieveSIEssl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/retrieveSIEssl-retrieveSIEssl.o `test -f 'tests/retrieveSIEssl.c' || echo '$(srcdir)/'`tests/retrieveSIEssl.c
 
 tests/retrieveSIEssl-retrieveSIEssl.obj: tests/retrieveSIEssl.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(retrieveSIEssl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/retrieveSIEssl-retrieveSIEssl.obj -MD -MP -MF "tests/$(DEPDIR)/retrieveSIEssl-retrieveSIEssl.Tpo" -c -o tests/retrieveSIEssl-retrieveSIEssl.obj `if test -f 'tests/retrieveSIEssl.c'; then $(CYGPATH_W) 'tests/retrieveSIEssl.c'; else $(CYGPATH_W) '$(srcdir)/tests/retrieveSIEssl.c'; fi`; \
- at am__fastdepCC_TRUE@	then mv -f "tests/$(DEPDIR)/retrieveSIEssl-retrieveSIEssl.Tpo" "tests/$(DEPDIR)/retrieveSIEssl-retrieveSIEssl.Po"; else rm -f "tests/$(DEPDIR)/retrieveSIEssl-retrieveSIEssl.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(retrieveSIEssl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/retrieveSIEssl-retrieveSIEssl.obj -MD -MP -MF tests/$(DEPDIR)/retrieveSIEssl-retrieveSIEssl.Tpo -c -o tests/retrieveSIEssl-retrieveSIEssl.obj `if test -f 'tests/retrieveSIEssl.c'; then $(CYGPATH_W) 'tests/retrieveSIEssl.c'; else $(CYGPATH_W) '$(srcdir)/tests/retrieveSIEssl.c'; fi`
+ at am__fastdepCC_TRUE@	mv -f tests/$(DEPDIR)/retrieveSIEssl-retrieveSIEssl.Tpo tests/$(DEPDIR)/retrieveSIEssl-retrieveSIEssl.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/retrieveSIEssl.c' object='tests/retrieveSIEssl-retrieveSIEssl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(retrieveSIEssl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/retrieveSIEssl-retrieveSIEssl.obj `if test -f 'tests/retrieveSIEssl.c'; then $(CYGPATH_W) 'tests/retrieveSIEssl.c'; else $(CYGPATH_W) '$(srcdir)/tests/retrieveSIEssl.c'; fi`
 
+.cpp.o:
+ at am__fastdepCXX_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	mv -f $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+ at am__fastdepCXX_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	mv -f $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+ at am__fastdepCXX_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	mv -f $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -859,10 +927,9 @@
 
 distclean-libtool:
 	-rm -f libtool
-uninstall-info-am:
 install-adminincDATA: $(admininc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(adminincdir)" || $(mkdir_p) "$(DESTDIR)$(adminincdir)"
+	test -z "$(adminincdir)" || $(MKDIR_P) "$(DESTDIR)$(adminincdir)"
 	@list='$(admininc_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -879,7 +946,7 @@
 	done
 install-admsslincDATA: $(admsslinc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(admsslincdir)" || $(mkdir_p) "$(DESTDIR)$(admsslincdir)"
+	test -z "$(admsslincdir)" || $(MKDIR_P) "$(DESTDIR)$(admsslincdir)"
 	@list='$(admsslinc_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -896,7 +963,7 @@
 	done
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
+	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
 	@list='$(pkgconfig_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -913,7 +980,7 @@
 	done
 install-pkgdataDATA: $(pkgdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(pkgdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -978,9 +1045,9 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
 	srcdir=$(srcdir); export srcdir; \
-	list='$(TESTS)'; \
+	list=' $(TESTS) '; \
 	if test -n "$$list"; then \
 	  for tst in $$list; do \
 	    if test -f ./$$tst; then dir=./; \
@@ -989,7 +1056,7 @@
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
 		echo "XPASS: $$tst"; \
@@ -1001,7 +1068,7 @@
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *$$ws$$tst$$ws*) \
 		xfail=`expr $$xfail + 1`; \
 		echo "XFAIL: $$tst"; \
 	      ;; \
@@ -1052,24 +1119,22 @@
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/lib/libadminutil $(distdir)/m4
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	test -d $(distdir) || mkdir $(distdir)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -1083,7 +1148,7 @@
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -1158,7 +1223,7 @@
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -1181,10 +1246,10 @@
 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-all-am: Makefile $(LTLIBRARIES) $(DATA)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(adminincdir)" "$(DESTDIR)$(admsslincdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgdatadir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -1206,6 +1271,8 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f lib/$(DEPDIR)/$(am__dirstamp)
+	-rm -f lib/$(am__dirstamp)
 	-rm -f lib/libadminutil/$(DEPDIR)/$(am__dirstamp)
 	-rm -f lib/libadminutil/$(am__dirstamp)
 	-rm -f lib/libadmsslutil/$(DEPDIR)/$(am__dirstamp)
@@ -1219,11 +1286,11 @@
 clean: clean-am
 
 clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool mostlyclean-am
+	clean-libtool clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf lib/libadminutil/$(DEPDIR) lib/libadmsslutil/$(DEPDIR) tests/$(DEPDIR)
+	-rm -rf lib/$(DEPDIR) lib/libadminutil/$(DEPDIR) lib/libadmsslutil/$(DEPDIR) tests/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -1241,18 +1308,26 @@
 install-data-am: install-adminincDATA install-admsslincDATA \
 	install-pkgconfigDATA install-pkgdataDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-libLTLIBRARIES
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf lib/libadminutil/$(DEPDIR) lib/libadmsslutil/$(DEPDIR) tests/$(DEPDIR)
+	-rm -rf lib/$(DEPDIR) lib/libadminutil/$(DEPDIR) lib/libadmsslutil/$(DEPDIR) tests/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -1270,26 +1345,30 @@
 ps-am:
 
 uninstall-am: uninstall-adminincDATA uninstall-admsslincDATA \
-	uninstall-info-am uninstall-libLTLIBRARIES \
-	uninstall-pkgconfigDATA uninstall-pkgdataDATA
+	uninstall-libLTLIBRARIES uninstall-pkgconfigDATA \
+	uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \
 	clean clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool ctags dist dist-all dist-bzip2 dist-gzip \
-	dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-adminincDATA \
-	install-admsslincDATA install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pkgconfigDATA \
-	install-pkgdataDATA install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-adminincDATA uninstall-admsslincDATA uninstall-am \
-	uninstall-info-am uninstall-libLTLIBRARIES \
-	uninstall-pkgconfigDATA uninstall-pkgdataDATA
+	clean-libtool clean-noinstPROGRAMS ctags dist dist-all \
+	dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip distcheck \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-adminincDATA install-admsslincDATA 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-libLTLIBRARIES \
+	install-man install-pdf install-pdf-am install-pkgconfigDATA \
+	install-pkgdataDATA install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-adminincDATA uninstall-admsslincDATA \
+	uninstall-am uninstall-libLTLIBRARIES uninstall-pkgconfigDATA \
+	uninstall-pkgdataDATA
 
 
 #////////////////////////////////////////////////////////////////




More information about the Fedora-directory-commits mailing list