diff --git a/autogen.sh b/autogen.sh
index 4a316e7..8cdf361 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,7 +6,14 @@ test -n "$srcdir" || srcdir=.
 olddir=`pwd`
 cd "$srcdir"
 
-# autoreconf -vsi --force
+mkdir -p scripts
+automake --add-missing 2> /dev/null | true
+
+libtoolize --force
+if test $? != 0 ; then
+	echo "libtoolize failed."
+	exit -1
+fi
 
 aclocal
 if test $? != 0 ; then
@@ -14,14 +21,17 @@ if test $? != 0 ; then
 	exit -1
 fi
 
-autoconf
+autoheader --force
 if test $? != 0 ; then
-	echo "autoconf failed."
+	echo "autoheader failed."
 	exit -1
 fi
 
-mkdir -p scripts
-automake --add-missing 2> /dev/null | true
+autoconf --force
+if test $? != 0 ; then
+	echo "autoconf failed."
+	exit -1
+fi
 
 cd "$olddir"
 test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
diff --git a/configure.ac b/configure.ac
index cfdd4ab..58e215d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,12 @@ AC_CONFIG_AUX_DIR([scripts])
 dnl Compute the canonical host-system type
 AC_CANONICAL_HOST
 
+AC_CONFIG_MACRO_DIRS([m4])
+
+dnl Initialize libtool.
+LT_INIT
+
+
 dnl Put macro definitions here (though they aren't used).
 AC_CONFIG_HEADERS([src/include/config.h])
 
@@ -152,6 +158,20 @@ fi
 
 AC_SUBST(HOST_CC)
 
+
+dnl ---------------------------------------------------------------------------
+dnl Compatibility definitions
+dnl ---------------------------------------------------------------------------
+
+AC_DEFINE(UNLOCK_MS, 350, [The delay, in miliseconds, between the host unlocking the keyboard and lib3270 actually performing the unlock])
+
+AC_DEFINE(X3270_TN3270E,[],[X3270 compatibility])
+AC_DEFINE(X3270_ANSI,[],[X3270 compatibility])
+AC_DEFINE(X3270_APL,[],[X3270 compatibility])
+
+AC_DEFINE(X3270_TRACE,[],[X3270 compatibility])
+AC_DEFINE(X3270_FT,[],[X3270 compatibility])
+
 dnl ---------------------------------------------------------------------------
 dnl Check for other programs
 dnl ---------------------------------------------------------------------------
diff --git a/src/include/config.h.in b/src/include/config.h.in
index 021a45e..8996f02 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -3,6 +3,9 @@
 /* The gettext package name. */
 #undef GETTEXT_PACKAGE
 
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
 /* Define to 1 if you have the `getaddrinfo' function. */
 #undef HAVE_GETADDRINFO
 
@@ -84,6 +87,9 @@
 /* The SDK version number */
 #undef LIB3270_SDK_VERSION
 
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#undef LT_OBJDIR
+
 /* Name of package */
 #undef PACKAGE
 
@@ -156,5 +162,24 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* The delay, in miliseconds, between the host unlocking the keyboard and
+   lib3270 actually performing the unlock */
+#undef UNLOCK_MS
+
 /* Version number of package */
 #undef VERSION
+
+/* X3270 compatibility */
+#undef X3270_ANSI
+
+/* X3270 compatibility */
+#undef X3270_APL
+
+/* X3270 compatibility */
+#undef X3270_FT
+
+/* X3270 compatibility */
+#undef X3270_TN3270E
+
+/* X3270 compatibility */
+#undef X3270_TRACE
--
libgit2 0.21.2