Module: ppl/ppl Branch: master Commit: b5d7b09c10aea7c95b9d2693986e2e4e549d3a12 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b5d7b09c10aea... Author: Roberto Bagnara <bagnara@cs.unipr.it> Date: Wed Mar 25 21:06:01 2009 +0100 Do not enable the Prolog interfaces by default in the release tarballs. --- Makefile.am | 2 ++ TODO | 1 - configure.ac | 11 +++++------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 145b807..d2f40fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -49,10 +49,12 @@ DISTCHECK_CONFIGURE_FLAGS = \ dist-hook: rm -f $(distdir)/ppl-config.h \ && $(SED) -e "s/^enableval=thorough$$/enableval=quick/g" \ + -e "s/^default_interfaces=\$${available_interfaces}$$/default_interfaces=\$${non_prolog_interfaces}/g" \ <$(distdir)/configure.ac >$(distdir)/configure.ac.new \ && touch $(distdir)/configure.ac.new -r $(distdir)/configure.ac \ && mv -f $(distdir)/configure.ac.new $(distdir)/configure.ac $(SED) -e "s/^enableval=thorough$$/enableval=quick/g" \ + -e "s/^default_interfaces=\$${available_interfaces}$$/default_interfaces=\$${non_prolog_interfaces}/g" \ <$(distdir)/configure >$(distdir)/configure.new \ && touch $(distdir)/configure.new -r $(distdir)/configure \ && mv -f $(distdir)/configure.new $(distdir)/configure \ diff --git a/TODO b/TODO index 92da786..98df6e6 100644 --- a/TODO +++ b/TODO @@ -7,7 +7,6 @@ Enhancements for PPL 0.10.1 or later versions in a directory where another `make check' was performed (completely or not, with failure or not), the latter `make check' can succeed without testing anything. -- Do not enable the Prolog interfaces by default in the release tarballs. Enhancements for PPL 0.11 or later versions diff --git a/configure.ac b/configure.ac index 8583b40..f9103eb 100644 --- a/configure.ac +++ b/configure.ac @@ -800,14 +800,13 @@ esac build_ppl_lpsol=$enableval AM_CONDITIONAL(BUILD_PPL_LPSOL, test x"$build_ppl_lpsol" = xyes) -# This is the list of available interfaces: lowercase and blank-separated. -available_interfaces="cxx c ciao_prolog gnu_prolog sicstus_prolog swi_prolog xsb_prolog yap_prolog ocaml java" +# Define lists of available interfaces: lowercase and blank-separated. +non_prolog_interfaces="cxx c ocaml java" +prolog_interfaces="ciao_prolog gnu_prolog sicstus_prolog swi_prolog xsb_prolog yap_prolog" +available_interfaces="${nonprolog_interfaces} ${prolog_interfaces}" # This is the list of interfaces that are enabled by default. -#default_interfaces="cxx c swi_prolog" -#default_interfaces=${available_interfaces} -default_interfaces="cxx c ciao_prolog gnu_prolog sicstus_prolog swi_prolog xsb_prolog ocaml java" -#default_interfaces="cxx c ciao_prolog gnu_prolog sicstus_prolog swi_prolog xsb_prolog yap_prolog ocaml java" +default_interfaces=${available_interfaces} enableval=not_specified AC_MSG_CHECKING([which interfaces are enabled])