From 2bb21e9e1bf61e48cba196b90b73b970077b02ac Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Mon, 10 Feb 2014 23:30:21 +0000 Subject: [PATCH 1/9] clean up makefile --- packages/bdd/Makefile.in | 6 ++++++ packages/bdd/configure.in | 33 ++++++++++++++++++++------------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/packages/bdd/Makefile.in b/packages/bdd/Makefile.in index 28ad4c0a6..ab4d9fe3e 100644 --- a/packages/bdd/Makefile.in +++ b/packages/bdd/Makefile.in @@ -65,6 +65,12 @@ install: all for h in $(BDD_PROLOG); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) +install-examples: + clean: rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK +realclean: clean + rm -f $(SOBJS) Makefile + + diff --git a/packages/bdd/configure.in b/packages/bdd/configure.in index 24fc8233e..727fc59c1 100644 --- a/packages/bdd/configure.in +++ b/packages/bdd/configure.in @@ -1,24 +1,23 @@ + AC_ARG_WITH(cudd, [ --with-cudd[=DIR] use CUDD package in DIR], yap_cv_cudd="$withval", [yap_cv_cudd=no]) +AC_ARG_ENABLE(bddlib, + [ --enable-bddlib dynamic bdd library ], + dynamic_bdd="$enableval", dynamic_bdd=no) + if test "$yap_cv_cudd" = no then - ENABLE_CUDD="@# " - ENABLE_BDDLIB="@# " + PKG_BDDLIB="" +elif test "$dynamic_bdd" = yes +then + PKG_BDDLIB="packages/bdd packages/ProbLog/simplecudd packages/ProbLog/simplecudd_lfi" else - if test "$dynamic_bdd" = yes - then - ENABLE_BDDLIB="" - else - ENABLE_BDDLIB="@# " - fi - ENABLE_CUDD="" + PKG_BDDLIB="packages/ProbLog/simplecudd packages/ProbLog/simplecudd_lfi" fi - - if test "$yap_cv_cudd" != no; then oldlibs="$LIBS" @@ -105,7 +104,15 @@ LIBS="$oldlibs" fi fi -AC_SUBST(ENABLE_CUDD) -AC_SUBST(ENABLE_BDDLIB) +AC_SUBST(PKG_BDDLIB) AC_SUBST(CUDD_LDFLAGS) AC_SUBST(CUDD_CPPFLAGS) + +mkdir -p packages/bdd + +if test "$PKG_BDDLIB" != ""; then +AC_CONFIG_FILES([packages/bdd/Makefile]) +AC_CONFIG_FILES([packages/ProbLog/simplecudd/Makefile]) +AC_CONFIG_FILES([packages/ProbLog/simplecudd_lfi/Makefile]) +fi + From 5bf0a5de61f87731d360abcee0b17a20f583d6bd Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Mon, 10 Feb 2014 23:30:21 +0000 Subject: [PATCH 2/9] clean up makefile --- packages/CLPBN/Makefile.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/CLPBN/Makefile.in b/packages/CLPBN/Makefile.in index c7402504d..e1e3c8f19 100644 --- a/packages/CLPBN/Makefile.in +++ b/packages/CLPBN/Makefile.in @@ -117,6 +117,7 @@ CLPBN_LEARNING_EXAMPLES= \ $(CLPBN_EXDIR)/learning/sprinkler_params.yap \ $(CLPBN_EXDIR)/learning/train.yap +all: install: $(CLBN_TOP) $(CLBN_PROGRAMS) $(CLPBN_LEARNING_PROGRAMS) $(CLPBN_SCHOOL_EXAMPLES) $(CLPBN_HMMER_EXAMPLES) $(CLPBN_LEARNING_EXAMPLES) mkdir -p $(DESTDIR)$(SHAREDIR)/clpbn @@ -128,6 +129,8 @@ install: $(CLBN_TOP) $(CLBN_PROGRAMS) $(CLPBN_LEARNING_PROGRAMS) $(CLPBN_SCHOOL_ for h in $(CLPBN_TOP); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done for h in $(CLPBN_PROGRAMS); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/clpbn; done for h in $(CLPBN_LEARNING_PROGRAMS); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR)/clpbn/learning; done + +install-examples: for h in $(CLPBN_EXAMPLES); do $(INSTALL_DATA) $$h $(DESTDIR)$(EXDIR); done for h in $(CLPBN_SCHOOL_EXAMPLES); do $(INSTALL_DATA) $$h $(DESTDIR)$(EXDIR)/School; done for h in $(CLPBN_HMMER_EXAMPLES); do $(INSTALL_DATA) $$h $(DESTDIR)$(EXDIR)/HMMer; done From 89e2c86a0b4f10e6e2fb79675796ceea9b6a0607 Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Mon, 10 Feb 2014 23:30:21 +0000 Subject: [PATCH 3/9] clean up makefile --- packages/cplint/configure.in | 14 ++++++++++++-- packages/cplint/doc/Makefile | 8 -------- 2 files changed, 12 insertions(+), 10 deletions(-) delete mode 100644 packages/cplint/doc/Makefile diff --git a/packages/cplint/configure.in b/packages/cplint/configure.in index 5e1993db0..f9b9e10bb 100644 --- a/packages/cplint/configure.in +++ b/packages/cplint/configure.in @@ -19,7 +19,6 @@ if test ! "$yap_cv_cplint" = "no" CPLINT_CFLAGS+=" -I${yap_cv_cplint}/include" CPLINT_LIBS="-lcudd -lmtr -lst -lepd -lutil -lm "$CPLINT_LIBS fi - ENABLE_CPLINT="" if test "$target_os" = "cygwin" -o "$target_os" = "mingw32" then CPLINT_SHLIB_LD="gcc -shared ../../yap.dll" @@ -28,12 +27,23 @@ if test ! "$yap_cv_cplint" = "no" CPLINT_SHLIB_LD=$SHLIB_LD SHLIB_SUFFIX="so" fi + PKG_CPLINT="packages/cplint packages/cplint/splipcase packages/cplint/approx/simplecuddLPADs" + AC_SUBST(PKG_CPLINT) AC_SUBST(CPLINT_LIBS) AC_SUBST(CPLINT_CFLAGS) AC_SUBST(CPLINT_LDFLAGS) AC_SUBST(CPLINT_SHLIB_LD) AC_SUBST(SHLIB_SUFFIX) else - ENABLE_CPLINT="@#" + PKG_CPLINT="" fi +mkdir -p packages/cplint +mkdir -p packages/cplint/approx +mkdir -p packages/cplint/approx/simplecuddLPADs + +AC_CONFIG_FILES([packages/cplint/Makefile]) +AC_CONFIG_FILES([packages/cplint/approx/simplecuddLPADs/Makefile]) +AC_CONFIG_FILES([packages/cplint/slipcase/Makefile]) + + diff --git a/packages/cplint/doc/Makefile b/packages/cplint/doc/Makefile deleted file mode 100644 index 786d90969..000000000 --- a/packages/cplint/doc/Makefile +++ /dev/null @@ -1,8 +0,0 @@ - -manual.pdf: manual.tex manual.bbl - pdflatex manual - pdflatex manual - -manual.html: manual.tex manual.bbl - htlatex manual - From 231290bad3b7e976be8a33eb25a6dfc61c741264 Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Mon, 10 Feb 2014 23:30:21 +0000 Subject: [PATCH 4/9] clean up makefile --- packages/cuda/Makefile.in | 9 +++++++-- packages/cuda/configure.in | 10 ++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/packages/cuda/Makefile.in b/packages/cuda/Makefile.in index 85c8eac96..20cbe54e1 100644 --- a/packages/cuda/Makefile.in +++ b/packages/cuda/Makefile.in @@ -67,6 +67,11 @@ install: all for h in $(BDD_PROLOG); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) -clean: - rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK +install-examples: + +clean: + rm -f *.o *~ $(OBJS) *.BAK + +realclean: + rm -f $(SOBJS) Makefile diff --git a/packages/cuda/configure.in b/packages/cuda/configure.in index f76424677..39ac15aac 100644 --- a/packages/cuda/configure.in +++ b/packages/cuda/configure.in @@ -14,14 +14,14 @@ CUDA_LDFLAGS="" CUDA_CPPFLAGS="" if test "$yap_cv_cuda" = no then - ENABLE_CUDA="@# " + PKG_CUDA="" else AC_PATH_PROG(NVCC, [nvcc], [no], [$yap_cv_cuda/bin]) if test "$yap_cv_cuda" = no then - ENABLE_CUDA="@# " + PKG_CUDA="" else - ENABLE_CUDA="" + PKG_CUDA="packages/cuda" case "$target_os" in *darwin*) CUDA_LDFLAGS="$LDFLAGS" @@ -37,7 +37,7 @@ else fi fi -AC_SUBST(ENABLE_CUDA) +AC_SUBST(PKG_CUDA) AC_SUBST(NVCC) AC_SUBST(CUDA_SHLIB_LD) AC_SUBST(CUDA_CPPFLAGS) @@ -45,3 +45,5 @@ AC_SUBST(CUDA_LDFLAGS) AC_CONFIG_FILES([packages/cuda/Makefile]) +mkdir -p packages/cuda + From 00f0d449ec1e67da3a32d99ea313b6c6b86fda15 Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Mon, 10 Feb 2014 23:30:21 +0000 Subject: [PATCH 5/9] clean up makefile --- packages/ProbLog/Makefile.in | 9 +++++++ packages/clib | 2 +- packages/gecode/Makefile.in | 5 ++++ packages/gecode/configure.in | 11 +++++--- packages/gecode/dev/Makefile | 5 ---- packages/gecode/dev/extractor/Makefile | 36 -------------------------- packages/myddas/configure.in | 11 +++----- packages/python/configure.in | 14 +++++----- packages/real | 2 +- packages/swi-minisat2/C/Makefile.in | 5 ++++ packages/swi-minisat2/Makefile.in | 8 ++++++ 11 files changed, 48 insertions(+), 60 deletions(-) delete mode 100644 packages/gecode/dev/Makefile delete mode 100644 packages/gecode/dev/extractor/Makefile diff --git a/packages/ProbLog/Makefile.in b/packages/ProbLog/Makefile.in index 721b2d390..68992240c 100644 --- a/packages/ProbLog/Makefile.in +++ b/packages/ProbLog/Makefile.in @@ -80,6 +80,8 @@ PROBLOG_EXAMPLES = \ MANUAL_NAME = problog MANUAL = $(srcdir)/$(MANUAL_NAME) +all: + install: $(PROGRAMS) $(PROBLOG_PROGRAMS) $(PROBLOG_EXAMPLES) mkdir -p $(DESTDIR)$(SHAREDIR)/Yap mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/problog @@ -88,6 +90,8 @@ install: $(PROGRAMS) $(PROBLOG_PROGRAMS) $(PROBLOG_EXAMPLES) for p in $(PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap; done for p in $(PROBLOG_PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap/problog; done $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(DOCSDIR) + +install-examples: for p in $(PROBLOG_EXAMPLES); do $(INSTALL_DATA) $$p $(DESTDIR)$(EXDOCSDIR); done pdf: $(MANUAL) @@ -97,3 +101,8 @@ pdf: $(MANUAL) install_docs: pdf $(INSTALL_DATA) problog.pdf $(DESTDIR)$(DOCSDIR) + +clean: + +realclean: + rm -f Makefile diff --git a/packages/clib b/packages/clib index b83d419ba..ab6b1a70d 160000 --- a/packages/clib +++ b/packages/clib @@ -1 +1 @@ -Subproject commit b83d419ba547a284a62ce951784849dc7b5ec712 +Subproject commit ab6b1a70db5dfaf6467b7d4ab51cfa76f1352d4c diff --git a/packages/gecode/Makefile.in b/packages/gecode/Makefile.in index 047553535..431fa4020 100644 --- a/packages/gecode/Makefile.in +++ b/packages/gecode/Makefile.in @@ -69,6 +69,9 @@ gecode.yap: $(srcdir)/gecode$(GECODE_MAJOR)_yap_hand_written.yap $(srcdir)/$(GEC clean: -rm -f *.o *.so *~ gecode.yap +realclean: + -rm -f $(SOBJS) Makefile + install: all mkdir -p $(DESTDIR)$(YAPLIBDIR) mkdir -p $(DESTDIR)$(SHAREDIR)/Yap @@ -76,3 +79,5 @@ install: all $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) $(INSTALL) gecode.yap $(DESTDIR)$(SHAREDIR)/Yap $(INSTALL) $(srcdir)/clpfd.yap $(DESTDIR)$(SHAREDIR)/Yap/gecode + +install-examples: diff --git a/packages/gecode/configure.in b/packages/gecode/configure.in index 905eeb44b..d1b75c6a6 100644 --- a/packages/gecode/configure.in +++ b/packages/gecode/configure.in @@ -20,11 +20,11 @@ AC_ARG_ENABLE(gecode, fi], use_gecode=$have_gecode) if test "$use_gecode" = no; then - ENABLE_GECODE="@# " + PKG_GECODE="" else - ENABLE_GECODE="" + PKG_GECODE="packages/gecode" fi -AC_SUBST(ENABLE_GECODE) +AC_SUBST(PKG_GECODE) AC_MSG_CHECKING([if dynamic arrays are supported]) @@ -90,3 +90,8 @@ fi AC_SUBST(GECODE_VERSION) AC_SUBST(GECODE_EXTRALIBS) + +if test "$PKG_GECODE" = "packages/gecode"; then +AC_CONFIG_FILES([packages/gecode/Makefile]) +fi + diff --git a/packages/gecode/dev/Makefile b/packages/gecode/dev/Makefile deleted file mode 100644 index 4464bb185..000000000 --- a/packages/gecode/dev/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: - python code-generator.py - -clean: - -rm -f *~ *.pyc diff --git a/packages/gecode/dev/extractor/Makefile b/packages/gecode/dev/extractor/Makefile deleted file mode 100644 index e45782ddc..000000000 --- a/packages/gecode/dev/extractor/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -GECODEDIR := $(shell g++ $(CPPFLAGS) $(CXXFLAGS) -H -E gecodedir.hh 2>&1 >/dev/null | grep gecode/kernel.hh | awk '{print $$2}' | sed 's|/kernel.hh||') -GECODECONFIG := $(GECODEDIR)/support/config.hpp -GECODEVERSION := $(shell cat $(GECODECONFIG) | egrep '\' | awk '{print $$3}' | sed 's/"//g') -PROTOTYPES = ../gecode-prototypes-$(GECODEVERSION).hh -ENUMS = ../gecode-enums-$(GECODEVERSION).py - -all: $(PROTOTYPES) $(ENUMS) - -$(PROTOTYPES): % : xml/namespaceGecode.xml extract-prototypes.xsl - cat notice.hh > $@ || { rm -f $@; exit 1; } - xsltproc extract-prototypes.xsl $< \ - | grep EXPORT \ - | grep -v Symmetry \ - | sed 's/Gecode:://g' \ - | sed 's/< //>/g' \ - | sed 's/ \&/\&/g' \ - | sed 's/, /,/g' \ - | sed 's/forceinline //g' \ - | sed 's/GECODE_INT_EXPORT //g' \ - | sed 's/GECODE_FLOAT_EXPORT //g' \ - | sed 's/GECODE_SET_EXPORT //g' \ - | grep -v '*' | sort >> $@ || { rm -f $@; exit 1; } - -$(ENUMS): % : xml/namespaceGecode.xml extract-enums.xsl - cat notice.py > $@ || { rm -f $@; exit 1; } - xsltproc extract-enums.xsl $< >> $@ || { rm -f $@; exit 1; } - -xml/namespaceGecode.xml: Doxyfile - doxygen Doxyfile - -Doxyfile: Doxyfile.in - cat $< | sed "s#@GECODEDIR@#$(GECODEDIR)#" > $@ || { rm -f $@; exit 1; } - -clean: - -rm -rf *~ gecode-prototypes-*.hh gecode-enums-*.py Doxyfile xml diff --git a/packages/myddas/configure.in b/packages/myddas/configure.in index d2caf0db6..ab8683778 100644 --- a/packages/myddas/configure.in +++ b/packages/myddas/configure.in @@ -31,7 +31,7 @@ AC_ARG_ENABLE(myddas-top-level, if test "$yap_cv_myddas" != "no" then - ENABLE_MYDDAS="" + PKG_MYDDAS="packages/myddas" dnl check for mysql AC_SEARCH_LIBS(mysql_init, [mysqlclient], [yap_cv_mysql="yes"], [yap_cv_mysql="no"]) if test "$yap_cv_mysql" = yes @@ -58,6 +58,7 @@ then ODBC_LIBS="$ODBC_LIBS -liodbc" fi fi + AC_CHECK_HEADERS(mysql/mysql.h) if test "$yap_cv_odbc" = yes then YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_ODBC" @@ -73,13 +74,9 @@ then YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_TOP_LEVEL" fi else - ENABLE_MYDDAS="#@ " + ENABLE_MYDDAS="" fi -AC_SUBST(ENABLE_MYDDAS) +AC_SUBST(PKG_MYDDAS) -if test "$yap_cv_myddas" != "no" -then - AC_CHECK_HEADERS(mysql/mysql.h) -fi diff --git a/packages/python/configure.in b/packages/python/configure.in index f3afa9994..9cc5477f6 100755 --- a/packages/python/configure.in +++ b/packages/python/configure.in @@ -11,10 +11,10 @@ AC_ARG_WITH(python, if test "$yap_cv_python" = "no"; then PYTHON_TARGET="dummy" - ENABLE_PYTHON="@# " + PKG_PYTHON="" elif test -e "$srcdir"/packages/python/Makefile.in ; then PYTHON_TARGET="pitf" - ENABLE_PYTHON="" + PKG_PYTHON="packages/python" if test "$yap_cv_python" = "yes" then AC_CHECK_PROGS(PYTHON, python, "none") @@ -39,7 +39,7 @@ elif test -e "$srcdir"/packages/python/Makefile.in ; then PYTHON_LIBS="-L $PYTHONHOME/lib" else echo "Could not find libraries for Python" - ENABLE_PYTHON="@# " + PKG_PYTHON="" fi OLIBS=$LIBS LIBS=$PYTHON_LIBS @@ -55,20 +55,20 @@ elif test -e "$srcdir"/packages/python/Makefile.in ; then PYTHON_INCLUDES="-I $PYTHONHOME/include" else echo "Could not find includes for Python" - ENABLE_PYTHON="@# " + PKG_PYTHON="" fi fi else PYTHON_TARGET="dummy" - ENABLE_PYTHON="@# " + PKG_PYTHON="" fi AC_SUBST(PYTHON_TARGET) -AC_SUBST(ENABLE_PYTHON) +AC_SUBST(PKG_PYTHON) AC_SUBST(PYTHON_INCLUDES) AC_SUBST(PYTHON_LIBS) -if test "$ENABLE_PYTHON" = ""; then +if test "$PKG_PYTHON" != ""; then AC_CONFIG_FILES([ packages/python/Makefile ]) fi diff --git a/packages/real b/packages/real index 970bd7591..651702fe4 160000 --- a/packages/real +++ b/packages/real @@ -1 +1 @@ -Subproject commit 970bd759158b8ea164c0a178c66d624609a419ee +Subproject commit 651702fe47088a12922e5051e6de89414a24e84c diff --git a/packages/swi-minisat2/C/Makefile.in b/packages/swi-minisat2/C/Makefile.in index c1f5f9601..a09385e0b 100644 --- a/packages/swi-minisat2/C/Makefile.in +++ b/packages/swi-minisat2/C/Makefile.in @@ -76,9 +76,14 @@ pl-minisat.o : $(srcdir)/pl-minisat.C install: all $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) +install-examples: + clean: rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK +realclean: + rm -f Makefile $(OBJS) + depend: $(HEADERS) $(C_SOURCES) -@if test "$(GCC)" = yes; then\ diff --git a/packages/swi-minisat2/Makefile.in b/packages/swi-minisat2/Makefile.in index 66abd1de4..a9e77e9ba 100644 --- a/packages/swi-minisat2/Makefile.in +++ b/packages/swi-minisat2/Makefile.in @@ -34,10 +34,18 @@ EXAMPLE_PROGRAMS= \ $(srcdir)/examples/adder.pl \ $(srcdir)/examples/pearl_examples.pl +all: + install: $(PROGRAMS) mkdir -p $(DESTDIR)$(SHAREDIR)/Yap mkdir -p $(DESTDIR)$(SHAREDIR)/doc/Yap/packages/examples/minisat for p in $(PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap; done for p in $(EXAMPLE_PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/doc/Yap/packages/examples/minisat; done +install-examples: + clean: + +realclean: + rm Makefile + From 9a46cdac9ba21588f436cac81a68360254e87f7a Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Mon, 10 Feb 2014 23:31:33 +0000 Subject: [PATCH 6/9] clean up makefile --- H/absmi.h | 2 +- Makefile.in | 457 +++------------ configure | 1043 +++++++++++++++++------------------ configure.in | 323 ++++------- library/lammpi/configure.in | 9 +- library/matlab/Makefile.in | 2 +- library/random/Makefile.in | 5 + packages/raptor | 2 +- packages/real | 2 +- packages/zlib | 2 +- swi/library/clp/Makefile.in | 4 + 11 files changed, 736 insertions(+), 1115 deletions(-) diff --git a/H/absmi.h b/H/absmi.h index de773077e..492ccf79a 100644 --- a/H/absmi.h +++ b/H/absmi.h @@ -72,7 +72,7 @@ static char SccsId[] = "%W% %G%"; #ifdef BP_FREE /*************************************************************** * Use bp as PREG for X86 machines * -***************************************************************/ +********************************************Term*******************/ #if defined(IN_ABSMI_C) register struct yami* P1REG asm ("bp"); /* can't use yamop before Yap.h */ #define PREG P1REG diff --git a/Makefile.in b/Makefile.in index b98002ef6..d97883691 100755 --- a/Makefile.in +++ b/Makefile.in @@ -224,8 +224,8 @@ IOLIB_SOURCES=$(srcdir)/os/pl-buffer.c $(srcdir)/os/pl-ctype.c \ $(srcdir)/os/pl-tai.c \ $(srcdir)/os/pl-text.c \ $(srcdir)/os/pl-version.c \ - $(srcdir)/os/pl-write.c \ - $(srcdir)/C/pl-yap.c @ENABLE_WINCONSOLE@$(srcdir)/os/windows/uxnt.c + $(srcdir)/os/pl-write.c \ + $(srcdir)/C/pl-yap.c @WINDOWS@$(srcdir)/os/windows/uxnt.c C_SOURCES= \ $(IOLIB_SOURCES) \ @@ -346,7 +346,7 @@ IOLIB_OBJECTS=pl-buffer.o pl-codelist.o pl-ctype.o pl-dtoa.o pl-error.o \ pl-stream.o pl-string.o pl-table.o \ pl-tai.o pl-text.o pl-utf8.o \ pl-version.o pl-write.o \ - pl-yap.o @ENABLE_WINCONSOLE@ uxnt.o + pl-yap.o @WINDOWS@ uxnt.o ENGINE_OBJECTS = \ agc.o absmi.o adtdefs.o alloc.o amasm.o analyst.o arrays.o \ @@ -402,7 +402,7 @@ PLCONS_OBJECTS = \ pl-ntconsole.o \ pl-ntmain.o -all: parms.h startup.yss @ENABLE_WINCONSOLE@ yap-win@EXEC_SUFFIX@ +all: parms.h startup.yss @WINDOWS@ yap-win@EXEC_SUFFIX@ Makefile: $(srcdir)/Makefile.in @@ -435,6 +435,11 @@ parms.h: Makefile @if cmp -s $@% $@; then rm $@%; else mv $@% $@; fi +$(OBJECTS): config.h + +yap.o: $(srcdir)/console/yap.c config.h + $(CC) -c $(CFLAGS) -I$(srcdir)/include $(srcdir)/console/yap.c -o $@ + #special rule for this one: we cannot use -fomit-frame-pointer because this will # interface with the outside world. c_interface.o: $(srcdir)/C/c_interface.c $(srcdir)/include/c_interface.h config.h @@ -446,86 +451,26 @@ yap-argss.o: $(srcdir)/C/yap-args.c $(srcdir)/include/c_interface.h config.h clause_list.o: $(srcdir)/C/clause_list.c $(srcdir)/include/clause_list.h config.h $(CC) $(C_INTERF_FLAGS) -c $(srcdir)/C/clause_list.c -o clause_list.o -init.o: $(srcdir)/C/init.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/C/init.c -o $@ - -load_foreign.o: $(srcdir)/C/load_foreign.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/C/load_foreign.c -o $@ - -qlyr.o: $(srcdir)/C/qlyr.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/C/qlyr.c -o $@ - -qlyw.o: $(srcdir)/C/qlyw.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/C/qlyw.c -o $@ - -save.o: $(srcdir)/C/save.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/C/save.c -o $@ - -signals.o: $(srcdir)/C/signals.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/C/signals.c -o $@ - -sysbits.o: $(srcdir)/C/sysbits.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/C/sysbits.c -o $@ - udi.o: $(srcdir)/C/udi.c config.h $(CC) -c $(C_INTERF_FLAGS) $(srcdir)/C/udi.c -o $@ -yap.o: $(srcdir)/console/yap.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include $(srcdir)/console/yap.c -o $@ +%.o: $(srcdir)/C/%.c config.h + $(CC) -c $(CFLAGS) $< -o $@ -mpi.o: $(srcdir)/library/mpi/mpi.c config.h - $(MPI_CC) -c $(CFLAGS) $(srcdir)/library/mpi/mpi.c -o $@ +%.o: $(srcdir)/OPTYap/%.c config.h + $(CC) -c $(CFLAGS) $< -o $@ -mpe.o: $(srcdir)/library/mpi/mpe.c config.h - $(MPI_CC) -c $(CFLAGS) $(srcdir)/library/mpi/mpe.c -o $@ - -or.memory.o: $(srcdir)/OPTYap/or.memory.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/OPTYap/or.memory.c -o $@ - -opt.init.o: $(srcdir)/OPTYap/opt.init.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/OPTYap/opt.init.c -o $@ - -opt.preds.o: $(srcdir)/OPTYap/opt.preds.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/OPTYap/opt.preds.c -o $@ - -or.cut.o: $(srcdir)/OPTYap/or.cut.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/OPTYap/or.cut.c -o $@ - -or.copy_engine.o: $(srcdir)/OPTYap/or.copy_engine.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/OPTYap/or.copy_engine.c -o $@ - -or.cow_engine.o: $(srcdir)/OPTYap/or.cow_engine.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/OPTYap/or.cow_engine.c -o $@ - -or.sba_engine.o: $(srcdir)/OPTYap/or.sba_engine.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/OPTYap/or.sba_engine.c -o $@ - -or.thread_engine.o: $(srcdir)/OPTYap/or.thread_engine.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/OPTYap/or.thread_engine.c -o $@ - -or.scheduler.o: $(srcdir)/OPTYap/or.scheduler.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/OPTYap/or.scheduler.c -o $@ - -tab.tries.o: $(srcdir)/OPTYap/tab.tries.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/OPTYap/tab.tries.c -o $@ - -tab.completion.o: $(srcdir)/OPTYap/tab.completion.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/OPTYap/tab.completion.c -o $@ - -eam_showcode.o: $(srcdir)/BEAM/eam_showcode.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/BEAM/eam_showcode.c -o $@ - -eam_am.o: $(srcdir)/BEAM/eam_am.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/BEAM/eam_am.c -o $@ - -eamamasm.o: $(srcdir)/BEAM/eamamasm.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/BEAM/eamamasm.c -o $@ - -eamindex.o: $(srcdir)/BEAM/eamindex.c config.h - $(CC) -c $(CFLAGS) $(srcdir)/BEAM/eamindex.c -o $@ +%.o: $(srcdir)/BEAM/%.c config.h + $(CC) -c $(CFLAGS) $< -o $@ sys.o: $(srcdir)/library/system/sys.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include $(srcdir)/library/system/sys.c -o $@ + $(CC) -c $(CFPLAGS) -I$(srcdir)/include $(srcdir)/library/system/sys.c -o $@ + +yap_random.o: $(srcdir)/library/random/yap_random.c config.h + $(CC) -c $(CFLAGS) -I$(srcdir)/include $(srcdir)/library/random/yap_random.c -o $@ + +%.o: $(srcdir)/library/regex/%.c @NO_BUILTIN_REGEXP@ $(srcdir)/library/regex/regex2.h $(srcdir)/library/regex/engine.c config.h + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir)/library/regex $< -o $@ swi.o: $(srcdir)/library/dialect/swi/fli/swi.c $(srcdir)/library/dialect/swi/fli/swi.h $(srcdir)/include/SWI-Prolog.h $(srcdir)/os/SWI-Stream.h config.h $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir)/library/dialect/swi/fli $(srcdir)/library/dialect/swi/fli/swi.c -o $@ @@ -533,26 +478,8 @@ swi.o: $(srcdir)/library/dialect/swi/fli/swi.c $(srcdir)/library/dialect/swi/fl blobs.o: $(srcdir)/library/dialect/swi/fli/blobs.c $(srcdir)/library/dialect/swi/fli/swi.h $(srcdir)/include/SWI-Prolog.h config.h $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir)/library/dialect/swi/fli $(srcdir)/library/dialect/swi/fli/blobs.c -o $@ -yap_random.o: $(srcdir)/library/random/yap_random.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include $(srcdir)/library/random/yap_random.c -o $@ - -regexp.o: $(srcdir)/library/regex/regexp.c @NO_BUILTIN_REGEXP@ $(srcdir)/library/regex/regex2.h $(srcdir)/library/regex/engine.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir)/library/regex $(srcdir)/library/regex/regexp.c -o regexp.o - -regcomp.o: $(srcdir)/library/regex/regcomp.c $(srcdir)/library/regex/regex2.h config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir)/library/regex $(srcdir)/library/regex/regcomp.c -o regcomp.o - -regerror.o: $(srcdir)/library/regex/regerror.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir)/library/regex $(srcdir)/library/regex/regerror.c -o regerror.o - -regfree.o: $(srcdir)/library/regex/regfree.c $(srcdir)/library/regex/regex2.h config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir)/library/regex $(srcdir)/library/regex/regfree.c -o regfree.o - -regexec.o: $(srcdir)/library/regex/regexec.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir)/library/regex $(srcdir)/library/regex/regexec.c -o regexec.o - -pl-nt.o: $(srcdir)/os/pl-nt.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-nt.c -o $@ +%.o: $(srcdir)/os/%.c config.h + $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $< -o $@ pl-ntcon.o: $(srcdir)/console/LGPL/pl-ntcon.c config.h $(CC) -c $(CFLAGS) -DPL_CONSOLE=1 -I$(srcdir)/include $(srcdir)/console/LGPL/pl-ntcon.c -o $@ @@ -563,81 +490,6 @@ pl-ntconsole.o: $(srcdir)/console/LGPL/pl-ntconsole.c config.h pl-ntmain.o: $(srcdir)/console/LGPL/pl-ntmain.c config.h $(CC) -municode -DUNICODE -D_UNICODE -c $(CFLAGS) -DPL_CONSOLE=1 -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/console/LGPL/pl-ntmain.c -o $@ -pl-buffer.o: $(srcdir)/os/pl-buffer.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-buffer.c -o $@ - -pl-codelist.o: $(srcdir)/os/pl-codelist.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-codelist.c -o $@ - -pl-ctype.o: $(srcdir)/os/pl-ctype.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-ctype.c -o $@ - -pl-dtoa.o: $(srcdir)/os/pl-dtoa.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-dtoa.c -o $@ - -pl-error.o: $(srcdir)/os/pl-error.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-error.c -o $@ - -pl-file.o: $(srcdir)/os/pl-file.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-file.c -o $@ - -pl-files.o: $(srcdir)/os/pl-files.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-files.c -o $@ - -pl-fmt.o: $(srcdir)/os/pl-fmt.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-fmt.c -o $@ - -pl-glob.o: $(srcdir)/os/pl-glob.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-glob.c -o $@ - -pl-locale.o: $(srcdir)/os/pl-locale.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-locale.c -o $@ - -pl-option.o: $(srcdir)/os/pl-option.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-option.c -o $@ - -pl-os.o: $(srcdir)/os/pl-os.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-os.c -o $@ - -pl-privitf.o: $(srcdir)/os/pl-privitf.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-privitf.c -o $@ - -pl-prologflag.o: $(srcdir)/os/pl-prologflag.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-prologflag.c -o $@ - -pl-rl.o: $(srcdir)/os/pl-rl.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-rl.c -o $@ - -pl-read.o: $(srcdir)/os/pl-read.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-read.c -o $@ - -pl-stream.o: $(srcdir)/os/pl-stream.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-stream.c -o $@ - -pl-string.o: $(srcdir)/os/pl-string.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-string.c -o $@ - -pl-table.o: $(srcdir)/os/pl-table.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-table.c -o $@ - -pl-text.o: $(srcdir)/os/pl-text.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-text.c -o $@ - -pl-utf8.o: $(srcdir)/os/pl-utf8.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-utf8.c -o $@ - -pl-version.o: $(srcdir)/os/pl-version.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-version.c -o $@ - -pl-write.o: $(srcdir)/os/pl-write.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-write.c -o $@ - -pl-yap.o: $(srcdir)/C/pl-yap.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/C/pl-yap.c -o $@ - -pl-tai.o: $(srcdir)/os/pl-tai.c config.h - $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/pl-tai.c -o $@ - uxnt.o: $(srcdir)/os/windows/uxnt.c config.h $(CC) -c $(CFLAGS) -I$(srcdir)/include -I$(srcdir) -I$(srcdir)/os @EXTRA_INCLUDES_FOR_WIN32@ $(srcdir)/os/windows/uxnt.c -o $@ @@ -646,11 +498,6 @@ uxnt.o: $(srcdir)/os/windows/uxnt.c config.h $(CC) -c $(CFLAGS) $< -o $@ -# default rule -%.o : $(srcdir)/C/%.c config.h - $(CC) -c $(CFLAGS) $< -o $@ - - ## CPP'ed files (for macro debugging) %.i : $(srcdir)/C/%.c @@ -666,44 +513,49 @@ c_interface.i: $(srcdir)/C/c_interface.c $(srcdir)/include/c_interface.h mycb: $(srcdir)/mycb.c $(CC) $(CFLAGS) $(srcdir)/mycb.c -o mycb +INSTALLED_PACKAGES= \ + library/random \ + library/regex \ + library/rltree \ + library/system \ + library/tries \ + packages/ProbLog \ + packages/yap-lbfgs \ + @PKG_BDDLIB@ \ + @PKG_CLPBN@ \ + @PKG_CUDA@ \ + @PKG_CPLINT@ \ + @PKG_GECODE@ \ + @PKG_MATLAB@ \ + @PKG_MINISAT@ \ + @PKG_MPI@ \ + @PKG_MYDDAS@ \ + @PKG_PRISM@ \ + @PKG_PYTHON@ \ + @PKG_RAPTOR@ \ + @PKG_CHR@ \ + @PKG_CLIB@ \ + @PKG_JPL@ \ + @PKG_LIBARCHIVE@ \ + @PKG_LTX2HTM@ \ + @PKG_ODBC@ \ + @PKG_PLDOC@ \ + @PKG_PLUNIT@ \ + @PKG_REAL@ \ + @PKG_RDF@ \ + @PKG_SEMWEB@ \ + @PKG_SGML@ \ + @PKG_WINCONSOLE@ \ + @PKG_ZLIB@ + +PACKAGES= \ + library \ + swi/library \ + swi/library/clp \ + $(INSTALLED_PACKAGES) + all: startup.yss - @ENABLE_GECODE@ @INSTALL_DLLS@ (cd packages/gecode; $(MAKE)) - @INSTALL_MPI@ (cd library/lammpi; $(MAKE)) - @INSTALL_MATLAB@ (cd library/matlab; $(MAKE)) - @INSTALL_DLLS@ (cd library/matrix; $(MAKE)) - @INSTALL_DLLS@ (cd library/random; $(MAKE)) - @INSTALL_DLLS@ (cd library/regex; $(MAKE)) - @INSTALL_DLLS@ (cd library/rltree; $(MAKE)) - @INSTALL_DLLS@ (cd packages/yap-lbfgs; $(MAKE)) - @ENABLE_WINCONSOLE@ (cd swi/console; $(MAKE)) - @INSTALL_DLLS@ (cd library/system; $(MAKE)) - @INSTALL_DLLS@ (cd library/tries; $(MAKE)) - @ENABLE_CLIB@ @INSTALL_DLLS@ (cd packages/clib; $(MAKE)) - @ENABLE_CHR@ (cd packages/chr; $(MAKE)) - @ENABLE_LIBARCHIVE@ @INSTALL_DLLS@ (cd packages/archive; $(MAKE)) - @ENABLE_LTX2HTM@ @INSTALL_DLLS@ (cd packages/ltx2htm; $(MAKE)) - @ENABLE_ODBC@ @INSTALL_DLLS@ (cd packages/odbc; $(MAKE)) - @ENABLE_PLDOC@ @INSTALL_DLLS@ (cd packages/pldoc; $(MAKE)) - @ENABLE_PLUNIT@ @INSTALL_DLLS@ (cd packages/plunit; $(MAKE)) - @ENABLE_RDF@ @INSTALL_DLLS@ (cd packages/RDF; $(MAKE)) - @ENABLE_SEMWEB@ @INSTALL_DLLS@ (cd packages/semweb; $(MAKE)) - @ENABLE_SGML@ @INSTALL_DLLS@ (cd packages/sgml; $(MAKE)) - @ENABLE_REAL@ @INSTALL_DLLS@ (cd packages/real; $(MAKE)) - @ENABLE_ZLIB@ @INSTALL_DLLS@ (cd packages/zlib; $(MAKE)) - @ENABLE_CLPBN_BP@ @INSTALL_DLLS@ (cd packages/CLPBN/horus; $(MAKE)) - @ENABLE_MINISAT@ @INSTALL_DLLS@ (cd packages/swi-minisat2/C; $(MAKE)) - @ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE)) - @ENABLE_CPLINT@ (cd packages/cplint; $(MAKE)) - @ENABLE_CPLINT@ (cd packages/cplint/slipcase; $(MAKE)) - @ENABLE_PRISM@ @INSTALL_DLLS@ (cd packages/prism/src/c; $(MAKE)) - @ENABLE_BDDLIB@ @INSTALL_DLLS@ (cd packages/bdd; $(MAKE)) - @ENABLE_RAPTOR@ @INSTALL_DLLS@ (cd packages/raptor; $(MAKE)) - @ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE)) - @ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE)) - @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE)) - @ENABLE_PYTHON@ @INSTALL_DLLS@ (cd packages/python; $(MAKE)) - @ENABLE_CUDA@ @INSTALL_DLLS@ (cd packages/cuda; $(MAKE)) - @ENABLE_MYDDAS@ @INSTALL_DLLS@ (cd packages/myddas; $(MAKE)) + for f in $(PACKAGES); do ( cd $$f ; $(MAKE) ); done startup.yss: yap@EXEC_SUFFIX@ $(PL_SOURCES) -rm -f startup.yss @@ -728,154 +580,43 @@ libYap.a: $(LIB_OBJECTS) @DYNYAPLIB@: $(LIB_OBJECTS) @YAPLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLAGS) $(SONAMEFLAG) -install: install_bin install_data - -install_bin: @INSTALL_COMMAND@ +install: @INSTALL_COMMAND@ install_unix: startup.yss @YAPLIB@ mkdir -p $(DESTDIR)$(BINDIR) - $(INSTALL_PROGRAM) -m 755 yap@EXEC_SUFFIX@ $(DESTDIR)$(BINDIR)/yap mkdir -p $(DESTDIR)$(YAPLIBDIR) - $(INSTALL_DATA) startup.yss $(DESTDIR)$(YAPLIBDIR)/startup.yss - @INSTALL_DLLS@ $(INSTALL_DATA) -m 755 @YAPLIB@ $(DESTDIR)$(LIBDIR) mkdir -p $(DESTDIR)$(SHAREDIR)/Yap mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/pl mkdir -p $(DESTDIR)$(DOCSDIR) + mkdir -p $(DESTDIR)$(INCLUDEDIR) + mkdir -p $(DESTDIR)$(INCLUDEDIR)/src + $(INSTALL_PROGRAM) -m 755 yap@EXEC_SUFFIX@ $(DESTDIR)$(BINDIR)/yap + $(INSTALL_DATA) startup.yss $(DESTDIR)$(YAPLIBDIR)/startup.yss + $(INSTALL_DATA) -m 755 @YAPLIB@ $(DESTDIR)$(LIBDIR) $(INSTALL) $(srcdir)/Artistic $(DESTDIR)$(DOCSDIR) $(INSTALL) $(srcdir)/README $(DESTDIR)$(DOCSDIR) $(INSTALL) $(srcdir)/COPYING $(DESTDIR)$(DOCSDIR) for f in $(PL_SOURCES); do $(INSTALL) $$f $(DESTDIR)$(SHAREDIR)/Yap/pl; done - @INSTALL_MPI@ (cd library/lammpi; $(MAKE) install) - @INSTALL_DLLS@ (cd library/matrix; $(MAKE) install) - @INSTALL_DLLS@ (cd library/random; $(MAKE) install) - @INSTALL_DLLS@ (cd library/regex; $(MAKE) install) - @INSTALL_DLLS@ (cd library/rltree; $(MAKE) install) - @INSTALL_DLLS@ (cd packages/yap-lbfgs; $(MAKE) install) - @INSTALL_DLLS@ (cd library/system; $(MAKE) install) - @INSTALL_DLLS@ (cd library/tries; $(MAKE) install) - @ENABLE_GECODE@ @INSTALL_DLLS@ (cd packages/gecode; $(MAKE) install) - @ENABLE_CLIB@ @INSTALL_DLLS@ (cd packages/clib; $(MAKE) install) - @ENABLE_HTTP@ @INSTALL_DLLS@ (cd packages/http; $(MAKE) install) - @ENABLE_HTTP@ @INSTALL_DLLS@ (cd packages/http; $(MAKE) install-examples) - @ENABLE_LIBARCHIVE@ @INSTALL_DLLS@ (cd packages/archive; $(MAKE) install) - @ENABLE_LTX2HTM@ @INSTALL_DLLS@ (cd packages/ltx2htm; $(MAKE) install) - @ENABLE_ODBC@ @INSTALL_DLLS@ (cd packages/odbc; $(MAKE) install) - @ENABLE_PLDOC@ @INSTALL_DLLS@ (cd packages/pldoc; $(MAKE) install) - @ENABLE_PLDOC@ @INSTALL_DLLS@ (cd packages/pldoc; $(MAKE) install-examples) - @ENABLE_PLUNIT@ @INSTALL_DLLS@ (cd packages/plunit; $(MAKE) install) - @ENABLE_PLUNIT@ @INSTALL_DLLS@ (cd packages/plunit; $(MAKE) install-examples) - @ENABLE_RDF@ @INSTALL_DLLS@ (cd packages/RDF; $(MAKE) install) - @ENABLE_SEMWEB@ @INSTALL_DLLS@ (cd packages/semweb; $(MAKE) install) - @ENABLE_SGML@ @INSTALL_DLLS@ (cd packages/sgml; $(MAKE) install) - @ENABLE_ZLIB@ @INSTALL_DLLS@ (cd packages/zlib; $(MAKE) install) - @ENABLE_CLPBN_BP@ @INSTALL_DLLS@ (cd packages/CLPBN/horus; $(MAKE) install) - @ENABLE_MINISAT@ @INSTALL_DLLS@ (cd packages/swi-minisat2/C; $(MAKE) install) - @INSTALL_MATLAB@ @INSTALL_DLLS@ (cd library/matlab; $(MAKE) install) - @ENABLE_REAL@ @INSTALL_DLLS@ (cd packages/real; $(MAKE) install) - @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) install) - @ENABLE_PYTHON@ @INSTALL_DLLS@ (cd packages/python; $(MAKE) install) - @ENABLE_CUDA@ @INSTALL_DLLS@ (cd packages/cuda; $(MAKE) install) - @ENABLE_MYDDAS@ @INSTALL_DLLS@ (cd packages/myddas; $(MAKE) install) - mkdir -p $(DESTDIR)$(INCLUDEDIR) - mkdir -p $(DESTDIR)$(INCLUDEDIR)/src $(INSTALL) $(HEADERS) $(DESTDIR)$(INCLUDEDIR)/src for h in $(INTERFACE_HEADERS); do $(INSTALL) $$h $(DESTDIR)$(INCLUDEDIR); done $(INSTALL) config.h $(DESTDIR)$(INCLUDEDIR)/src/config.h $(INSTALL) parms.h $(DESTDIR)$(INCLUDEDIR)/src/parms.h $(INSTALL) YapTermConfig.h $(DESTDIR)$(INCLUDEDIR) - @ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) install) - @ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE) install) - @ENABLE_PRISM@ @INSTALL_DLLS@ (cd packages/prism/src/c; $(MAKE) install) - @ENABLE_PRISM@ @INSTALL_DLLS@ (cd packages/prism/src/prolog; $(MAKE) install) - @ENABLE_BDDLIB@ @INSTALL_DLLS@ (cd packages/bdd; $(MAKE) install) - @ENABLE_RAPTOR@ @INSTALL_DLLS@ (cd packages/raptor; $(MAKE) install) - @ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) install) - @ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE) install) + for f in $(PACKAGES); do ( echo $$f; cd $$f ; $(MAKE) install ); done + for f in $(PACKAGES); do ( echo $$f; cd $$f ; $(MAKE) install-examples ); done - -install_win32: startup.yss @ENABLE_WINCONSOLE@ yap-win@EXEC_SUFFIX@ - mkdir -p $(DESTDIR)$(BINDIR) - mkdir -p $(DESTDIR)$(LIBDIR) - mkdir -p $(DESTDIR)$(YAPLIBDIR) - mkdir -p $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_PROGRAM) -m 755 yap.exe $(DESTDIR)$(BINDIR)/yap.exe +install_win32: startup.yss @WINDOWS@ yap-win@EXEC_SUFFIX@ install_unix $(INSTALL_PROGRAM) -m 755 yap.dll $(DESTDIR)$(BINDIR)/yap.dll - @ENABLE_WINCONSOLE@ $(INSTALL_PROGRAM) -m 755 yap-win.exe $(DESTDIR)$(BINDIR)/yap-win.exe - @ENABLE_WINCONSOLE@ $(INSTALL_PROGRAM) -m 755 plterm.dll $(DESTDIR)$(BINDIR)/plterm.dll - $(INSTALL_PROGRAM) -m 755 @YAPLIB@ $(DESTDIR)$(YAPLIBDIR)/@YAPLIB@ - $(INSTALL_PROGRAM) -m 755 startup.yss $(DESTDIR)$(YAPLIBDIR)/startup.yss - mkdir -p $(DESTDIR)$(SHAREDIR)/Yap - mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/pl - mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/swi - mkdir -p $(DESTDIR)$(DOCSDIR) - $(INSTALL) $(srcdir)/Artistic $(DESTDIR)$(DOCSDIR) - $(INSTALL) $(srcdir)/README $(DESTDIR)$(DOCSDIR)/README.TXT - $(INSTALL) $(srcdir)/COPYING $(DESTDIR)$(DOCSDIR)/COPYING.TXT - for f in $(PL_SOURCES); do $(INSTALL) $$f $(DESTDIR)$(SHAREDIR)/Yap/pl; done - $(INSTALL) $(HEADERS) $(DESTDIR)$(INCLUDEDIR) - for h in $(INTERFACE_HEADERS); do $(INSTALL) $$h $(DESTDIR)$(INCLUDEDIR); done - $(INSTALL) config.h $(DESTDIR)$(INCLUDEDIR)/config.h - $(INSTALL) parms.h $(DESTDIR)$(INCLUDEDIR)/parms.h - (cd library/random; $(MAKE) install) - (cd library/matrix; $(MAKE) install) - (cd library/regex; $(MAKE) install) - (cd library/rltree; $(MAKE) install) - (cd library/system; $(MAKE) install) - @INSTALL_DLLS@ (cd packages/yap-lbfgs; $(MAKE) install) - @ENABLE_WINCONSOLE@ (cd swi/console; $(MAKE) install) - @INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install) - (cd library/tries; $(MAKE) install) - @ENABLE_CLIB@ (cd packages/clib; $(MAKE) install) - @ENABLE_PLDOC@ (cd packages/pldoc; $(MAKE) install) - @ENABLE_PLDOC@ (cd packages/pldoc; $(MAKE) install-examples) - @ENABLE_PLUNIT@ (cd packages/plunit; $(MAKE) install) - @ENABLE_PLUNIT@ (cd packages/plunit; $(MAKE) install-examples) - @ENABLE_HTTP@ (cd packages/http; $(MAKE) install) - @ENABLE_LTX2HTM@ (cd packages/ltx2htm; $(MAKE) install) - @ENABLE_REAL@ (cd packages/real; $(MAKE) install) - @ENABLE_RDF@ (cd packages/RDF; $(MAKE) install) - @ENABLE_SEMWEB@ (cd packages/semweb; $(MAKE) install) - @ENABLE_SGML@ (cd packages/sgml; $(MAKE) install) - @ENABLE_ZLIB@ (cd packages/zlib; $(MAKE) install) - (cd packages/CLPBN ; $(MAKE) install) - @ENABLE_CLPBN_BP@ (cd packages/CLPBN/horus; $(MAKE) install) - @ENABLE_JPL@ (cd packages/jpl ; $(MAKE) install) - @ENABLE_PYTHON@ (cd packages/python ; $(MAKE) install) - @ENABLE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install) - @ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) install) - @ENABLE_PRISM@ (cd packages/prism/src/c; $(MAKE) install) - @ENABLE_PRISM@ (cd packages/prism/src/prolog; $(MAKE) install) - @ENABLE_BDDLIB@ (cd packages/bdd; $(MAKE) install) - @ENABLE_RAPTOR@ (cd packages/raptor; $(MAKE) install) - @ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) install) - @ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE) install) - @ENABLE_CUDA@ @INSTALL_DLLS@ (cd packages/cuda; $(MAKE) install) - @ENABLE_MYDDAS@ @INSTALL_DLLS@ (cd packages/myddas; $(MAKE) install) + @WINDOWS@ $(INSTALL_PROGRAM) -m 755 yap-win.exe $(DESTDIR)$(BINDIR)/yap-win.exe + @WINDOWS@ $(INSTALL_PROGRAM) -m 755 plterm.dll $(DESTDIR)$(BINDIR)/plterm.dll install_library: @YAPLIB@ mkdir -p $(DESTDIR)$(INCLUDEDIR) for h in $(HEADERS); do $(INSTALL) $$h $(DESTDIR)$(INCLUDEDIR); done -install_data: install_copied_files install_bin - @ENABLE_CHR@ (cd packages/chr ; $(MAKE) install) - @ENABLE_CHR@ (cd packages/chr ; $(MAKE) install-examples) - @ENABLE_CHR@ (cd packages/clpqr ; $(MAKE) install) - -install_copied_files: - (cd library ; $(MAKE) install) - @ENABLE_MINISAT@ (cd packages/swi-minisat2; $(MAKE) install) - (cd swi/library ; $(MAKE) install) - $(INSTALL_DATA) $(srcdir)/LGPL/pillow/icon_address.pl $(DESTDIR)$(SHAREDIR)/Yap/ - $(INSTALL_DATA) $(srcdir)/LGPL/pillow/pillow.pl $(DESTDIR)$(SHAREDIR)/Yap/ - @INSTALLCLP@(cd swi/library/clp ; $(MAKE) install) - (cd packages/CLPBN ; $(MAKE) install) - (cd packages/meld; $(MAKE) install) - (cd packages/xml; $(MAKE) install) - (cd packages/ProbLog ; $(MAKE) install) - ########## TAGS: $(C_SOURCES) $(PL_SOURCES) $(HEADERS) - etags $(C_SOURCES) $(PL_SOURCES) $(HEADERS) + etags $(C_SOURCES) $(PL_SOURCES) $(HEADERS) depend: $(HEADERS) $(C_SOURCES) -@if test "$(GCC)" = yes; then\ @@ -887,47 +628,7 @@ depend: $(HEADERS) $(C_SOURCES) clean: clean_docs rm -f *.o *~ *.BAK *.a - @ENABLE_GECODE@ @INSTALL_DLLS@ (cd packages/gecode; $(MAKE) clean) - @INSTALL_MPI@ (cd library/lammpi; $(MAKE) clean) - @INSTALL_MATLAB@ (cd library/matlab; $(MAKE) clean) - @INSTALL_DLLS@ (cd library/matrix; $(MAKE) clean) - @INSTALL_DLLS@ (cd library/random; $(MAKE) clean) - @INSTALL_DLLS@ (cd library/regex; $(MAKE) clean) - @INSTALL_DLLS@ (cd library/rltree; $(MAKE) clean) - @INSTALL_DLLS@ (cd packages/yap-lbfgs; $(MAKE) clean) - @ENABLE_WINCONSOLE@ (cd swi/console; $(MAKE) clean) - @INSTALL_DLLS@ (cd library/system; $(MAKE) clean) - @INSTALL_DLLS@ (cd library/tries; $(MAKE) clean) - @ENABLE_CLIB@ @INSTALL_DLLS@ (cd packages/clib; $(MAKE) clean) - @ENABLE_LTX2HTM@ @INSTALL_DLLS@ (cd packages/ltx2htm; $(MAKE) clean) - @ENABLE_HTTP@ @INSTALL_DLLS@ (cd packages/http; $(MAKE) clean) - @ENABLE_PLDOC@ @INSTALL_DLLS@ (cd packages/pldoc; $(MAKE) clean) - @ENABLE_PLUNIT@ @INSTALL_DLLS@ (cd packages/plunit; $(MAKE) clean) - @ENABLE_R@ @INSTALL_DLLS@ (cd packages/R; $(MAKE) clean) - @ENABLE_RDF@ @INSTALL_DLLS@ (cd packages/RDF; $(MAKE) clean) - @ENABLE_SEMWEB@ @INSTALL_DLLS@ (cd packages/semweb; $(MAKE) clean) - @ENABLE_SGML@ @INSTALL_DLLS@ (cd packages/sgml; $(MAKE) clean) - @ENABLE_REAL@ (cd packages/real; $(MAKE) clean) - @ENABLE_MINISAT@ (cd packages/swi-minisat2; $(MAKE) clean) - @ENABLE_CLPBN_BP@ (cd packages/CLPBN/horus; $(MAKE) clean) - @ENABLE_CHR@ (cd packages/chr; $(MAKE) clean) - @ENABLE_ZLIB@ @INSTALL_DLLS@ (cd packages/zlib; $(MAKE) clean) - @ENABLE_PRISM@ (cd packages/prism/src/c; $(MAKE) clean) - @ENABLE_PRISM@ (cd packages/prism/src/prolog; $(MAKE) clean) - @ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE) clean) - @ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) clean) - @ENABLE_BDDLIB@ (cd packages/bdd; $(MAKE) clean) - @ENABLE_RAPTOR@ (cd packages/raptor; $(MAKE) clean) - @ENABLE_LIBARCHIVE@ (cd packages/archive; $(MAKE) clean) - @ENABLE_ODBC@ (cd packages/odbc; $(MAKE) clean) - @ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) clean) - @ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE) clean) - @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) clean) - @ENABLE_PYTHON@ @INSTALL_DLLS@ (cd packages/python; $(MAKE) clean) - @ENABLE_CUDA@ @INSTALL_DLLS@ (cd packages/cuda; $(MAKE) clean) - @ENABLE_MYDDAS@ @INSTALL_DLLS@ (cd packages/myddas; $(MAKE) clean) - - + for f in $(PACKAGES); do ( cd $$f ; $(MAKE) clean ); done distclean: clean realclean_docs rm -f yap@EXEC_SUFFIX@ startup.yss libYap.* Makefile */Makefile */*/Makefile */*defs */*/*/Makefile *.h config.* diff --git a/configure b/configure index ee0d6a613..b7a49acc4 100755 --- a/configure +++ b/configure @@ -1,6 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69. +# Generated by GNU Autoconf 2.69 for YAP 6.3.4. +# +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -264,10 +266,11 @@ fi $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, -$0: including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." + $as_echo "$0: Please tell bug-autoconf@gnu.org and yap-users@sf.net +$0: about your system, including any error possibly output +$0: before this message. Then install a modern shell, or +$0: manually run the script under such a shell if you do +$0: have one." fi exit 1 fi @@ -575,14 +578,13 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= -PACKAGE_URL= +PACKAGE_NAME='YAP' +PACKAGE_TARNAME='yap ' +PACKAGE_VERSION='6.3.4' +PACKAGE_STRING='YAP 6.3.4' +PACKAGE_BUGREPORT='yap-users@sf.net' +PACKAGE_URL='' -ac_unique_file="console/yap.c" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -619,30 +621,39 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='ENABLE_ODBC -ENABLE_LIBARCHIVE +ac_subst_vars='PKG_ODBC +PKG_LIBARCHIVE +GECODE_EXTRALIBS +GECODE_VERSION +GECODE_MAJOR +PKG_GECODE CUDA_LDFLAGS CUDA_CPPFLAGS CUDA_SHLIB_LD -ENABLE_CUDA +PKG_CUDA NVCC +SHLIB_SUFFIX +CPLINT_SHLIB_LD +CPLINT_LDFLAGS +CPLINT_CFLAGS +CPLINT_LIBS +PKG_CPLINT PYTHON_LIBS PYTHON_INCLUDES -ENABLE_PYTHON +PKG_PYTHON PYTHON_TARGET PYTHON MPICF MPILDF YAPMPILIB +PKG_MPI +PKG_MATLAB +MATLAB_INCLUDE LTLIBOBJS LIBOBJS RAPTOR_CPPFLAGS RAPTOR_LDFLAGS -ENABLE_RAPTOR -GECODE_EXTRALIBS -GECODE_VERSION -GECODE_MAJOR -ENABLE_GECODE +PKG_RAPTOR LTX_PL _ACJNI_JAVAC JAVADOC @@ -668,8 +679,7 @@ ZLIB_PLTARGETS ZLIB_TARGETS CUDD_CPPFLAGS CUDD_LDFLAGS -ENABLE_BDDLIB -ENABLE_CUDD +PKG_BDDLIB ODBC_LIBS ODBC_LDFLAGS ODBC_CFLAGS @@ -684,7 +694,7 @@ CLIB_CRYPTLIBS CLIB_NETLIBS CLIB_PLTARGETS CLIB_TARGETS -ENABLE_MYDDAS +PKG_MYDDAS EXTRA_LIBS_FOR_SWIDLLS CLIB_PTHREADS CHR_TARGETS @@ -695,33 +705,31 @@ IN_YAP PROLOG_SYSTEM M4GENABSMI INSTALL_PRISM -MATLAB_INCLUDE -INSTALL_MATLAB -ENABLE_REAL -ENABLE_MINISAT +PKG_REAL +PKG_MINISAT EXTRA_INCLUDES_FOR_WIN32 -ENABLE_WINCONSOLE +WINDOWS +PKG_WINCONSOLE STATIC_MODE MAX_WORKERS INSTALLCLP INSTALL_COMMAND MPI_CC -INSTALL_MPI IN_UNIX -ENABLE_CLPBN_BP -ENABLE_ZLIB -ENABLE_SGML -ENABLE_SEMWEB -ENABLE_RDF -ENABLE_R -ENABLE_PLUNIT -ENABLE_PLDOC -ENABLE_LTX2HTM -ENABLE_JPL -ENABLE_HTTP -ENABLE_CLPQR -ENABLE_CLIB -ENABLE_CHR +PKG_CLPBN +PKG_ZLIB +PKG_SGML +PKG_SEMWEB +PKG_RDF +PKG_R +PKG_PLUNIT +PKG_PLDOC +PKG_LTX2HTM +PKG_JPL +PKG_HTTP +PKG_CLPQR +PKG_CLIB +PKG_CHR NO_BUILTIN_REGEXP YAP_EXTRAS SONAMEFLAG @@ -744,13 +752,7 @@ M4GENHDRS M4 PRE_INSTALL_ENV INSTALL_ENV -ENABLE_CPLINT -SHLIB_SUFFIX -CPLINT_SHLIB_LD -CPLINT_LDFLAGS -CPLINT_CFLAGS -CPLINT_LIBS -ENABLE_PRISM +PKG_PRISM EGREP GREP INSTALL_INFO @@ -839,7 +841,6 @@ enable_depth_limit enable_wam_profile enable_low_level_tracer enable_threads -enable_bddlib enable_pthread_locking enable_max_performance enable_max_memory @@ -862,7 +863,6 @@ with_judy with_minisat with_java with_readline -with_matlab with_heap_space with_stack_space with_trail_space @@ -874,14 +874,16 @@ enable_myddas_top_level with_time with_odbc with_cudd +enable_bddlib with_junit -enable_gecode with_raptor +with_matlab with_mpi with_mpe with_python -with_cuda enable_cplint +with_cuda +enable_gecode ' ac_precious_vars='build_alias host_alias @@ -935,7 +937,7 @@ sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' includedir='${prefix}/include' oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE}' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' infodir='${datarootdir}/info' htmldir='${docdir}' dvidir='${docdir}' @@ -1435,7 +1437,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. +\`configure' configures YAP 6.3.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1483,7 +1485,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --docdir=DIR documentation root [DATAROOTDIR/doc/yap ] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1500,7 +1502,9 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of YAP 6.3.4:";; + esac cat <<\_ACEOF Optional Features: @@ -1515,7 +1519,6 @@ Optional Features: --enable-wam-profile support low level profiling of abstract machine --enable-low-level-tracer support support for procedure-call tracing --enable-threads support system threads - --enable-bddlib dynamic bdd library --enable-pthread-locking use pthread locking primitives for internal locking (requires threads) --enable-max-performance try using the best flags for specific architecture --enable-max-memory try using the best flags for using the memory to the most @@ -1535,8 +1538,9 @@ Optional Features: --enable-myddas[=DIR] enable the MYDDAS library --enable-myddas-stats enable the MYDDAS library statistics support --enable-myddas-top-level enable the MYDDAS top-level support to MySQL - --enable-gecode install gecode library + --enable-bddlib dynamic bdd library --enable-cplint=DIR enable the cplint library using the CUDD library in DIR/lib + --enable-gecode install gecode library Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1547,7 +1551,6 @@ Optional Packages: --enable-minisat use minisat interface --with-java=JAVA_HOME use Java instalation in JAVA_HOME --with-readline=DIR use GNU Readline Library in DIR - --with-matlab=DIR use MATLAB package in DIR --with-heap-space=space default heap size in Kbytes --with-stack-space=space default stack size in Kbytes --with-trail-space=space default trail size in Kbytes @@ -1558,6 +1561,7 @@ Optional Packages: --with-cudd=DIR use CUDD package in DIR --with-junit=PATH Specify location of the junit JAR file --with-raptor=DIR use RAPTOR package in DIR + --with-matlab=DIR use MATLAB package in DIR --with-mpi=DIR use LAM/MPI library in DIR --with-mpe=DIR use MPE library in DIR --with-python=DIR interface to R language @@ -1578,7 +1582,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to the package provider. +Report bugs to . _ACEOF ac_status=$? fi @@ -1641,7 +1645,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -configure +YAP configure 6.3.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1884,6 +1888,10 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +( $as_echo "## ------------------------------- ## +## Report this to yap-users@sf.net ## +## ------------------------------- ##" + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 @@ -2338,7 +2346,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by $as_me, which was +It was created by YAP $as_me 6.3.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4148,13 +4156,6 @@ else threads=no fi -# Check whether --enable-bddlib was given. -if test "${enable_bddlib+set}" = set; then : - enableval=$enable_bddlib; dynamic_bdd="$enableval" -else - dynamic_bdd=no -fi - # Check whether --enable-pthread-locking was given. if test "${enable_pthread_locking+set}" = set; then : enableval=$enable_pthread_locking; pthreadlocking="$enableval" @@ -4375,22 +4376,6 @@ fi -# Check whether --with-matlab was given. -if test "${with_matlab+set}" = set; then : - withval=$with_matlab; if test "$withval" = yes; then - yap_cv_matlab=yes - elif test "$withval" = no; then - yap_cv_matlab=no - else - yap_cv_matlab=$with_matlab - MATLAB_INCLUDE="-I${yap_cv_matlab}/extern/include" - fi -else - yap_cv_matlab=no -fi - - - # Check whether --with-heap-space was given. if test "${with_heap_space+set}" = set; then : withval=$with_heap_space; if test "$withval" = yes; then @@ -4524,32 +4509,11 @@ fi if test "$yap_cv_prism" = no then - INSTALL_PRISM="@# " + INSTALL_PRISM="packages/prism/src/c packages/prism/src/prolog" else INSTALL_PRISM="" fi -if test "$yap_cv_matlab" = no -then - INSTALL_MATLAB="@# " -elif test "$yap_cv_matlab" = yes -then - INSTALL_MATLAB="" -else - case "$target_cpu" in - i*86*) - LDFLAGS="$LDFLAGS -L${yap_cv_matlab}/bin/glnx86" - ;; - x86*) - LDFLAGS="$LDFLAGS -L${yap_cv_matlab}/bin/glnxa64" - ;; - sparc*) - LDFLAGS="$LDFLAGS -L${yap_cv_matlab}/bin/sol2" - ;; - esac - INSTALL_MATLAB="" -fi - if test "$yap_cv_clpbn_bp"="yes"; then ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -4594,9 +4558,9 @@ fi if test "$yap_cv_clpbn_bp" = no then - ENABLE_CLPBN_BP="@# " + PKG_CLPBN="packages/CLPBN" else - ENABLE_CLPBN_BP="" + PKG_CLPBN="packages/CLPBN packages/CLPBN/horus" fi @@ -5520,16 +5484,19 @@ fi esac fi echo $prefix - ENABLE_WINCONSOLE="" + WINDOWS="" + PKG_WINCONSOLE="swi/console" else - ENABLE_WINCONSOLE="#" + WINDOWS="#" + PKG_WINCONSOLE="" LIBS="-lcygwin" EXTRA_LIBS_FOR_DLLS="\$(abs_top_builddir)/yap.dll" EXTRA_INCLUDES_FOR_WIN32="-I\$(srcdir)/packages/PLStream/windows" fi else INSTALL_COMMAND="install_unix" - ENABLE_WINCONSOLE="#" + WINDOWS="#" + PKG_WINCONSOLE="" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5 $as_echo_n "checking for sin in -lm... " >&6; } if ${ac_cv_lib_m_sin+:} false; then : @@ -6443,98 +6410,98 @@ CMFLAGS=-fpic CIFLAGS=-I. if test "$use_prism" = no; then - ENABLE_PRISM="@# " + PKG_PRISM="@# " else - ENABLE_PRISM="" + PKG_PRISM="" fi if test -e "$srcdir"/packages/archive/Makefile.in; then - ENABLE_LIBARCHIVE="" + PKG_LIBARCHIVE="" else - ENABLE_LIBARCHIVE="@# " + PKG_LIBARCHIVE="@# " fi if test -e "$srcdir"/packages/odbc/Makefile.in; then - ENABLE_ODBC="" + PKG_ODBC="" else - ENABLE_ODBC="@# " + PKG_ODBC="@# " fi if test "$use_chr" = no; then - ENABLE_CHR="@# " + PKG_CHR="" elif test -e "$srcdir"/packages/chr/Makefile.in; then - ENABLE_CHR="" + PKG_CHR="packages/chr" else - ENABLE_CHR="@# " + PKG_CHR="" fi if test "$use_clpqr" = no; then - ENABLE_CLPQR="@# " + PKG_CLPQR="" elif test -e "$srcdir"/packages/clpqr/Makefile.in; then - ENABLE_CLPQR="" + PKG_CLPQR="packages/clpqr" else - ENABLE_CLPQR="@# " + PKG_CLPQR="" fi if test -e "$srcdir"/packages/clib/Makefile.in; then - ENABLE_CLIB="" + PKG_CLIB="packages/clib" else - ENABLE_CLIB="@# " + PKG_CLIB="" fi if test -e "$srcdir"/packages/http/Makefile.in; then - ENABLE_HTTP="" + PKG_HTTP="packages/http" else - ENABLE_HTTP="@# " + PKG_HTTP="" fi if test -e "$srcdir"/packages/pldoc/Makefile.in; then - ENABLE_PLDOC="" + PKG_PLDOC="packages/pldoc" else - ENABLE_PLDOC="@# " + PKG_PLDOC="" fi if test -e "$srcdir"/packages/plunit/Makefile.in; then - ENABLE_PLUNIT="" + PKG_PLUNIT="packages/plunit" else - ENABLE_PLUNIT="@# " + PKG_PLUNIT="" fi if test -e "$srcdir"/packages/R/Makefile.in; then - ENABLE_R="" + PKG_R="packages/R" else - ENABLE_R="@# " + PKG_R="" fi if test -e "$srcdir"/packages/RDF/Makefile.in; then - ENABLE_RDF="" + PKG_RDF="packages/RDF" else - ENABLE_RDF="@# " + PKG_RDF="" fi if test -e "$srcdir"/packages/ltx2htm/Makefile.in; then - ENABLE_LTX2HTM="" + PKG_LTX2HTM="packages/ltx2htm" else - ENABLE_LTX2HTM="@# " + PKG_LTX2HTM="" fi if test -e "$srcdir"/packages/semweb/Makefile.in; then - ENABLE_SEMWEB="" + PKG_SEMWEB="packages/semweb" else - ENABLE_SEMWEB="@# " + PKG_SEMWEB="" fi if test -e "$srcdir"/packages/sgml/Makefile.in; then - ENABLE_SGML="" + PKG_SGML="packages/sgml" else - ENABLE_SGML="@# " + PKG_SGML="" fi if test -e "$srcdir"/packages/zlib/Makefile.in; then - ENABLE_ZLIB="" + PKG_ZLIB="packages/zlib" else - ENABLE_ZLIB="@# " + PKG_ZLIB="" fi if test "$cross_compiling" = "yes" @@ -6655,7 +6622,7 @@ fi fi -INSTALL_DLLS="#" +INSTALL_DLLS="no" EXTRA_OBJS="" SHLIB_LD="#" SHLIB_CXX_LD="#" @@ -6736,7 +6703,7 @@ fi then SHLIB_CFLAGS="-shared -fPIC $CFLAGS" SHLIB_CXXFLAGS="-shared -fPIC $CXXFLAGS" - INSTALL_DLLS="" + INSTALL_DLLS="yes" fi LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" @@ -6766,7 +6733,7 @@ fi LIBS="$LIBS -lnsl" fi SO="o" - INSTALL_DLLS="" + INSTALL_DLLS="yes" LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" SONAMEFLAG="" @@ -6792,7 +6759,7 @@ fi SO="sl" SHLIB_CFLAGS="+z $CFLAGS" SHLIB_CXXFLAGS="+z $CXXFLAGS" - INSTALL_DLLS="" + INSTALL_DLLS="yes" # If the xnet library was found, turn on X/Open networking if test "$ac_cv_lib_xnet_getsockname" = yes then @@ -6802,7 +6769,7 @@ fi fi else - INSTALL_DLLS="#" + INSTALL_DLLS="no" fi fi #do not use realloc() from HP-UX 10.20 together with MPI @@ -6824,7 +6791,7 @@ fi # # SO="a" #SHLIB_LD="\$(srcdir)/../../ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry" - #INSTALL_DLLS="" + #INSTALL_DLLS="yes" LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" SONAMEFLAG="" @@ -6896,7 +6863,7 @@ fi DO_SECOND_LD="" SHLIB_LD="ld -n32 -shared -rdata_shared" SHLIB_CXX_LD="$SHLIB_LD" - INSTALL_DLLS="" + INSTALL_DLLS="yes" LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" SONAMEFLAG="" @@ -6974,7 +6941,7 @@ fi then SHLIB_CFLAGS="-shared -fPIC $CFLAGS" SHLIB_CXXFLAGS="-shared -fPIC $CXXFLAGS" - INSTALL_DLLS="" + INSTALL_DLLS="yes" fi CC="$CC -fstrict-aliasing -freorder-blocks -fsched-interblock -Wall" DYNYAPLIB=libYap."$SO" @@ -6998,7 +6965,7 @@ fi SHLIB_CXX_LD="$CXX -shared -export-dynamic" DO_SECOND_LD="" SO="so" - INSTALL_DLLS="" + INSTALL_DLLS="yes" fi LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR)" DYNYAPLIB=libYap."$SO" @@ -7017,7 +6984,7 @@ fi SHLIB_CXX_LD="$CXX -shared" DO_SECOND_LD="" SO="so" - INSTALL_DLLS="" + INSTALL_DLLS="yes" LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" SONAMEFLAG="-Wl,--soname=$DYNYAPLIB" @@ -7051,7 +7018,7 @@ fi SO="dll" C_PARSER_FLAGS="$C_INTERF_FLAGS" EXEC_SUFFIX=".exe" - INSTALL_DLLS="" + INSTALL_DLLS="yes" DO_SECOND_LD="" MERGE_DLL_OBJS="" IN_UNIX="#" @@ -7107,7 +7074,7 @@ fi then SO="o" LIBS="$LIBS -ldl" - INSTALL_DLLS="" + INSTALL_DLLS="yes" if test "$GCC" = "yes" then SHLIB_CXXFLAGS="-fPIC $CXXFLAGS" @@ -7242,33 +7209,6 @@ if test "$tabling" = "yes" then YAP_EXTRAS="$YAP_EXTRAS -DTABLING=1" fi -if test ! "$yap_cv_cplint" = "no" - then - if test ! "$yap_cv_cplint" = "yes" - 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_CFLAGS+=" -I${yap_cv_cplint}/include" - CPLINT_LIBS="-lcudd -lmtr -lst -lepd -lutil -lm "$CPLINT_LIBS - fi - ENABLE_CPLINT="" - if test "$target_os" = "cygwin" -o "$target_os" = "mingw32" - then - CPLINT_SHLIB_LD="gcc -shared ../../yap.dll" - SHLIB_SUFFIX="dll" - else - CPLINT_SHLIB_LD=$SHLIB_LD - SHLIB_SUFFIX="so" - fi - - - - - -else - ENABLE_CPLINT="@#" -fi - - @@ -8159,7 +8099,6 @@ CMDEXT=sh - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc threaded code" >&5 @@ -9178,16 +9117,14 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -if test "$yap_cv_minisat" = no +if test "$yap_cv_minisat" = no -a "$INSTALL_DLLS" = "no" then - ENABLE_MINISAT="@# " -elif test "$INSTALL_DLLS" = "#" -then - ENABLE_MINISAT="@# " + PKG_MINISAT="" else - ENABLE_MINISAT="" + PKG_MINISAT="packages/swi-minisat2" fi + if test "x$PLARCH" = "x"; then case "$host" in *linux*) @@ -9256,7 +9193,7 @@ fi if test "$yap_cv_myddas" != "no" then - ENABLE_MYDDAS="" + PKG_MYDDAS="packages/myddas" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing mysql_init" >&5 $as_echo_n "checking for library containing mysql_init... " >&6; } if ${ac_cv_search_mysql_init+:} false; then : @@ -9452,6 +9389,18 @@ fi ODBC_LIBS="$ODBC_LIBS -liodbc" fi fi + for ac_header in mysql/mysql.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "mysql/mysql.h" "ac_cv_header_mysql_mysql_h" "$ac_includes_default" +if test "x$ac_cv_header_mysql_mysql_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_MYSQL_MYSQL_H 1 +_ACEOF + +fi + +done + if test "$yap_cv_odbc" = yes then YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_ODBC" @@ -9467,30 +9416,15 @@ fi YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_TOP_LEVEL" fi else - ENABLE_MYDDAS="#@ " + ENABLE_MYDDAS="" fi -if test "$yap_cv_myddas" != "no" -then - for ac_header in mysql/mysql.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "mysql/mysql.h" "ac_cv_header_mysql_mysql_h" "$ac_includes_default" -if test "x$ac_cv_header_mysql_mysql_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_MYSQL_MYSQL_H 1 -_ACEOF - -fi - -done - -fi -if test "$ENABLE_CLIB" = "" +if test "$PKG_CLIB" = "" then @@ -9897,8 +9831,9 @@ esac export CC LD CFLAGS LDFLAGS; mkdir -p packages/clib/maildrop/rfc822; mkdir -p packages/clib/maildrop/rfc2045; - ( cd packages/clib/maildrop/rfc822 && $CONFIG_SHELL ../../../../"$srcdir"/packages/clib/maildrop/rfc822/configure --host=$host) - ( cd packages/clib/maildrop/rfc2045 && $CONFIG_SHELL ../../../../"$srcdir"/packages/clib/maildrop/rfc2045/configure --host=$host) + DIR=`dirname "$srcdir"/packages/clib/maildrop` + ( cd packages/clib/maildrop/rfc822 && $CONFIG_SHELL $DIR/rfc822/configure --host=$host) + ( cd packages/clib/maildrop/rfc2045 && $CONFIG_SHELL $DIR/rfc2045/configure --host=$host) ) @@ -10168,7 +10103,7 @@ fi fi -if test "$ENABLE_LIBARCHIVE" = "" +if test "$PKG_LIBARCHIVE" = "" then @@ -10303,12 +10238,12 @@ fi if test "$ARCHIVE_TARGETS" = "nolib" then - ENABLE_LIBARCHIVE="@# " + PKG_LIBARCHIVE="@# " fi fi -if test "$ENABLE_ODBC" = ""; then +if test "$PKG_ODBC" = ""; then @@ -10901,7 +10836,7 @@ ODBC_PLTARGETS=`echo $ODBC_TARGETS | sed "s/4pl\.$SO/.pl/g"` if test "$ODBC_TARGETS" = "nolib" then - ENABLE_ODBC="@# " + PKG_ODBC="@# " fi else @@ -10911,6 +10846,7 @@ fi + # Check whether --with-cudd was given. if test "${with_cudd+set}" = set; then : withval=$with_cudd; yap_cv_cudd="$withval" @@ -10919,21 +10855,23 @@ else fi -if test "$yap_cv_cudd" = no -then - ENABLE_CUDD="@# " - ENABLE_BDDLIB="@# " +# Check whether --enable-bddlib was given. +if test "${enable_bddlib+set}" = set; then : + enableval=$enable_bddlib; dynamic_bdd="$enableval" else - if test "$dynamic_bdd" = yes - then - ENABLE_BDDLIB="" - else - ENABLE_BDDLIB="@# " - fi - ENABLE_CUDD="" + dynamic_bdd=no fi +if test "$yap_cv_cudd" = no +then + PKG_BDDLIB="" +elif test "$dynamic_bdd" = yes +then + PKG_BDDLIB="packages/bdd packages/ProbLog/simplecudd packages/ProbLog/simplecudd_lfi" +else + PKG_BDDLIB="packages/ProbLog/simplecudd packages/ProbLog/simplecudd_lfi" +fi if test "$yap_cv_cudd" != no; then @@ -11325,9 +11263,20 @@ fi +mkdir -p packages/bdd + +if test "$PKG_BDDLIB" != ""; then +ac_config_files="$ac_config_files packages/bdd/Makefile" + +ac_config_files="$ac_config_files packages/ProbLog/simplecudd/Makefile" + +ac_config_files="$ac_config_files packages/ProbLog/simplecudd_lfi/Makefile" + +fi -if test "$ENABLE_ZLIB" = "" + +if test "$PKG_ZLIB" = "" then @@ -11415,13 +11364,13 @@ fi if test "$ZLIB_TARGETS" = "nolib" then - ENABLE_ZLIB="@# " + PKG_ZLIB="@# " fi fi if test "$yap_cv_R" != "no" -a -e "$srcdir"/packages/real/Makefile.in; then - ENABLE_REAL="" + PKG_REAL="packages/real" @@ -11533,13 +11482,13 @@ fi else REAL_TARGET="dummy" - ENABLE_REAL="@# " + PKG_REAL="" fi if test "$yap_cv_java" = no; then - ENABLE_JPL="@#" + PKG_JPL="" elif test -e "$srcdir"/packages/jpl/Makefile.in; then - ENABLE_JPL="" + PKG_JPL="packages/jpl" if test "$yap_cv_java" != "yes"; then JAVA_HOME=$yap_cv_java JAVAPREFIX="$JAVA_HOME"/bin @@ -11754,7 +11703,7 @@ else JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 11757 "configure" */ +/* #line 11706 "configure" */ public class Test { } EOF @@ -11930,7 +11879,7 @@ EOF if uudecode$EXEEXT Test.uue; then ac_cv_prog_uudecode_base64=yes else - echo "configure: 11933: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 11882: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=no @@ -12061,7 +12010,7 @@ else JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 12064 "configure" */ +/* #line 12013 "configure" */ public class Test { } EOF @@ -12096,7 +12045,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class TEST=Test cat << \EOF > $JAVA_TEST -/* [#]line 12099 "configure" */ +/* [#]line 12048 "configure" */ public class Test { public static void main (String args[]) { System.exit (0); @@ -12757,7 +12706,7 @@ _ACEOF fi if test -e "$srcdir"/packages/ltx2htm/Makefile.in; then - ENABLE_LTX22HTM="" + PKG_LTX22HTM="packages/ltx2htm" @@ -12779,186 +12728,9 @@ ac_config_commands="$ac_config_commands exe" else - ENABLE_LTX2HTM="@# " + PKG_LTX2HTM="" fi - -if test -d /usr/local/include/gecode; then - CFLAGS="$CFLAGS -I/usr/local/include" - SHLIB_CXXFLAGS="$SHLIB_CXXFLAGS -I/usr/local/include" - GECODE_EXTRALIBS="-L/usr/local/lib" -fi - -ac_fn_c_check_header_mongrel "$LINENO" "gecode/support/config.hpp" "ac_cv_header_gecode_support_config_hpp" "$ac_includes_default" -if test "x$ac_cv_header_gecode_support_config_hpp" = xyes; then : - have_gecode=yes -else - have_gecode=no -fi - - - -# Check whether --enable-gecode was given. -if test "${enable_gecode+set}" = set; then : - enableval=$enable_gecode; use_gecode="$enableval" - if test "$use_gecode" = yes; then - if test "$have_gecode" = no; then - as_fn_error $? "cannot enable gecode: gecode library not found" "$LINENO" 5 - fi - fi -else - use_gecode=$have_gecode -fi - - -if test "$use_gecode" = no; then - ENABLE_GECODE="@# " -else - ENABLE_GECODE="" -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if dynamic arrays are supported" >&5 -$as_echo_n "checking if dynamic arrays are supported... " >&6; } - -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - void foo(int n) { int a[n]; a[1]=0; } -int -main () -{ -foo(3); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define HAVE_DYNARRAY 1" >>confdefs.h - - -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -GECODE_VERSION=unknown-gecode-version - - -if test "$use_gecode" = yes; then - if test $i_am_cross_compiling = yes - then - GECODE_VERSION=4.2.1 - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking gecode version" >&5 -$as_echo_n "checking gecode version... " >&6; } - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include "gecode/support/config.hpp" -#include - -int -main () -{ - - FILE* out = fopen("conftest.out","w"); - fprintf(out,"%s\n",GECODE_VERSION); - fclose(out); - return 0; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - GECODE_VERSION=$(cat conftest.out) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GECODE_VERSION" >&5 -$as_echo "$GECODE_VERSION" >&6; } -else - as_fn_error $? "cannot determine gecode version" "$LINENO" 5 -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - case "$target_os" in - *darwin*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -framework gecode is required" >&5 -$as_echo_n "checking if -framework gecode is required... " >&6; } - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - saved_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -framework gecode" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include "gecode/int.hh" - -int -main () -{ - -Gecode::Exception e("",""); -return 0; - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - GECODE_EXTRALIBS="-framework gecode" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - CXXFLAGS="$saved_CXXFLAGS" - ;; - esac -fi -fi - -GECODE_MAJOR=`echo $GECODE_VERSION| sed 's/\(^.\).*/\1/'` - - - -if test "$GECODE_MAJOR" = "3"; then - GECODE_EXTRALIBS="$GECODE_EXTRALIBS -lgecodesupport -lgecodekernel -lgecodeint -lgecodeset -lgecodesearch" -else - GECODE_EXTRALIBS="$GECODE_EXTRALIBS -lgecodesupport -lgecodekernel -lgecodefloat -lgecodeint -lgecodeset -lgecodesearch" -fi - - - - - if test -e "$srcdir"/packages/raptor/Makefile.in; then @@ -12975,9 +12747,9 @@ fi if test "$yap_cv_raptor" = no then - ENABLE_RAPTOR="@# " + PKG_RAPTOR="" else - ENABLE_RAPTOR="" + PKG_RAPTOR="packages/raptor" fi if test "$yap_cv_raptor" != no; then @@ -13085,7 +12857,7 @@ RAPTOR_LDFLAGS="$LIBS" if test "$raptor_available" = no then - ENABLE_RAPTOR="@# " + PKG_RAPTOR="" cat << EOF ################################################################## # ERROR: Could not find raptor library. Either I don't have the @@ -13093,7 +12865,7 @@ then ################################################################## EOF else - ENABLE_RAPTOR="" + PKG_RAPTOR="packages/raptor" fi @@ -13615,7 +13387,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by $as_me, which was +This file was extended by YAP $as_me 6.3.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13675,13 +13447,13 @@ $config_headers Configuration commands: $config_commands -Report bugs to the package provider." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -config.status +YAP config.status 6.3.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -13806,6 +13578,9 @@ do case $ac_config_target in "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "YapTermConfig.h") CONFIG_HEADERS="$CONFIG_HEADERS YapTermConfig.h" ;; + "packages/bdd/Makefile") CONFIG_FILES="$CONFIG_FILES packages/bdd/Makefile" ;; + "packages/ProbLog/simplecudd/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/simplecudd/Makefile" ;; + "packages/ProbLog/simplecudd_lfi/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/simplecudd_lfi/Makefile" ;; "exe") CONFIG_COMMANDS="$CONFIG_COMMANDS exe" ;; "packages/raptor/raptor_config.h") CONFIG_HEADERS="$CONFIG_HEADERS packages/raptor/raptor_config.h" ;; "packages/raptor/Makefile") CONFIG_FILES="$CONFIG_FILES packages/raptor/Makefile" ;; @@ -14411,6 +14186,56 @@ fi fi +# Check whether --with-matlab was given. +if test "${with_matlab+set}" = set; then : + withval=$with_matlab; if test "$withval" = yes; then + yap_cv_matlab=yes + elif test "$withval" = no; then + yap_cv_matlab=no + else + yap_cv_matlab=$with_matlab + MATLAB_INCLUDE="-I${yap_cv_matlab}/extern/include" + fi +else + yap_cv_matlab=no +fi + + +if test "$yap_cv_matlab" = no +then + PKG_MATLAB="" +elif test "$yap_cv_matlab" = yes +then + PKG_MATLAB="" +else + case "$target_cpu" in + i*86*) + LDFLAGS="$LDFLAGS -L${yap_cv_matlab}/bin/glnx86" + ;; + x86*) + LDFLAGS="$LDFLAGS -L${yap_cv_matlab}/bin/glnxa64" + ;; + sparc*) + LDFLAGS="$LDFLAGS -L${yap_cv_matlab}/bin/sol2" + ;; + esac + PKG_MATLAB="library/matlab" + + + +mkdir -p library/matlab + +ac_config_files="$ac_config_files library/matlab/Makefile" + + +fi + + + + + + + # Check whether --with-mpi was given. if test "${with_mpi+set}" = set; then : withval=$with_mpi; if test "$withval" = yes; then @@ -14452,7 +14277,7 @@ then fi -if test "$yap_cv_mpi" != "no"; then +if test "$yap_cv_mpi" != "no" -a "$INSTALL_DLLS" != "no"; then if test "$yap_cv_mpi" != "yes"; then # Extract the first word of "mpicc", so it can be a program name with args. set dummy mpicc; ac_word=$2 @@ -14543,7 +14368,7 @@ fi MPILDF=`"$MPI_CC" --showme:link` MPICF=`"$MPI_CC" --showme:compile` LIBS="$LIBS $MPILDF" - INSTALL_MPI="" + PKG_MPI="library/mpi" OLD_CC=${CC} CC=${MPI_CC} for ac_header in mpi.h @@ -14627,7 +14452,7 @@ done CC=${OLD_CC} fi else - INSTALL_MPI="# " + PKG_MPI="" MPI_CC=${CC} fi @@ -14637,6 +14462,9 @@ fi +mkdir -p library/lammpi + + # Check whether --with-python was given. if test "${with_python+set}" = set; then : @@ -14654,10 +14482,10 @@ fi if test "$yap_cv_python" = "no"; then PYTHON_TARGET="dummy" - ENABLE_PYTHON="@# " + PKG_PYTHON="" elif test -e "$srcdir"/packages/python/Makefile.in ; then PYTHON_TARGET="pitf" - ENABLE_PYTHON="" + PKG_PYTHON="packages/python" if test "$yap_cv_python" = "yes" then for ac_prog in python @@ -14723,7 +14551,7 @@ test -n "$PYTHON" || PYTHON=""none"" PYTHON_LIBS="-L $PYTHONHOME/lib" else echo "Could not find libraries for Python" - ENABLE_PYTHON="@# " + PKG_PYTHON="" fi OLIBS=$LIBS LIBS=$PYTHON_LIBS @@ -14796,12 +14624,12 @@ fi PYTHON_INCLUDES="-I $PYTHONHOME/include" else echo "Could not find includes for Python" - ENABLE_PYTHON="@# " + PKG_PYTHON="" fi fi else PYTHON_TARGET="dummy" - ENABLE_PYTHON="@# " + PKG_PYTHON="" fi @@ -14809,7 +14637,7 @@ fi -if test "$ENABLE_PYTHON" = ""; then +if test "$PKG_PYTHON" != ""; then ac_config_files="$ac_config_files packages/python/Makefile" fi @@ -14817,6 +14645,57 @@ fi +# Check whether --enable-cplint was given. +if test "${enable_cplint+set}" = set; then : + enableval=$enable_cplint; yap_cv_cplint=$enableval +else + yap_cv_cplint=no +fi + + + +if test ! "$yap_cv_cplint" = "no" + then + if test ! "$yap_cv_cplint" = "yes" + 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_CFLAGS+=" -I${yap_cv_cplint}/include" + CPLINT_LIBS="-lcudd -lmtr -lst -lepd -lutil -lm "$CPLINT_LIBS + fi + if test "$target_os" = "cygwin" -o "$target_os" = "mingw32" + then + CPLINT_SHLIB_LD="gcc -shared ../../yap.dll" + SHLIB_SUFFIX="dll" + else + CPLINT_SHLIB_LD=$SHLIB_LD + SHLIB_SUFFIX="so" + fi + PKG_CPLINT="packages/cplint packages/cplint/splipcase packages/cplint/approx/simplecuddLPADs" + + + + + + +else + PKG_CPLINT="" +fi + +mkdir -p packages/cplint +mkdir -p packages/cplint/approx +mkdir -p packages/cplint/approx/simplecuddLPADs + +ac_config_files="$ac_config_files packages/cplint/Makefile" + +ac_config_files="$ac_config_files packages/cplint/approx/simplecuddLPADs/Makefile" + +ac_config_files="$ac_config_files packages/cplint/slipcase/Makefile" + + + + + + # Check whether --with-cuda was given. if test "${with_cuda+set}" = set; then : withval=$with_cuda; if test "$withval" = yes; then @@ -14836,7 +14715,7 @@ CUDA_LDFLAGS="" CUDA_CPPFLAGS="" if test "$yap_cv_cuda" = no then - ENABLE_CUDA="@# " + PKG_CUDA="" else # Extract the first word of "nvcc", so it can be a program name with args. set dummy nvcc; ac_word=$2 @@ -14881,9 +14760,9 @@ fi if test "$yap_cv_cuda" = no then - ENABLE_CUDA="@# " + PKG_CUDA="" else - ENABLE_CUDA="" + PKG_CUDA="packages/cuda" case "$target_os" in *darwin*) CUDA_LDFLAGS="$LDFLAGS" @@ -14908,42 +14787,189 @@ fi ac_config_files="$ac_config_files packages/cuda/Makefile" +mkdir -p packages/cuda -# Check whether --enable-cplint was given. -if test "${enable_cplint+set}" = set; then : - enableval=$enable_cplint; yap_cv_cplint=$enableval + +if test -d /usr/local/include/gecode; then + CFLAGS="$CFLAGS -I/usr/local/include" + SHLIB_CXXFLAGS="$SHLIB_CXXFLAGS -I/usr/local/include" + GECODE_EXTRALIBS="-L/usr/local/lib" +fi + +ac_fn_c_check_header_mongrel "$LINENO" "gecode/support/config.hpp" "ac_cv_header_gecode_support_config_hpp" "$ac_includes_default" +if test "x$ac_cv_header_gecode_support_config_hpp" = xyes; then : + have_gecode=yes else - yap_cv_cplint=no + have_gecode=no fi -if test ! "$yap_cv_cplint" = "no" - then - if test ! "$yap_cv_cplint" = "yes" - 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_CFLAGS+=" -I${yap_cv_cplint}/include" - CPLINT_LIBS="-lcudd -lmtr -lst -lepd -lutil -lm "$CPLINT_LIBS - fi - ENABLE_CPLINT="" - if test "$target_os" = "cygwin" -o "$target_os" = "mingw32" - then - CPLINT_SHLIB_LD="gcc -shared ../../yap.dll" - SHLIB_SUFFIX="dll" - else - CPLINT_SHLIB_LD=$SHLIB_LD - SHLIB_SUFFIX="so" - fi +# Check whether --enable-gecode was given. +if test "${enable_gecode+set}" = set; then : + enableval=$enable_gecode; use_gecode="$enableval" + if test "$use_gecode" = yes; then + if test "$have_gecode" = no; then + as_fn_error $? "cannot enable gecode: gecode library not found" "$LINENO" 5 + fi + fi +else + use_gecode=$have_gecode +fi +if test "$use_gecode" = no; then + PKG_GECODE="" +else + PKG_GECODE="packages/gecode" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if dynamic arrays are supported" >&5 +$as_echo_n "checking if dynamic arrays are supported... " >&6; } + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + void foo(int n) { int a[n]; a[1]=0; } +int +main () +{ +foo(3); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_DYNARRAY 1" >>confdefs.h + else - ENABLE_CPLINT="@#" + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +GECODE_VERSION=unknown-gecode-version + + +if test "$use_gecode" = yes; then + if test $i_am_cross_compiling = yes + then + GECODE_VERSION=4.2.1 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking gecode version" >&5 +$as_echo_n "checking gecode version... " >&6; } + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include "gecode/support/config.hpp" +#include + +int +main () +{ + + FILE* out = fopen("conftest.out","w"); + fprintf(out,"%s\n",GECODE_VERSION); + fclose(out); + return 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + GECODE_VERSION=$(cat conftest.out) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GECODE_VERSION" >&5 +$as_echo "$GECODE_VERSION" >&6; } +else + as_fn_error $? "cannot determine gecode version" "$LINENO" 5 +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + case "$target_os" in + *darwin*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -framework gecode is required" >&5 +$as_echo_n "checking if -framework gecode is required... " >&6; } + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + saved_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -framework gecode" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include "gecode/int.hh" + +int +main () +{ + +Gecode::Exception e("",""); +return 0; + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + GECODE_EXTRALIBS="-framework gecode" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + CXXFLAGS="$saved_CXXFLAGS" + ;; + esac +fi +fi + +GECODE_MAJOR=`echo $GECODE_VERSION| sed 's/\(^.\).*/\1/'` + + + +if test "$GECODE_MAJOR" = "3"; then + GECODE_EXTRALIBS="$GECODE_EXTRALIBS -lgecodesupport -lgecodekernel -lgecodeint -lgecodeset -lgecodesearch" +else + GECODE_EXTRALIBS="$GECODE_EXTRALIBS -lgecodesupport -lgecodekernel -lgecodefloat -lgecodeint -lgecodeset -lgecodesearch" +fi + + + + +if test "$PKG_GECODE" = "packages/gecode"; then +ac_config_files="$ac_config_files packages/gecode/Makefile" + fi @@ -14952,10 +14978,7 @@ fi - -mkdir -p library/lammpi mkdir -p library/matrix -mkdir -p library/matlab mkdir -p library/mpi mkdir -p library/random mkdir -p library/regex @@ -14964,7 +14987,6 @@ mkdir -p library/tries mkdir -p library/rltree mkdir -p LGPL mkdir -p packages/ -mkdir -p packages/bdd mkdir -p packages/clib mkdir -p packages/clib/sha1 mkdir -p packages/clib/maildrop @@ -14974,10 +14996,6 @@ mkdir -p packages/CLPBN mkdir -p packages/CLPBN/clpbn mkdir -p packages/CLPBN/horus mkdir -p packages/clpqr -mkdir -p packages/cplint -mkdir -p packages/cplint/approx -mkdir -p packages/cplint/approx/simplecuddLPADs -mkdir -p packages/cuda mkdir -p packages/http mkdir -p packages/jpl mkdir -p packages/jpl/src @@ -15026,8 +15044,6 @@ ac_config_files="$ac_config_files library/Makefile" ac_config_files="$ac_config_files library/lammpi/Makefile" -ac_config_files="$ac_config_files library/matlab/Makefile" - ac_config_files="$ac_config_files library/matrix/Makefile" ac_config_files="$ac_config_files library/mpi/Makefile" @@ -15046,142 +15062,120 @@ ac_config_files="$ac_config_files packages/Makefile.defs" ac_config_files="$ac_config_files packages/Dialect.defs" -ac_config_files="$ac_config_files packages/CLPBN/Makefile" - -ac_config_files="$ac_config_files packages/cplint/Makefile" - -ac_config_files="$ac_config_files packages/cplint/approx/simplecuddLPADs/Makefile" - -ac_config_files="$ac_config_files packages/cplint/slipcase/Makefile" - ac_config_files="$ac_config_files packages/meld/Makefile" ac_config_files="$ac_config_files packages/xml/Makefile" ac_config_files="$ac_config_files packages/ProbLog/Makefile" -ac_config_files="$ac_config_files swi/console/Makefile" - ac_config_files="$ac_config_files swi/library/Makefile" ac_config_files="$ac_config_files swi/library/clp/Makefile" -if test "$ENABLE_CHR" = ""; then +if test "$PKG_CHR" != ""; then ac_config_files="$ac_config_files packages/chr/Makefile" fi -if test "$ENABLE_CLIB" = ""; then +if test "$PKG_CLIB" != ""; then ac_config_files="$ac_config_files packages/clib/Makefile" fi -if test "$ENABLE_CLPQR" = ""; then +if test "$PKG_CLPQR" != ""; then ac_config_files="$ac_config_files packages/clpqr/Makefile" fi -if test "$ENABLE_HTTP" = ""; then +if test "$PKG_HTTP" != ""; then ac_config_files="$ac_config_files packages/http/Makefile" fi -if test "$ENABLE_JPL" = ""; then +if test "$PKG_JPL" != ""; then ac_config_files="$ac_config_files packages/jpl/Makefile packages/jpl/src/java/Makefile" fi -if test "$ENABLE_LTX2HTM" = ""; then +if test "$PKG_LTX2HTM" != ""; then ac_config_files="$ac_config_files packages/ltx2htm/Makefile packages/ltx2htm/latex2html" fi -if test "$ENABLE_PLDOC" = ""; then +if test "$PKG_PLDOC" != ""; then ac_config_files="$ac_config_files packages/pldoc/Makefile" ac_config_files="$ac_config_files packages/pldoc/server/man_server.pl" fi -if test "$ENABLE_PLUNIT" = ""; then +if test "$PKG_PLUNIT" != ""; then ac_config_files="$ac_config_files packages/plunit/Makefile" fi -if test "$ENABLE_R" = ""; then +if test "$PKG_R" != ""; then ac_config_files="$ac_config_files packages/R/Makefile" fi -if test "$ENABLE_RDF" = ""; then +if test "$PKG_RDF" != ""; then ac_config_files="$ac_config_files packages/RDF/Makefile" fi -if test "$ENABLE_SEMWEB" = ""; then +if test "$PKG_SEMWEB" != ""; then ac_config_files="$ac_config_files packages/semweb/Makefile" fi -if test "$ENABLE_SGML" = ""; then +if test "$PKG_SGML" != ""; then ac_config_files="$ac_config_files packages/sgml/Makefile" fi -if test "$ENABLE_ZLIB" = ""; then +if test "$PKG_ZLIB" != ""; then ac_config_files="$ac_config_files packages/zlib/Makefile" fi -if test "$ENABLE_LIBARCHIVE" = ""; then +if test "$PKG_LIBARCHIVE" != ""; then ac_config_files="$ac_config_files packages/archive/Makefile" fi -if test "$ENABLE_ODBC" = ""; then +if test "$PKG_ODBC" != ""; then ac_config_files="$ac_config_files packages/odbc/Makefile" fi -if test "$ENABLE_CUDD" = ""; then -ac_config_files="$ac_config_files packages/bdd/Makefile" - -ac_config_files="$ac_config_files packages/ProbLog/simplecudd/Makefile" - -ac_config_files="$ac_config_files packages/ProbLog/simplecudd_lfi/Makefile" - -fi - -if test "$ENABLE_MINISAT" = ""; then +if test "$PKG_MINISAT" != ""; then ac_config_files="$ac_config_files packages/swi-minisat2/Makefile" ac_config_files="$ac_config_files packages/swi-minisat2/C/Makefile" fi -if test "$ENABLE_REAL" = ""; then +if test "$PKG_REAL" != ""; then ac_config_files="$ac_config_files packages/real/Makefile" fi -if test "$ENABLE_MYDDAS" = ""; then +if test "$PKG_MYDDAS" != ""; then ac_config_files="$ac_config_files packages/myddas/Makefile" fi -if test "$ENABLE_CLPBN_BP" = ""; then +if test "$PKG_CLPBN" != ""; then +ac_config_files="$ac_config_files packages/CLPBN/Makefile" + ac_config_files="$ac_config_files packages/CLPBN/horus/Makefile" fi -if test "$ENABLE_GECODE" = ""; then -ac_config_files="$ac_config_files packages/gecode/Makefile" - -fi - -if test "$ENABLE_PRISM" = ""; then +if test "$PKG_PRISM" != ""; then ac_config_files="$ac_config_files packages/prism/src/c/Makefile" ac_config_files="$ac_config_files packages/prism/src/prolog/Makefile" @@ -15698,7 +15692,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by $as_me, which was +This file was extended by YAP $as_me 6.3.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15758,13 +15752,13 @@ $config_headers Configuration commands: $config_commands -Report bugs to the package provider." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -config.status +YAP config.status 6.3.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -15889,15 +15883,22 @@ do case $ac_config_target in "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "YapTermConfig.h") CONFIG_HEADERS="$CONFIG_HEADERS YapTermConfig.h" ;; + "packages/bdd/Makefile") CONFIG_FILES="$CONFIG_FILES packages/bdd/Makefile" ;; + "packages/ProbLog/simplecudd/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/simplecudd/Makefile" ;; + "packages/ProbLog/simplecudd_lfi/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/simplecudd_lfi/Makefile" ;; "exe") CONFIG_COMMANDS="$CONFIG_COMMANDS exe" ;; "packages/raptor/raptor_config.h") CONFIG_HEADERS="$CONFIG_HEADERS packages/raptor/raptor_config.h" ;; "packages/raptor/Makefile") CONFIG_FILES="$CONFIG_FILES packages/raptor/Makefile" ;; + "library/matlab/Makefile") CONFIG_FILES="$CONFIG_FILES library/matlab/Makefile" ;; "packages/python/Makefile") CONFIG_FILES="$CONFIG_FILES packages/python/Makefile" ;; + "packages/cplint/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/Makefile" ;; + "packages/cplint/approx/simplecuddLPADs/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/approx/simplecuddLPADs/Makefile" ;; + "packages/cplint/slipcase/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/slipcase/Makefile" ;; "packages/cuda/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cuda/Makefile" ;; + "packages/gecode/Makefile") CONFIG_FILES="$CONFIG_FILES packages/gecode/Makefile" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "library/Makefile") CONFIG_FILES="$CONFIG_FILES library/Makefile" ;; "library/lammpi/Makefile") CONFIG_FILES="$CONFIG_FILES library/lammpi/Makefile" ;; - "library/matlab/Makefile") CONFIG_FILES="$CONFIG_FILES library/matlab/Makefile" ;; "library/matrix/Makefile") CONFIG_FILES="$CONFIG_FILES library/matrix/Makefile" ;; "library/mpi/Makefile") CONFIG_FILES="$CONFIG_FILES library/mpi/Makefile" ;; "library/random/Makefile") CONFIG_FILES="$CONFIG_FILES library/random/Makefile" ;; @@ -15907,14 +15908,9 @@ do "library/tries/Makefile") CONFIG_FILES="$CONFIG_FILES library/tries/Makefile" ;; "packages/Makefile.defs") CONFIG_FILES="$CONFIG_FILES packages/Makefile.defs" ;; "packages/Dialect.defs") CONFIG_FILES="$CONFIG_FILES packages/Dialect.defs" ;; - "packages/CLPBN/Makefile") CONFIG_FILES="$CONFIG_FILES packages/CLPBN/Makefile" ;; - "packages/cplint/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/Makefile" ;; - "packages/cplint/approx/simplecuddLPADs/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/approx/simplecuddLPADs/Makefile" ;; - "packages/cplint/slipcase/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/slipcase/Makefile" ;; "packages/meld/Makefile") CONFIG_FILES="$CONFIG_FILES packages/meld/Makefile" ;; "packages/xml/Makefile") CONFIG_FILES="$CONFIG_FILES packages/xml/Makefile" ;; "packages/ProbLog/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/Makefile" ;; - "swi/console/Makefile") CONFIG_FILES="$CONFIG_FILES swi/console/Makefile" ;; "swi/library/Makefile") CONFIG_FILES="$CONFIG_FILES swi/library/Makefile" ;; "swi/library/clp/Makefile") CONFIG_FILES="$CONFIG_FILES swi/library/clp/Makefile" ;; "packages/chr/Makefile") CONFIG_FILES="$CONFIG_FILES packages/chr/Makefile" ;; @@ -15935,15 +15931,12 @@ do "packages/zlib/Makefile") CONFIG_FILES="$CONFIG_FILES packages/zlib/Makefile" ;; "packages/archive/Makefile") CONFIG_FILES="$CONFIG_FILES packages/archive/Makefile" ;; "packages/odbc/Makefile") CONFIG_FILES="$CONFIG_FILES packages/odbc/Makefile" ;; - "packages/bdd/Makefile") CONFIG_FILES="$CONFIG_FILES packages/bdd/Makefile" ;; - "packages/ProbLog/simplecudd/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/simplecudd/Makefile" ;; - "packages/ProbLog/simplecudd_lfi/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/simplecudd_lfi/Makefile" ;; "packages/swi-minisat2/Makefile") CONFIG_FILES="$CONFIG_FILES packages/swi-minisat2/Makefile" ;; "packages/swi-minisat2/C/Makefile") CONFIG_FILES="$CONFIG_FILES packages/swi-minisat2/C/Makefile" ;; "packages/real/Makefile") CONFIG_FILES="$CONFIG_FILES packages/real/Makefile" ;; "packages/myddas/Makefile") CONFIG_FILES="$CONFIG_FILES packages/myddas/Makefile" ;; + "packages/CLPBN/Makefile") CONFIG_FILES="$CONFIG_FILES packages/CLPBN/Makefile" ;; "packages/CLPBN/horus/Makefile") CONFIG_FILES="$CONFIG_FILES packages/CLPBN/horus/Makefile" ;; - "packages/gecode/Makefile") CONFIG_FILES="$CONFIG_FILES packages/gecode/Makefile" ;; "packages/prism/src/c/Makefile") CONFIG_FILES="$CONFIG_FILES packages/prism/src/c/Makefile" ;; "packages/prism/src/prolog/Makefile") CONFIG_FILES="$CONFIG_FILES packages/prism/src/prolog/Makefile" ;; "packages/yap-lbfgs/Makefile") CONFIG_FILES="$CONFIG_FILES packages/yap-lbfgs/Makefile" ;; diff --git a/configure.in b/configure.in index 6e9a4899f..28cba3853 100755 --- a/configure.in +++ b/configure.in @@ -36,7 +36,7 @@ dnl EXTRA_LIBS_FOR_DLLS= libs that are required when lding a so dnl EXTRA_LIBS_FOR_SWIDLLS= libs that are required when lding a SWI so -AC_INIT(console/yap.c) +AC_INIT(YAP, 6.3.4, yap-users@sf.net, yap ) AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(YapTermConfig.h) @@ -98,9 +98,6 @@ AC_ARG_ENABLE(low-level-tracer, AC_ARG_ENABLE(threads, [ --enable-threads support system threads ], threads="$enableval", threads=no) -AC_ARG_ENABLE(bddlib, - [ --enable-bddlib dynamic bdd library ], - dynamic_bdd="$enableval", dynamic_bdd=no) AC_ARG_ENABLE(pthread-locking, [ --enable-pthread-locking use pthread locking primitives for internal locking (requires threads) ], pthreadlocking="$enableval", pthreadlocking=no) @@ -234,18 +231,6 @@ AC_ARG_WITH(readline, fi, [yap_cv_readline=yes]) -AC_ARG_WITH(matlab, - [ --with-matlab[=DIR] use MATLAB package in DIR], - if test "$withval" = yes; then - yap_cv_matlab=yes - elif test "$withval" = no; then - yap_cv_matlab=no - else - yap_cv_matlab=$with_matlab - MATLAB_INCLUDE="-I${yap_cv_matlab}/extern/include" - fi, - [yap_cv_matlab=no]) - AC_ARG_WITH(heap-space, [ --with-heap-space[=space] default heap size in Kbytes], if test "$withval" = yes; then @@ -337,33 +322,11 @@ fi if test "$yap_cv_prism" = no then - INSTALL_PRISM="@# " + INSTALL_PRISM="packages/prism/src/c packages/prism/src/prolog" else INSTALL_PRISM="" fi -dnl condor does not like dynamic linking on Linux, DEC, and HP-UX platforms. -if test "$yap_cv_matlab" = no -then - INSTALL_MATLAB="@# " -elif test "$yap_cv_matlab" = yes -then - INSTALL_MATLAB="" -else - case "$target_cpu" in - i*86*) - LDFLAGS="$LDFLAGS -L${yap_cv_matlab}/bin/glnx86" - ;; - x86*) - LDFLAGS="$LDFLAGS -L${yap_cv_matlab}/bin/glnxa64" - ;; - sparc*) - LDFLAGS="$LDFLAGS -L${yap_cv_matlab}/bin/sol2" - ;; - esac - INSTALL_MATLAB="" -fi - if test "$yap_cv_clpbn_bp"="yes"; then AC_LANG_PUSH([C++]) my_save_cxxflags="$CXXFLAGS" @@ -380,9 +343,9 @@ fi if test "$yap_cv_clpbn_bp" = no then - ENABLE_CLPBN_BP="@# " + PKG_CLPBN="packages/CLPBN" else - ENABLE_CLPBN_BP="" + PKG_CLPBN="packages/CLPBN packages/CLPBN/horus" fi @@ -571,16 +534,19 @@ then esac fi echo $prefix - ENABLE_WINCONSOLE="" + WINDOWS="" + PKG_WINCONSOLE="swi/console" else - ENABLE_WINCONSOLE="#" + WINDOWS="#" + PKG_WINCONSOLE="" LIBS="-lcygwin" EXTRA_LIBS_FOR_DLLS="\$(abs_top_builddir)/yap.dll" EXTRA_INCLUDES_FOR_WIN32="-I\$(srcdir)/packages/PLStream/windows" fi else INSTALL_COMMAND="install_unix" - ENABLE_WINCONSOLE="#" + WINDOWS="#" + PKG_WINCONSOLE="" AC_CHECK_LIB(m,sin) AC_CHECK_LIB(socket,socket) dnl X/Open Networking is sometimes a separate library @@ -657,98 +623,98 @@ CMFLAGS=-fpic CIFLAGS=-I. if test "$use_prism" = no; then - ENABLE_PRISM="@# " + PKG_PRISM="@# " else - ENABLE_PRISM="" + PKG_PRISM="" fi -AC_SUBST(ENABLE_PRISM) +AC_SUBST(PKG_PRISM) if test -e "$srcdir"/packages/archive/Makefile.in; then - ENABLE_LIBARCHIVE="" + PKG_LIBARCHIVE="" else - ENABLE_LIBARCHIVE="@# " + PKG_LIBARCHIVE="@# " fi if test -e "$srcdir"/packages/odbc/Makefile.in; then - ENABLE_ODBC="" + PKG_ODBC="" else - ENABLE_ODBC="@# " + PKG_ODBC="@# " fi if test "$use_chr" = no; then - ENABLE_CHR="@# " + PKG_CHR="" elif test -e "$srcdir"/packages/chr/Makefile.in; then - ENABLE_CHR="" + PKG_CHR="packages/chr" else - ENABLE_CHR="@# " + PKG_CHR="" fi if test "$use_clpqr" = no; then - ENABLE_CLPQR="@# " + PKG_CLPQR="" elif test -e "$srcdir"/packages/clpqr/Makefile.in; then - ENABLE_CLPQR="" + PKG_CLPQR="packages/clpqr" else - ENABLE_CLPQR="@# " + PKG_CLPQR="" fi if test -e "$srcdir"/packages/clib/Makefile.in; then - ENABLE_CLIB="" + PKG_CLIB="packages/clib" else - ENABLE_CLIB="@# " + PKG_CLIB="" fi if test -e "$srcdir"/packages/http/Makefile.in; then - ENABLE_HTTP="" + PKG_HTTP="packages/http" else - ENABLE_HTTP="@# " + PKG_HTTP="" fi if test -e "$srcdir"/packages/pldoc/Makefile.in; then - ENABLE_PLDOC="" + PKG_PLDOC="packages/pldoc" else - ENABLE_PLDOC="@# " + PKG_PLDOC="" fi if test -e "$srcdir"/packages/plunit/Makefile.in; then - ENABLE_PLUNIT="" + PKG_PLUNIT="packages/plunit" else - ENABLE_PLUNIT="@# " + PKG_PLUNIT="" fi if test -e "$srcdir"/packages/R/Makefile.in; then - ENABLE_R="" + PKG_R="packages/R" else - ENABLE_R="@# " + PKG_R="" fi if test -e "$srcdir"/packages/RDF/Makefile.in; then - ENABLE_RDF="" + PKG_RDF="packages/RDF" else - ENABLE_RDF="@# " + PKG_RDF="" fi if test -e "$srcdir"/packages/ltx2htm/Makefile.in; then - ENABLE_LTX2HTM="" + PKG_LTX2HTM="packages/ltx2htm" else - ENABLE_LTX2HTM="@# " + PKG_LTX2HTM="" fi if test -e "$srcdir"/packages/semweb/Makefile.in; then - ENABLE_SEMWEB="" + PKG_SEMWEB="packages/semweb" else - ENABLE_SEMWEB="@# " + PKG_SEMWEB="" fi if test -e "$srcdir"/packages/sgml/Makefile.in; then - ENABLE_SGML="" + PKG_SGML="packages/sgml" else - ENABLE_SGML="@# " + PKG_SGML="" fi if test -e "$srcdir"/packages/zlib/Makefile.in; then - ENABLE_ZLIB="" + PKG_ZLIB="packages/zlib" else - ENABLE_ZLIB="@# " + PKG_ZLIB="" fi if test "$cross_compiling" = "yes" @@ -759,7 +725,7 @@ else fi dnl defaults -INSTALL_DLLS="#" +INSTALL_DLLS="no" EXTRA_OBJS="" SHLIB_LD="#" SHLIB_CXX_LD="#" @@ -804,7 +770,7 @@ case "$target_os" in then SHLIB_CFLAGS="-shared -fPIC $CFLAGS" SHLIB_CXXFLAGS="-shared -fPIC $CXXFLAGS" - INSTALL_DLLS="" + INSTALL_DLLS="yes" fi LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" @@ -834,7 +800,7 @@ case "$target_os" in LIBS="$LIBS -lnsl" fi SO="o" - INSTALL_DLLS="" + INSTALL_DLLS="yes" LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" SONAMEFLAG="" @@ -859,7 +825,7 @@ case "$target_os" in SO="sl" SHLIB_CFLAGS="+z $CFLAGS" SHLIB_CXXFLAGS="+z $CXXFLAGS" - INSTALL_DLLS="" + INSTALL_DLLS="yes" # If the xnet library was found, turn on X/Open networking if test "$ac_cv_lib_xnet_getsockname" = yes then @@ -867,7 +833,7 @@ case "$target_os" in AC_DEFINE(_XOPEN_SOURCE_EXTENDED,1) fi else - INSTALL_DLLS="#" + INSTALL_DLLS="no" fi fi #do not use realloc() from HP-UX 10.20 together with MPI @@ -888,7 +854,7 @@ case "$target_os" in # # SO="a" #SHLIB_LD="\$(srcdir)/../../ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry" - #INSTALL_DLLS="" + #INSTALL_DLLS="yes" LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" SONAMEFLAG="" @@ -922,7 +888,7 @@ dnl Linux has both elf and a.out, in this case we found elf DO_SECOND_LD="" SHLIB_LD="ld -n32 -shared -rdata_shared" SHLIB_CXX_LD="$SHLIB_LD" - INSTALL_DLLS="" + INSTALL_DLLS="yes" LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" SONAMEFLAG="" @@ -961,7 +927,7 @@ dnl Linux has both elf and a.out, in this case we found elf then SHLIB_CFLAGS="-shared -fPIC $CFLAGS" SHLIB_CXXFLAGS="-shared -fPIC $CXXFLAGS" - INSTALL_DLLS="" + INSTALL_DLLS="yes" fi CC="$CC -fstrict-aliasing -freorder-blocks -fsched-interblock -Wall" DYNYAPLIB=libYap."$SO" @@ -985,7 +951,7 @@ dnl Linux has both elf and a.out, in this case we found elf SHLIB_CXX_LD="$CXX -shared -export-dynamic" DO_SECOND_LD="" SO="so" - INSTALL_DLLS="" + INSTALL_DLLS="yes" fi LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR)" DYNYAPLIB=libYap."$SO" @@ -1004,7 +970,7 @@ dnl Linux has both elf and a.out, in this case we found elf SHLIB_CXX_LD="$CXX -shared" DO_SECOND_LD="" SO="so" - INSTALL_DLLS="" + INSTALL_DLLS="yes" LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" DYNYAPLIB=libYap."$SO" SONAMEFLAG="-Wl,--soname=$DYNYAPLIB" @@ -1038,7 +1004,7 @@ dnl Linux has both elf and a.out, in this case we found elf SO="dll" C_PARSER_FLAGS="$C_INTERF_FLAGS" EXEC_SUFFIX=".exe" - INSTALL_DLLS="" + INSTALL_DLLS="yes" DO_SECOND_LD="" MERGE_DLL_OBJS="" IN_UNIX="#" @@ -1055,7 +1021,7 @@ dnl Linux has both elf and a.out, in this case we found elf then SO="o" LIBS="$LIBS -ldl" - INSTALL_DLLS="" + INSTALL_DLLS="yes" if test "$GCC" = "yes" then SHLIB_CXXFLAGS="-fPIC $CXXFLAGS" @@ -1185,33 +1151,6 @@ if test "$tabling" = "yes" then YAP_EXTRAS="$YAP_EXTRAS -DTABLING=1" fi -if test ! "$yap_cv_cplint" = "no" - then - if test ! "$yap_cv_cplint" = "yes" - 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_CFLAGS+=" -I${yap_cv_cplint}/include" - CPLINT_LIBS="-lcudd -lmtr -lst -lepd -lutil -lm "$CPLINT_LIBS - fi - ENABLE_CPLINT="" - if test "$target_os" = "cygwin" -o "$target_os" = "mingw32" - then - CPLINT_SHLIB_LD="gcc -shared ../../yap.dll" - SHLIB_SUFFIX="dll" - else - CPLINT_SHLIB_LD=$SHLIB_LD - SHLIB_SUFFIX="so" - fi - AC_SUBST(CPLINT_LIBS) - AC_SUBST(CPLINT_CFLAGS) - AC_SUBST(CPLINT_LDFLAGS) - AC_SUBST(CPLINT_SHLIB_LD) - AC_SUBST(SHLIB_SUFFIX) -else - ENABLE_CPLINT="@#" -fi -AC_SUBST(ENABLE_CPLINT) - AC_SUBST(INSTALL_ENV) AC_SUBST(PRE_INSTALL_ENV) @@ -1354,34 +1293,33 @@ AC_SUBST(INSTALL_INFO) dnl let YAP_EXTRAS fall through configure, from the env into Makefile AC_SUBST(YAP_EXTRAS) AC_SUBST(NO_BUILTIN_REGEXP) -AC_SUBST(ENABLE_CHR) -AC_SUBST(ENABLE_CLIB) -AC_SUBST(ENABLE_CLPQR) -AC_SUBST(ENABLE_HTTP) -AC_SUBST(ENABLE_JPL) -AC_SUBST(ENABLE_LTX2HTM) -AC_SUBST(ENABLE_PLDOC) -AC_SUBST(ENABLE_PLUNIT) -AC_SUBST(ENABLE_R) -AC_SUBST(ENABLE_RDF) -AC_SUBST(ENABLE_SEMWEB) -AC_SUBST(ENABLE_SGML) -AC_SUBST(ENABLE_ZLIB) -AC_SUBST(ENABLE_CLPBN_BP) +AC_SUBST(PKG_CHR) +AC_SUBST(PKG_CLIB) +AC_SUBST(PKG_CLPQR) +AC_SUBST(PKG_HTTP) +AC_SUBST(PKG_JPL) +AC_SUBST(PKG_LTX2HTM) +AC_SUBST(PKG_PLDOC) +AC_SUBST(PKG_PLUNIT) +AC_SUBST(PKG_R) +AC_SUBST(PKG_RDF) +AC_SUBST(PKG_SEMWEB) +AC_SUBST(PKG_SGML) +AC_SUBST(PKG_ZLIB) +AC_SUBST(PKG_CLPBN) AC_SUBST(IN_UNIX) -AC_SUBST(INSTALL_MPI) AC_SUBST(MPI_CC) AC_SUBST(INSTALL_COMMAND) AC_SUBST(INSTALLCLP) AC_SUBST(MAX_WORKERS) AC_SUBST(STATIC_MODE) -AC_SUBST(ENABLE_WINCONSOLE) +AC_SUBST(PKG_WINCONSOLE) +AC_SUBST(WINDOWS) AC_SUBST(EXTRA_INCLUDES_FOR_WIN32) -AC_SUBST(ENABLE_MINISAT) -AC_SUBST(ENABLE_REAL) -AC_SUBST(INSTALL_MATLAB) -AC_SUBST(MATLAB_INCLUDE) +AC_SUBST(PKG_MINISAT) +AC_SUBST(PKG_REAL) + AC_SUBST(INSTALL_PRISM) dnl check for threaded code @@ -1771,16 +1709,14 @@ AC_TRY_COMPILE( AC_MSG_RESULT(yes), AC_MSG_RESULT(no)) -if test "$yap_cv_minisat" = no +if test "$yap_cv_minisat" = no -a "$INSTALL_DLLS" = "no" then - ENABLE_MINISAT="@# " -elif test "$INSTALL_DLLS" = "#" -then - ENABLE_MINISAT="@# " + PKG_MINISAT="" else - ENABLE_MINISAT="" + PKG_MINISAT="packages/swi-minisat2" fi + if test "x$PLARCH" = "x"; then case "$host" in *linux*) @@ -1807,32 +1743,32 @@ fi m4_include([packages/myddas/configure.in]) -if test "$ENABLE_CLIB" = "" +if test "$PKG_CLIB" = "" then m4_include([packages/clib/configure.in]) fi -if test "$ENABLE_LIBARCHIVE" = "" +if test "$PKG_LIBARCHIVE" = "" then m4_include([packages/archive/configure.in]) if test "$ARCHIVE_TARGETS" = "nolib" then - ENABLE_LIBARCHIVE="@# " + PKG_LIBARCHIVE="@# " fi fi -if test "$ENABLE_ODBC" = ""; then +if test "$PKG_ODBC" = ""; then m4_include([packages/odbc/configure.in]) if test "$ODBC_TARGETS" = "nolib" then - ENABLE_ODBC="@# " + PKG_ODBC="@# " fi else @@ -1844,34 +1780,34 @@ fi m4_include([packages/bdd/configure.in]) dnl zlib -if test "$ENABLE_ZLIB" = "" +if test "$PKG_ZLIB" = "" then m4_include([packages/zlib/configure.in]) if test "$ZLIB_TARGETS" = "nolib" then - ENABLE_ZLIB="@# " + PKG_ZLIB="@# " fi fi if test "$yap_cv_R" != "no" -a -e "$srcdir"/packages/real/Makefile.in; then - ENABLE_REAL="" + PKG_REAL="packages/real" m4_include([packages/real/configure.in]) else REAL_TARGET="dummy" - ENABLE_REAL="@# " + PKG_REAL="" fi dnl dnl java is hard dnl if test "$yap_cv_java" = no; then - ENABLE_JPL="@#" + PKG_JPL="" elif test -e "$srcdir"/packages/jpl/Makefile.in; then - ENABLE_JPL="" + PKG_JPL="packages/jpl" if test "$yap_cv_java" != "yes"; then JAVA_HOME=$yap_cv_java JAVAPREFIX="$JAVA_HOME"/bin @@ -1884,35 +1820,34 @@ elif test -e "$srcdir"/packages/jpl/Makefile.in; then fi if test -e "$srcdir"/packages/ltx2htm/Makefile.in; then - ENABLE_LTX22HTM="" + PKG_LTX22HTM="packages/ltx2htm" m4_include([packages/ltx2htm/configure.in]) else - ENABLE_LTX2HTM="@# " + PKG_LTX2HTM="" fi -m4_include([packages/gecode/configure.in]) - if test -e "$srcdir"/packages/raptor/Makefile.in; then m4_include([packages/raptor/configure.in]) fi +m4_include([library/matlab/configure.in]) + m4_include([library/lammpi/configure.in]) m4_include([packages/python/configure.in]) -m4_include([packages/cuda/configure.in]) - m4_include([packages/cplint/configure.in]) +m4_include([packages/cuda/configure.in]) -AC_SUBST(ENABLE_LIBARCHIVE) +m4_include([packages/gecode/configure.in]) -AC_SUBST(ENABLE_ODBC) +AC_SUBST(PKG_LIBARCHIVE) + +AC_SUBST(PKG_ODBC) -mkdir -p library/lammpi mkdir -p library/matrix -mkdir -p library/matlab mkdir -p library/mpi mkdir -p library/random mkdir -p library/regex @@ -1921,7 +1856,6 @@ mkdir -p library/tries mkdir -p library/rltree mkdir -p LGPL mkdir -p packages/ -mkdir -p packages/bdd mkdir -p packages/clib mkdir -p packages/clib/sha1 mkdir -p packages/clib/maildrop @@ -1931,10 +1865,6 @@ mkdir -p packages/CLPBN mkdir -p packages/CLPBN/clpbn mkdir -p packages/CLPBN/horus mkdir -p packages/clpqr -mkdir -p packages/cplint -mkdir -p packages/cplint/approx -mkdir -p packages/cplint/approx/simplecuddLPADs -mkdir -p packages/cuda mkdir -p packages/http mkdir -p packages/jpl mkdir -p packages/jpl/src @@ -1980,7 +1910,6 @@ mkdir -p swi/library/clp AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([library/Makefile]) AC_CONFIG_FILES([library/lammpi/Makefile]) -AC_CONFIG_FILES([library/matlab/Makefile]) AC_CONFIG_FILES([library/matrix/Makefile]) AC_CONFIG_FILES([library/mpi/Makefile]) AC_CONFIG_FILES([library/random/Makefile]) @@ -1990,107 +1919,93 @@ AC_CONFIG_FILES([library/system/Makefile]) AC_CONFIG_FILES([library/tries/Makefile]) AC_CONFIG_FILES([packages/Makefile.defs]) AC_CONFIG_FILES([packages/Dialect.defs]) -AC_CONFIG_FILES([packages/CLPBN/Makefile]) -AC_CONFIG_FILES([packages/cplint/Makefile]) -AC_CONFIG_FILES([packages/cplint/approx/simplecuddLPADs/Makefile]) -AC_CONFIG_FILES([packages/cplint/slipcase/Makefile]) AC_CONFIG_FILES([packages/meld/Makefile]) AC_CONFIG_FILES([packages/xml/Makefile]) AC_CONFIG_FILES([packages/ProbLog/Makefile ]) -AC_CONFIG_FILES([swi/console/Makefile]) AC_CONFIG_FILES([swi/library/Makefile]) AC_CONFIG_FILES([swi/library/clp/Makefile]) -if test "$ENABLE_CHR" = ""; then +if test "$PKG_CHR" != ""; then AC_CONFIG_FILES([packages/chr/Makefile]) fi -if test "$ENABLE_CLIB" = ""; then +if test "$PKG_CLIB" != ""; then AC_CONFIG_FILES([packages/clib/Makefile]) fi -if test "$ENABLE_CLPQR" = ""; then +if test "$PKG_CLPQR" != ""; then AC_CONFIG_FILES([packages/clpqr/Makefile]) fi -if test "$ENABLE_HTTP" = ""; then +if test "$PKG_HTTP" != ""; then AC_CONFIG_FILES([packages/http/Makefile]) fi -if test "$ENABLE_JPL" = ""; then +if test "$PKG_JPL" != ""; then AC_CONFIG_FILES([packages/jpl/Makefile packages/jpl/src/java/Makefile ]) fi -if test "$ENABLE_LTX2HTM" = ""; then +if test "$PKG_LTX2HTM" != ""; then AC_CONFIG_FILES([ packages/ltx2htm/Makefile packages/ltx2htm/latex2html]) fi -if test "$ENABLE_PLDOC" = ""; then +if test "$PKG_PLDOC" != ""; then AC_CONFIG_FILES([packages/pldoc/Makefile]) AC_CONFIG_FILES([packages/pldoc/server/man_server.pl]) fi -if test "$ENABLE_PLUNIT" = ""; then +if test "$PKG_PLUNIT" != ""; then AC_CONFIG_FILES([packages/plunit/Makefile]) fi -if test "$ENABLE_R" = ""; then +if test "$PKG_R" != ""; then AC_CONFIG_FILES([packages/R/Makefile]) fi -if test "$ENABLE_RDF" = ""; then +if test "$PKG_RDF" != ""; then AC_CONFIG_FILES([packages/RDF/Makefile]) fi -if test "$ENABLE_SEMWEB" = ""; then +if test "$PKG_SEMWEB" != ""; then AC_CONFIG_FILES([packages/semweb/Makefile]) fi -if test "$ENABLE_SGML" = ""; then +if test "$PKG_SGML" != ""; then AC_CONFIG_FILES([packages/sgml/Makefile]) fi -if test "$ENABLE_ZLIB" = ""; then +if test "$PKG_ZLIB" != ""; then AC_CONFIG_FILES([packages/zlib/Makefile]) fi -if test "$ENABLE_LIBARCHIVE" = ""; then +if test "$PKG_LIBARCHIVE" != ""; then AC_CONFIG_FILES([packages/archive/Makefile]) fi -if test "$ENABLE_ODBC" = ""; then +if test "$PKG_ODBC" != ""; then AC_CONFIG_FILES([packages/odbc/Makefile]) fi -if test "$ENABLE_CUDD" = ""; then -AC_CONFIG_FILES([packages/bdd/Makefile]) -AC_CONFIG_FILES([packages/ProbLog/simplecudd/Makefile]) -AC_CONFIG_FILES([packages/ProbLog/simplecudd_lfi/Makefile]) -fi - -if test "$ENABLE_MINISAT" = ""; then +if test "$PKG_MINISAT" != ""; then AC_CONFIG_FILES([packages/swi-minisat2/Makefile]) AC_CONFIG_FILES([packages/swi-minisat2/C/Makefile]) fi -if test "$ENABLE_REAL" = ""; then +if test "$PKG_REAL" != ""; then AC_CONFIG_FILES([packages/real/Makefile]) fi -if test "$ENABLE_MYDDAS" = ""; then +if test "$PKG_MYDDAS" != ""; then AC_CONFIG_FILES([packages/myddas/Makefile]) fi -if test "$ENABLE_CLPBN_BP" = ""; then +if test "$PKG_CLPBN" != ""; then +AC_CONFIG_FILES([packages/CLPBN/Makefile]) AC_CONFIG_FILES([packages/CLPBN/horus/Makefile]) fi -if test "$ENABLE_GECODE" = ""; then -AC_CONFIG_FILES([packages/gecode/Makefile]) -fi - -if test "$ENABLE_PRISM" = ""; then +if test "$PKG_PRISM" != ""; then AC_CONFIG_FILES([packages/prism/src/c/Makefile]) AC_CONFIG_FILES([packages/prism/src/prolog/Makefile]) fi diff --git a/library/lammpi/configure.in b/library/lammpi/configure.in index bea2e73fa..ace99a4bf 100644 --- a/library/lammpi/configure.in +++ b/library/lammpi/configure.in @@ -34,7 +34,7 @@ fi dnl LAM/MPI interface -if test "$yap_cv_mpi" != "no"; then +if test "$yap_cv_mpi" != "no" -a "$INSTALL_DLLS" != "no"; then if test "$yap_cv_mpi" != "yes"; then AC_PATH_PROG(MPI_CC,mpicc,true,$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin) else @@ -43,7 +43,7 @@ if test "$yap_cv_mpi" != "no"; then MPILDF=`"$MPI_CC" --showme:link` MPICF=`"$MPI_CC" --showme:compile` LIBS="$LIBS $MPILDF" - INSTALL_MPI="" + PKG_MPI="library/mpi" OLD_CC=${CC} CC=${MPI_CC} AC_CHECK_HEADERS(mpi.h) @@ -64,11 +64,14 @@ if test "$yap_cv_mpi" != "no"; then CC=${OLD_CC} fi else - INSTALL_MPI="# " + PKG_MPI="" MPI_CC=${CC} fi +AC_SUBST(PKG_MPI) AC_SUBST(YAPMPILIB) AC_SUBST(MPILDF) AC_SUBST(MPICF) + +mkdir -p library/lammpi diff --git a/library/matlab/Makefile.in b/library/matlab/Makefile.in index a290f5a99..1e069a8a9 100644 --- a/library/matlab/Makefile.in +++ b/library/matlab/Makefile.in @@ -59,5 +59,5 @@ clean: rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK realclean: clean - rm -f Makefile + rm -f Makefile $(SOBJS) diff --git a/library/random/Makefile.in b/library/random/Makefile.in index 50e573ba2..9a0fe5b05 100644 --- a/library/random/Makefile.in +++ b/library/random/Makefile.in @@ -56,6 +56,11 @@ yap_random.o: $(srcdir)/yap_random.c install: all $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) +install-examples: + clean: rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK +realclean: clean + rm -f Makefile $(SOBJS) + diff --git a/packages/raptor b/packages/raptor index 0f77a1e1b..d5c70de04 160000 --- a/packages/raptor +++ b/packages/raptor @@ -1 +1 @@ -Subproject commit 0f77a1e1b90b36bddb1844712380f4f3858123b7 +Subproject commit d5c70de04a6fce6be71a9086d0164dd0b0c9d9d4 diff --git a/packages/real b/packages/real index 651702fe4..6235790ec 160000 --- a/packages/real +++ b/packages/real @@ -1 +1 @@ -Subproject commit 651702fe47088a12922e5051e6de89414a24e84c +Subproject commit 6235790ec8283ca65aefaed14f95a1749e744325 diff --git a/packages/zlib b/packages/zlib index 044e8b33b..a8a43aa09 160000 --- a/packages/zlib +++ b/packages/zlib @@ -1 +1 @@ -Subproject commit 044e8b33bfe3158463141add5bb9ce5e71cb7451 +Subproject commit a8a43aa09892c4b7018dc053d8e7653e2f648107 diff --git a/swi/library/clp/Makefile.in b/swi/library/clp/Makefile.in index 1c227209d..9de7ce49d 100644 --- a/swi/library/clp/Makefile.in +++ b/swi/library/clp/Makefile.in @@ -25,8 +25,12 @@ srcdir=@srcdir@ PROGRAMS= $(srcdir)/clp_events.pl +all: + install: $(PROGRAMS) mkdir -p $(DESTDIR)$(SHAREDIR)/Yap mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/clp for p in $(PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap/clp; done +install-examples: + From bcde1666fb9dc38ece7ef3b95cc46c18f6632f74 Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Mon, 10 Feb 2014 23:46:22 +0000 Subject: [PATCH 7/9] package updates --- packages/clib | 2 +- packages/jpl | 2 +- packages/pldoc | 2 +- packages/real | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/clib b/packages/clib index ab6b1a70d..f9c9a5e10 160000 --- a/packages/clib +++ b/packages/clib @@ -1 +1 @@ -Subproject commit ab6b1a70db5dfaf6467b7d4ab51cfa76f1352d4c +Subproject commit f9c9a5e10f84c2c0238a8338ef7ac3f93886c30d diff --git a/packages/jpl b/packages/jpl index f96cfb753..e111442b4 160000 --- a/packages/jpl +++ b/packages/jpl @@ -1 +1 @@ -Subproject commit f96cfb7533c57789fa25db64b73c09aa7269d244 +Subproject commit e111442b428bcaac015d9545e42faf97df6b30f4 diff --git a/packages/pldoc b/packages/pldoc index 1e324d30b..34ef10c71 160000 --- a/packages/pldoc +++ b/packages/pldoc @@ -1 +1 @@ -Subproject commit 1e324d30b913edbe78cc4b923cde7998013cbfb0 +Subproject commit 34ef10c71d1577dcde1e5437949cc202638ed671 diff --git a/packages/real b/packages/real index 6235790ec..e8360ba2d 160000 --- a/packages/real +++ b/packages/real @@ -1 +1 @@ -Subproject commit 6235790ec8283ca65aefaed14f95a1749e744325 +Subproject commit e8360ba2db265175a3b469bc9d51aff5cfccabb0 From bfc94cbbe52a482a40799ad1fb33283afd93f4fc Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Mon, 10 Feb 2014 23:55:35 +0000 Subject: [PATCH 8/9] fix matlab autoconf --- library/matlab/configure.in | 44 +++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 library/matlab/configure.in diff --git a/library/matlab/configure.in b/library/matlab/configure.in new file mode 100644 index 000000000..962b43f99 --- /dev/null +++ b/library/matlab/configure.in @@ -0,0 +1,44 @@ +AC_ARG_WITH(matlab, + [ --with-matlab[=DIR] use MATLAB package in DIR], + if test "$withval" = yes; then + yap_cv_matlab=yes + elif test "$withval" = no; then + yap_cv_matlab=no + else + yap_cv_matlab=$with_matlab + MATLAB_INCLUDE="-I${yap_cv_matlab}/extern/include" + fi, + [yap_cv_matlab=no]) + +dnl condor does not like dynamic linking on Linux, DEC, and HP-UX platforms. +if test "$yap_cv_matlab" = no +then + PKG_MATLAB="" +elif test "$yap_cv_matlab" = yes +then + PKG_MATLAB="" +else + case "$target_cpu" in + i*86*) + LDFLAGS="$LDFLAGS -L${yap_cv_matlab}/bin/glnx86" + ;; + x86*) + LDFLAGS="$LDFLAGS -L${yap_cv_matlab}/bin/glnxa64" + ;; + sparc*) + LDFLAGS="$LDFLAGS -L${yap_cv_matlab}/bin/sol2" + ;; + esac + PKG_MATLAB="library/matlab" + +AC_SUBST(MATLAB_INCLUDE) + +mkdir -p library/matlab + +AC_CONFIG_FILES([library/matlab/Makefile]) + +fi + +AC_SUBST(PKG_MATLAB) + + From 78596fe951882af8da776ca792aefb876d97a9a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Tue, 11 Feb 2014 00:14:00 +0000 Subject: [PATCH 9/9] fix configure --- configure | 206 +++--------------------------------------------------- 1 file changed, 9 insertions(+), 197 deletions(-) diff --git a/configure b/configure index bf2aa04a8..7adcdc81b 100755 --- a/configure +++ b/configure @@ -653,7 +653,7 @@ LTLIBOBJS LIBOBJS RAPTOR_CPPFLAGS RAPTOR_LDFLAGS -PKG_RAPTOR +ENABLE_RAPTOR LTX_PL _ACJNI_JAVAC JAVADOC @@ -9827,9 +9827,8 @@ esac export CC LD CFLAGS LDFLAGS; mkdir -p packages/clib/maildrop/rfc822; mkdir -p packages/clib/maildrop/rfc2045; - DIR=`dirname "$srcdir"/packages/clib/maildrop` - ( cd packages/clib/maildrop/rfc822 && $CONFIG_SHELL $DIR/rfc822/configure --host=$host) - ( cd packages/clib/maildrop/rfc2045 && $CONFIG_SHELL $DIR/rfc2045/configure --host=$host) + ( cd packages/clib/maildrop/rfc822 && $CONFIG_SHELL ../../../../"$srcdir"/packages/clib/maildrop/rfc822/configure --host=$host) + ( cd packages/clib/maildrop/rfc2045 && $CONFIG_SHELL ../../../../"$srcdir"/packages/clib/maildrop/rfc2045/configure --host=$host) ) @@ -11699,11 +11698,7 @@ else JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -<<<<<<< HEAD -/* #line 11753 "configure" */ -======= -/* #line 11706 "configure" */ ->>>>>>> bcde1666fb9dc38ece7ef3b95cc46c18f6632f74 +/* #line 11701 "configure" */ public class Test { } EOF @@ -11879,11 +11874,7 @@ EOF if uudecode$EXEEXT Test.uue; then ac_cv_prog_uudecode_base64=yes else -<<<<<<< HEAD - echo "configure: 11929: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 -======= - echo "configure: 11882: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 ->>>>>>> bcde1666fb9dc38ece7ef3b95cc46c18f6632f74 + echo "configure: 11877: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=no @@ -12014,11 +12005,7 @@ else JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -<<<<<<< HEAD -/* #line 12060 "configure" */ -======= -/* #line 12013 "configure" */ ->>>>>>> bcde1666fb9dc38ece7ef3b95cc46c18f6632f74 +/* #line 12008 "configure" */ public class Test { } EOF @@ -12053,11 +12040,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class TEST=Test cat << \EOF > $JAVA_TEST -<<<<<<< HEAD -/* [#]line 12095 "configure" */ -======= -/* [#]line 12048 "configure" */ ->>>>>>> bcde1666fb9dc38ece7ef3b95cc46c18f6632f74 +/* [#]line 12043 "configure" */ public class Test { public static void main (String args[]) { System.exit (0); @@ -12743,175 +12726,6 @@ else PKG_LTX2HTM="" fi -if test -e "$srcdir"/packages/raptor/Makefile.in; then - - - - - -# Check whether --with-raptor was given. -if test "${with_raptor+set}" = set; then : - withval=$with_raptor; yap_cv_raptor="$withval" -else - yap_cv_raptor=no -fi - - -if test "$yap_cv_raptor" = no -then - PKG_RAPTOR="" -else - PKG_RAPTOR="packages/raptor" -fi - -if test "$yap_cv_raptor" != no; then - -oldlibs="$LIBS" - -if test "$yap_cv_raptor" != "NONE" -a "$yap_cv_raptor" != "yes"; then - RAPTOR_CPPFLAGS="-I $yap_cv_raptor/include" - raptor_dir="$yap_cv_raptor" -elif test "$prefix" != "NONE"; then - RAPTOR_CPPFLAGS="-I $prefix/include" - raptor_dir="$prefix" -else - RAPTOR_CPPFLAGS="-I /usr/local/include" - raptor_dir=/usr/local -fi - -OLD_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $RAPTOR_CPPFLAGS" - -for ac_header in raptor2/raptor2.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "raptor2/raptor2.h" "ac_cv_header_raptor2_raptor2_h" "$ac_includes_default" -if test "x$ac_cv_header_raptor2_raptor2_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_RAPTOR2_RAPTOR2_H 1 -_ACEOF - -fi - -done - -for ac_header in raptor.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "raptor.h" "ac_cv_header_raptor_h" "$ac_includes_default" -if test "x$ac_cv_header_raptor_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_RAPTOR_H 1 -_ACEOF - -fi - -<<<<<<< HEAD - -if test "$use_gecode" = yes; then - if test $i_am_cross_compiling = yes - then - GECODE_VERSION=4.2.1 - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking gecode version" >&5 -$as_echo_n "checking gecode version... " >&6; } - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include "gecode/support/config.hpp" -#include - -int -main () -{ - - FILE* out = fopen("conftest.out","w"); - fprintf(out,"%s\n",GECODE_VERSION); - fclose(out); - return 0; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - GECODE_VERSION=$(cat conftest.out) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GECODE_VERSION" >&5 -$as_echo "$GECODE_VERSION" >&6; } -else - as_fn_error $? "cannot determine gecode version" "$LINENO" 5 -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - case "$target_os" in - *darwin*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -framework gecode is required" >&5 -$as_echo_n "checking if -framework gecode is required... " >&6; } - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - saved_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -framework gecode" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include "gecode/int.hh" - -int -main () -{ - -Gecode::Exception e("",""); -return 0; - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - GECODE_EXTRALIBS="-framework gecode" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - CXXFLAGS="$saved_CXXFLAGS" - ;; - esac -fi -fi - -GECODE_MAJOR=`echo $GECODE_VERSION| sed 's/\(^.\).*/\1/'` - - - -if test "$GECODE_MAJOR" = "3"; then - GECODE_EXTRALIBS="$GECODE_EXTRALIBS -lgecodesupport -lgecodekernel -lgecodeint -lgecodeset -lgecodesearch" -else - GECODE_EXTRALIBS="$GECODE_EXTRALIBS -lgecodesupport -lgecodekernel -lgecodefloat -lgecodeint -lgecodeset -lgecodesearch" -fi - - - - - if test -e "$srcdir"/packages/raptor/Makefile.in; then ENABLE_RAPTOR="" @@ -12975,8 +12789,6 @@ _ACEOF fi -======= ->>>>>>> bcde1666fb9dc38ece7ef3b95cc46c18f6632f74 done @@ -13042,7 +12854,7 @@ RAPTOR_LDFLAGS="$LIBS" if test "$raptor_available" = no then - PKG_RAPTOR="" + ENABLE_RAPTOR="@# " cat << EOF ################################################################## # ERROR: Could not find raptor library. Either I don't have the @@ -13050,7 +12862,7 @@ then ################################################################## EOF else - PKG_RAPTOR="packages/raptor" + ENABLE_RAPTOR="" fi