diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes for external CUDD compatibility.

Browse Source
This commit is contained in:
Costa Vitor 2012-07-16 11:58:21 -05:00
parent a99412c48f
commit 8ba1de7250
7 changed files with 16858 additions and 5834 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.h.in
View File

@ -358,3 +358,4 @@
#undef MAX_THREADS #undef MAX_THREADS
#endif /* YAP_CONFIG_H */ #endif /* YAP_CONFIG_H */

22472
configure vendored
View File

File diff suppressed because it is too large Load Diff

7
configure.in
View File

@ -234,7 +234,6 @@ AC_ARG_WITH(gmp,
CFLAGS="$CFLAGS -I${yap_cv_gmp}/include" CFLAGS="$CFLAGS -I${yap_cv_gmp}/include"
fi, fi,
[yap_cv_gmp=yes]) [yap_cv_gmp=yes])
AC_ARG_WITH(R, AC_ARG_WITH(R,
[ --with-R[=DIR] interface to R language], [ --with-R[=DIR] interface to R language],
if test "$withval" = yes; then if test "$withval" = yes; then
@ -854,7 +853,7 @@ fi
if test "$yap_cv_cudd" != no; then if test "$yap_cv_cudd" != no; then
oldlibs="$LIBS" oldlibs="$LIBS"
if test "$yap_cv_cudd" != "NONE"; then if test "$yap_cv_cudd" != "NONE" -a "$yap_cv_cudd" != "yes"; then
CUDD_CPPFLAGS="-I $yap_cv_cudd/include" CUDD_CPPFLAGS="-I $yap_cv_cudd/include"
cudd_dir="$yap_cv_cudd" cudd_dir="$yap_cv_cudd"
elif test "$prefix" != "NONE"; then elif test "$prefix" != "NONE"; then
@ -864,9 +863,8 @@ if test "$yap_cv_cudd" != no; then
CUDD_CPPFLAGS="-I /usr/local/include" CUDD_CPPFLAGS="-I /usr/local/include"
cudd_dir=/usr/local cudd_dir=/usr/local
fi fi
OLD_CFLAGS="$CPPFLAGS" OLD_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $CUDD_CPPFLAGS" CPPFLAGS="$CPPFLAGS $CUDD_CPPFLAGS"
CPPFLAGS="$OLD_CFLAGS"
AC_CHECK_HEADERS(util.h cudd/util.h cudd.h cudd/cudd.h) AC_CHECK_HEADERS(util.h cudd/util.h cudd.h cudd/cudd.h)
AC_CHECK_HEADERS(cuddInt.h cudd/cuddInt.h) AC_CHECK_HEADERS(cuddInt.h cudd/cuddInt.h)
dnl cudd can be most everywhere dnl cudd can be most everywhere
@ -899,6 +897,7 @@ if test "$yap_cv_cudd" != no; then
LIBS="$LIBS -L $cudd_dir/cudd" LIBS="$LIBS -L $cudd_dir/cudd"
fi fi
AC_SEARCH_LIBS(Cudd_Init, [cudd], [cudd_installed="yes"], [cudd_installed="no"]) AC_SEARCH_LIBS(Cudd_Init, [cudd], [cudd_installed="yes"], [cudd_installed="no"])
CPPFLAGS="$OLD_CPPFLAGS"
if test "$cudd_installed" = yes; then if test "$cudd_installed" = yes; then
CUDD_LDFLAGS="$LIBS" CUDD_LDFLAGS="$LIBS"
else else

2
packages/ProbLog/simplecudd/Makefile.in
View File

@ -40,7 +40,7 @@ CWD=$(PWD)
DYNAMIC = DYNAMIC =
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
INCLUDE = @CUDD_CPPFLAGS@ INCLUDE = -I@abs_top_builddir@ @CUDD_CPPFLAGS@
LINKFLAGS = -lm LINKFLAGS = -lm
LINKLIBS = @CUDD_LDFLAGS@ LINKLIBS = @CUDD_LDFLAGS@

2
packages/ProbLog/simplecudd/simplecudd.h
View File

@ -192,7 +192,7 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include <time.h> #include <time.h>
#include "../../../config.h" #include "config.h"
#if HAVE_UTIL_H #if HAVE_UTIL_H
#include <util.h> #include <util.h>
#endif #endif

2
packages/ProbLog/simplecudd_lfi/Makefile.in
View File

@ -40,7 +40,7 @@ CWD=$(PWD)
DYNAMIC = DYNAMIC =
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
INCLUDE = @CUDD_CPPFLAGS@ INCLUDE = -I@abs_top_builddir@ @CUDD_CPPFLAGS@
LINKFLAGS = -lm LINKFLAGS = -lm
LINKLIBS = @CUDD_LDFLAGS@ LINKLIBS = @CUDD_LDFLAGS@

2
packages/ProbLog/simplecudd_lfi/simplecudd.h
View File

@ -191,7 +191,7 @@
#include <math.h> #include <math.h>
#include <time.h> #include <time.h>
#include "pqueue.h" #include "pqueue.h"
#include "../../../config.h" #include "config.h"
#if HAVE_UTIL_H #if HAVE_UTIL_H
#include <util.h> #include <util.h>
#endif #endif