[pkg-opensc-commit] [pkcs11-helper] 73/253: Visual studio partial support

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository pkcs11-helper.

commit 6196c763e285123e56c3872ebe7c4999f8c2dbc2
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date:   Thu Feb 8 14:35:51 2007 +0000

    Visual studio partial support
---
 configure.ac         | 21 ++++++++++++++-------
 lib/pkcs11h-crypto.c |  1 -
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 19f77aa..d3a5d10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,12 +71,15 @@ AC_ARG_WITH([cygwin-native],
 	[with_cygwin_native="no"]
 )
 
-WIN32="no"
-CYGWIN="no"
+test -z "${WIN32}" && WIN32="no"
+test -z "${CYGWIN}" && CYGWIN="no"
 case "${host}" in
 	*-mingw32*)
 		WIN32="yes"
 	;;
+	*-winnt*)
+		WIN32="yes"
+	;;
 	*-cygwin*)
 		AC_MSG_CHECKING([cygwin mode to use])
 		CYGWIN="yes"
@@ -185,10 +188,12 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 PKG_PROG_PKG_CONFIG
+
 if test "${enable_doc}" = "yes"; then
 	AC_CHECK_PROGS([DOXYGEN], [doxygen])
 	test -z "${DOXYGEN}" && AC_MSG_ERROR([doxygen is required for docs])
 fi
+
 if test "${WIN32}" = "yes"; then
 	AC_CHECK_PROGS([MAN2HTML], [man2html])
 	test -z "${MAN2HTML}" && AC_MSG_ERROR([man2html is required for win32])
@@ -291,14 +296,16 @@ if test "$with_mem_check" = "valgrind"; then
 #	LIBS="${VALGRIND_LIBS} ${LIBS}"
 fi
 
-CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wsign-compare -Wno-unused-parameter -Wno-unused-function"
+if echo "${CC}" | grep gcc 2>&1 > /dev/null; then
+	CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wsign-compare -Wno-unused-parameter -Wno-unused-function"
 
-if test "$enable_pedantic" = "yes"; then
-	CFLAGS="${CFLAGS} -ansi -pedantic -D__STRICT_ANSI__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE -D_SVID_SOURCE"
+	if test "${WIN32}" = "yes"; then
+		LIBS="${LIBS} -lkernel32 -lgdi32"
+	fi
 fi
 
-if test "${WIN32}" = "yes"; then
-	LIBS="${LIBS} -lkernel32 -lgdi32"
+if test "$enable_pedantic" = "yes"; then
+	CFLAGS="${CFLAGS} -ansi -pedantic -D__STRICT_ANSI__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE -D_SVID_SOURCE"
 fi
 
 if test "${enable_threading}" != "yes" -a "${enable_slotevent}" = "yes"; then
diff --git a/lib/pkcs11h-crypto.c b/lib/pkcs11h-crypto.c
index 9cb776a..63b5b4f 100644
--- a/lib/pkcs11h-crypto.c
+++ b/lib/pkcs11h-crypto.c
@@ -314,7 +314,6 @@ pkcs11h_engine_crypto_t _g_pkcs11h_crypto_engine = {
 	NULL,
 	NULL,
 	NULL,
-	NULL,
 	NULL
 };
 #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/pkcs11-helper.git