diff -r 06885e558546 -r 94d7459828ba configure.ac
--- a/configure.ac	Fri Oct 03 12:26:22 2014 +0100
+++ b/configure.ac	Thu Nov 13 10:44:53 2014 +0000
@@ -72,11 +72,18 @@
     AC_SUBST([RAZOR_HAVE_ATOMIC_ROLLBACK],['#undef RAZOR_HAVE_ATOMIC_ROLLBACK'])
 fi
 
+AC_ARG_ENABLE([tests],
+	      [AS_HELP_STRING([--enable-tests],
+	      		      [install test programs])],
+	      [],
+	      [enable_tests=no])
+AM_CONDITIONAL(INSTALL_TEST_PROGRAMS, test "$enable_tests" = "yes")
+
 AC_MSG_CHECKING([for Microsoft Windows native API])
 case $host_os in
     *mingw*)	AC_DEFINE([MSWIN_API], 1,
 		  [Define to 1 to use Microsoft Windows native API.])
-		EXTRA_LIBS='-lshell32 -lws2_32'
+		EXTRA_LIBS='-lshlwapi -lshell32 -lws2_32'
 		mswin_api=yes;;
     *)		mswin_api=no;;
 esac