diff --git a/Makefile.in b/Makefile.in index ba9903f6d..530de6528 100755 --- a/Makefile.in +++ b/Makefile.in @@ -724,6 +724,7 @@ all: startup.yss @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/pyswip; $(MAKE)) startup.yss: yap@EXEC_SUFFIX@ $(PL_SOURCES) -rm -f startup.yss @@ -792,6 +793,7 @@ install_unix: startup.yss libYap.a @INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install) @ENABLE_REAL@ (cd packages/real; $(MAKE) install) @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) install) + @ENABLE_PYTHON@ @INSTALL_DLLS@ (cd packages/pyswip; $(MAKE) install) #@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/pyswip; $(MAKE) install) mkdir -p $(DESTDIR)$(INCLUDEDIR) mkdir -p $(DESTDIR)$(INCLUDEDIR)/src @@ -857,6 +859,7 @@ install_win32: startup.yss @ENABLE_WINCONSOLE@ yap-win@EXEC_SUFFIX@ (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) @@ -931,6 +934,7 @@ clean: clean_docs @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) diff --git a/configure b/configure index f38935c8b..753b0d0e3 100755 --- a/configure +++ b/configure @@ -11201,7 +11201,12 @@ ac_config_files="$ac_config_files packages/http/Makefile" fi if test "$ENABLE_JPL" = ""; then -ac_config_files="$ac_config_files packages/jpl/Makefile packages/jpl/jpl_paths.yap packages/jpl/src/java/Makefile packages/pyswip/Makefile" +ac_config_files="$ac_config_files packages/jpl/Makefile packages/jpl/jpl_paths.yap packages/jpl/src/java/Makefile" + +fi + +if test "$ENABLE_PYTHON" = ""; then +ac_config_files="$ac_config_files packages/pyswip/Makefile" fi diff --git a/configure.in b/configure.in index abba5be1c..b30793ab5 100755 --- a/configure.in +++ b/configure.in @@ -2527,7 +2527,11 @@ AC_CONFIG_FILES([packages/http/Makefile]) fi if test "$ENABLE_JPL" = ""; then -AC_CONFIG_FILES([packages/jpl/Makefile packages/jpl/jpl_paths.yap packages/jpl/src/java/Makefile packages/pyswip/Makefile ]) +AC_CONFIG_FILES([packages/jpl/Makefile packages/jpl/jpl_paths.yap packages/jpl/src/java/Makefile ]) +fi + +if test "$ENABLE_PYTHON" = ""; then +AC_CONFIG_FILES([ packages/pyswip/Makefile ]) fi if test "$ENABLE_PLDOC" = ""; then diff --git a/packages/real b/packages/real index 8f441c441..aaef14840 160000 --- a/packages/real +++ b/packages/real @@ -1 +1 @@ -Subproject commit 8f441c441b9e481e0467676d70b0f5e949c87a79 +Subproject commit aaef148402584fef38f291b3b5f319c9c2e1d811