From 4b0a3a7a37672ca6054b68e882243353207564ad Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Tue, 17 Jan 2012 14:33:21 +0100 Subject: [PATCH] Make it possible not to build Python bindings. * configure.ac: Add a --disable-python option tied to a USE_PYTHON conditional. * README: Document the option. * wrap/Makefile.am: Use the conditional. --- ChangeLog | 9 +++++++++ NEWS | 2 ++ README | 14 +++++++++++++- configure.ac | 16 ++++++++++++++-- wrap/Makefile.am | 4 ++++ 5 files changed, 42 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0210d6777..2a53294d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2012-01-17 Alexandre Duret-Lutz + + Make it possible not to build Python bindings. + + * configure.ac: Add a --disable-python option tied to + a USE_PYTHON conditional. + * README: Document the option. + * wrap/Makefile.am: Use the conditional. + 2012-01-17 Alexandre Duret-Lutz Fix position of the Send button with WebKit. diff --git a/NEWS b/NEWS index 186f628f0..725e1c0cb 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ New in spot 0.8.1a: + * configure now has a --disable-python option to disable + the compilation of Python bindings. * Bug fixes: - spot::ltl::length() forgot to count the '&' and '|' operators in an LTL formula. diff --git a/README b/README index ddf3ba6d3..40819131a 100644 --- a/README +++ b/README @@ -18,7 +18,9 @@ Requirements ------------ Spot requires a complete installation of Python (version 2.0 or -later). Especially, Python's headers files should be installed. +later). Especially, Python's headers files should be installed. If +you don't have Python installed, you should run configure with +the --disable-python option (see below). Spot also uses modified versions of BuDDy (a binary decision diagram), and LBTT (an LTL to Büchi test bench). You do not need to install @@ -57,6 +59,13 @@ flags specific to Spot: build, and installation of the included versions of these package, even when compatible versions are already installed. + --disable-python + Turn off the compilation of Python bindings. These bindings are + currently used to run a couple of tests, and to build the CGI + script that translates LTL formulae on-line. You may safely + disable these, especially if you do not have a working Python + installation or if you are attempting some cross-compilation. + --enable-devel Enable debugging symbols, turn off aggressive optimizations, and turn on assertions. This option is effective by default in @@ -172,3 +181,6 @@ End: LocalWords: gtec Tarjan tgbaparse tgbatest doc html PDF spotref pdf cgi ELTL LocalWords: CGI ltl iface BDD Couvreur's evtgba emptchk kripke Kripke saba vm LocalWords: eltlparse eltltest SABA sabaalgos sabatest ssp ltlcouter scc SCC +LocalWords: formulae optimizations kripkeparse kripketest Automata +LocalWords: neverparse ltlcounter ltlclasses parallelizing automata +LocalWords: wdba WDBA ajax dve DiVinE ltdl Libtool's dlopen diff --git a/configure.ac b/configure.ac index 80f7d227f..a6702683c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2008, 2009, 2010, 2011 Laboratoire de Recherche et +# Copyright (C) 2008, 2009, 2010, 2011, 2012 Laboratoire de Recherche et # Développement de l'Epita (LRDE). # Copyright (C) 2003, 2004, 2005, 2006, 2007 Laboratoire d'Informatique de # Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC), Université @@ -35,7 +35,19 @@ test -z "$CFLAGS" && CFLAGS= test -z "$CXXFLAGS" && CXXFLAGS= adl_ENABLE_DEVEL -adl_CHECK_PYTHON + +AC_ARG_ENABLE([python], + [AC_HELP_STRING([--disable-python], + [do not compile Python bindings])], + [], [enable_python=yes]) + +AM_CONDITIONAL([USE_PYTHON], [test "x${enable_python:-yes}" = xyes]) + +if test "x${enable_python:-yes}" = xyes; then + AC_MSG_NOTICE([You may configure with --disable-python ]dnl +[if you do not need Python bindings.]) + adl_CHECK_PYTHON +fi AC_PROG_CC AM_PROG_CC_C_O diff --git a/wrap/Makefile.am b/wrap/Makefile.am index 0065d7ae4..5b6b79251 100644 --- a/wrap/Makefile.am +++ b/wrap/Makefile.am @@ -1,3 +1,5 @@ +## Copyright (C) 2012 Laboratoire de Recherche et Developpement de +## l'Epita (LRDE). ## Copyright (C) 2003 Laboratoire d'Informatique de Paris 6 (LIP6), ## département Systèmes Répartis Coopératifs (SRC), Université Pierre ## et Marie Curie. @@ -19,4 +21,6 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. +if USE_PYTHON SUBDIRS = python +endif