Commit ccadc9ef authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

We should not run "make check" in taf-kit if the taf-kit binaries

have been disabled.

* Makefile.am (SUBDIRS): Rewrite using the MAYBE_ idiom.  Recurse
into taf-kit conditionally.
* taf-kit/src/Makefile.am (bin_PROGRAMS): Build all programs
unconditionally.
* build-aux/vcsn-taf-kit.m4 (VCSN_TAF_KIT): Rename as ...
(ENABLE_TAF_KIT): ... for consistency.
parent 5e2d00b0
2008-03-21 Alexandre Duret-Lutz <adl@lrde.epita.fr>
We should not run "make check" in taf-kit if the taf-kit binaries
have been disabled.
* Makefile.am (SUBDIRS): Rewrite using the MAYBE_ idiom. Recurse
into taf-kit conditionally.
* taf-kit/src/Makefile.am (bin_PROGRAMS): Build all programs
unconditionally.
* build-aux/vcsn-taf-kit.m4 (VCSN_TAF_KIT): Rename as ...
(ENABLE_TAF_KIT): ... for consistency.
2008-03-21 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Use any --with-python, --with-boost, and --with-xerces
......
......@@ -13,11 +13,16 @@
include $(top_srcdir)/vaucanson.mk
SUBDIRS = argp lib include src data taf-kit tools doc build-aux debian
if ENABLE_TAF_KIT
MAYBE_TAF_KIT = taf-kit
endif
if ENABLE_VAUCANSWIG
SUBDIRS += vaucanswig
MAYBE_VAUCANSWIG = vaucanswig
endif
SUBDIRS = argp lib include src data $(MAYBE_TAF_KIT) $(MAYBE_VAUCANSWIG) \
tools doc build-aux debian
EXTRA_DIST = vaucanson.spec ChangeLog.1 ChangeLog.2 README NEWS
DISTCHECK_CONFIGURE_FLAGS = --enable-demos --enable-vaucanswig \
......
# -*- Autoconf -*-
# Vaucanson, a generic library for finite state machines.
# Copyright (C) 2006 The Vaucanson Group.
# Copyright (C) 2006, 2008 The Vaucanson Group.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
......@@ -56,6 +56,5 @@ AC_DEFUN([VCSN_TAF_KIT],
else
enable_taf_kit=no
fi
m4_pattern_allow([^VCSN_TAF_KIT$])
AM_CONDITIONAL([VCSN_TAF_KIT], [test x$enable_taf_kit = xyes])
AM_CONDITIONAL([ENABLE_TAF_KIT], [test x$enable_taf_kit = xyes])
])
## Vaucanson, a generic library for finite state machines.
## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 The Vaucanson Group.
## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008 The Vaucanson Group.
##
## This program is free software; you can redistribute it and/or
## modify it under the terms of the GNU General Public License
......@@ -16,13 +16,7 @@ include $(top_srcdir)/vaucanson.mk
AM_CPPFLAGS += $(CXXFLAGS_OPTIMIZE)
AM_LDFLAGS = $(TERMLIBS)
Progs = vcsn-b vcsn-z vcsn-tdc
if VCSN_TAF_KIT
bin_PROGRAMS = $(Progs)
else
EXTRA_PROGRAMS = $(Progs)
endif
bin_PROGRAMS = vcsn-b vcsn-z vcsn-tdc
COMMON_SOURCES = commands.hh \
commands_macros.hh \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment