diff --git a/ccid/configure.ac b/ccid/configure.ac
index 338119b..1ca6951 100644
--- a/ccid/configure.ac
+++ b/ccid/configure.ac
@@ -7,6 +7,8 @@ AC_CONFIG_SRCDIR([src/ccid.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
+AC_USE_SYSTEM_EXTENSIONS
+AC_PROG_RANLIB
 LT_INIT
 
 # Checks for programs.
@@ -18,6 +20,7 @@ AC_PROG_LIBTOOL
 AM_PROG_CC_C_O
 AC_PROG_SED
 PKG_PROG_PKG_CONFIG
+
 AC_PATH_PROG(HELP2MAN, help2man, false // No help2man //)
 AC_PATH_PROG(GENGETOPT, gengetopt, false // No gengetopt //)
 
@@ -117,6 +120,7 @@ AC_TYPE_UINT8_T
 # Checks for library functions.
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
+AC_FUNC_STRNLEN
 AC_CHECK_FUNCS([memmove memset strerror strtol])
 
 cat << EOF
diff --git a/npa/configure.ac b/npa/configure.ac
index 9b8b75d..6f718f2 100644
--- a/npa/configure.ac
+++ b/npa/configure.ac
@@ -30,6 +30,7 @@ PKG_PROG_PKG_CONFIG
 AC_PATH_PROG(HELP2MAN, help2man, false // No help2man //)
 AC_PATH_PROG(GENGETOPT, gengetopt, false // No gengetopt //)
 AC_PATH_PROG(GENGETOPT, doxygen, false // No gengetopt //)
+AC_PROG_RANLIB
 
 # If you need to see the details, just run make V=1.
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
@@ -80,7 +81,7 @@ AC_TYPE_UINT8_T
 # Checks for library functions.
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
-AC_CHECK_FUNCS([getline memmove memset strerror])
+AC_CHECK_FUNCS([getline memmove memset strerror gettimeofday strtol])
 
 cat << EOF
 
diff --git a/pcsc-relay/Makefile.am b/pcsc-relay/Makefile.am
index 70a215c..aa1960c 100644
--- a/pcsc-relay/Makefile.am
+++ b/pcsc-relay/Makefile.am
@@ -34,7 +34,7 @@ $(PCSC_RELAY_EXE): $(LIBNFC_DIR) $(LIBNFC_DLL)
 
 
 WIN32_DIR=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)_win32
-win: src/pcsc-relay.exe
+win: $(PCSC_RELAY_EXE)
 	mkdir -p $(WIN32_DIR)
 	for i in \
 		$(LIBNFC_DLL) \
diff --git a/pcsc-relay/configure.ac b/pcsc-relay/configure.ac
index ebe1268..0f9a2d4 100644
--- a/pcsc-relay/configure.ac
+++ b/pcsc-relay/configure.ac
@@ -55,15 +55,18 @@ AC_ARG_ENABLE(piccdev,
 AC_DEFINE_UNQUOTED(PICCDEV, "${piccdev}", [OpenPICC character device])
 
 # Checks for header files.
-AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h unistd.h])
+AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h unistd.h termios.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_TYPE_UINT8_T
 
 # Checks for library functions.
-AC_CHECK_FUNCS([sigaction tcgetattr])
+AC_CHECK_FUNCS([sigaction tcgetattr strerror strtol strtoul])
 AC_FUNC_FORK
 AC_FUNC_MALLOC
+AC_FUNC_REALLOC
 
 
 cat << EOF
diff --git a/virtualsmartcard/configure.ac b/virtualsmartcard/configure.ac
index 111b484..196a78b 100644
--- a/virtualsmartcard/configure.ac
+++ b/virtualsmartcard/configure.ac
@@ -27,6 +27,8 @@ AC_PROG_LIBTOOL
 AC_PROG_LN_S
 AC_PROG_SED
 AM_PATH_PYTHON
+AC_PROG_CXX
+AC_PROG_RANLIB
 AM_PROG_CC_C_O
 PKG_PROG_PKG_CONFIG
 AC_PATH_PROG(HELP2MAN, help2man, false // No help2man //)