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

try to clean-up makefiles and autoconfs

Browse Source
This commit is contained in:
Vítor Santos Costa 2014-10-26 17:39:52 +00:00
parent 9cd2975532
commit 2053c44054
18 changed files with 143 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.h.in
View File

@ -929,7 +929,7 @@
/* Define to 1 if you have the <winsock.h> header file. */ /* Define to 1 if you have the <winsock.h> header file. */
#undef HAVE_WINSOCK_H #undef HAVE_WINSOCK_H
/* Define to 1 if you have the <zlib.h> header file. */ /* Define to 1 if you have <zlib.h>. */
#undef HAVE_ZLIB_H #undef HAVE_ZLIB_H
/* Define to 1 if you have the <zutil.h> header file. */ /* Define to 1 if you have the <zutil.h> header file. */

119
configure vendored
View File

@ -683,13 +683,12 @@ ZLIB_LIBS
ZLIB_PLTARGETS ZLIB_PLTARGETS
ZLIB_TARGETS ZLIB_TARGETS
PKG_CPLINT PKG_CPLINT
SHLIB_SUFFIX
CPLINT_SHLIB_LD CPLINT_SHLIB_LD
CPLINT_CPPFLAGS
CPLINT_LDFLAGS CPLINT_LDFLAGS
CPLINT_CFLAGS
CPLINT_LIBS CPLINT_LIBS
CUDD_CPPFLAGS CUDD_CPPFLAGS
CUDD_LDFLAGS CUDD_LIBS
PKG_BDDLIB PKG_BDDLIB
ODBC_LIBS ODBC_LIBS
ODBC_LDFLAGS ODBC_LDFLAGS
@ -915,7 +914,7 @@ with_libarchive
with_odbc with_odbc
with_cudd with_cudd
enable_bddlib enable_bddlib
enable_cplint with_cplint
with_zlib with_zlib
with_R with_R
with_junit with_junit
@ -1583,7 +1582,6 @@ Optional Features:
--enable-statistic-predicates support statistic predicates --enable-statistic-predicates support statistic predicates
--enable-mimecharset=charset Default MIME charset to set on new messages --enable-mimecharset=charset Default MIME charset to set on new messages
--enable-bddlib dynamic bdd library --enable-bddlib dynamic bdd library
--enable-cplint=DIR enable the cplint library using the CUDD library in DIR/lib
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -1605,6 +1603,7 @@ Optional Packages:
--with-libarchive=DIR libarchive package --with-libarchive=DIR libarchive package
--with-odbc=<dir> Location of ODBC include/lib --with-odbc=<dir> Location of ODBC include/lib
--with-cudd=DIR use CUDD package in DIR --with-cudd=DIR use CUDD package in DIR
--with-cplint=DIR with the cplint library using the CUDD library in DIR/lib
--with-zlib=DIR zlib compression library --with-zlib=DIR zlib compression library
--with-R=DIR interface to the R language --with-R=DIR interface to the R language
--with-junit=PATH Specify location of the junit JAR file --with-junit=PATH Specify location of the junit JAR file
@ -4625,6 +4624,7 @@ if test "${with_gmp+set}" = set; then :
LIBS="$LIBS -L${yap_cv_gmp}/lib" LIBS="$LIBS -L${yap_cv_gmp}/lib"
CPPFLAGS="$CPPFLAGS -I${yap_cv_gmp}/include" CPPFLAGS="$CPPFLAGS -I${yap_cv_gmp}/include"
CFLAGS="$CFLAGS -I${yap_cv_gmp}/include" CFLAGS="$CFLAGS -I${yap_cv_gmp}/include"
CXXFLAGS="$CXXFLAGS -I${yap_cv_gmp}/include"
fi fi
else else
yap_cv_gmp=yes yap_cv_gmp=yes
@ -11779,11 +11779,11 @@ fi
fi fi
if test x"$UUID_H" = "x"; then if test x"$UUID_H" = "x" -a ! -d /usr/include/uuid; then
ac_fn_c_check_header_compile "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "/*first*/ ac_fn_c_check_header_compile "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "/*first*/
" "
if test "x$ac_cv_header_uuid_uuid_h" = xyes; then : if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
UUID_H=ossp/uuid.h UUID_H=uuid/uuid.h
fi fi
@ -12188,7 +12188,7 @@ then
old_inc="$CPPFLAGS" old_cppflags="$CPPFLAGS"
old_libs="$LIBS" old_libs="$LIBS"
old_ldflags="$LDFLAGS" old_ldflags="$LDFLAGS"
ARCHIVE_TARGETS=nolib ARCHIVE_TARGETS=nolib
@ -12260,8 +12260,12 @@ else
ARCHIVELIB=no ARCHIVELIB=no
fi fi
else
ARCHIVELIB=no
fi fi
if test "$ARCHIVELIB" = yes; then
for ac_func in archive_read_support_compression_bzip2 \ for ac_func in archive_read_support_compression_bzip2 \
archive_read_support_compression_compress \ archive_read_support_compression_compress \
archive_read_support_compression_gzip \ archive_read_support_compression_gzip \
@ -12299,8 +12303,6 @@ _ACEOF
fi fi
done done
if test "$ARCHIVELIB" = yes; then
ARCHIVE_CPPFLAGS="$CPPFLAGS" ARCHIVE_CPPFLAGS="$CPPFLAGS"
ARCHIVE_LIBS="$LIBS" ARCHIVE_LIBS="$LIBS"
@ -12329,7 +12331,7 @@ fi
fi fi
1
if test "$ARCHIVE_TARGETS" = "nolib" if test "$ARCHIVE_TARGETS" = "nolib"
@ -13027,7 +13029,7 @@ fi
if test "$target_os" = "mingw32" -o "$target_os" = "mingw64" if test "$target_os" = "mingw32" -o "$target_os" = "mingw64"
then then
#mingw: we know where things are #mingw: we know where things are
CUDD_LDFLAGS="$cudd_dir/lib/all_cudd.dll" CUDD_LIBS="$cudd_dir/lib/all_cudd.dll"
cudd_installed="yes" cudd_installed="yes"
else else
@ -13341,7 +13343,7 @@ fi
CPPFLAGS="$OLD_CPPFLAGS" CPPFLAGS="$OLD_CPPFLAGS"
if test "$cudd_installed" = yes; then if test "$cudd_installed" = yes; then
CUDD_LDFLAGS="$LIBS" CUDD_LIBS="$LIBS"
else else
cat << EOF cat << EOF
################################################################## ##################################################################
@ -13376,9 +13378,10 @@ fi
found_cplint=false found_cplint=false
# Check whether --enable-cplint was given.
if test "${enable_cplint+set}" = set; then : # Check whether --with-cplint was given.
enableval=$enable_cplint; yap_cv_cplint=$enableval if test "${with_cplint+set}" = set; then :
withval=$with_cplint; yap_cv_cplint=$withval
else else
yap_cv_cplint=no yap_cv_cplint=no
fi fi
@ -13390,23 +13393,27 @@ then
else else
if test x"$yap_cv_cplint" != "xyes" if test x"$yap_cv_cplint" != "xyes"
then then
CPLINT_LDFLAGS+=" -L${yap_cv_cplint}/cudd -L${yap_cv_cplint}/mtr -L${yap_cv_cplint}/st -L${yap_cv_cplint}/util -L${yap_cv_cplint}/epd " CPLINT_LIBS+=" -L${yap_cv_cplint}/cudd -L${yap_cv_cplint}/mtr -L${yap_cv_cplint}/st -L${yap_cv_cplint}/util -L${yap_cv_cplint}/epd "
#typical of user-compiled cudd fi #typical of user-compiled cudd fi
CPLINT_CFLAGS+=" -I${yap_cv_cplint}/include" CPLINT_CPPFLAGS+=" -I${yap_cv_cplint}/include"
CPLINT_LIBS="$LIBS"
found_cplint=true found_cplint=true
fi fi
# cudd has been probably just tested, so why try again? # cudd has been probably just tested, so why try again?
# cudd is available on fedora, and maybe other linux distributions # cudd is available on fedora, and maybe other linux distributions
if test -d "/usr/include/cudd" -a x"$CPLINT_CFLAGS" = x if test x"$CUDD_LIBS" != x -a x"$CPLINT_CPPFLAGS" = x
then then
CPLINT_CFLAGS=" -I/usr/include/cudd" CPLINT_CPPFLAGS="$CUDD_CPPFLAGS"
CPLINT_LIBS="-lcudd -lmtr -lcuddst -lepd -lcuddutil -lm $LIBS" CPLINT_LIBS="$CUDD_LIBS"
found_cplint=true found_cplint=true
elif test -d "/usr/local/include/cudd" -a x"$CPLINT_CFLAGS" = x elif test -d "/usr/include/cudd" -a x"$CPLINT_CPPFLAGS" = x
then
CPLINT_CPPFLAGS=" -I/usr/include/cudd"
CPLINT_LIBS+="-lcudd -lmtr -lcuddst -lepd -lcuddutil -lm"
found_cplint=true
elif test -d "/usr/local/include/cudd" -a x"$CPLINT_CPPFLAGS" = x
then then
found_cplint=true found_cplint=true
CPLINT_CFLAGS=" -I/usr/local/include/cudd" CPLINT_CPPFLAGS+=" -I/usr/local/include/cudd"
CPLINT_LIBS+=" -L/usr/local/lib" CPLINT_LIBS+=" -L/usr/local/lib"
fi fi
if test "$found_cplint" = true if test "$found_cplint" = true
@ -13422,7 +13429,7 @@ else
CPLINT_SHLIB_LD="$SHLIB_LD" CPLINT_SHLIB_LD="$SHLIB_LD"
fi fi
PKG_CPLINT="packages/cplint/approx/simplecuddLPADs packages/cplint" PKG_CPLINT="packages/cplint/approx/simplecuddLPADs packages/cplint"
CPLINT_LDFLAGS="$LDFLAGS"
@ -13468,19 +13475,19 @@ else
fi fi
if test "$yap_cv_zlib" != no; if test "$yap_cv_zlib" != no;
then then
old_cppflags="$CPPFLAGS"
old_inc="$CPPFLAGS"
old_libs="$LDFLAGS" old_libs="$LDFLAGS"
ZLIB_TARGETS=nolib ZLIB_TARGETS=nolib
if test "yap_cv_zlib" != yes; if test "$yap_cv_zlib" != yes;
then then
CPPFLAGS+=" -I $yap_cv_zlib/include" CPPFLAGS+=" -I $yap_cv_zlib/include"
LDFLAGS+=" -L $yap_cv_zlib/lib" LDFLAGS+=" -L $yap_cv_zlib/lib"
@ -13488,19 +13495,31 @@ fi
for ac_header in zlib.h zutil.h ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
if test "x$ac_cv_header_zlib_h" = xyes; then :
$as_echo "#define HAVE_ZLIB_H 1" >>confdefs.h
has_zlib_h=true
else
has_zlib_h=true
fi
for ac_header in zutil.h
do : do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "zutil.h" "ac_cv_header_zutil_h" "$ac_includes_default"
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" if test "x$ac_cv_header_zutil_h" = xyes; then :
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 #define HAVE_ZUTIL_H 1
_ACEOF _ACEOF
fi fi
done done
if test "$has_zlib_h" = true; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlibVersion in -lz" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlibVersion in -lz" >&5
$as_echo_n "checking for zlibVersion in -lz... " >&6; } $as_echo_n "checking for zlibVersion in -lz... " >&6; }
if ${ac_cv_lib_z_zlibVersion+:} false; then : if ${ac_cv_lib_z_zlibVersion+:} false; then :
@ -13544,14 +13563,15 @@ else
ZLIB=no ZLIB=no
fi fi
else
ZLIB=no
ZLIB_LIBS="$LIBS"
fi
if test "$ZLIB" = yes; then if test "$ZLIB" = yes; then
ZLIB_CPPFLAGS="$CPPFLAGS" ZLIB_CPPFLAGS="$CPPFLAGS"
ZLIB_LDFLAGS="$LDFLAGS" ZLIB_LDFLAGS="$LDFLAGS"
CPPFLAGS="$old_cppflags"
LDFLAGS="$old_ldflags"
ZLIB_TARGETS="zlib4pl.$SO" ZLIB_TARGETS="zlib4pl.$SO"
ZLIB_PLTARGETS=zlib.pl ZLIB_PLTARGETS=zlib.pl
else else
@ -13565,6 +13585,11 @@ else
################################################################## ##################################################################
EOF EOF
fi fi
CPPFLAGS="$old_cppflags"
LIBS="$old_libs"
fi fi
@ -14017,7 +14042,7 @@ else
JAVA_TEST=Test.java JAVA_TEST=Test.java
CLASS_TEST=Test.class CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST cat << \EOF > $JAVA_TEST
/* #line 14020 "configure" */ /* #line 14045 "configure" */
public class Test { public class Test {
} }
EOF EOF
@ -14193,7 +14218,7 @@ EOF
if uudecode$EXEEXT Test.uue; then if uudecode$EXEEXT Test.uue; then
ac_cv_prog_uudecode_base64=yes ac_cv_prog_uudecode_base64=yes
else else
echo "configure: 14196: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: 14221: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
echo "configure: failed file was:" >&5 echo "configure: failed file was:" >&5
cat Test.uue >&5 cat Test.uue >&5
ac_cv_prog_uudecode_base64=no ac_cv_prog_uudecode_base64=no
@ -14324,7 +14349,7 @@ else
JAVA_TEST=Test.java JAVA_TEST=Test.java
CLASS_TEST=Test.class CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST cat << \EOF > $JAVA_TEST
/* #line 14327 "configure" */ /* #line 14352 "configure" */
public class Test { public class Test {
} }
EOF EOF
@ -14359,7 +14384,7 @@ JAVA_TEST=Test.java
CLASS_TEST=Test.class CLASS_TEST=Test.class
TEST=Test TEST=Test
cat << \EOF > $JAVA_TEST cat << \EOF > $JAVA_TEST
/* [#]line 14362 "configure" */ /* [#]line 14387 "configure" */
public class Test { public class Test {
public static void main (String args[]) { public static void main (String args[]) {
System.exit (0); System.exit (0);
@ -17104,12 +17129,12 @@ fi
*darwin*) *darwin*)
CUDA_LDFLAGS="$LDFLAGS" CUDA_LDFLAGS="$LDFLAGS"
CUDA_CPPFLAGS="-arch=sm_20 -Xcompiler -fPIC -O3 " CUDA_CPPFLAGS="-arch=sm_20 -Xcompiler -fPIC -O3 "
CUDA_SHLIB_LD="$NVCC -Xcompiler -shared -L../.. -lYap " CUDA_SHLIB_LD="$NVCC --shared -L../.. -lYap "
;; ;;
*linux*) *linux*)
CUDA_LDFLAGS="$LDFLAGS" CUDA_LDFLAGS="$LDFLAGS"
CUDA_CPPFLAGS="-arch=sm_20 -Xcompiler -fPIC -O3 " CUDA_CPPFLAGS="-arch=sm_20 -Xcompiler -fPIC -O3 "
CUDA_SHLIB_LD="$NVCC -Xcompiler -shared -L../.. -lYap " CUDA_SHLIB_LD="$NVCC --shared -L../.. -lYap "
;; ;;
**) **)
CUDA_LDFLAGS="$LDFLAGS $LIBS" CUDA_LDFLAGS="$LDFLAGS $LIBS"

1
configure.in
View File

@ -213,6 +213,7 @@ AC_ARG_WITH(gmp,
LIBS="$LIBS -L${yap_cv_gmp}/lib" LIBS="$LIBS -L${yap_cv_gmp}/lib"
CPPFLAGS="$CPPFLAGS -I${yap_cv_gmp}/include" CPPFLAGS="$CPPFLAGS -I${yap_cv_gmp}/include"
CFLAGS="$CFLAGS -I${yap_cv_gmp}/include" CFLAGS="$CFLAGS -I${yap_cv_gmp}/include"
CXXFLAGS="$CXXFLAGS -I${yap_cv_gmp}/include"
fi, fi,
[yap_cv_gmp=yes]) [yap_cv_gmp=yes])

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

@ -42,7 +42,7 @@ DYNAMIC =
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
INCLUDE = -I@abs_top_builddir@ @CUDD_CPPFLAGS@ INCLUDE = -I@abs_top_builddir@ @CUDD_CPPFLAGS@
LINKFLAGS = -lm LINKFLAGS = -lm
LINKLIBS = @CUDD_LDFLAGS@ LINKLIBS = @CUDD_LIBS@
default: problogbdd default: problogbdd

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

@ -42,7 +42,7 @@ DYNAMIC =
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
INCLUDE = -I@abs_top_builddir@ @CUDD_CPPFLAGS@ INCLUDE = -I@abs_top_builddir@ @CUDD_CPPFLAGS@
LINKFLAGS = -lm LINKFLAGS = -lm
LINKLIBS = @CUDD_LDFLAGS@ LINKLIBS = @CUDD_LIBS@
default: problogbdd_lfi default: problogbdd_lfi

2
packages/archive

@ -1 +1 @@
Subproject commit 7d117f75c2befd526cc59193c35a7795be0d30d8 Subproject commit 3f3e7d7798613fef9894afae05c5cc1b0bd22d49

6
packages/bdd/Makefile.in
View File

@ -55,16 +55,16 @@ cudd.o: $(srcdir)/cudd.c
$(CC) -c $(CFLAGS) $(srcdir)/cudd.c -o cudd.o $(CC) -c $(CFLAGS) $(srcdir)/cudd.c -o cudd.o
@DO_SECOND_LD@%.@SO@: %.o @DO_SECOND_LD@%.@SO@: %.o
@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@ @CUDD_LDFLAGS@ @DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@ @CUDD_LIBS@
@DO_SECOND_LD@cudd.@SO@: cudd.o @DO_SECOND_LD@cudd.@SO@: cudd.o
@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o cudd.@SO@ cudd.o @EXTRA_LIBS_FOR_DLLS@ @CUDD_LDFLAGS@ @DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o cudd.@SO@ cudd.o @EXTRA_LIBS_FOR_DLLS@ @CUDD_LIBS@
install: all install-examples install: all install-examples
mkdir -p $(DESTDIR)$(SHAREDIR) mkdir -p $(DESTDIR)$(SHAREDIR)
for h in $(BDD_PROLOG); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done for h in $(BDD_PROLOG); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
@WINDOWS@ $(INSTALL_PROGRAM) @CUDD_LDFLAGS@ $(DESTDIR)$(BINDIR) @WINDOWS@ $(INSTALL_PROGRAM) @CUDD_LIBS@ $(DESTDIR)$(BINDIR)
install-examples: install-examples:

6
packages/bdd/configure.in
View File

@ -53,7 +53,7 @@ fi
if test "$target_os" = "mingw32" -o "$target_os" = "mingw64" if test "$target_os" = "mingw32" -o "$target_os" = "mingw64"
then then
#mingw: we know where things are #mingw: we know where things are
CUDD_LDFLAGS="$cudd_dir/lib/all_cudd.dll" CUDD_LIBS="$cudd_dir/lib/all_cudd.dll"
cudd_installed="yes" cudd_installed="yes"
else else
@ -90,7 +90,7 @@ AC_SEARCH_LIBS(Cudd_Init, [cudd], [cudd_installed="yes"], [cudd_installed="no"])
CPPFLAGS="$OLD_CPPFLAGS" CPPFLAGS="$OLD_CPPFLAGS"
if test "$cudd_installed" = yes; then if test "$cudd_installed" = yes; then
CUDD_LDFLAGS="$LIBS" CUDD_LIBS="$LIBS"
else else
cat << EOF cat << EOF
################################################################## ##################################################################
@ -106,7 +106,7 @@ fi
fi fi
AC_SUBST(PKG_BDDLIB) AC_SUBST(PKG_BDDLIB)
AC_SUBST(CUDD_LDFLAGS) AC_SUBST(CUDD_LIBS)
AC_SUBST(CUDD_CPPFLAGS) AC_SUBST(CUDD_CPPFLAGS)
mkdir -p packages/bdd mkdir -p packages/bdd

2
packages/clib

@ -1 +1 @@
Subproject commit a2a537095752aa3b47dc069c80ec7c88795d2d17 Subproject commit 55f1b0d765c607c99b9b9c67f150df64d33128b0

5
packages/cplint/Makefile.in
View File

@ -23,7 +23,7 @@ SHAREDIR=$(ROOTDIR)/share/Yap
# #
DEFS=@DEFS@ -D_YAP_NOT_INSTALLED_=1 DEFS=@DEFS@ -D_YAP_NOT_INSTALLED_=1
CC=@CC@ CC=@CC@
CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../include @CPPFLAGS@ CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../include -I../.. @CPPFLAGS@
# #
# #
# You shouldn't need to change what follows. # You shouldn't need to change what follows.
@ -35,8 +35,7 @@ SHELL=/bin/sh
RANLIB=@RANLIB@ RANLIB=@RANLIB@
srcdir=@srcdir@ srcdir=@srcdir@
SO=@SO@ SO=@SO@
CPLINT_CFLAGS=@CPLINT_CFLAGS@ CPLINT_CFLAGS=@CPLINT_CPPFLAGS@
CPLINT_LDFLAGS=@CPLINT_LDFLAGS@
CPLINT_LIBS=@CPLINT_LIBS@ CPLINT_LIBS=@CPLINT_LIBS@
#4.1VPATH=@srcdir@:@srcdir@/OPTYap #4.1VPATH=@srcdir@:@srcdir@/OPTYap
CWD=$(PWD) CWD=$(PWD)

12
packages/cplint/approx/simplecuddLPADs/Makefile.in
View File

@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin
# where YAP should look for libraries # where YAP should look for libraries
# #
LIBDIR=@libdir@/Yap LIBDIR=@libdir@/Yap
DESTDIR=$(prefix)/share/Yap DESTDIR=$(BINDIR)
# #
# #
CC=@CC@ CC=@CC@
@ -25,14 +25,14 @@ INSTALL=@INSTALL@
INSTALL_DATA=@INSTALL_DATA@ INSTALL_DATA=@INSTALL_DATA@
INSTALL_PROGRAM=@INSTALL_PROGRAM@ INSTALL_PROGRAM=@INSTALL_PROGRAM@
SHELL=/bin/sh SHELL=/bin/sh
RANLIB=ranlib RANLIB=@RANLIB@
SHLIB_CFLAGS=-shared -fPIC SHLIB_SUFFIX=@SO@
SHLIB_SUFFIX=.so
CWD=$(PWD) CWD=$(PWD)
srcdir=@srcdir@ srcdir=@srcdir@
CPLINT_CFLAGS=@CPLINT_CFLAGS@ CPLINT_CPPFLAGS=@CPPFLAGS@ @CPLINT_CPPFLAGS@ -I@abs_top_builddir@
CPLINT_LDFLAGS=@CPLINT_LDFLAGS@ CPLINT_LDFLAGS=@CPLINT_LDFLAGS@
CPLINT_LIBS=@CPLINT_LIBS@ CPLINT_LIBS=@CPLINT_LIBS@
CFLAGS=@CFLAGS@ $(YAP_EXTRAS) $(DEFS)
# #
@ -45,7 +45,7 @@ LPADBDD: ProblogBDD.o simplecudd.o general.o
$(CC) $(CPLINT_LDFLAGS) ProblogBDD.o simplecudd.o general.o $(CPLINT_LIBS) -o LPADBDD $(CC) $(CPLINT_LDFLAGS) ProblogBDD.o simplecudd.o general.o $(CPLINT_LIBS) -o LPADBDD
%.o : $(srcdir)/%.c %.o : $(srcdir)/%.c
$(CC) $(CPLINT_CFLAGS) -c $< $(CC) $(CPLINT_CPPFLAGS) -c $<
clean: clean:
rm -f *.o LPADBDD rm -f *.o LPADBDD

18
packages/cplint/approx/simplecuddLPADs/simplecudd.h
View File

@ -196,9 +196,25 @@ variable=value
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include <time.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" #include "cudd.h"
#endif
#if HAVE_CUDD_CUDD_H
#include "cudd/cudd.h"
#endif
#if HAVE_CUDDINT_H
#include "cuddInt.h" #include "cuddInt.h"
#endif
#if HAVE_CUDD_CUDDINT_H
#include "cudd/cuddInt.h"
#endif
#include "general.h" #include "general.h"
#define IsHigh(manager, node) HIGH(manager) == node #define IsHigh(manager, node) HIGH(manager) == node

31
packages/cplint/configure.in
View File

@ -3,13 +3,14 @@ dnl
dnl CPLINT_LIBS= dnl CPLINT_LIBS=
dnl CPLINT_LDFLAGS= dnl CPLINT_LDFLAGS=
dnl CPLINT_SHLIB_LD= dnl CPLINT_SHLIB_LD=
dnl CPLINT_CPPFLAGS=
dnl dnl
found_cplint=false found_cplint=false
AC_ARG_ENABLE(cplint, AC_ARG_WITH(cplint,
[ --enable-cplint[=DIR] enable the cplint library using the CUDD library in DIR/lib], [ --with-cplint[=DIR] with the cplint library using the CUDD library in DIR/lib],
yap_cv_cplint=$enableval, yap_cv_cplint=no) yap_cv_cplint=$withval, yap_cv_cplint=no)
if test x"$yap_cv_cplint" = "xno" if test x"$yap_cv_cplint" = "xno"
then then
@ -17,23 +18,27 @@ then
else else
if test x"$yap_cv_cplint" != "xyes" if test x"$yap_cv_cplint" != "xyes"
then then
CPLINT_LDFLAGS+=" -L${yap_cv_cplint}/cudd -L${yap_cv_cplint}/mtr -L${yap_cv_cplint}/st -L${yap_cv_cplint}/util -L${yap_cv_cplint}/epd " CPLINT_LIBS+=" -L${yap_cv_cplint}/cudd -L${yap_cv_cplint}/mtr -L${yap_cv_cplint}/st -L${yap_cv_cplint}/util -L${yap_cv_cplint}/epd "
#typical of user-compiled cudd fi #typical of user-compiled cudd fi
CPLINT_CFLAGS+=" -I${yap_cv_cplint}/include" CPLINT_CPPFLAGS+=" -I${yap_cv_cplint}/include"
CPLINT_LIBS="$LIBS"
found_cplint=true found_cplint=true
fi fi
# cudd has been probably just tested, so why try again? # cudd has been probably just tested, so why try again?
# cudd is available on fedora, and maybe other linux distributions # cudd is available on fedora, and maybe other linux distributions
if test -d "/usr/include/cudd" -a x"$CPLINT_CFLAGS" = x if test x"$CUDD_LIBS" != x -a x"$CPLINT_CPPFLAGS" = x
then then
CPLINT_CFLAGS=" -I/usr/include/cudd" CPLINT_CPPFLAGS="$CUDD_CPPFLAGS"
CPLINT_LIBS="-lcudd -lmtr -lcuddst -lepd -lcuddutil -lm $LIBS" CPLINT_LIBS="$CUDD_LIBS"
found_cplint=true found_cplint=true
elif test -d "/usr/local/include/cudd" -a x"$CPLINT_CFLAGS" = x elif test -d "/usr/include/cudd" -a x"$CPLINT_CPPFLAGS" = x
then
CPLINT_CPPFLAGS=" -I/usr/include/cudd"
CPLINT_LIBS+="-lcudd -lmtr -lcuddst -lepd -lcuddutil -lm"
found_cplint=true
elif test -d "/usr/local/include/cudd" -a x"$CPLINT_CPPFLAGS" = x
then then
found_cplint=true found_cplint=true
CPLINT_CFLAGS=" -I/usr/local/include/cudd" CPLINT_CPPFLAGS+=" -I/usr/local/include/cudd"
CPLINT_LIBS+=" -L/usr/local/lib" CPLINT_LIBS+=" -L/usr/local/lib"
fi fi
if test "$found_cplint" = true if test "$found_cplint" = true
@ -49,11 +54,11 @@ else
CPLINT_SHLIB_LD="$SHLIB_LD" CPLINT_SHLIB_LD="$SHLIB_LD"
fi fi
PKG_CPLINT="packages/cplint/approx/simplecuddLPADs packages/cplint" PKG_CPLINT="packages/cplint/approx/simplecuddLPADs packages/cplint"
CPLINT_LDFLAGS="$LDFLAGS"
AC_SUBST(CPLINT_LIBS) AC_SUBST(CPLINT_LIBS)
AC_SUBST(CPLINT_CFLAGS)
AC_SUBST(CPLINT_LDFLAGS) AC_SUBST(CPLINT_LDFLAGS)
AC_SUBST(CPLINT_CPPFLAGS)
AC_SUBST(CPLINT_SHLIB_LD) AC_SUBST(CPLINT_SHLIB_LD)
AC_SUBST(SHLIB_SUFFIX)
else else
PKG_CPLINT="" PKG_CPLINT=""
fi fi

8
packages/cplint/cplint.h
View File

@ -7,10 +7,16 @@ This package uses the library cudd, see http://vlsi.colorado.edu/~fabio/CUDD/
for the relative license. for the relative license.
*/ */
#include "config.h"
#if HAVE_CUDD_UTIL_H
#include "cudd/util.h"
#include "cudd/cuddInt.h"
#include "cudd/mtr.h"
#else
#include "util.h" #include "util.h"
#include "cuddInt.h" #include "cuddInt.h"
#include "mtr.h" #include "mtr.h"
#endif
#include "YapInterface.h" #include "YapInterface.h"
typedef struct typedef struct

2
packages/cplint/slipcase/Makefile.in
View File

@ -17,7 +17,7 @@ DESTDIR=$(prefix)/lib/Yap
# #
# #
CC=@CC@ CC=@CC@
CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir)/../../../include @CPPFLAGS@ CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir)/../../../include -I../../.. @CPPFLAGS@
# #
# #
# You shouldn't need to change what follows. # You shouldn't need to change what follows.

5
packages/cplint/slipcase/bddem.c
View File

@ -13,7 +13,12 @@ for the relative license.
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "config.h"
#if HAVE_CUDD_CUDDINT_H
#include "cudd/cuddInt.h"
#else
#include "cuddInt.h" #include "cuddInt.h"
#endif
#include "YapInterface.h" #include "YapInterface.h"
#define LOGZERO log(0.000001) #define LOGZERO log(0.000001)
#define CACHE_SLOTS 1 #define CACHE_SLOTS 1

4
packages/cuda/configure.in
View File

@ -26,12 +26,12 @@ else
*darwin*) *darwin*)
CUDA_LDFLAGS="$LDFLAGS" CUDA_LDFLAGS="$LDFLAGS"
CUDA_CPPFLAGS="-arch=sm_20 -Xcompiler -fPIC -O3 " CUDA_CPPFLAGS="-arch=sm_20 -Xcompiler -fPIC -O3 "
CUDA_SHLIB_LD="$NVCC -Xcompiler -shared -L../.. -lYap " CUDA_SHLIB_LD="$NVCC --shared -L../.. -lYap "
;; ;;
*linux*) *linux*)
CUDA_LDFLAGS="$LDFLAGS" CUDA_LDFLAGS="$LDFLAGS"
CUDA_CPPFLAGS="-arch=sm_20 -Xcompiler -fPIC -O3 " CUDA_CPPFLAGS="-arch=sm_20 -Xcompiler -fPIC -O3 "
CUDA_SHLIB_LD="$NVCC -Xcompiler -shared -L../.. -lYap " CUDA_SHLIB_LD="$NVCC --shared -L../.. -lYap "
;; ;;
**) **)
CUDA_LDFLAGS="$LDFLAGS $LIBS" CUDA_LDFLAGS="$LDFLAGS $LIBS"

2
packages/zlib

@ -1 +1 @@
Subproject commit d1684692855ee300470c853f1ce9b9bc101c8cc0 Subproject commit f2517a4e893bacbad21273eb578dadf9bf0f4ca1