diff --git a/ChangeLog b/ChangeLog
index ab1936dc9..2e9d6e54a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-05  Alexandre Duret-Lutz  <aduret@src.lip6.fr>
+
+	* m4/buddy.m4: New file.
+	* Makefile.am (EXTRA_DIST): Add m4/buddy.m4.
+	* configure.ac: Call AX_CHECK_BUDDY.
+
 2003-04-30  Alexandre DURET-LUTZ  <aduret@src.lip6.fr>
 
 	* src/ltlvisit/Makefile.am (lib_LTLIBRARIES): Rename as ...
diff --git a/Makefile.am b/Makefile.am
index d2ad118b7..20f839b67 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS = doc src wrap
 ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = m4/gccwarn.m4 m4/pypath.m4
+EXTRA_DIST = m4/gccwarn.m4 m4/pypath.m4 m4/buddy.m4
diff --git a/configure.ac b/configure.ac
index d5b30e352..58a985961 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,10 +10,12 @@ AC_PROG_CXX
 AM_PROG_LEX
 AC_PROG_YACC
 
-AC_PROG_LIBTOOL
-
 AC_LANG(C++)
 
+AX_CHECK_BUDDY
+
+AC_PROG_LIBTOOL
+
 CF_GXX_WARNINGS
 
 AC_CHECK_PROG([DOT], [dot], [dot])
diff --git a/m4/buddy.m4 b/m4/buddy.m4
new file mode 100644
index 000000000..25fd401b4
--- /dev/null
+++ b/m4/buddy.m4
@@ -0,0 +1,4 @@
+AC_DEFUN([AX_CHECK_BUDDY], [
+  AC_CHECK_LIB([bdd], [bdd_init],, 
+    [AC_MSG_ERROR([Could not link with BuDDy.  Please install BuDDy first 
+                   or set CPPFLAGS/LDFLAGS appropriately.])])])