[Opendnssec-commits] [keihatsu.kirei.se/svn/dnssec] r5308 - trunk/softHSM

Rickard Bellgrim rickard at opendnssec.org
Fri Jul 8 15:08:18 CEST 2011


Author: rb
Date: 2011-07-08 15:08:18 +0200 (Fri, 08 Jul 2011)
New Revision: 5308

Modified:
   trunk/softHSM/NEWS
   trunk/softHSM/configure.ac
Log:
Windows: The softhsm tool will use the DLL file by default.


Modified: trunk/softHSM/NEWS
===================================================================
--- trunk/softHSM/NEWS	2011-07-08 12:46:41 UTC (rev 5307)
+++ trunk/softHSM/NEWS	2011-07-08 13:08:18 UTC (rev 5308)
@@ -30,6 +30,7 @@
 * Windows: Compatibility function for getpass.
 * Windows: Use _putenv and not setenv.
 * Windows: Generate the DLL file.
+* Windows: The softhsm tool will use the DLL file by default.
 
 
 SoftHSM 1.2.1 - 2011-05-03 

Modified: trunk/softHSM/configure.ac
===================================================================
--- trunk/softHSM/configure.ac	2011-07-08 12:46:41 UTC (rev 5307)
+++ trunk/softHSM/configure.ac	2011-07-08 13:08:18 UTC (rev 5308)
@@ -126,12 +126,25 @@
   ["$default_softhsm_conf"],
   [The default location of softhsm.conf]
 )
-AC_DEFINE_UNQUOTED(
-  [DEFAULT_PKCS11_LIB],
-  ["$full_libdir/libsofthsm.so"],
-  [The default PKCS#11 library]
-)
 
+# Host specific configuration
+case "${host}" in
+*-*-winnt* | *-*-mingw* | *-*-cygwin*)
+  AC_DEFINE_UNQUOTED(
+    [DEFAULT_PKCS11_LIB],
+    ["$full_libdir/libsofthsm.dll"],
+    [The default PKCS#11 library]
+  )
+  ;;
+*)
+  AC_DEFINE_UNQUOTED(
+    [DEFAULT_PKCS11_LIB],
+    ["$full_libdir/libsofthsm.so"],
+    [The default PKCS#11 library]
+  )
+  ;;
+esac
+
 # Generate the libtool script and install script 
 AC_PROG_INSTALL
 ifdef(




More information about the Opendnssec-commits mailing list