diff --git a/configure.ac b/configure.ac
index 931310c..c65f76a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,9 @@
-define([rev], esyscmd([sh -c "echo -e 'r\c' && svnversion -n"]))dnl
-AC_INIT(libnfc, 1.2.1+rev, info@libnfc.org)
+# SVN revison
+define([svn_revision], esyscmd([sh -c "svnversion -n"]))
+SVN_REVISION=svn_revision
+
+# General init
+AC_INIT(libnfc, 1.2.1, info@libnfc.org)
 
 AC_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE
@@ -24,7 +28,7 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config)
 # Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_STDBOOL
-AC_CHECK_HEADERS([stdio.h stdlib.h stdint.h stddef.h stdbool.h usb.h])
+AC_CHECK_HEADERS([stdio.h stdlib.h stdint.h stddef.h stdbool.h])
 
 # Checks for types
 AC_TYPE_SIZE_T
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 71ec0e6..3f2a750 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -14,4 +14,14 @@ libnfc_la_LIBADD = \
 	$(top_builddir)/src/lib/buses/libnfcbuses.la \
 	$(top_builddir)/src/lib/drivers/libnfcdrivers.la
 
+if PCSC_LITE_ENABLED
+  libnfc_la_CFLAGS += @LIBPCSCLITE_CFLAGS@ -DHAVE_PCSC_LITE
+  libnfc_la_LIBADD += @LIBPCSCLITE_LIBS@
+endif
+
+if LIBUSB_ENABLED
+  libnfc_la_CFLAGS += @LIBUSB_CFLAGS@ -DHAVE_LIBUSB
+  libnfc_la_LIBADD  += @LIBUSB_LIBS@
+endif
+
 DISTCLEANFILES = Makefile.in