fix cudd support.

config.h.in

@@ -51,6 +51,10 @@
 #undef  HAVE_CTYPE_H
 #undef  HAVE_CRYPT_H
 #undef  HAVE_CUDD_H
+#undef  HAVE_CUDDINT_H
+#undef  HAVE_CUDD_CUDD_H
+#undef  HAVE_CUDD_CUDDINT_H
+#undef  HAVE_CUDD_UTIL_H
 #undef  HAVE_DIRECT_H
 #undef  HAVE_DIRENT_H
 #undef  HAVE_DLFCN_H
@@ -105,6 +109,7 @@
 #undef  HAVE_TIME_H
 #undef  HAVE_UNISTD_H
 #undef  HAVE_UTIME_H
+#undef  HAVE_UTIL_H
 #undef  HAVE_WCTYPE_H
 #undef  HAVE_WINSOCK_H
 #undef  HAVE_WINSOCK2_H

configure.in

@@ -855,28 +855,20 @@ fi
 if test "$yap_cv_cudd" != no; then
    	    oldlibs="$LIBS"
 	    if test "$yap_cv_cudd" != "NONE"; then
-	       if test -d "$yap_cv_cudd"/include/cudd; then
-	         CUDD_CPPFLAGS="-I $yap_cv_cudd/include/cudd"
-               else
 	       CUDD_CPPFLAGS="-I $yap_cv_cudd/include"
-	       fi 
-	       cudd_dir="$yap_cv_cudd"
-	    elif test -e /usr/include/cudd; then
-	       CUDD_CPPFLAGS="-I /usr/include/cudd"
 	       cudd_dir="$yap_cv_cudd"
 	    elif test "$prefix" != "NONE"; then
-	       if test -d "$prefix"/include/cudd; then
-	         CUDD_CPPFLAGS="-I $prefix/include/cudd"
-               else
 	       CUDD_CPPFLAGS="-I $prefix/include"
-	       fi 
 	       cudd_dir="$prefix"
 	    else
-	       if test -d /usr/local/include/cudd; then
+	       CUDD_CPPFLAGS="-I /usr/local/include"
-	         CUDD_CPPFLAGS="-I /usr/local/include/cudd"
-               fi
 	       cudd_dir=/usr/local
 	    fi
+	    OLD_CFLAGS="$CPPFLAGS"
+	    CPPFLAGS="$CPPFLAGS $CUDD_CPPFLAGS" 
+	    CPPFLAGS="$OLD_CFLAGS"
+	    AC_CHECK_HEADERS(util.h cudd/util.h cudd.h cudd/cudd.h)
+	    AC_CHECK_HEADERS(cuddInt.h cudd/cuddInt.h)
             dnl cudd can be most everywhere
 	    if test -d "$cudd_dir/lib64/cudd" -a "$YAP_TARGET" = amd64; then
 	      LIBS="$LIBS -L $cudd_dir/lib64/cudd"
@@ -1668,10 +1660,6 @@ if test "$yap_cv_gmp" != "no"
 then
   AC_CHECK_HEADERS(gmp.h)
 fi
-if test "$yap_cv_cudd" != "no"
-then
-  AC_CHECK_HEADERS(cudd.h)
-fi
 if test "$yap_cv_myddas" != "no"
 then
   AC_CHECK_HEADERS(mysql/mysql.h)

packages/ProbLog/simplecudd/simplecudd.h

@@ -192,9 +192,25 @@
 #include <string.h>
 #include <math.h>
 #include <time.h>
-#include "util.h"
+#include "../../../config.h"
+#if HAVE_UTIL_H
+#include <util.h>
+#endif
+#if HAVE_CUDD_UTIL_H
+#include <cudd/util.h>
+#endif
+#if HAVE_CUDD_H
 #include "cudd.h"
+#endif
+#if HAVE_CUDD_CUDD_H
+#include "cudd/cudd.h"
+#endif
+#if HAVE_CUDDINT_H
 #include "cuddInt.h"
+#endif
+#if HAVE_CUDD_CUDDINT_H
+#include "cudd/cuddInt.h"
+#endif
 #include "general.h"
 
 #define IsHigh(manager, node)   HIGH(manager) == node

packages/ProbLog/simplecudd_lfi/simplecudd.h

@@ -191,9 +191,25 @@
 #include <math.h>
 #include <time.h>
 #include "pqueue.h"
-#include "util.h"
+#include "../../../config.h"
+#if HAVE_UTIL_H
+#include <util.h>
+#endif
+#if HAVE_CUDD_UTIL_H
+#include <cudd/util.h>
+#endif
+#if HAVE_CUDD_H
 #include "cudd.h"
+#endif
+#if HAVE_CUDD_CUDD_H
+#include "cudd/cudd.h"
+#endif
+#if HAVE_CUDDINT_H
 #include "cuddInt.h"
+#endif
+#if HAVE_CUDD_CUDDINT_H
+#include "cudd/cuddInt.h"
+#endif
 #include "general.h"
 
 #define IsHigh(manager, node)   HIGH(manager) == node

packages/bdd/cudd.c

@@ -1,10 +1,21 @@
 
 #include <stdio.h>
 
+#include "config.h"
 #include "YapInterface.h"
 
-#include "util.h"
+#if HAVE_UTIL_H
+#include <util.h>
+#endif
+#if HAVE_CUDD_UTIL_H
+#include <cudd/util.h>
+#endif
+#if HAVE_CUDD_H
 #include "cudd.h"
+#endif
+#if HAVE_CUDD_CUDD_H
+#include "cudd/cudd.h"
+#endif
 
 static YAP_Functor FunctorDollarVar,
   FunctorCudd,