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

Merge branch 'master' of ssh://git.dcc.fc.up.pt/yap-6.3

Browse Source
This commit is contained in:
Vítor Santos Costa 2013-11-04 21:41:58 +00:00
commit 0788a6c857
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -867,7 +867,7 @@ install_win32: startup.yss @ENABLE_WINCONSOLE@ yap-win@EXEC_SUFFIX@
@ENABLE_RDF@ (cd packages/RDF; $(MAKE) install) @ENABLE_RDF@ (cd packages/RDF; $(MAKE) install)
@ENABLE_SEMWEB@ (cd packages/semweb; $(MAKE) install) @ENABLE_SEMWEB@ (cd packages/semweb; $(MAKE) install)
@ENABLE_SGML@ (cd packages/sgml; $(MAKE) install) @ENABLE_SGML@ (cd packages/sgml; $(MAKE) install)
@ENABLE_ZLIB@ (cd packages/zlib; $(MAKE) @ZLIB_INSTALL@) @ENABLE_ZLIB@ (cd packages/zlib; $(MAKE) install)
(cd packages/CLPBN ; $(MAKE) install) (cd packages/CLPBN ; $(MAKE) install)
@ENABLE_CLPBN_BP@ (cd packages/CLPBN/horus; $(MAKE) install) @ENABLE_CLPBN_BP@ (cd packages/CLPBN/horus; $(MAKE) install)
@ENABLE_JPL@ (cd packages/jpl ; $(MAKE) install) @ENABLE_JPL@ (cd packages/jpl ; $(MAKE) install)

15
configure.in
View File

@ -1821,12 +1821,22 @@ then
m4_include([packages/archive/configure.in]) m4_include([packages/archive/configure.in])
if test "$ARCHIVE_TARGETS" = "nolib"
then
ENABLE_LIBARCHIVE="@# "
fi
fi fi
if test "$ENABLE_ODBC" = ""; then if test "$ENABLE_ODBC" = ""; then
m4_include([packages/odbc/configure.in]) m4_include([packages/odbc/configure.in])
if test "$ODBC_TARGETS" = "nolib"
then
ENABLE_ODBC="@# "
fi
else else
ODBC_TARGETS=nolib ODBC_TARGETS=nolib
ODBC_PLTARGETS=odbc.pl ODBC_PLTARGETS=odbc.pl
@ -1841,6 +1851,11 @@ then
m4_include([packages/zlib/configure.in]) m4_include([packages/zlib/configure.in])
if test "$ZLIB_TARGETS" = "nolib"
then
ENABLE_ZLIB="@# "
fi
fi fi
m4_include([packages/gecode/configure.in]) m4_include([packages/gecode/configure.in])