[pkg-opensc-commit] [opensc] 81/295: winconfig.h: use more values from configure.ac

[Eric Dorland]

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

eric pushed a commit to branch master
in repository opensc.

commit abd1595f606b17c304cba94a1fa0e5c62d4cdd2a
Author: Frank Morgner <frankmorgner at gmail.com>
Date:   Tue Sep 20 09:33:38 2016 +0200

    winconfig.h: use more values from configure.ac
    
    fixes #866
---
 win32/winconfig.h.in | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/win32/winconfig.h.in b/win32/winconfig.h.in
index 541b38f..95056c0 100644
--- a/win32/winconfig.h.in
+++ b/win32/winconfig.h.in
@@ -78,7 +78,9 @@
 #define HAVE_IO_H
 #define ENABLE_PCSC
 #define HAVE_WINSCARD_H
-#define DEFAULT_PCSC_PROVIDER "winscard.dll"
+#ifndef DEFAULT_PCSC_PROVIDER
+#define DEFAULT_PCSC_PROVIDER "@DEFAULT_PCSC_PROVIDER@"
+#endif
 
 #define SC_PKCS15_PROFILE_DIRECTORY "C:\\Program Files\\OpenSC Project\\OpenSC\\profiles"
 
@@ -97,23 +99,23 @@
 #endif
 
 #ifndef OPENSC_VERSION_MAJOR
-#define OPENSC_VERSION_MAJOR 0
+#define OPENSC_VERSION_MAJOR "@OPENSC_VERSION_MAJOR@"
 #endif
 
 #ifndef OPENSC_VERSION_MINOR
-#define OPENSC_VERSION_MINOR 15
+#define OPENSC_VERSION_MINOR "@OPENSC_VERSION_MINOR@"
 #endif
 
 #ifndef OPENSC_VS_FF_COMPANY_NAME
-#define OPENSC_VS_FF_COMPANY_NAME "OpenSC Project"
+#define OPENSC_VS_FF_COMPANY_NAME  "@OPENSC_VS_FF_COMPANY_NAME@"
 #endif
 
 #ifndef OPENSC_VS_FF_PRODUCT_NAME
-#define OPENSC_VS_FF_PRODUCT_NAME "OpenSC smartcard framework"
+#define OPENSC_VS_FF_PRODUCT_NAME  "@OPENSC_VS_FF_PRODUCT_NAME@"
 #endif
 
 #ifndef DEFAULT_PKCS11_PROVIDER
-#define DEFAULT_PKCS11_PROVIDER "opensc-pkcs11.dll"
+#define DEFAULT_PKCS11_PROVIDER "@DEFAULT_PKCS11_PROVIDER@"
 #endif
 
 #ifndef OPENSC_SCM_REVISION

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