[Fedora-directory-commits] coolkey README, NONE, 1.1 aclocal.m4, 1.1.1.1, 1.2 config.h, 1.1.1.1, 1.2 config.status, 1.4, 1.5 configure, 1.3, 1.4 configure.in, 1.4, 1.5 libtool, 1.2, 1.3 ltmain.sh, 1.1.1.1, 1.2

[Doctor Conrad]

Author: rrelyea

Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26618

Modified Files:
	aclocal.m4 config.h config.status configure configure.in 
	libtool ltmain.sh 
Added Files:
	README 
Log Message:

Complete the windows build.



--- NEW FILE README ---
Building:

Linux/Unix:
autoconf
./configure

If you need to modify the Makefiles, automake 1.9.6 was used. Makefile.am is 
included in the source.

------------------------------------------------------------------------------

Mac OS X:

------------------------------------------------------------------------------

Windows:

Prereqs -
Microsoft Visual C++ and Platform SDK.
Install as normal. Make sure INCLUDE and LIB are set appropriately.
These are available at (http://msdn.microsoft.com/visualc/)

Cygwin
Install as normal. You'll need base, the shell, autoconf-2.5x, cvs*...
This can be downloaded at (http://www.cygwin.com)

ZLib
Download ZLib source an binaries from here (http://www.zlib.org)
Unzip into a known directory (like c:/zlib)
Set ZLIB_INCLUDE to the location of the include files (e.g. c:/zlib/include)
and ZLIB_LIB to the location of the export libraries (e.g. c:/zlib/lib) 

Once everything is installed, start a cygwin shell.
1. checkout the coolkey source
2. Make sure the environment variables INCLUDE, LIB, ZLIB_INCLUDE, and ZLIB_LIB 
are defined.
3. Make sure the Visual C++ tools are in your path.

In the root directory type:

autoconf-2.5x
./configure
make


NOTE: Make install does not work on windows. You'll need to fetch
src/libckyapplet/.lib/libckyapplet-1.dll
src/coolkeypk11/.lib/libcookeypk11.dll
and
zlib1.dll from your zlibdirectory and install it in your windows system32 
directory.


* This may not be a full list. If you discover additional packages which are 
needed please let us know.


Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/coolkey/aclocal.m4,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- aclocal.m4	9 Jun 2006 18:31:31 -0000	1.1.1.1
+++ aclocal.m4	25 Aug 2006 00:31:39 -0000	1.2
@@ -3032,7 +3032,7 @@
     _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 
     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs
$deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname
${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -LD -shared -nostdlib $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname
${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker'
       # If the export-symbols file already is a .def file (1st line
       # is EXPORTS), use it as is; otherwise, prepend...
       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q
$export_symbols`" = xEXPORTS; then
@@ -3041,7 +3041,11 @@
 	echo EXPORTS > $output_objdir/$soname.def;
 	cat $export_symbols >> $output_objdir/$soname.def;
       fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs
$postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base
-Xlinker --out-implib -Xlinker $lib'
+      #
+      # Hack... gcc and lc are quite different, we can use either for cygwin
+      # try to get a line that both are happy with...
+      #
+      $CC -LD -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs
$deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname
${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker '
     else
       _LT_AC_TAGVAR(ld_shlibs, $1)=no
     fi


Index: config.h
===================================================================
RCS file: /cvs/dirsec/coolkey/config.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- config.h	9 Jun 2006 18:31:38 -0000	1.1.1.1
+++ config.h	25 Aug 2006 00:31:39 -0000	1.2
@@ -5,7 +5,7 @@
 #define DEBUG 1
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
+/* #undef HAVE_DLFCN_H */
 
 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
 /* #undef HAVE_DOPRNT */
@@ -14,7 +14,7 @@
 #define HAVE_FCNTL_H 1
 
 /* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
+/* #undef HAVE_INTTYPES_H */
 
 /* Define to 1 if your system has a GNU libc compatible `malloc' function, and
    to 0 otherwise. */
@@ -27,7 +27,7 @@
 #define HAVE_MEMSET 1
 
 /* Have PC/SC implementation */
-#define HAVE_PCSC 1
+/* #undef HAVE_PCSC */
 
 /* old version of pc/sc-lite */
 /* #undef HAVE_PCSC_OLD */
@@ -41,7 +41,7 @@
 /* #undef HAVE_STAT_EMPTY_STRING_BUG */
 
 /* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
+/* #undef HAVE_STDINT_H */
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
@@ -53,13 +53,13 @@
 #define HAVE_STRERROR 1
 
 /* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
+/* #undef HAVE_STRINGS_H */
 
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
 /* Define to 1 if you have the <syslog.h> header file. */
-#define HAVE_SYSLOG_H 1
+/* #undef HAVE_SYSLOG_H */
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
@@ -68,14 +68,14 @@
 #define HAVE_SYS_TYPES_H 1
 
 /* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
+/* #undef HAVE_UNISTD_H */
 
 /* Define to 1 if you have the `vprintf' function. */
 #define HAVE_VPRINTF 1
 
 /* Define to 1 if `lstat' dereferences a symlink specified with a trailing
    slash. */
-#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
+/* #undef LSTAT_FOLLOWS_SLASHED_SYMLINK */
 
 /* Name of package */
 #define PACKAGE "coolkey"


Index: config.status
===================================================================
RCS file: /cvs/dirsec/coolkey/config.status,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config.status	18 Aug 2006 16:04:42 -0000	1.4
+++ config.status	25 Aug 2006 00:31:39 -0000	1.5
@@ -484,31 +484,31 @@
 s,@ECHO_C@,,;t t
 s,@ECHO_N@,-n,;t t
 s,@ECHO_T@,,;t t
-s,@LIBS@,-ldl -lz ,;t t
-s,@build@,i686-redhat-linux-gnu,;t t
+s,@LIBS@,,;t t
+s,@build@,i686-pc-cygwin,;t t
 s,@build_cpu@,i686,;t t
-s,@build_vendor@,redhat,;t t
-s,@build_os@,linux-gnu,;t t
-s,@host@,i686-redhat-linux-gnu,;t t
+s,@build_vendor@,pc,;t t
+s,@build_os@,cygwin,;t t
+s,@host@,i686-pc-cygwin,;t t
 s,@host_cpu@,i686,;t t
-s,@host_vendor@,redhat,;t t
-s,@host_os@,linux-gnu,;t t
-s,@target@,i686-redhat-linux-gnu,;t t
+s,@host_vendor@,pc,;t t
+s,@host_os@,cygwin,;t t
+s,@target@,i686-pc-cygwin,;t t
 s,@target_cpu@,i686,;t t
-s,@target_vendor@,redhat,;t t
-s,@target_os@,linux-gnu,;t t
+s,@target_vendor@,pc,;t t
+s,@target_os@,cygwin,;t t
 s,@INSTALL_PROGRAM@,${INSTALL},;t t
 s,@INSTALL_SCRIPT@,${INSTALL},;t t
 s,@INSTALL_DATA@,${INSTALL} -m 644,;t t
-s,@CYGPATH_W@,echo,;t t
+s,@CYGPATH_W@,cygpath -w,;t t
 s,@PACKAGE@,coolkey,;t t
 s,@VERSION(a),1.1.0,;t t
-s,@ACLOCAL@,${SHELL} /builds/fedora/coolkey/missing --run aclocal-1.9,;t t
-s,@AUTOCONF@,${SHELL} /builds/fedora/coolkey/missing --run autoconf,;t t
-s,@AUTOMAKE@,${SHELL} /builds/fedora/coolkey/missing --run automake-1.9,;t t
-s,@AUTOHEADER@,${SHELL} /builds/fedora/coolkey/missing --run autoheader,;t t
-s,@MAKEINFO@,${SHELL} /builds/fedora/coolkey/missing --run makeinfo,;t t
-s,@install_sh@,/builds/fedora/coolkey/install-sh,;t t
+s,@ACLOCAL@,${SHELL} /cygdrive/c/builds/fedora/coolkey/missing --run aclocal-1.9,;t t
+s,@AUTOCONF@,${SHELL} /cygdrive/c/builds/fedora/coolkey/missing --run autoconf,;t t
+s,@AUTOMAKE@,${SHELL} /cygdrive/c/builds/fedora/coolkey/missing --run automake-1.9,;t t
+s,@AUTOHEADER@,${SHELL} /cygdrive/c/builds/fedora/coolkey/missing --run autoheader,;t t
+s,@MAKEINFO@,${SHELL} /cygdrive/c/builds/fedora/coolkey/missing --run makeinfo,;t t
+s,@install_sh@,/cygdrive/c/builds/fedora/coolkey/install-sh,;t t
 s,@STRIP@,strip,;t t
 s,@ac_ct_STRIP@,strip,;t t
 s,@INSTALL_STRIP_PROGRAM@,${SHELL} $(install_sh) -c -s,;t t
@@ -516,34 +516,34 @@
 s,@AWK@,gawk,;t t
 s,@SET_MAKE@,,;t t
 s,@am__leading_dot(a),.,;t t
-s,@AMTAR@,${SHELL} /builds/fedora/coolkey/missing --run tar,;t t
+s,@AMTAR@,${SHELL} /cygdrive/c/builds/fedora/coolkey/missing --run tar,;t t
 s,@am__tar@,${AMTAR} chof - "$$tardir",;t t
 s,@am__untar@,${AMTAR} xf -,;t t
 s,@MAINTAINER_MODE_TRUE@,#,;t t
 s,@MAINTAINER_MODE_FALSE@,,;t t
 s,@MAINT@,#,;t t
-s,@CC@,gcc,;t t
-s,@CFLAGS@,-g -O2,;t t
+s,@CC@,cl,;t t
+s,@CFLAGS@,-g,;t t
 s,@LDFLAGS@,,;t t
-s,@CPPFLAGS@,,;t t
-s,@ac_ct_CC@,gcc,;t t
-s,@EXEEXT@,,;t t
-s,@OBJEXT@,o,;t t
+s,@CPPFLAGS@,  -DWIN32,;t t
+s,@ac_ct_CC@,cl,;t t
+s,@EXEEXT(a),.exe,;t t
+s,@OBJEXT@,obj,;t t
 s,@DEPDIR(a),.deps,;t t
 s,@am__include@,include,;t t
 s,@am__quote@,,;t t
 s,@AMDEP_TRUE@,,;t t
 s,@AMDEP_FALSE@,#,;t t
 s,@AMDEPBACKSLASH@,\,;t t
-s,@CCDEPMODE@,depmode=gcc3,;t t
-s,@am__fastdepCC_TRUE@,,;t t
-s,@am__fastdepCC_FALSE@,#,;t t
-s,@CXX@,g++,;t t
-s,@CXXFLAGS@,-g -O2,;t t
-s,@ac_ct_CXX@,g++,;t t
-s,@CXXDEPMODE@,depmode=gcc3,;t t
-s,@am__fastdepCXX_TRUE@,,;t t
-s,@am__fastdepCXX_FALSE@,#,;t t
+s,@CCDEPMODE@,depmode=none,;t t
+s,@am__fastdepCC_TRUE@,#,;t t
+s,@am__fastdepCC_FALSE@,,;t t
+s,@CXX@,cl,;t t
+s,@CXXFLAGS@, /EHsc,;t t
+s,@ac_ct_CXX@,,;t t
+s,@CXXDEPMODE@,depmode=none,;t t
+s,@am__fastdepCXX_TRUE@,#,;t t
+s,@am__fastdepCXX_FALSE@,,;t t
 s,@EGREP@,grep -E,;t t
 s,@LN_S@,ln -s,;t t
 s,@ECHO@,echo,;t t
@@ -551,22 +551,24 @@
 s,@ac_ct_AR@,ar,;t t
 s,@RANLIB@,ranlib,;t t
 s,@ac_ct_RANLIB@,ranlib,;t t
-s,@CPP@,gcc -E,;t t
-s,@CXXCPP@,g++ -E,;t t
+s,@CPP@,cl -E,;t t
+s,@CXXCPP@,cl -E,;t t
 s,@F77@,,;t t
 s,@FFLAGS@,,;t t
 s,@ac_ct_F77@,,;t t
 s,@LIBTOOL@,$(SHELL) $(top_builddir)/libtool,;t t
 s,@LIBCKYAPPLET(a),${top_builddir}/src/libckyapplet/libckyapplet.la,;t t
-s,@PCSC_CFLAGS@,-pthread -I/usr/include/PCSC  ,;t t
-s,@PCSC_LIBS@,-lpcsclite  ,;t t
-s,@SCARD_LIB_NAME(a),libpcsclite.so.1,;t t
 s,@PKG_CONFIG@,/usr/bin/pkg-config,;t t
 s,@ac_pt_PKG_CONFIG@,/usr/bin/pkg-config,;t t
-s,@HAVE_PCSC_TRUE@,,;t t
-s,@HAVE_PCSC_FALSE@,#,;t t
-s,@LIBOBJS@,,;t t
-s,@LTLIBOBJS@,,;t t
+s,@PCSC_CFLAGS@,,;t t
+s,@PCSC_LIBS@,,;t t
+s,@ZLIB_CFLAGS@,-Ic:/zlib,;t t
+s,@ZLIB_LIBS@,c:/zlib/zlib.dll,;t t
+s,@SCARD_LIB_NAME(a),winscard.dll,;t t
+s,@HAVE_PCSC_TRUE@,#,;t t
+s,@HAVE_PCSC_FALSE@,,;t t
+s,@LIBOBJS@, ${LIBOBJDIR}lstat$U.obj,;t t
+s,@LTLIBOBJS@, ${LIBOBJDIR}lstat$U.lo,;t t
 CEOF
 
   # Split the substitutions into bite-sized pieces for seds with
@@ -889,26 +891,14 @@
 ${ac_dA}HAVE_STDLIB_H${ac_dB}HAVE_STDLIB_H${ac_dC}1${ac_dD}
 ${ac_dA}HAVE_STRING_H${ac_dB}HAVE_STRING_H${ac_dC}1${ac_dD}
 ${ac_dA}HAVE_MEMORY_H${ac_dB}HAVE_MEMORY_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STRINGS_H${ac_dB}HAVE_STRINGS_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_INTTYPES_H${ac_dB}HAVE_INTTYPES_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STDINT_H${ac_dB}HAVE_STDINT_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_UNISTD_H${ac_dB}HAVE_UNISTD_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_DLFCN_H${ac_dB}HAVE_DLFCN_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_LIBZ${ac_dB}HAVE_LIBZ${ac_dC}1${ac_dD}
-${ac_dA}HAVE_LIBDL${ac_dB}HAVE_LIBDL${ac_dC}1${ac_dD}
-${ac_dA}HAVE_PCSC${ac_dB}HAVE_PCSC${ac_dC}1${ac_dD}
 ${ac_dA}DEBUG${ac_dB}DEBUG${ac_dC}1${ac_dD}
 ${ac_dA}STDC_HEADERS${ac_dB}STDC_HEADERS${ac_dC}1${ac_dD}
 ${ac_dA}HAVE_STRING_H${ac_dB}HAVE_STRING_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SYSLOG_H${ac_dB}HAVE_SYSLOG_H${ac_dC}1${ac_dD}
 ${ac_dA}HAVE_FCNTL_H${ac_dB}HAVE_FCNTL_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_UNISTD_H${ac_dB}HAVE_UNISTD_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_ZLIB_H${ac_dB}HAVE_ZLIB_H${ac_dC}1${ac_dD}
 ${ac_dA}HAVE_STDLIB_H${ac_dB}HAVE_STDLIB_H${ac_dC}1${ac_dD}
 ${ac_dA}HAVE_MALLOC${ac_dB}HAVE_MALLOC${ac_dC}1${ac_dD}
 ${ac_dA}HAVE_STDLIB_H${ac_dB}HAVE_STDLIB_H${ac_dC}1${ac_dD}
 ${ac_dA}HAVE_REALLOC${ac_dB}HAVE_REALLOC${ac_dC}1${ac_dD}
-${ac_dA}LSTAT_FOLLOWS_SLASHED_SYMLINK${ac_dB}LSTAT_FOLLOWS_SLASHED_SYMLINK${ac_dC}1${ac_dD}
 ${ac_dA}HAVE_VPRINTF${ac_dB}HAVE_VPRINTF${ac_dC}1${ac_dD}
 ${ac_dA}HAVE_MEMSET${ac_dB}HAVE_MEMSET${ac_dC}1${ac_dD}
 ${ac_dA}HAVE_STRDUP${ac_dB}HAVE_STRDUP${ac_dC}1${ac_dD}
@@ -939,39 +929,18 @@
 ${ac_uA}HAVE_STDLIB_H${ac_uB}HAVE_STDLIB_H${ac_uC}1${ac_uD}
 ${ac_uA}HAVE_STRING_H${ac_uB}HAVE_STRING_H${ac_uC}1${ac_uD}
 ${ac_uA}HAVE_MEMORY_H${ac_uB}HAVE_MEMORY_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STRINGS_H${ac_uB}HAVE_STRINGS_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_INTTYPES_H${ac_uB}HAVE_INTTYPES_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STDINT_H${ac_uB}HAVE_STDINT_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_UNISTD_H${ac_uB}HAVE_UNISTD_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_DLFCN_H${ac_uB}HAVE_DLFCN_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_LIBZ${ac_uB}HAVE_LIBZ${ac_uC}1${ac_uD}
-${ac_uA}HAVE_LIBDL${ac_uB}HAVE_LIBDL${ac_uC}1${ac_uD}
-${ac_uA}HAVE_PCSC${ac_uB}HAVE_PCSC${ac_uC}1${ac_uD}
 ${ac_uA}DEBUG${ac_uB}DEBUG${ac_uC}1${ac_uD}
 ${ac_uA}STDC_HEADERS${ac_uB}STDC_HEADERS${ac_uC}1${ac_uD}
 ${ac_uA}HAVE_STRING_H${ac_uB}HAVE_STRING_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SYSLOG_H${ac_uB}HAVE_SYSLOG_H${ac_uC}1${ac_uD}
 ${ac_uA}HAVE_FCNTL_H${ac_uB}HAVE_FCNTL_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_UNISTD_H${ac_uB}HAVE_UNISTD_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_ZLIB_H${ac_uB}HAVE_ZLIB_H${ac_uC}1${ac_uD}
 ${ac_uA}HAVE_STDLIB_H${ac_uB}HAVE_STDLIB_H${ac_uC}1${ac_uD}
 ${ac_uA}HAVE_MALLOC${ac_uB}HAVE_MALLOC${ac_uC}1${ac_uD}
 ${ac_uA}HAVE_STDLIB_H${ac_uB}HAVE_STDLIB_H${ac_uC}1${ac_uD}
 ${ac_uA}HAVE_REALLOC${ac_uB}HAVE_REALLOC${ac_uC}1${ac_uD}
-${ac_uA}LSTAT_FOLLOWS_SLASHED_SYMLINK${ac_uB}LSTAT_FOLLOWS_SLASHED_SYMLINK${ac_uC}1${ac_uD}
 ${ac_uA}HAVE_VPRINTF${ac_uB}HAVE_VPRINTF${ac_uC}1${ac_uD}
 ${ac_uA}HAVE_MEMSET${ac_uB}HAVE_MEMSET${ac_uC}1${ac_uD}
 ${ac_uA}HAVE_STRDUP${ac_uB}HAVE_STRDUP${ac_uC}1${ac_uD}
 ${ac_uA}HAVE_STRERROR${ac_uB}HAVE_STRERROR${ac_uC}1${ac_uD}
-CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-
-  cat >$tmp/undefs.sed <<CEOF
-/^[	 ]*#[	 ]*undef/!b
-t clr
-: clr
 s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
 CEOF
   sed -f $tmp/undefs.sed $tmp/in >$tmp/out


Index: configure
===================================================================
RCS file: /cvs/dirsec/coolkey/configure,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure	10 Jun 2006 00:51:08 -0000	1.3
+++ configure	25 Aug 2006 00:31:39 -0000	1.4
@@ -463,7 +463,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION
PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir
libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir
infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build
build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu
target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE
VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar
MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC
EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE
am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE
am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S E!
 CHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBCKYAPPLET
PCSC_CFLAGS PCSC_LIBS SCARD_LIB_NAME PKG_CONFIG ac_pt_PKG_CONFIG HAVE_PCSC_TRUE
HAVE_PCSC_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION
PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir
libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir
infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build
build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu
target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE
VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar
MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC
EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE
am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE
am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S E!
 CHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBCKYAPPLET
PKG_CONFIG ac_pt_PKG_CONFIG PCSC_CFLAGS PCSC_LIBS ZLIB_CFLAGS ZLIB_LIBS SCARD_LIB_NAME
HAVE_PCSC_TRUE HAVE_PCSC_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1059,7 +1059,7 @@
                           both]
   --with-tags[=TAGS]
                           include additional configurations [automatic]
-  --with-pcsclite=PATH    use PC/SC Lite in PATH
+  --with-pcsclite         Use pcsc-lite (default=yes)
 
 Some influential environment variables:
   CC          C compiler command
@@ -2092,6 +2092,52 @@
 
 fi
 
+
+#
+# ./config does a poor job of dealing with native OS stuff other than
+# unix, detect Windows and mac and do something a little more OS
+# friendly
+WINDOWS=0
+MAC=0
+UNIX=0
+echo "$as_me:$LINENO: checking platform type: " >&5
+echo $ECHO_N "checking platform type: ... $ECHO_C" >&6
+case "$host" in
+*-*-win*|*-*-cygwin*)
+  	echo "$as_me:$LINENO: result: Windows" >&5
+echo "${ECHO_T}Windows" >&6
+	WINDOWS=1
+	ZLIB_CFLAGS=-Ic:/zlib
+	ZLIB_LIBS=c:/zlib/zlib.dll
+	#OS_FLAGS=`echo $INCLUDE | tr '[[:upper:]]' '[[:lower:]]' | sed -e
's;\\\\;/;g' -e 's;.:;/cygdrive/&/;g' -e 's;:;;g' -e
's;//;/;g' -e 's/;/\" -I\"/g' -e 's;^;-I\";' -e
's;$;\";'`
+	CPPFLAGS="$CPPFLAGS $OS_FLAGS -DWIN32"
+	LDFLAGS="$LDFLAGS"
+	{ echo "$as_me:$LINENO: WARNING: changing CPPFLAGS = $CPPFLAGS  " >&5
+echo "$as_me: WARNING: changing CPPFLAGS = $CPPFLAGS  " >&2;};
+	SCARD_LIB_NAME="winscard.dll"
+	# override config defaults for windows
+	CC=cl
+	CXX=cl
+	CXXFLAGS="$CXXFLAGS /EHsc"
+	;;
+*-*-darwin*)
+  	echo "$as_me:$LINENO: result: MAC" >&5
+echo "${ECHO_T}MAC" >&6
+	MAC=1
+	SCARD_LIB_NAME="PCSC.Framework/PCSC"
+	PCSC_MSG=yes
+	PCSC_CFLAGS=""
+	PCSC_LIBS="-Wl,-framework,PCSC"
+	;;
+*)
+  	echo "$as_me:$LINENO: result: UNIX/LINUX" >&5
+echo "${ECHO_T}UNIX/LINUX" >&6
+	UNIX=1
+        # should look it up on the local system
+	SCARD_LIB_NAME="libpcsclite.so.1"
+	;;
+esac
+
 # Checks for programs.
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -4227,7 +4273,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4230 "configure"' > conftest.$ac_ext
+  echo '#line 4276 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5362,7 +5408,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:5365:" \
+echo "$as_me:5411:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null
>&5\"") >&5
@@ -6425,11 +6471,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6428: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6474: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6432: \$? = $ac_status" >&5
+   echo "$as_me:6478: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6693,11 +6739,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6696: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6742: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6700: \$? = $ac_status" >&5
+   echo "$as_me:6746: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6797,11 +6843,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6800: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6846: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6804: \$? = $ac_status" >&5
+   echo "$as_me:6850: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8266,7 +8312,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 8269 "configure"' > conftest.$ac_ext
+    echo '#line 8315 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9163,7 +9209,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9166 "configure"
+#line 9212 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9263,7 +9309,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9266 "configure"
+#line 9312 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10479,7 +10525,7 @@
     enable_shared_with_static_runtimes_CXX=yes
 
     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs
$postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base
-Xlinker --out-implib -Xlinker $lib'
+      archive_cmds_CXX='$CC -LD -shared -nostdlib $predep_objects $libobjs $deplibs
$postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base
-Xlinker --out-implib -Xlinker'
       # If the export-symbols file already is a .def file (1st line
       # is EXPORTS), use it as is; otherwise, prepend...
       archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" =
xEXPORTS; then
@@ -10488,7 +10534,11 @@
 	echo EXPORTS > $output_objdir/$soname.def;
 	cat $export_symbols >> $output_objdir/$soname.def;
       fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs
$postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base
-Xlinker --out-implib -Xlinker $lib'
+      #
+      # Hack... gcc and lc are quite different, we can use either for cygwin
+      # try to get a line that both are happy with...
+      #
+      $CC -LD -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs
$deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname
${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker '
     else
       ld_shlibs_CXX=no
     fi
@@ -11603,11 +11653,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11606: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11656: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11610: \$? = $ac_status" >&5
+   echo "$as_me:11660: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11707,11 +11757,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11710: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11760: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11714: \$? = $ac_status" >&5
+   echo "$as_me:11764: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12243,7 +12293,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 12246 "configure"' > conftest.$ac_ext
+    echo '#line 12296 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -13298,11 +13348,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13301: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13351: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13305: \$? = $ac_status" >&5
+   echo "$as_me:13355: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13402,11 +13452,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13405: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13455: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13409: \$? = $ac_status" >&5
+   echo "$as_me:13459: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14851,7 +14901,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 14854 "configure"' > conftest.$ac_ext
+    echo '#line 14904 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -15626,11 +15676,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15629: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15679: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15633: \$? = $ac_status" >&5
+   echo "$as_me:15683: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15894,11 +15944,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15897: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15947: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15901: \$? = $ac_status" >&5
+   echo "$as_me:15951: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15998,11 +16048,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16001: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16051: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16005: \$? = $ac_status" >&5
+   echo "$as_me:16055: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17467,7 +17517,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 17470 "configure"' > conftest.$ac_ext
+    echo '#line 17520 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -18778,6 +18828,7 @@
 
 
 # Checks for libraries.
+if test $WINDOWS -ne 1; then
 
 echo "$as_me:$LINENO: checking for uncompress in -lz" >&5
 echo $ECHO_N "checking for uncompress in -lz... $ECHO_C" >&6
@@ -18934,47 +18985,22 @@
    { (exit 1); exit 1; }; }
 fi
 
+fi
 
 # add our compiled static libraries
 
 LIBCKYAPPLET="\${top_builddir}/src/libckyapplet/libckyapplet.la"
 
-PCSC_MSG=no
-pcsc_path=/usr
-
-
-
-
-case "$host" in
-*-*-win*)
-	SCARD_LIB_NAME="winscard.dll"
-	;;
-*-*-darwin*)
-	SCARD_LIB_NAME="PCSC.Framework/PCSC"
-	PCSC_MSG=yes
-	PCSC_CFLAGS=""
-	PCSC_LIBS="-Wl,-framework,PCSC"
-	;;
-*)
-        # should look it up on the local system
-	SCARD_LIB_NAME="libpcsclite.so.1"
-	;;
-esac
-
-saved_LIBS="$LIBS"
-saved_CFLAGS="$CFLAGS"
-saved_LDFLAGS="$LDFLAGS"
-saved_CPPFLAGS="$CPPFLAGS"
 
 # Check whether --with-pcsclite or --without-pcsclite was given.
 if test "${with_pcsclite+set}" = set; then
   withval="$with_pcsclite"
-  pcsc_path=$withval
+
 fi;
-if test "x$pcsc_path" = "xno"; then
-	PCSC_MSG="no"
-fi
-if test "x$pcsc_path" != "xno" -a "x$PCSC_MSG" !=
"xyes"; then
+if test "$with_pcsclite" = "no" -o "$with_pcsclite" =
"false"
+then
+  with_pcsclite=no
+else
 
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -19139,297 +19165,52 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$PCSC_PKG_ERRORS" >&5
 
-
-	echo "$as_me:$LINENO: checking for PC/SC Lite support (old style)" >&5
-echo $ECHO_N "checking for PC/SC Lite support (old style)... $ECHO_C"
>&6
-	for pcscdir in "" /PCSC; do
-		CPPFLAGS="$saved_CPPFLAGS"
-		LDFLAGS="$saved_LDFLAGS"
-		LIBS="-lpcsclite $saved_LIBS"
-		PCSC_CFLAGS=""
-
-		for pcsc_libdir in $pcsc_path/lib$pcscdir \
-			      $pcsc_path$pcscdir/lib \
-			      $pcsc_path$pcscdir; do
-			if test -d $pcsc_libdir; then
-				if test -n "${need_dash_r}"; then
-					LDFLAGS="-R${pcsc_libdir}/ ${LDFLAGS}"
-				fi
-				LDFLAGS="-L${pcsc_libdir} ${LDFLAGS}"
-			fi
-		done
-
-		for pcsc_incdir in $pcsc_path/include$pcscdir \
-			      $pcsc_path$pcscdir/include \
-			      $pcsc_path$pcscdir; do
-		      if test -d $pcsc_incdir; then
-				PCSC_CFLAGS="-I${pcsc_incdir}"
-				break;
-		      fi
-		done
-
-		CPPFLAGS="${PCSC_CFLAGS} ${CPPFLAGS}"
-		cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <winscard.h>
-int
-main ()
-{
-SCardEstablishContext(0, NULL, NULL, NULL);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pcsclite_SCardEstablishContext=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-		if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" = "xyes";
then
-			PCSC_MSG=yes
-			break;
-		fi
-		CPPFLAGS="$saved_CPPFLAGS"
-		LDFLAGS="$saved_LDFLAGS"
-		LIBS="$saved_LIBS"
-		PCSC_CFLAGS=""
-	done
-	echo "$as_me:$LINENO: result: $PCSC_MSG" >&5
-echo "${ECHO_T}$PCSC_MSG" >&6
-	if test "x$PCSC_MSG" = "xyes" ; then
-		PCSC_LIBS="-lpcsclite"
-		CPPFLAGS="$saved_CPPFLAGS"
-		LIBS="$saved_LIBS"
-	fi
+	 if test -f /usr/local/lib/pkgconfig/libpcsclite.pc ; then
+                { { echo "$as_me:$LINENO: error: use
PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure" >&5
+echo "$as_me: error: use PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure"
>&2;}
+   { (exit 1); exit 1; }; }
+          else
+                { echo "$as_me:$LINENO: WARNING: pcsc-lite not found"
>&5
+echo "$as_me: WARNING: pcsc-lite not found" >&2;}
+                with_pcsclite=no
+        fi
 
 elif test $pkg_failed = untried; then
-
-	echo "$as_me:$LINENO: checking for PC/SC Lite support (old style)" >&5
-echo $ECHO_N "checking for PC/SC Lite support (old style)... $ECHO_C"
>&6
-	for pcscdir in "" /PCSC; do
-		CPPFLAGS="$saved_CPPFLAGS"
-		LDFLAGS="$saved_LDFLAGS"
-		LIBS="-lpcsclite $saved_LIBS"
-		PCSC_CFLAGS=""
-
-		for pcsc_libdir in $pcsc_path/lib$pcscdir \
-			      $pcsc_path$pcscdir/lib \
-			      $pcsc_path$pcscdir; do
-			if test -d $pcsc_libdir; then
-				if test -n "${need_dash_r}"; then
-					LDFLAGS="-R${pcsc_libdir}/ ${LDFLAGS}"
-				fi
-				LDFLAGS="-L${pcsc_libdir} ${LDFLAGS}"
-			fi
-		done
-
-		for pcsc_incdir in $pcsc_path/include$pcscdir \
-			      $pcsc_path$pcscdir/include \
-			      $pcsc_path$pcscdir; do
-		      if test -d $pcsc_incdir; then
-				PCSC_CFLAGS="-I${pcsc_incdir}"
-				break;
-		      fi
-		done
-
-		CPPFLAGS="${PCSC_CFLAGS} ${CPPFLAGS}"
-		cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <winscard.h>
-int
-main ()
-{
-SCardEstablishContext(0, NULL, NULL, NULL);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pcsclite_SCardEstablishContext=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-		if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" = "xyes";
then
-			PCSC_MSG=yes
-			break;
-		fi
-		CPPFLAGS="$saved_CPPFLAGS"
-		LDFLAGS="$saved_LDFLAGS"
-		LIBS="$saved_LIBS"
-		PCSC_CFLAGS=""
-	done
-	echo "$as_me:$LINENO: result: $PCSC_MSG" >&5
-echo "${ECHO_T}$PCSC_MSG" >&6
-	if test "x$PCSC_MSG" = "xyes" ; then
-		PCSC_LIBS="-lpcsclite"
-		CPPFLAGS="$saved_CPPFLAGS"
-		LIBS="$saved_LIBS"
-	fi
+	 if test -f /usr/local/lib/pkgconfig/libpcsclite.pc ; then
+                { { echo "$as_me:$LINENO: error: use
PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure" >&5
+echo "$as_me: error: use PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure"
>&2;}
+   { (exit 1); exit 1; }; }
+          else
+                { echo "$as_me:$LINENO: WARNING: pcsc-lite not found"
>&5
+echo "$as_me: WARNING: pcsc-lite not found" >&2;}
+                with_pcsclite=no
+        fi
 
 else
 	PCSC_CFLAGS=$pkg_cv_PCSC_CFLAGS
 	PCSC_LIBS=$pkg_cv_PCSC_LIBS
         echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-
-		PCSC_MSG="yes"
-		echo "$as_me:$LINENO: result: $PCSC_MSG" >&5
-echo "${ECHO_T}$PCSC_MSG" >&6
-
+	 with_pcsclite=yes
 fi
 fi
 
 
-if test "x$PCSC_MSG" = "xyes"; then
-  HAVE_PCSC_TRUE=
-  HAVE_PCSC_FALSE='#'
-else
-  HAVE_PCSC_TRUE='#'
-  HAVE_PCSC_FALSE=
-fi
-
-if test "x$PCSC_MSG" = "xyes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PCSC 1
-_ACEOF
-
-else
-	PCSC_LIBS=""
-	PCSC_CFLAGS=""
-fi
-
-if test "x$PCSC_MSG" = "xyes"; then
-	CPPFLAGS="${PCSC_CFLAGS} $saved_CPPFLAGS"
-	CFLAGS="$PCSC_CFLAGS $saved_CFLAGS"
-	LIBS="$PCSC_LIBS $saved_LIBS"
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <stdlib.h>
-#ifdef __APPLE__
-#include <PCSC/wintypes.h>
-#include <PCSC/winscard.h>
-#else
-#include <winscard.h>
-#endif
-
-int
-main ()
-{
-
-SCardControl(NULL, NULL, 0, NULL, NULL);
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PCSC_OLD 1
-_ACEOF
 
 
+if test x$with_pcsclite = xyes; then
+  HAVE_PCSC_TRUE=
+  HAVE_PCSC_FALSE='#'
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-	CPPFLAGS="$saved_CPPFLAGS"
-	CFLAGS="$saved_CFLAGS"
-	LIBS="$saved_LIBS"
+  HAVE_PCSC_TRUE='#'
+  HAVE_PCSC_FALSE=
 fi
 
 
+
 cat >>confdefs.h <<\_ACEOF
 #define DEBUG 1
 _ACEOF
@@ -21080,9 +20861,10 @@
   # 1. Remove the extension, and $U if already installed.
   ac_i=`echo "$ac_i" |
 	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -21732,11 +21514,13 @@
 s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
 s,@LIBCKYAPPLET@,$LIBCKYAPPLET,;t t
+s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
 s,@PCSC_CFLAGS@,$PCSC_CFLAGS,;t t
 s,@PCSC_LIBS@,$PCSC_LIBS,;t t
+s,@ZLIB_CFLAGS@,$ZLIB_CFLAGS,;t t
+s,@ZLIB_LIBS@,$ZLIB_LIBS,;t t
 s,@SCARD_LIB_NAME@,$SCARD_LIB_NAME,;t t
-s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
 s,@HAVE_PCSC_TRUE@,$HAVE_PCSC_TRUE,;t t
 s,@HAVE_PCSC_FALSE@,$HAVE_PCSC_FALSE,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t


Index: configure.in
===================================================================
RCS file: /cvs/dirsec/coolkey/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configure.in	18 Aug 2006 16:03:31 -0000	1.4
+++ configure.in	25 Aug 2006 00:31:39 -0000	1.5
@@ -55,7 +55,7 @@
   	AC_MSG_RESULT([Windows])
 	WINDOWS=1
 	ZLIB_CFLAGS=-Ic:/zlib
-	ZLIB_LIB=c:/zlib/zlib.dll
+	ZLIB_LIBS=c:/zlib/zlib.dll
 	#OS_FLAGS=`echo $INCLUDE | tr '[[:upper:]]' '[[:lower:]]' | sed -e
's;\\\\;/;g' -e 's;.:;/cygdrive/&/;g' -e 's;:;;g' -e
's;//;/;g' -e 's/;/\" -I\"/g' -e 's;^;-I\";' -e
's;$;\";'`
 	CPPFLAGS="$CPPFLAGS $OS_FLAGS -DWIN32"
 	LDFLAGS="$LDFLAGS"


Index: libtool
===================================================================
RCS file: /cvs/dirsec/coolkey/libtool,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libtool	9 Jun 2006 21:56:34 -0000	1.2
+++ libtool	25 Aug 2006 00:31:39 -0000	1.3
@@ -30,10 +30,10 @@
 # the same distribution terms that you use for the rest of that program.
 
 # A sed program that does not truncate output.
-SED="/bin/sed"
+SED="/usr/bin/sed"
 
 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="/bin/sed -e 1s/^X//"
+Xsed="/usr/bin/sed -e 1s/^X//"
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
@@ -44,7 +44,7 @@
 
 # ### BEGIN LIBTOOL CONFIG
 
-# Libtool was configured on host jordan.sfbay.redhat.com:
+# Libtool was configured on host relyea2:
 
 # Shell to use when invoking shell scripts.
 SHELL="/bin/sh"
@@ -56,23 +56,23 @@
 build_old_libs=yes
 
 # Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=no
+build_libtool_need_lc=yes
 
 # Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=no
+allow_libtool_libs_with_static_runtimes=yes
 
 # Whether or not to optimize for fast installation.
 fast_install=yes
 
 # The host system.
 host_alias=
-host=i686-redhat-linux-gnu
-host_os=linux-gnu
+host=i686-pc-cygwin
+host_os=cygwin
 
 # The build system.
 build_alias=
-build=i686-redhat-linux-gnu
-build_os=linux-gnu
+build=i686-pc-cygwin
+build_os=cygwin
 
 # An echo program that does not interpret backslashes.
 echo="echo"
@@ -82,22 +82,22 @@
 AR_FLAGS="cru"
 
 # A C compiler.
-LTCC="gcc"
+LTCC="cl"
 
 # LTCC compiler flags.
-LTCFLAGS="-g -O2"
+LTCFLAGS="-g"
 
 # A language-specific compiler.
-CC="gcc"
+CC="cl"
 
 # Is the compiler the GNU C compiler?
-with_gcc=yes
+with_gcc=
 
 # An ERE matcher.
 EGREP="grep -E"
 
 # The linker used to build libraries.
-LD="/usr/bin/ld"
+LD="/bin/ld"
 
 # Whether we need hard or soft links.
 LN_S="ln -s"
@@ -128,32 +128,32 @@
 reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
 
 # How to pass a linker flag through the compiler.
-wl="-Wl,"
+wl=""
 
 # Object file suffix (normally "o").
-objext="o"
+objext="obj"
 
 # Old archive suffix (normally "a").
-libext="a"
+libext="lib"
 
 # Shared library suffix (normally ".so").
-shrext='.so'
+shrext='.dll'
 
 # Executable file suffix (normally "").
 exeext=""
 
 # Additional compiler flags for building library objects.
-pic_flag=" -fPIC -DPIC"
+pic_flag=" -DPIC"
 pic_mode=default
 
 # What is the maximum length of a command?
-max_cmd_len=32768
+max_cmd_len=8192
 
 # Does compiler simultaneously support -c and -o options?
-compiler_c_o="yes"
+compiler_c_o="no"
 
 # Must we lock files when doing compilation?
-need_locks="no"
+need_locks="yes"
 
 # Do we need the lib prefix for modules?
 need_lib_prefix=no
@@ -171,36 +171,36 @@
 dlopen_self_static=unknown
 
 # Compiler flag to prevent dynamic linking.
-link_static_flag="-static"
+link_static_flag=""
 
 # Compiler flag to turn off builtin functions.
-no_builtin_flag=" -fno-builtin"
+no_builtin_flag=""
 
 # Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec="\${wl}--export-dynamic"
+export_dynamic_flag_spec=""
 
 # Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec="\${wl}--whole-archive\$convenience
\${wl}--no-whole-archive"
+whole_archive_flag_spec=""
 
 # Compiler flag to generate thread-safe objects.
 thread_safe_flag_spec=""
 
 # Library versioning type.
-version_type=linux
+version_type=windows
 
 # Format of library name prefix.
 libname_spec="lib\$name"
 
 # List of archive names.  First name is the real one, the rest are links.
 # The last name is the one that the linker finds with -lNAME.
-library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix
\${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
+library_names_spec="\${libname}\`echo \${release} | \$SED -e
s/[.]/-/g\`\${versuffix}\${shared_ext} \$libname.lib"
 
 # The coded name of the library, if different from the real name.
-soname_spec="\${libname}\${release}\${shared_ext}\$major"
+soname_spec=""
 
 # Commands used to build and install an old-style archive.
 RANLIB="ranlib"
-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB
\$oldlib"
+old_archive_cmds="lib /OUT:\$oldlib\$oldobjs\$old_deplibs"
 old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
 old_postuninstall_cmds=""
 
@@ -211,11 +211,8 @@
 old_archive_from_expsyms_cmds=""
 
 # Commands used to build and install a shared archive.
-archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname
\$wl\$soname -o \$lib"
-archive_expsym_cmds="\$echo \\\"{ global:\\\" >
\$output_objdir/\$libname.ver~
-  cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >>
\$output_objdir/\$libname.ver~
-  \$echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~
-	  \$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname
\${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
+archive_cmds="\$CC -o \$lib \$libobjs \$compiler_flags \\\`echo
\\\"\$deplibs\\\" | \$SED -e 's/ -lc\$//'\\\` -link
-dll~linknames="
+archive_expsym_cmds=""
 postinstall_cmds=""
 postuninstall_cmds=""
 
@@ -248,25 +245,25 @@
 compiler_lib_search_path=""
 
 # Method to check whether dependent libraries are shared objects.
-deplibs_check_method="pass_all"
+deplibs_check_method="file_magic ^x86 archive import|^x86 DLL"
 
 # Command to use when deplibs_check_method == file_magic.
-file_magic_cmd="\$MAGIC_CMD"
+file_magic_cmd="func_win32_libid"
 
 # Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=""
+allow_undefined_flag="unsupported"
 
 # Flag that forces no undefined symbols.
 no_undefined_flag=""
 
 # Commands used to finish a libtool library installation in a directory.
-finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
+finish_cmds=""
 
 # Same as above, but a single script fragment to be evaled but not shown.
 finish_eval=""
 
 # Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[ 	]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ 	][
	]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'"
+global_symbol_pipe="sed -n -e 's/^.*[ 	]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ 	][
	]*_\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 _\\2 \\2/p'"
 
 # Transform the output of nm in a proper C declaration
 global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int
\\1;/p'"
@@ -275,23 +272,23 @@
 global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ 
{\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^
]*\\)\$/  {\"\\2\", (lt_ptr) \\&\\2},/p'"
 
 # This is the shared library runtime path variable.
-runpath_var=LD_RUN_PATH
+runpath_var=
 
 # This is the shared library path variable.
-shlibpath_var=LD_LIBRARY_PATH
+shlibpath_var=PATH
 
 # Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=no
+shlibpath_overrides_runpath=unknown
 
 # How to hardcode a shared library path into an executable.
 hardcode_action=immediate
 
 # Whether we should hardcode library paths into libraries.
-hardcode_into_libs=yes
+hardcode_into_libs=no
 
 # Flag to hardcode $libdir into a binary during linking.
 # This must work even if $libdir does not exist.
-hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
+hardcode_libdir_flag_spec=" "
 
 # If ld is used when linking, flag to hardcode $libdir into
 # a binary during linking. This must work even if $libdir does
@@ -319,19 +316,19 @@
 
 # Variables whose values should be saved in libtool wrapper scripts and
 # restored at relink time.
-variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX
COMPILER_PATH LIBRARY_PATH"
+variables_saved_for_relink="PATH PATH "
 
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=unknown
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=" /usr/lib/gcc/i386-redhat-linux/4.1.0/
/usr/lib/gcc/i386-redhat-linux/4.1.0/
/usr/lib/gcc/i386-redhat-linux/4.1.0/../../../../i386-redhat-linux/lib/i386-redhat-linux/4.1.0/
/usr/lib/gcc/i386-redhat-linux/4.1.0/../../../../i386-redhat-linux/lib/
/usr/lib/gcc/i386-redhat-linux/4.1.0/../../../i386-redhat-linux/4.1.0/
/usr/lib/gcc/i386-redhat-linux/4.1.0/../../../ /lib/i386-redhat-linux/4.1.0/ /lib/
/usr/lib/i386-redhat-linux/4.1.0/ /usr/lib/"
+sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 
 # Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/mysql /usr/lib/mysql
/usr/lib/qt-3.3/lib /usr/X11R6/lib /usr/lib/mysql /usr/lib/wine "
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
 
 # Fix the shell variable $srcfile for the compiler.
-fix_srcfile_path=""
+fix_srcfile_path="`cygpath -w "$srcfile"`"
 
 # Set to yes if exported symbols are required.
 always_export_symbols=no
@@ -1931,6 +1928,12 @@
 	continue
 	;;
 
+      *$shrext)
+	# A shared library
+	deplibs="$deplibs $arg"
+	continue
+	;;
+
       *.la)
 	# A libtool-controlled library.
 
@@ -2263,6 +2266,12 @@
 	  continue
 	  ;;
 	*.la) lib="$deplib" ;;
+	*$shrext)
+	  if test "$pass" = link -a "$shrext" = ".dll"; then
+		deplib=`echo $deplib | sed -e 's;'$shrext'\$;.'$libext';'`
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue;;
 	*.$libext)
 	  if test "$pass" = conv; then
 	    deplibs="$deplib $deplibs"
@@ -6651,7 +6660,7 @@
 # End:
 # ### BEGIN LIBTOOL TAG CONFIG: CXX
 
-# Libtool was configured on host jordan.sfbay.redhat.com:
+# Libtool was configured on host relyea2:
 
 # Shell to use when invoking shell scripts.
 SHELL="/bin/sh"
@@ -6666,20 +6675,20 @@
 build_libtool_need_lc=no
 
 # Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=no
+allow_libtool_libs_with_static_runtimes=yes
 
 # Whether or not to optimize for fast installation.
 fast_install=yes
 
 # The host system.
 host_alias=
-host=i686-redhat-linux-gnu
-host_os=linux-gnu
+host=i686-pc-cygwin
+host_os=cygwin
 
 # The build system.
 build_alias=
-build=i686-redhat-linux-gnu
-build_os=linux-gnu
+build=i686-pc-cygwin
+build_os=cygwin
 
 # An echo program that does not interpret backslashes.
 echo="echo"
@@ -6689,22 +6698,22 @@
 AR_FLAGS="cru"
 
 # A C compiler.
-LTCC="gcc"
+LTCC="cl"
 
 # LTCC compiler flags.
-LTCFLAGS="-g -O2"
+LTCFLAGS="-g"
 
 # A language-specific compiler.
-CC="g++"
+CC="cl"
 
 # Is the compiler the GNU C compiler?
-with_gcc=yes
+with_gcc=no
 
 # An ERE matcher.
 EGREP="grep -E"
 
 # The linker used to build libraries.
-LD="/usr/bin/ld"
+LD="/bin/ld"
 
 # Whether we need hard or soft links.
 LN_S="ln -s"
@@ -6735,32 +6744,32 @@
 reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
 
 # How to pass a linker flag through the compiler.
-wl="-Wl,"
+wl=""
 
 # Object file suffix (normally "o").
-objext="o"
+objext="obj"
 
 # Old archive suffix (normally "a").
-libext="a"
+libext="lib"
 
 # Shared library suffix (normally ".so").
-shrext='.so'
+shrext='.dll'
 
 # Executable file suffix (normally "").
 exeext=""
 
 # Additional compiler flags for building library objects.
-pic_flag=" -fPIC -DPIC"
+pic_flag=" -DPIC"
 pic_mode=default
 
 # What is the maximum length of a command?
-max_cmd_len=32768
+max_cmd_len=8192
 
 # Does compiler simultaneously support -c and -o options?
-compiler_c_o="yes"
+compiler_c_o="no"
 
 # Must we lock files when doing compilation?
-need_locks="no"
+need_locks="yes"
 
 # Do we need the lib prefix for modules?
 need_lib_prefix=no
@@ -6778,36 +6787,36 @@
 dlopen_self_static=unknown
 
 # Compiler flag to prevent dynamic linking.
-link_static_flag="-static"
+link_static_flag=""
 
 # Compiler flag to turn off builtin functions.
-no_builtin_flag=" -fno-builtin"
+no_builtin_flag=""
 
 # Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec="\${wl}--export-dynamic"
+export_dynamic_flag_spec=""
 
 # Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec="\${wl}--whole-archive\$convenience
\${wl}--no-whole-archive"
+whole_archive_flag_spec=""
 
 # Compiler flag to generate thread-safe objects.
 thread_safe_flag_spec=""
 
 # Library versioning type.
-version_type=linux
+version_type=windows
 
 # Format of library name prefix.
 libname_spec="lib\$name"
 
 # List of archive names.  First name is the real one, the rest are links.
 # The last name is the one that the linker finds with -lNAME.
-library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix
\${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
+library_names_spec="\${libname}\`echo \${release} | \$SED -e
s/[.]/-/g\`\${versuffix}\${shared_ext} \$libname.lib"
 
 # The coded name of the library, if different from the real name.
-soname_spec="\${libname}\${release}\${shared_ext}\$major"
+soname_spec=""
 
 # Commands used to build and install an old-style archive.
 RANLIB="ranlib"
-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB
\$oldlib"
+old_archive_cmds="lib /OUT:\$oldlib\$oldobjs\$old_deplibs"
 old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
 old_postuninstall_cmds=""
 
@@ -6818,8 +6827,18 @@
 old_archive_from_expsyms_cmds=""
 
 # Commands used to build and install a shared archive.
-archive_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs
\$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
-archive_expsym_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs
\$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-retain-symbols-file
\$wl\$export_symbols -o \$lib"
+archive_cmds="\$CC -LD -shared -nostdlib \$predep_objects \$libobjs \$deplibs
\$postdep_objects \$compiler_flags -o \$output_objdir/\$soname
\${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker"
+archive_expsym_cmds="if test \\\"x\\\`\$SED 1q \$export_symbols\\\`\\\" =
xEXPORTS; then
+	cp \$export_symbols \$output_objdir/\$soname.def;
+      else
+	echo EXPORTS > \$output_objdir/\$soname.def;
+	cat \$export_symbols >> \$output_objdir/\$soname.def;
+      fi~
+      #
+      # Hack... gcc and lc are quite different, we can use either for cygwin
+      # try to get a line that both are happy with...
+      #
+      \$CC -LD -shared -nostdlib \$output_objdir/\$soname.def \$predep_objects \$libobjs
\$deplibs \$postdep_objects \$compiler_flags -o \$output_objdir/\$soname
\${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker "
 postinstall_cmds=""
 postuninstall_cmds=""
 
@@ -6833,11 +6852,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects="/usr/lib/gcc/i386-redhat-linux/4.1.0/../../../crti.o
/usr/lib/gcc/i386-redhat-linux/4.1.0/crtbeginS.o"
+predep_objects=""
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects="/usr/lib/gcc/i386-redhat-linux/4.1.0/crtendS.o
/usr/lib/gcc/i386-redhat-linux/4.1.0/../../../crtn.o"
+postdep_objects=""
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -6845,32 +6864,32 @@
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
+postdeps=""
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path="-L/usr/lib/gcc/i386-redhat-linux/4.1.0
-L/usr/lib/gcc/i386-redhat-linux/4.1.0
-L/usr/lib/gcc/i386-redhat-linux/4.1.0/../../.."
+compiler_lib_search_path=""
 
 # Method to check whether dependent libraries are shared objects.
-deplibs_check_method="pass_all"
+deplibs_check_method="file_magic ^x86 archive import|^x86 DLL"
 
 # Command to use when deplibs_check_method == file_magic.
-file_magic_cmd="\$MAGIC_CMD"
+file_magic_cmd="func_win32_libid"
 
 # Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=""
+allow_undefined_flag="unsupported"
 
 # Flag that forces no undefined symbols.
 no_undefined_flag=""
 
 # Commands used to finish a libtool library installation in a directory.
-finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
+finish_cmds=""
 
 # Same as above, but a single script fragment to be evaled but not shown.
 finish_eval=""
 
 # Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[ 	]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ 	][
	]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'"
+global_symbol_pipe="sed -n -e 's/^.*[ 	]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ 	][
	]*_\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 _\\2 \\2/p'"
 
 # Transform the output of nm in a proper C declaration
 global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int
\\1;/p'"
@@ -6879,23 +6898,23 @@
 global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ 
{\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^
]*\\)\$/  {\"\\2\", (lt_ptr) \\&\\2},/p'"
 
 # This is the shared library runtime path variable.
-runpath_var=LD_RUN_PATH
+runpath_var=
 
 # This is the shared library path variable.
-shlibpath_var=LD_LIBRARY_PATH
+shlibpath_var=PATH
 
 # Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=no
+shlibpath_overrides_runpath=unknown
 
 # How to hardcode a shared library path into an executable.
 hardcode_action=immediate
 
 # Whether we should hardcode library paths into libraries.
-hardcode_into_libs=yes
+hardcode_into_libs=no
 
 # Flag to hardcode $libdir into a binary during linking.
 # This must work even if $libdir does not exist.
-hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
+hardcode_libdir_flag_spec="-L\$libdir"
 
 # If ld is used when linking, flag to hardcode $libdir into
 # a binary during linking. This must work even if $libdir does
@@ -6923,16 +6942,16 @@
 
 # Variables whose values should be saved in libtool wrapper scripts and
 # restored at relink time.
-variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX
COMPILER_PATH LIBRARY_PATH"
+variables_saved_for_relink="PATH PATH "
 
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=unknown
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=" /usr/lib/gcc/i386-redhat-linux/4.1.0/
/usr/lib/gcc/i386-redhat-linux/4.1.0/
/usr/lib/gcc/i386-redhat-linux/4.1.0/../../../../i386-redhat-linux/lib/i386-redhat-linux/4.1.0/
/usr/lib/gcc/i386-redhat-linux/4.1.0/../../../../i386-redhat-linux/lib/
/usr/lib/gcc/i386-redhat-linux/4.1.0/../../../i386-redhat-linux/4.1.0/
/usr/lib/gcc/i386-redhat-linux/4.1.0/../../../ /lib/i386-redhat-linux/4.1.0/ /lib/
/usr/lib/i386-redhat-linux/4.1.0/ /usr/lib/"
+sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 
 # Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/mysql /usr/lib/mysql
/usr/lib/qt-3.3/lib /usr/X11R6/lib /usr/lib/mysql /usr/lib/wine "
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
 
 # Fix the shell variable $srcfile for the compiler.
 fix_srcfile_path=""
@@ -6941,7 +6960,7 @@
 always_export_symbols=no
 
 # The commands to list exported symbols.
-export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED
's/.* //' | sort | uniq > \$export_symbols"
+export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED -e
'/^[BCDGRS] /s/.* \\\\([^ ]*\\\\)/\\\\1 DATA/;/^.* __nm__/s/^.* __nm__\\\\([^ ]*\\\\)
[^ ]*/\\\\1 DATA/;/^I /d;/^[AITW] /s/.* //' | sort | uniq > \$export_symbols"
 
 # The commands to extract the exported symbol list from a shared archive.
 extract_expsyms_cmds=""


Index: ltmain.sh
===================================================================
RCS file: /cvs/dirsec/coolkey/ltmain.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ltmain.sh	9 Jun 2006 18:31:33 -0000	1.1.1.1
+++ ltmain.sh	25 Aug 2006 00:31:39 -0000	1.2
@@ -1579,6 +1579,12 @@
 	continue
 	;;
 
+      *$shrext)
+	# A shared library
+	deplibs="$deplibs $arg"
+	continue
+	;;
+
       *.la)
 	# A libtool-controlled library.
 
@@ -1911,6 +1917,12 @@
 	  continue
 	  ;;
 	*.la) lib="$deplib" ;;
+	*$shrext)
+	  if test "$pass" = link -a "$shrext" = ".dll"; then
+		deplib=`echo $deplib | sed -e 's;'$shrext'\$;.'$libext';'`
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue;;
 	*.$libext)
 	  if test "$pass" = conv; then
 	    deplibs="$deplib $deplibs"