don't use AC_LIB_HAVE_LINKFLAGS
it seems to be from gnulib or such, not always available fixes #7
This commit is contained in:
+10
-6
@@ -87,11 +87,15 @@ fi
|
|||||||
|
|
||||||
if test "x$with_backend" = xwinscard; then
|
if test "x$with_backend" = xwinscard; then
|
||||||
AC_MSG_NOTICE([checking for winscard with Windows linkage])
|
AC_MSG_NOTICE([checking for winscard with Windows linkage])
|
||||||
AC_LIB_HAVE_LINKFLAGS(winscard,, [#include <winscard.h>],
|
AC_CHECK_HEADERS([winscard.h])
|
||||||
[SCardBeginTransaction(0)])
|
PCSC_WIN_LIBS="-lwinscard"
|
||||||
if test "x$ac_cv_libwinscard" != xyes; then
|
save_LIBS="$LIBS"
|
||||||
AC_MSG_ERROR([cannot find Windows winscard library/headers])
|
LIBS="$LIBS $PCSC_WIN_LIBS"
|
||||||
fi
|
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
|
fi
|
||||||
|
|
||||||
if test "x$with_backend" = xmacscard; then
|
if test "x$with_backend" = xmacscard; then
|
||||||
@@ -172,7 +176,7 @@ AC_MSG_NOTICE([summary of build options:
|
|||||||
CFLAGS: ${PCSC_CFLAGS}
|
CFLAGS: ${PCSC_CFLAGS}
|
||||||
LIBS: ${PCSC_LIBS}
|
LIBS: ${PCSC_LIBS}
|
||||||
Winscard
|
Winscard
|
||||||
LIBS: ${LTLIBWINSCARD}
|
LIBS: ${PCSC_WIN_LIBS}
|
||||||
Mac PCSC
|
Mac PCSC
|
||||||
LIBS: ${PCSC_MACOSX_LIBS}
|
LIBS: ${PCSC_MACOSX_LIBS}
|
||||||
])
|
])
|
||||||
|
|||||||
+1
-1
@@ -38,7 +38,7 @@ libykpiv_la_include_HEADERS = ykpiv.h ykpiv-version.h
|
|||||||
EXTRA_libykpiv_la_DEPENDENCIES = ykpiv.map
|
EXTRA_libykpiv_la_DEPENDENCIES = ykpiv.map
|
||||||
|
|
||||||
libykpiv_la_LIBADD = $(OPENSSL_LIBS) $(PCSC_LIBS)
|
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 = -no-undefined
|
||||||
libykpiv_la_LDFLAGS += -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
|
libykpiv_la_LDFLAGS += -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
|
||||||
|
|||||||
Reference in New Issue
Block a user