diff --git a/ChangeLog b/ChangeLog
index 18542b2c..06ab344f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-07-29  Martin Baulig  <martin@home-of-linux.org>
+
+	* configure.in (ENABLE_STATIC, ENABLE_SHARED): New automake
+	conditionals.
+
 1999-07-27  Martin Baulig  <martin@home-of-linux.org>
 
 	* configure.in (LT_VERSION_INFO): Add `-release ${LT_RELEASE}'.
diff --git a/configure.in b/configure.in
index e0aa0252..de1ea334 100644
--- a/configure.in
+++ b/configure.in
@@ -158,6 +158,9 @@ else
   static_targets=""
 fi
 
+AM_CONDITIONAL(ENABLE_STATIC, test x$enable_static = xyes)
+AM_CONDITIONAL(ENABLE_SHARED, test x$enable_static = xyes)
+
 AC_SUBST(static_targets)
 AC_SUBST(smp_examples)
 AC_SUBST(guile_examples)