diff --git a/buddy/.cvsignore b/buddy/.cvsignore
index 8a8db1567..af651cd16 100644
--- a/buddy/.cvsignore
+++ b/buddy/.cvsignore
@@ -8,3 +8,6 @@ config.status
 libtool
 *.tar.gz
 autom4te.cache
+config.h
+config.h.in
+stamp-h1
diff --git a/buddy/ChangeLog b/buddy/ChangeLog
index 92a0ff65b..d37c90f57 100644
--- a/buddy/ChangeLog
+++ b/buddy/ChangeLog
@@ -1,5 +1,9 @@
 2003-05-05  Alexandre Duret-Lutz  <aduret@src.lip6.fr>
 
+	* configure.ac: Output config.h.
+	* src/kernel.h: Include it.
+	* src/Makefile.am (AM_CPPFLAGS): New variable.
+
 	* configure.ac, Makefile.am, src/Makefile.am, doc/Makefile.am,
 	examples/Makefile.am, examples/Makefile.def, 
 	examples/adder/Makefile.am, examples/calculator/Makefile.am,
diff --git a/buddy/configure.ac b/buddy/configure.ac
index 98fc76a70..e169759e1 100644
--- a/buddy/configure.ac
+++ b/buddy/configure.ac
@@ -14,6 +14,8 @@ AC_PROG_LIBTOOL
 
 buddy_DEBUG_FLAGS
 
+AC_CONFIG_HEADERS([config.h])
+
 AC_CONFIG_FILES([
   Makefile
   src/Makefile
diff --git a/buddy/src/Makefile.am b/buddy/src/Makefile.am
index 793c7cb47..596b56b70 100644
--- a/buddy/src/Makefile.am
+++ b/buddy/src/Makefile.am
@@ -1,3 +1,6 @@
+# For 
+AM_CPPFLAGS = -I$(top_builddir) 
+
 include_HEADERS = bdd.h fdd.h bvec.h
 
 lib_LTLIBRARIES = libbdd.la
diff --git a/buddy/src/kernel.h b/buddy/src/kernel.h
index 95a763833..4545e5515 100644
--- a/buddy/src/kernel.h
+++ b/buddy/src/kernel.h
@@ -28,7 +28,7 @@
 ========================================================================*/
 
 /*************************************************************************
-  $Header: /Volumes/CVS/repository/spot/spot/buddy/src/kernel.h,v 1.2 2003/05/05 13:45:07 aduret Exp $
+  $Header: /Volumes/CVS/repository/spot/spot/buddy/src/kernel.h,v 1.3 2003/05/05 14:07:28 aduret Exp $
   FILE:  kernel.h
   DESCR: Kernel specific definitions for BDD package
   AUTH:  Jorn Lind
@@ -43,6 +43,9 @@
 #include <limits.h>
 #include <setjmp.h>
 #include "bdd.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 /*=== SANITY CHECKS ====================================================*/