From 029bf8359c4a4edbd408fd22237c11a7306f1dbc Mon Sep 17 00:00:00 2001 From: "U-w7\\vsc" Date: Mon, 4 Nov 2013 18:05:23 +0000 Subject: [PATCH] improvements --- Makefile.in | 2 +- configure.in | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index baaa7ad44..df419c2aa 100755 --- a/Makefile.in +++ b/Makefile.in @@ -867,7 +867,7 @@ install_win32: startup.yss @ENABLE_WINCONSOLE@ yap-win@EXEC_SUFFIX@ @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) @ZLIB_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) diff --git a/configure.in b/configure.in index 177f9305e..cf6714c23 100755 --- a/configure.in +++ b/configure.in @@ -1821,12 +1821,22 @@ then m4_include([packages/archive/configure.in]) +if test "$ARCHIVE_TARGETS" = "nolib" +then + ENABLE_LIBARCHIVE="@# " +fi + fi if test "$ENABLE_ODBC" = ""; then m4_include([packages/odbc/configure.in]) +if test "$ODBC_TARGETS" = "nolib" +then + ENABLE_ODBC="@# " +fi + else ODBC_TARGETS=nolib ODBC_PLTARGETS=odbc.pl @@ -1841,6 +1851,11 @@ then m4_include([packages/zlib/configure.in]) +if test "$ZLIB_TARGETS" = "nolib" +then + ENABLE_ZLIB="@# " +fi + fi m4_include([packages/gecode/configure.in])