Commit graph

99 commits

Author SHA1 Message Date
Alexandre Duret-Lutz
8cb68d76b5 * NEWS, buddy/src/bddop.c, m4/valgrind.m4: s/wether/whether/. 2012-08-22 13:53:59 +02:00
Alexandre Duret-Lutz
3a1a71016d * m4/buddy.m4: Check for bdd_implies. 2012-06-19 21:52:03 +02:00
Alexandre Duret-Lutz
1c1c95f65f Use the distributed LBTT is the installed one is not 1.2.1a.
* m4/lbtt.m4: Check version number.
2012-05-21 15:37:42 +02:00
Alexandre Duret-Lutz
de64a48e8b * m4/buddy.m4: Typo, reported by Thomas Badie. 2012-05-09 21:49:20 +02:00
Alexandre Duret-Lutz
1319e18e1d Make sure PYTHON is absolute.
* m4/pypath.m4: Here.  This is needed because PYTHON is used as
she-bang line in scripts.
2012-04-30 11:57:55 +02:00
Alexandre Duret-Lutz
5e77b2498a Fix computation of PYTHONINC for Python 3.
* m4/pypath.m4: The print syntax changed in Python 3, so use
sys.stdout.write for compatibility with all versions.
2012-02-25 13:37:42 +01:00
Alexandre Duret-Lutz
89279d9829 Do use of tr1::unordered_map with G++ 4.0.0.
* m4/stl.m4 (AC_HEADER_TR1_UNORDERED_MAP): Add some code so
we don't pick a broken tr1::unordered_map.
2012-01-12 18:40:40 +01:00
Alexandre Duret-Lutz
9679032510 Don't rely on the g++ version to include tr1/unordered_map and co.
The previous setup failed with clang++ 3.0.

* m4/stl.m4: New file.
* configure.ac: Call AC_HEADER_UNORDERED_MAP,
AC_HEADER_TR1_UNORDERED_MAP, and AC_HEADER_EXT_HASH_MAP.
* src/misc/hash.hh: Include _config.h, and used the
SPOT_HAVE_UNORDERED_MAP, SPOT_HAVE_TR1_UNORDERED_MAP,
or SPOT_HAVE_EXT_HASH_MAP defines to decide which
file to include.
2011-12-16 10:03:07 +01:00
Alexandre Duret-Lutz
67ff9f203f Install a misc/_config.h to hide all the defines that clutter the
built output.

This is also a step towards better checks for things like
__attribute__ or std::tr1.

* m4/ax_prefix_config_h.m4: New file.
* configure.ac: Call AC_CONFIG_HEADERS and AX_PREFIX_CONFIG_H.
* src/misc/Makefile.am: Install misc/_config.h.
* src/misc/random.cc, src/misc/version.cc: Include misc/_config.h.
2011-06-06 12:52:50 +02:00
Alexandre Duret-Lutz
2b6ea2279f Always pass --enable-devel or --disable-devel to BuDDy.
* configure.ac: Do not add CXXFLAGS and CFLAGS in ac_configure_args,
it causes problem when using config.cache.  Instead ...
* m4/devel.m4: Add --enable-devel or --disable-devel on
ac_configure_args, now that BuDDy understands that.
2011-04-10 22:12:25 +02:00
Alexandre Duret-Lutz
155d76f4fb Setup libltdl in ltdl/, so we can use it in the dve2 interface.
Don't keep it under version control since it is installed by
autoreconf.

* configure.ac: Call LT_CONFIG_LTDL_DIR and LTDL_INIT.
* README: Mention ltdl/.
* Makefile.am: Recurse into ldtl.
* iface/dve2/Makefile.am: Link with it.
2011-03-05 12:29:04 +01:00
Alexandre Duret-Lutz
067a1a0b24 Prevent Spot from using an installed BuDDy version that does not
have the latest function we added.  Reported by Kristin Rozier.

* m4/buddy.m4 (AX_CHECK_BUDDY): Check for bdd_setxor.
2011-02-04 21:28:17 +01:00
Alexandre Duret-Lutz
be6efe94a4 Fix the --enable-optimizations check.
* m4/gccoptim.m4: Add missing AC_LANG_PUSH/AC_LANG_POP around the
C test.  It was using the C++ compiler instead...
2010-05-20 17:16:59 +02:00
Alexandre Duret-Lutz
deff1a5ca7 * m4/buddy.m4 (AX_CHECK_BUDDY): Check for bdd_satprefix, the
latest function added to BuDDy.
2009-11-26 17:16:49 +01:00
Alexandre Duret-Lutz
d3dcecc6c3 Do not use the Boost macro from the Autoconf macro archive.
* m4/boost.m4: Rewrite like I already did in Vaucanson.
2009-11-09 17:02:40 +01:00
Alexandre Duret-Lutz
9eecd6aed5 * configure.ac: Switch from Libtool 1.5.x to Libtool 2.x, and
add an AC_CONFIG_MACRO_DIR call.
* m4/libtool.m4, tools/ltmain.sh: Remove.
2009-09-02 10:41:15 +02:00
Guillaume Sadegh
afeaf287e9 * m4/intel.m4: Fix to support the cache. 2009-07-09 21:29:50 +02:00
Guillaume Sadegh
7ac816f38e Adjust the build system for ICC.
* m4/intel.m4: Remove the `-W' option from CXXFLAGS since icpc
    does not support it. Inhibit the warning ``method was declared
    but never referenced''.
2009-06-12 16:37:21 +02:00
Guillaume Sadegh
7817f325eb More files to ignore. 2009-06-10 03:34:08 +02:00
Damien Lefortier
2fbcd7e52f Add support for ELTL (AST & parser), and an adaptation of LaCIM
for ELTL.  This is a new version of the work started in 2008 with
LTL and ELTL formulae now sharing the same class hierarchy.

* configure.ac: Adjust for src/eltlparse/ and src/eltltest/
directories, and call AX_BOOST_BASE.
* m4/boost.m4: New file defining AX_BOOST_BASE([MINIMUM-VERSION]).
* src/Makefile.am: Add eltlparse and eltltest.
* src/eltlparse/: New directory.  Contains the ELTL parser.
* src/eltltest/: New directory.  Contains tests related to
ELTL (parser and AST).
* src/ltlast/Makefile.am: Adjust for ELTL AST files.
* src/ltlast/automatop.cc, src/ltlast/automatop.hh: New files.
Represent automaton operators nodes used in ELTL ASTs.
* src/ltlast/nfa.cc, src/ltlast/nfa.hh: New files.  Represent
simple NFAs used internally by automatop nodes.
* src/ltlast/allnode.hh, src/ltlast/predecl.hh,
src/ltlast/visitor.hh: Adjust for automatop.
* src/ltlvisit/basicreduce.cc, src/ltlvisit/clone.cc,
src/ltlvisit/clone.hh, src/ltlvisit/contain.cc,
src/ltlvisit/dotty.cc, src/ltlvisit/nenoform.cc,
src/ltlvisit/postfix.cc, src/ltlvisit/postfix.hh,
src/ltlvisit/reduce.cc, src/ltlvisit/syntimpl.cc,
src/ltlvisit/tostring.cc: Because LTL and ELTL formulae share the
same class hierarchy, LTL visitors need to handle automatop nodes
to compile.  When it's meaningful the visitor applies on automatop
nodes or simply assert(0) otherwise.
* src/tgba/tgbabddconcretefactory.cc (create_anonymous_state),
src/tgba/tgbabddconcretefactory.hh (create_anonymous_state): New
function used by the LaCIM translation algorithm for ELTL.
* src/tgbaalgos/Makefile.am: Adjust for eltl2tgba_lacim* files.
* src/tgbaalgos/eltl2tgba_lacim.cc,
src/tgbaalgos/eltl2tgba_lacim.hh: New files.  Implementation of
the LaCIM translation algorithm for ELTL.
* src/tgbaalgos/ltl2tgba_fm.cc, src/tgbaalgos/ltl2tgba_lacim.cc:
Handle automatop nodes in the translation by an assert(0).
* src/tgbatest/Makefile.am: Adjust for eltl2tgba.* files.
* src/src/tgbatest/eltl2tgba.cc, src/tgbatest/eltl2tgba.test: New
files
2009-03-26 12:05:08 +01:00
Alexandre Duret-Lutz
b1bfdee870 Revert everything related to Damien's work in 2008 (he will commit a new version soon).
Here are the reverted patches:
8c0d1003b0,
25a3114287,
9afbaf6342,
dc0005f4e1,
543190f2bc.
2009-03-25 16:44:05 +01:00
Guillaume SADEGH
1d58493be3 Update to compile with the Intel compiler. 2008-12-18 23:41:10 +01:00
Damien Lefortier
8c0d1003b0 Start the ELTL translation (LACIM).
Merge all eltlast/ files into formula.hh (except automatop.hh).
2008-06-20 00:27:06 +02:00
Alexandre Duret-Lutz
87c700feb2 Keep libtool's files under CVS so that we don't use the broken
Debian versions installed in build hosts during automatic builds.

* m4/libtool.m4: New file, from GNU Libtool 1.4.24.
* tools/ltmain.sh: New file, from GNU Libtool 1.4.24.
* HACKING: Installing Libtool is no longer required.
2008-02-25 14:37:54 +01:00
Alexandre Duret-Lutz
3d01dd2eef * m4/valgrind.m4: New file.
* configure.ac: Use it.
2008-02-25 14:37:54 +01:00
Alexandre Duret-Lutz
723054ce80 * iface/gspn/ssp.cc (couvreur99_check_shy_ssp::find_state): Correctly
update the emptiness statistics.

* m4/gspnlib.m4: Typo.
2008-02-25 14:36:56 +01:00
Alexandre Duret-Lutz
7bcd027712 * configure.ac: Empty CFLAGS and CXXFLAGS.
* m4/debug.m4: Update CXXFLAGS too.
2004-10-11 12:32:49 +00:00
Alexandre Duret-Lutz
e94f297ba3 * m4/gccoptim.m4: Compute optimization flags for CXX too. 2004-08-09 09:14:15 +00:00
Alexandre Duret-Lutz
50ed9f8c0b * m4/ndebug.m4: Update CPPFLAGS, not CFLAGS. 2004-08-09 08:51:39 +00:00
Alexandre Duret-Lutz
b4eda5e84d * m4/gccwarn.m4: Do not check nor use -Wstrict-prototypes.
g++-3.4 complains it makes no sense in C++.
2004-07-16 14:38:44 +00:00
Alexandre Duret-Lutz
133bcf9442 Rename EESRG as SSP.
* iface/gspn/eesrg.cc, iface/gspn/eesrg.hh,
iface/gspn/dottyeesrg.cc: Rename as ...
* iface/gspn/ssp.cc, iface/gspn/ssp.hh, iface/gspn/dottyssp.cc:
... these.  Adjust all classes and function names.
* iface/gspn/ltlgspn.cc, iface/gspn/Makefile.am: Adjust all classes
filenames and function names.
* m4/gspnlib.m4: Define WITH_GSPN_SSP and LIBGSPNSSP_LDFLAGS.
2004-04-15 12:05:20 +00:00
Alexandre Duret-Lutz
06877eac24 * m4/gspnlib.m4 (AX_CHECK_GSPNLIB): Do not warn about a missing
library for eesrg.  Define the WITH_GSPN_EESRG conditional.
* iface/gspn/Makefile.am (gspn_HEADERS, check_PROGRAMS): Add the
eesrg items in condition WITH_GSPN_EESRG.
(libspotgspneesrg_la_LIBADD, libspotgspneesrg_la_CPPFLAGS)
(libspotgspneesrg_la_SOURCES): Define only in condition
WITH_GSPN_EESRG.
2004-01-09 12:12:48 +00:00
Alexandre Duret-Lutz
e6c113f953 * m4/devel.m4: Fix quoting and simplify default setting of
enable_devel.
2003-11-24 10:48:53 +00:00
Alexandre Duret-Lutz
65bfea0c8d * m4/gspnlib.m4: Define LIBGSPNESRG_LDFLAGS.
* iface/gspn/Makefile.am (gspn_HEADERS): Add common.hh.
(libspotgspn_la_SOURCES): Add common.cc.
(libspotgspneesrg_la_LIBADD, libspotgspneesrg_la_CPPFLAGS)
(libspotgspneesrg_la_SOURCES, ltlgspn_eesrg_SOURCES)
(dotty_eesrg_LDADD, dotty_eesrg_CPPFLAGS): New variables.
(lib_LTLIBRARIES): Add libspotgspneesrg.la.
(check_PROGRAMS): Add dottygspn-eesrg.
* iface/gspn/gspn.hh, iface/gspn/gspn.cc
(gspn_exeption, operator<<(gspn_exeption), gspn_environment): Move ...
* iface/gspn/common.hh, iface/gspn/common.cc: ... in these new files.
* iface/gspn/eesrg.hh, iface/gspn/eesrg.cc, iface/gspn/dottyeesrg.cc:
New files.
2003-10-30 15:53:33 +00:00
Alexandre Duret-Lutz
e5641f5b69 * m4/debug.m4, m4/devel.m4, m4/gccoptim.m4, m4/ndebug.m4: New files.
* Makefile.am (EXTRA_DIST): Add them.
* configure.ac: Call adl_ENABLE_DEVEL, adl_ENABLE_DEBUG, ad_GCC_OPTIM,
and adl_NDEBUG.
2003-10-01 11:44:57 +00:00
Alexandre Duret-Lutz
5b245d7dd1 * configure.ac, NEWS: Bump version to 0.0f.
* iface/gspn/simple.test, iface/gspn/dcswave.test,
iface/gspn/dcswaveltl.test: Make sure the example directory
is writable.
* m4/lbtt.m4, m4/buddy.m4: Always configure buddy/ and lbtt/,
regardless of the --with-included-buddy and --with-included-lbtt
settings.
2003-08-01 10:25:56 +00:00
Alexandre Duret-Lutz
94a9543f38 * m4/gspnlib.m4: Check for libgspnRG.a and libgspnSRG.a.
Define LIBGSPNRG_LDFLAGS and LIBGSPNSRG_LDFLAGS, not
LIBGSPN_LDFLAGS.
* iface/gspn/Makefile.am: Adjust, build dottygspn-rg and
dottygspn-srg instead of dottygspn.
* iface/gspn/gspn.cc (EVENT_TRUE): Undefine.
(tgba_gspn_private_::~tgba_gspn_private_): Free all_indexes.
* iface/gspn/dottygspn.cc (main): Destroy the automaton before
its dictionnary.
2003-07-22 13:11:32 +00:00
Alexandre Duret-Lutz
44993317ea Rename gspnlin.m4 to gspnlib.m4 2003-07-17 16:07:55 +00:00
Alexandre Duret-Lutz
4ac192ac1e * m4/gspnlib.m4: New file.
* configure.ac: Call AX_CHECK_GSPNLIB.
* Makefile.am (EXTRA_DIST): Add m4/gspnlib.m4.
* iface/gspn/Makefile.am (AM_CPPFLAGS): Add $(LIBGSPN_CPPFLAGS).
(libspotgspn_la_LIBADD, check_PROGRAMS, dottygspn_SOURCES,
dottygspn_LDADD): New variables.
* iface/gspn/gspn.hh (gspn_interface): New class.
(gspn_exeption): Take a string argument and adjust all callers.
(operator<<): Define for gspn_exeption.
* iface/gspn/gspn.cc (gspn_interface::gspn_interface,
gspn_interface::~gspn_interface): New.
* iface/gspn/gspnlib.h: Delete, it belongs to GSPN.
* iface/gspn/dottygspn.cc: New file.
2003-07-16 12:56:38 +00:00
Alexandre Duret-Lutz
49fd9579da * m4/lbtt.m4 (AX_CHECK_LBTT): Set LBTT and LBTT_TRANSLATE
when using an already installed lbtt.
2003-07-15 12:26:03 +00:00
Alexandre Duret-Lutz
600b21acfe * m4/lbtt.m4: Run lbtt-translate, not lbtt. 2003-07-12 17:59:47 +00:00
Alexandre Duret-Lutz
79bed65843 * lbtt/: New directory. Contains a patched version of lbtt 1.0.1.
* Makefile.am (MAYBE_LBTT): New variables.
(SUBDIRS): Add $(MAYBE_LBTT).
(EXTRA_DIST): Add m4/lbtt.m4.
* configure.ac: Call AX_CHECK_LBTT.
* m4/lbtt.m4: New file.
* src/tgbatest/Makefile.am (check_PROGRAMS): Add spotlbtt.
(spotlbtt_SOURCES): New variables.
(TESTS): Add spotlbtt.test.
(CLEANFILE): Add config.
* src/tgbatest/defs.in (top_builddir, LBTT, LBTT_TRANSLATE): New
substitutions.
* src/tgbatest/spotlbtt.cc, src/tgbatest/spotlbtt.test: New files.
2003-07-09 15:40:24 +00:00
Alexandre Duret-Lutz
692f78d663 Fix errors reported by ICC.
* src/tgba/state.hh (state_ptr_less_than::operator()): Make it const.
* src/tgba/tgbaproduct.cc: Include string.hh.
* src/ltlast/multop.hh (multop::add, multop::add_sorted): Do
not use qualified names in declarations.
* m4/gccwarn.m4 (CF_GXX_WARNINGS): Fix GXX test.
* src/ltlenv/defaultenv.hh, src/ltlenv/defaultenv.cc,
src/ltlenv/environment.hh: Add virtual destructors.
2003-06-28 10:10:25 +00:00
Alexandre Duret-Lutz
98a31af495 * m4/buddy.m4 (BUDDY_LDFLAGS): Use $(top_builddir), not $(top_srcdir).
* src/tgbaparse/Makefile.am (AM_CPPFLAGS): Add $(BUDDY_CPPFLAGS).
2003-06-26 12:53:29 +00:00
Alexandre Duret-Lutz
510756cdb7 Distribute BuDDy. Compile and link with the included version if
explicitely requested (--with-included-buddy) or if there is
now stuitable version already installed.

* buddy/: New directory.  Contains a patched version of BuDDy 2.2.
* m4/buddy.m4: Make sure the installed BuDDy supports bdd_mergepairs.
Honor --with-included-buddy and --without-included-buddy.  Define
the BUDDY_LDFLAGS and BUDDY_CPPFLAGS output variables, and the
WITH_INCLUDED_BUDDY Automake conditional
* Makefile.am [WITH_INCLUDED_BUDDY] (MAYBE_SUBDIRS): New variable.
(SUBDIRS): Prepend $(MAYBE_SUBDIRS).
* src/Makefile.am (libspot_LDFLAGS): New variable.
* src/tgba/Makefile.am (AM_CPPFLAGS): Add $(BUDDY_CPPFLAGS).
* src/tgbaalgos/Makefile.am (AM_CPPFLAGS): Likewise.
* src/tgbatest/Makefile.am (AM_CPPFLAGS): Likewise.
2003-06-26 11:53:17 +00:00
Alexandre Duret-Lutz
557c86b65b * m4/gccwarn.m4: Do not use -Winline, this is inappropriate
with STL.
* src/ltlast/atomic_prop.cc, src/ltlvisit/lunabbrev.cc,
src/ltlvisit/nenoform.cc: Include <cassert>.
2003-05-23 11:51:20 +00:00
Alexandre Duret-Lutz
1c5c42d22f * m4/buddy.m4: New file.
* Makefile.am (EXTRA_DIST): Add m4/buddy.m4.
* configure.ac: Call AX_CHECK_BUDDY.
2003-05-05 14:33:39 +00:00
Alexandre Duret-Lutz
e2c42a9f79 * m4/pypath.m4: New file.
* Makefile.am (SUBDIRS): Add wrap.
* wrap/Makefile.am: New file.
* wrap/spot.i: New file.  Preliminary bindings for Python.
* configure.ac: Call adl_CHECK_PYTHON and output wrap/Makefile.
2003-04-30 12:35:22 +00:00
Alexandre Duret-Lutz
f0a8d0aeb3 * HACKING, Makefile.am, configure.ac, m4/gccwarn.m4,
src/Makefile.am, src/ltlast/Makefile.am, src/ltlast/allnodes.hh,
src/ltlast/atomic_prop.cc, src/ltlast/atomic_prop.hh,
src/ltlast/binop.cc, src/ltlast/binop.hh, src/ltlast/constant.cc,
src/ltlast/constant.hh, src/ltlast/formulae.hh,
src/ltlast/multop.cc, src/ltlast/multop.hh, src/ltlast/predecl.hh,
src/ltlast/unop.cc, src/ltlast/unop.hh, src/ltlast/visitor.hh,
src/ltlparse/Makefile.am, src/ltlparse/ltlparse.yy,
src/ltlparse/ltlscan.ll, src/ltlparse/parsedecl.hh,
src/ltlparse/public.hh, src/ltlvisit/Makefile.am,
src/ltlvisit/dotty.cc, src/ltlvisit/dotty.hh,
src/ltlvisit/dump.cc, src/ltlvisit/dump.hh,
src/ltlvisit/rewrite.cc, src/ltlvisit/rewrite.hh,
src/ltltest/Makefile.am, src/ltltest/defs.in, src/ltltest/readltl.cc,
src/ltltest/parse.test, src/ltltest/parseerr.test,
src/misc/Makefile.am, src/misc/const_sel.hh: New files.
2003-04-15 10:55:16 +00:00