From a4235e957512c6802db7e9c478b5b04f2c881212 Mon Sep 17 00:00:00 2001
From: Klas Lindfors <klas@yubico.com>
Date: Thu, 30 Oct 2014 14:09:44 +0100
Subject: [PATCH] don't use AC_LIB_HAVE_LINKFLAGS

it seems to be from gnulib or such, not always available
fixes #7
---
 configure.ac    | 16 ++++++++++------
 lib/Makefile.am |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 932a43f..4584bfe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,11 +87,15 @@ fi
 
 if test "x$with_backend" = xwinscard; then
   AC_MSG_NOTICE([checking for winscard with Windows linkage])
-  AC_LIB_HAVE_LINKFLAGS(winscard,, [#include <winscard.h>],
-                        [SCardBeginTransaction(0)])
-  if test "x$ac_cv_libwinscard" != xyes; then
-    AC_MSG_ERROR([cannot find Windows winscard library/headers])
-  fi
+  AC_CHECK_HEADERS([winscard.h])
+  PCSC_WIN_LIBS="-lwinscard"
+  save_LIBS="$LIBS"
+  LIBS="$LIBS $PCSC_WIN_LIBS"
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winscard.h>]],
+          [[SCardBeginTransaction(0)]])],
+                 [AC_SUBST([PCSC_WIN_LIBS])],
+                 [AC_MSG_ERROR([cannot find Windows PCSC library/headers])])
+  LIBS="$save_LIBS"
 fi
 
 if test "x$with_backend" = xmacscard; then
@@ -172,7 +176,7 @@ AC_MSG_NOTICE([summary of build options:
           CFLAGS:   ${PCSC_CFLAGS}
             LIBS:   ${PCSC_LIBS}
   Winscard
-            LIBS:   ${LTLIBWINSCARD}
+            LIBS:   ${PCSC_WIN_LIBS}
   Mac PCSC
             LIBS:   ${PCSC_MACOSX_LIBS}
 ])
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7a02a82..2947765 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -38,7 +38,7 @@ libykpiv_la_include_HEADERS = ykpiv.h ykpiv-version.h
 EXTRA_libykpiv_la_DEPENDENCIES = ykpiv.map
 
 libykpiv_la_LIBADD = $(OPENSSL_LIBS) $(PCSC_LIBS)
-libykpiv_la_LIBADD += $(LTLIBWINSCARD) $(PCSC_MACOSX_LIBS)
+libykpiv_la_LIBADD += $(PCSC_WIN_LIBS) $(PCSC_MACOSX_LIBS)
 
 libykpiv_la_LDFLAGS = -no-undefined
 libykpiv_la_LDFLAGS += -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)