alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Distribute BuDDy. Compile and link with the included version if

Browse source 
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.
This commit is contained in:
Alexandre Duret-Lutz 2003-06-26 11:53:17 +00:00
parent 832a504d8d
commit 510756cdb7
7 changed files with 56 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ChangeLog
View file

@ -1,3 +1,21 @@
2003-06-26 Alexandre Duret-Lutz <aduret@src.lip6.fr>
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-25 Alexandre Duret-Lutz <aduret@src.lip6.fr> 2003-06-25 Alexandre Duret-Lutz <aduret@src.lip6.fr>
* src/tgba/succiterconcrete.cc (tgba_succ_iterator_concrete::next): * src/tgba/succiterconcrete.cc (tgba_succ_iterator_concrete::next):

7
Makefile.am
View file

@ -1,3 +1,8 @@
SUBDIRS = doc src wrap if WITH_INCLUDED_BUDDY
MAYBE_BUDDY = buddy
endif WITH_INCLUDED_BUDDY
SUBDIRS = $(MAYBE_BUDDY) doc src wrap
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = m4/gccwarn.m4 m4/pypath.m4 m4/buddy.m4 EXTRA_DIST = m4/gccwarn.m4 m4/pypath.m4 m4/buddy.m4

31
m4/buddy.m4
View file

@ -1,4 +1,29 @@
AC_DEFUN([AX_CHECK_BUDDY], [ AC_DEFUN([AX_CHECK_BUDDY], [
AC_CHECK_LIB([bdd], [bdd_init],, AC_ARG_WITH([included-buddy],
[AC_MSG_ERROR([Could not link with BuDDy. Please install BuDDy first [AC_HELP_STRING([--with-included-buddy],
or set CPPFLAGS/LDFLAGS appropriately.])])]) [use the BuDDy library inclued here])])
AC_CHECK_LIB([bdd], [bdd_mergepairs],
[need_included_buddy=no],
[need_included_buddy=yes])
if test "$need_included_buddy" = yes; then
if test "$with_included_buddy" = no; then
AC_MSG_ERROR([Could not link with BuDDy. Please install BuDDy first,
set CPPFLAGS/LDFLAGS appropriately, or configure with
--with-included-buddy])
else
with_included_buddy=yes
fi
fi
if test "$with_included_buddy" = yes; then
AC_CONFIG_SUBDIRS([buddy])
BUDDY_LDFLAGS='$(top_srcdir)/buddy/src/bdd.la'
BUDDY_CPPFLAGS='-I$(top_srcdir)/buddy/src'
else
BUDDY_LDFLAGS='-lbdd'
fi
AM_CONDITIONAL([WITH_INCLUDED_BUDDY], [test "$with_included_buddy" = yes])
AC_SUBST([BUDDY_LDFLAGS])
AC_SUBST([BUDDY_CPPFLAGS])
])

1
src/Makefile.am
View file

@ -7,6 +7,7 @@ SUBDIRS = misc ltlenv ltlast ltlvisit ltlparse tgba tgbaalgos tgbaparse . \
lib_LTLIBRARIES = libspot.la lib_LTLIBRARIES = libspot.la
libspot_la_SOURCES = libspot_la_SOURCES =
libspot_la_LDFLAGS = $(BUDDY_LDFLAGS)
libspot_la_LIBADD = \ libspot_la_LIBADD = \
ltlenv/libltlenv.la \ ltlenv/libltlenv.la \
ltlparse/libltlparse.la \ ltlparse/libltlparse.la \

2
src/tgba/Makefile.am
View file

@ -1,4 +1,4 @@
AM_CPPFLAGS = -I$(srcdir)/.. AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS)
AM_CXXFLAGS = $(WARNING_CXXFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS)
noinst_LTLIBRARIES = libtgba.la noinst_LTLIBRARIES = libtgba.la

2
src/tgbaalgos/Makefile.am
View file

@ -1,4 +1,4 @@
AM_CPPFLAGS = -I$(srcdir)/.. AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS)
AM_CXXFLAGS = $(WARNING_CXXFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS)
noinst_LTLIBRARIES = libtgbaalgos.la noinst_LTLIBRARIES = libtgbaalgos.la

2
src/tgbatest/Makefile.am
View file

@ -1,4 +1,4 @@
AM_CPPFLAGS = -I$(srcdir)/.. AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS)
LDADD = ../libspot.la LDADD = ../libspot.la
check_SCRIPTS = defs check_SCRIPTS = defs