diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-11-17 18:59:12 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-11-17 18:59:12 +0100 |
| commit | 8935273593866458213e5b1e7b3b5553fddffbc8 (patch) | |
| tree | 4f27cefb3426c6ded7505bfe1a2ddfeba7e5b331 | |
| parent | 4a83714253a6dee42bb0b27abcf9fb9ffcc6906f (diff) | |
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 13 |
2 files changed, 18 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 20d46f8..0f8dd6f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,6 +22,11 @@ libcacard_la_SOURCES= \ vreader.c \ $(NULL) +if OS_WIN32 +AM_CFLAGS = -D_WIN32_WINNT=0x0600 +AM_LDFLAGS = -lws2_32 +endif + if WITH_NSS libcacard_la_SOURCES += vcard_emul_nss.c libcacard_la_LIBADD += $(NSS_LIBS) diff --git a/configure.ac b/configure.ac index 66b1a18..c6d0856 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,18 @@ AC_PATH_PROGS(PYTHON, python2 python) CAC_LT_VERSION=m4_format("%d:%d:%d", 1, 0, 2) AC_SUBST(CAC_LT_VERSION) +AC_MSG_CHECKING([for native Win32]) +case "$host_os" in + *mingw*|*cygwin*) + os_win32=yes + ;; + *) + os_win32=no + ;; +esac +AC_MSG_RESULT([$os_win32]) +AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"]) + dnl ========================================================================= dnl Check deps @@ -120,6 +132,7 @@ AC_SUBST(CAC_CARD_REQUIRES) AC_SUBST(CAC_NONPKGCONFIG_CFLAGS) AC_SUBST(CAC_CARD_NONPKGCONFIG_LIBS) +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AC_OUTPUT([ Makefile libcacard.pc |