diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 000000000..5852dac2f
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+libtoolize &&
+aclocal &&
+automake -a &&
+autoconf
+
diff --git a/configure.in b/configure.in
index 21a5e6edf..7536168e2 100644
--- a/configure.in
+++ b/configure.in
@@ -57,7 +57,7 @@ AC_ARG_ENABLE(
                                       --enable-pkcs11=/path/to/default-pkcs11.so]),
     smartcard=true
     AC_DEFINE(SMARTCARD)
-    AC_DEFINE(PKCS11_DEFAULT_LIB, ${enableval})
+    AC_DEFINE_UNQUOTED(PKCS11_DEFAULT_LIB, "$enableval")
 )
 AM_CONDITIONAL(USE_SMARTCARD, test x$smartcard = xtrue)