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

Merge branch 'exp/no-more-with' into next

parents 3bce248d f85cb219
2009-09-15 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Propagate configure arguments to distcheck.
* configure.ac (DISTCHECK_CONFIGURE_FLAGS): Substitute it from
here, and include $ac_configure_args.
* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Remove.
2009-09-15 Alexandre Duret-Lutz <adl@lrde.epita.fr>
* doc/README.txt: Update instructions for building with Boost
and Xerces in a non-standard directory. Move the "Requirements"
section before these instructions.
2009-09-15 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Eradicate empty variables tied to --with options.
* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Remove
MORE_DISTCHECK_CONFIGURE_FLAGS.
* vaucanson.mk (AM_CPPFLAGS): Remove BOOST_FLAGS.
(AM_LDFLAGS): Remove.
* taf-kit/src/Makefile.am (AM_LDFLAGS): Set with =, not +=.
2009-09-15 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Remove --with-xerces.
* build-aux/vcsn-xml.m4: Rewrite using a more recent syntax, and
without using --with. People will set CPPFLAGS and LDFLAGS if
they have an unusual Boost installation root. Take the minimum
version as argument.
* configure.ac: Adjust call to VCSN_XML, and remove the definition
of MORE_DISTCHECK_CONFIGURE_FLAGS.
2009-09-15 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Do not use AX_BOOST_BASE.
* build-aux/ax_boost_base.m4: Delete.
* build-aux/Makefile.am (dist_m4data_DATA): Remove
ax_boost_base.m4.
* build-aux/vcsn-boost.m4: New file.
* configure.ac: Use VCSN_BOOST instead of AX_BOOST_BASE. The
latter did too much and we want people to simply set CPPFLAGS
and LDFLAGS if they have an unusual Boost installation root.
2009-09-16 Alexandre Duret-Lutz <adl@lrde.epita.fr>
 
* include/generate_headers.sh: Use the full name to erase a file.
......
......@@ -22,9 +22,6 @@ SUBDIRS = gnulib cbs lib include src data $(MAYBE_TAF_KIT) \
EXTRA_DIST = vaucanson.spec ChangeLog.1 ChangeLog.2 README NEWS m4/gnulib-cache.m4
DISTCHECK_CONFIGURE_FLAGS = --enable-demos --enable-bench \
$(MORE_DISTCHECK_CONFIGURE_FLAGS)
# Prevent accidental edition of generated files.
$(srcdir)/README: $(srcdir)/doc/README.txt
rm -f $(srcdir)/README
......
......@@ -16,7 +16,7 @@
###
m4datadir = $(datadir)/aclocal
dist_m4data_DATA = vcsn.m4 vcsn-xml.m4 ax_boost_base.m4
dist_m4data_DATA = vcsn.m4 vcsn-xml.m4
EXTRA_DIST = \
find_tests.sh \
......
# ===========================================================================
# http://autoconf-archive.cryp.to/ax_boost_base.html
# ===========================================================================
#
# SYNOPSIS
#
# AX_BOOST_BASE([MINIMUM-VERSION])
#
# DESCRIPTION
#
# Test for the Boost C++ libraries of a particular version (or newer)
#
# If no path to the installed boost library is given the macro searchs
# under /usr, /usr/local, /opt and /opt/local and evaluates the
# $BOOST_ROOT environment variable. Further documentation is available at
# <http://randspringer.de/boost/index.html>.
#
# This macro calls:
#
# AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS)
#
# And sets:
#
# HAVE_BOOST
#
# LAST MODIFICATION
#
# 2008-04-12
#
# COPYLEFT
#
# Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved.
AC_DEFUN([AX_BOOST_BASE],
[
AC_ARG_WITH([boost],
AS_HELP_STRING([--with-boost@<:@=DIR@:>@], [use boost (default is yes) - it is possible to specify the root directory for boost (optional)]),
[
if test "$withval" = "no"; then
want_boost="no"
elif test "$withval" = "yes"; then
want_boost="yes"
ac_boost_path=""
else
want_boost="yes"
ac_boost_path="$withval"
fi
],
[want_boost="yes"])
AC_ARG_WITH([boost-libdir],
AS_HELP_STRING([--with-boost-libdir=LIB_DIR],
[Force given directory for boost libraries. Note that this will overwrite library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]),
[
if test -d $withval
then
ac_boost_lib_path="$withval"
else
AC_MSG_ERROR(--with-boost-libdir expected directory name)
fi
],
[ac_boost_lib_path=""]
)
if test "x$want_boost" = "xyes"; then
boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'`
boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'`
boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
if test "x$boost_lib_version_req_sub_minor" = "x" ; then
boost_lib_version_req_sub_minor="0"
fi
WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
succeeded=no
dnl first we check the system location for boost libraries
dnl this location ist chosen if boost libraries are installed with the --layout=system option
dnl or if you install boost with RPM
if test "$ac_boost_path" != ""; then
BOOST_LDFLAGS="-L$ac_boost_path/lib"
BOOST_CPPFLAGS="-I$ac_boost_path/include"
else
for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
break;
fi
done
fi
dnl overwrite ld flags if we have required special directory with
dnl --with-boost-libdir parameter
if test "$ac_boost_lib_path" != ""; then
BOOST_LDFLAGS="-L$ac_boost_lib_path"
fi
CPPFLAGS_SAVED="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
LDFLAGS_SAVED="$LDFLAGS"
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
AC_LANG_PUSH(C++)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@%:@include <boost/version.hpp>
]], [[
#if BOOST_VERSION >= $WANT_BOOST_VERSION
// Everything is okay
#else
# error Boost version is too old
#endif
]])],[
AC_MSG_RESULT(yes)
succeeded=yes
found_system=yes
],[
])
AC_LANG_POP([C++])
dnl if we found no boost with system layout we search for boost libraries
dnl built and installed without the --layout=system option or for a staged(not installed) version
if test "x$succeeded" != "xyes"; then
_version=0
if test "$ac_boost_path" != ""; then
if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
_version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
V_CHECK=`expr $_version_tmp \> $_version`
if test "$V_CHECK" = "1" ; then
_version=$_version_tmp
fi
VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
done
fi
else
for ac_boost_path in /usr /usr/local /opt /opt/local ; do
if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
_version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
V_CHECK=`expr $_version_tmp \> $_version`
if test "$V_CHECK" = "1" ; then
_version=$_version_tmp
best_path=$ac_boost_path
fi
done
fi
done
VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
if test "$ac_boost_lib_path" = ""
then
BOOST_LDFLAGS="-L$best_path/lib"
fi
if test "x$BOOST_ROOT" != "x"; then
if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/lib" && test -r "$BOOST_ROOT/stage/lib"; then
version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
V_CHECK=`expr $stage_version_shorten \>\= $_version`
if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
BOOST_CPPFLAGS="-I$BOOST_ROOT"
BOOST_LDFLAGS="-L$BOOST_ROOT/stage/lib"
fi
fi
fi
fi
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
AC_LANG_PUSH(C++)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@%:@include <boost/version.hpp>
]], [[
#if BOOST_VERSION >= $WANT_BOOST_VERSION
// Everything is okay
#else
# error Boost version is too old
#endif
]])],[
AC_MSG_RESULT(yes)
succeeded=yes
found_system=yes
],[
])
AC_LANG_POP([C++])
fi
if test "$succeeded" != "yes" ; then
if test "$_version" = "0" ; then
AC_MSG_ERROR([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])
else
AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])
fi
else
AC_SUBST(BOOST_CPPFLAGS)
AC_SUBST(BOOST_LDFLAGS)
AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
fi
CPPFLAGS="$CPPFLAGS_SAVED"
LDFLAGS="$LDFLAGS_SAVED"
fi
])
AC_DEFUN([VCSN_BOOST],
[
AC_LANG_PUSH([C++])
AC_CHECK_HEADER([boost/version.hpp],, [AC_MSG_ERROR([
Cannot find Boost headers. If they are installed on an unusuall path on
your system, please run configure with the suitable CPPFLAGS and LDFLAGS
options. For instance if it is installed in /opt/boost/ please use:
./configure CPPFLAGS="-I/opt/boost/include" LDFLAGS="-L/opt/boost/lib"
])])
# Do not require boost::serialization headers.
CPPFLAGS="$CPPFLAGS -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION"
AC_CACHE_CHECK([whether Boost version is >= $1], [ac_cv_boost_recent],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@%:@include <boost/version.hpp>
]], [[
#if BOOST_VERSION >= $2
// Everything is okay
#else
# error Boost version is too old
#endif
]])],[
ac_cv_boost_recent=yes
],[
ac_cv_boost_recent=no
])])
if test "x$ac_cvboost_recent" = xno; then
AC_MSG_ERROR([Boost appears to be too old. We need version 1.34 or more recent.])
fi
# FIXME: It would be nice to check the availability of the part of
# Boost we require (boost::graph, boost::multi_index...). Some
# distribution, like Debian, split Boost in multiple packages.
AC_LANG_POP([C++])
])
......@@ -14,64 +14,49 @@
AC_PREREQ([2.60])
# _VCSN_CHECK_XML
# ---------------
AC_DEFUN([_VCSN_CHECK_XML],
[dnl
# User-specified directory overrides any other definition
if test "x$with_cv_xerces_dir" != x; then
XERCES_EXTRA_CPPFLAGS="-I$with_cv_xerces_dir/include"
XERCES_EXTRA_LDFLAGS="-L$with_cv_xerces_dir/lib"
else
XERCES_EXTRA_CPPFLAGS=''
XERCES_EXTRA_LDFLAGS=''
fi
# VCSN_XML(MAJOR, MINOR)
# ----------------------
AC_DEFUN([VCSN_XML], [
AC_LANG_PUSH([C++])
AC_CACHE_CHECK([for previously found Xerces-C++ headers >= 2.3],
[vcsn_cv_xerces],
[vcsn_cv_xerces=unknown])
if test x$vcsn_cv_xerces = xunknown; then
vcsn_cv_xerces=no
vcsn_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $XERCES_EXTRA_CPPFLAGS"
AC_CHECK_HEADER([xercesc/util/XercesVersion.hpp],
[AC_COMPILE_IFELSE([AC_LANG_SOURCE([
AC_CHECK_HEADER([xercesc/util/XercesVersion.hpp],, [AC_MSG_ERROR([
Cannot find Xerces-C++ headers. If they are installed on an unusuall path on
your system, please run configure with the suitable CPPFLAGS and LDFLAGS
options. For instance if it is installed in /opt/xerces/ please use:
./configure CPPFLAGS="-I/opt/xerces/include" LDFLAGS="-L/opt/xerces/lib"
])])
AC_CACHE_CHECK([whether Xerces-C++ version is >= $1.$2],
[vcsn_cv_xerces_recent],
[AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
#include <xercesc/util/XercesVersion.hpp>
#if XERCES_VERSION_MAJOR < 2
#if XERCES_VERSION_MAJOR < $1
# error "Unsupported Xerces-C++ major version (too old)."
#endif
#if XERCES_VERSION_MAJOR == 2 && XERCES_VERSION_MINOR < 3
#if XERCES_VERSION_MAJOR == $1 && XERCES_VERSION_MINOR < $2
# error "Unsupported Xerces-C++ minor version (too old)."
#endif
])],
[vcsn_cv_xerces=yes])])
CPPFLAGS=$vcsn_save_CPPFLAGS
fi
]])],
[vcsn_cv_xerces_recent=yes],
[vcsn_cv_xerces_recent=no])])
if test x$vcsn_cv_xerces != xyes; then
AC_ERROR([Xerces-C++ not found or not >= 2.3])
if test x$vcsn_cv_xerces_recent != xyes; then
AC_MSG_ERROR([Xerces-C++ appears to be too old. We need version $1.$2 or more recent])
fi
AC_CACHE_CHECK([for usable Xerces-C++ library],
[vcsn_cv_xerces_lib],
[vcsn_cv_xerces_lib=no
vcsn_save_CPPFLAGS=$CPPFLAGS
vcsn_save_LDFLAGS=$LDFLAGS
vcsn_save_LIBS=$LIBS
CPPFLAGS="$CPPFLAGS $XERCES_EXTRA_CPPFLAGS"
LDFLAGS="$LDFLAGS $XERCES_EXTRA_LDFLAGS"
[vcsn_save_LIBS=$LIBS
LIBS="$LIBS -lxerces-c"
AC_LINK_IFELSE([AC_LANG_SOURCE([
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/util/XMLString.hpp>
/// The type used by Xerces-C++ for the file position type.
# if (XERCES_VERSION_MAJOR == 2)
# if (XERCES_VERSION_MAJOR == $1)
# define XMLSize_t unsigned int
# define XERCES_FILEPOS XMLSize_t
# elif (XERCES_VERSION_MAJOR > 2)
# elif (XERCES_VERSION_MAJOR >= $2)
# define XERCES_FILEPOS XMLFilePos
# else
# error "Unsupported Xerces-C++ major version."
......@@ -132,37 +117,17 @@ namespace vcsn
}
}
}
])],
[vcsn_cv_xerces_lib=yes])
]])],
[vcsn_cv_xerces_lib=yes],
[vcsn_cv_xerces_lib=no])
LIBS=$vcsn_save_LIBS
LDFLAGS=$vcsn_save_LDFLAGS
CPPFLAGS=$vcsn_save_CPPFLAGS
])
if test x$vcsn_cv_xerces_lib != xyes; then
AC_ERROR([cannot link with Xerces-C++ library])
AC_MSG_ERROR([cannot link with Xerces-C++ library (do you need to set LDFLAGS?)])
fi
CPPFLAGS="$CPPFLAGS $XERCES_EXTRA_CPPFLAGS"
LDFLAGS="$LDFLAGS $XERCES_EXTRA_LDFLAGS"
LIBS="$LIBS -lxerces-c"
AC_LANG_POP([C++])
])
# VCSN_XML
# --------
# Xerces C++
AC_DEFUN([VCSN_XML],
[dnl
AC_CACHE_CHECK([for Xerces-C++ in user-specified directory],
[with_cv_xerces_dir],
[])
AC_ARG_WITH([xerces],
[AC_HELP_STRING([--with-xerces=DIR],
[base directory where Xerces-C++ is installed])],
[with_cv_xerces_dir="$withval"],
[])
_VCSN_CHECK_XML
])
......@@ -25,6 +25,11 @@ AC_CONFIG_HEADERS([config.h:config.hin] [include/vaucanson/config/pconf.hh])
AC_CONFIG_SUBDIRS([cbs])
# Propagate configure arguments to distcheck.
AC_SUBST([DISTCHECK_CONFIGURE_FLAGS],
[$ac_configure_args --enable-demos --enable-bench])
# Check the default graph implementation near the top, this way we can
# quickly react to incorrect values.
ac_default_graph_impl=listg
......@@ -80,17 +85,7 @@ AC_ARG_ENABLE([bench],
AM_CONDITIONAL([ENABLE_BENCH], [test "x$enable_bench" = "xyes"])
# Boost
AX_BOOST_BASE([1.34])
# Do not require boost::serialization headers.
BOOST_CPPFLAGS="$BOOST_CPPFLAGS -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION"
# FIXME: It would be nice to check that the Boost package we require
# (boost::graph, boost::multi_index...)
AC_SUBST([MORE_DISTCHECK_CONFIGURE_FLAGS])
if test "${with_boost+set}" = set; then
MORE_DISTCHECK_CONFIGURE_FLAGS="$MORE_DISTCHECK_CONFIGURE_FLAGS --with-boost=$with_boost"
fi
VCSN_BOOST([1.34], [103400])
# Libtool used
LT_INIT([disable-static])
......@@ -98,11 +93,8 @@ LT_INIT([disable-static])
# Where to install Emacs files.
AM_PATH_LISPDIR
VCSN_XML
if test "${with_xerces+set}" = set; then
MORE_DISTCHECK_CONFIGURE_FLAGS="$MORE_DISTCHECK_CONFIGURE_FLAGS --with-xerces=$with_xerces"
fi
# Xerces-C++ >= 2.3
VCSN_XML(2,3)
VCSN_TAF_KIT
......
......@@ -78,16 +78,59 @@ check the whole library. Running the test suite may require up to
10GB of free space and several hours.
Additional features
-------------------
Requirements
============
Vaucanson was tested with the `GNU Compiler Collection (GCC)`_ version
4.1.x to 4.4.x.
.. _GNU Compiler Collection (GCC): http://gcc.gnu.org/
.. _ICC: http://www.intel.com/software/products/compilers/
TAF-Kit and some test cases can use the AT&T dot format to save
automaton in a human readable file. You should install Graphviz_ to
visualize these ``.dot`` files or run the test suite.
.. _Graphviz: http://www.research.att.com/sw/tools/graphviz/
The XML I/O system is based on the Apache `Xerces-C++`_ library
version 2.3 or above.
To specify a special path for the Xerces-C library::
.. _Xerces-C++: http://xml.apache.org/xerces-c/
./configure --with-xerces=/absolute/path/to/xerces
The C++ Application Binary Interface (ABI) of the Xerces-C++ library
must be the same as the C++ ABI of the compiler used to built
Vaucanson's XML I/O system. In particular, users of Fink or
DarwinPorts on MacOS should pay attention to the compiler that was
used to build their version of the Xerces-C++ library, as it might
differ from the one used to build Vaucanson. Vaucanson should work
with any version after 2.3.
To specify a special path for the Boost-C++ library::
.. _Boost: http://www.boost.org/
./configure --with-boost=/absolute/path/to/boost
`Boost`_ has been used since Vaucanson 1.1. It is a C++ library which
provides many useful objects, including hash tables. Currently, Boost
is used in algorithms only, but its use shall be extended to automata
structures and other portions of code. You must install this library
on your system. Vaucanson should support any version after 1.34.
Libraries installed in non-standard directories
-----------------------------------------------
If you have installed Xerces-C++ or Boost in a non-standard directory
(i.e., a directory that is not searched by default by your C++
compiler), you will have to set the ``CPPFLAGS`` and ``LDFLAGS``
variables to pass the necessary ``-I`` and ``-L`` options to the
preprocessor and linker.
For instance if you installed Xerces-C++ in ``/opt/xerces/`` and Boost in ``/opt/boost/`` you should run ``./configure`` as follows::
./configure CPPFLAGS="-I/opt/xerces -I/opt/boost" LDFLAGS="-L/opt/xerces -L/opt/boost"
Graph implementations
---------------------
Vaucanson can use two graph implementations: ``listg`` is a
representation based on adjacency lists, while ``bmig`` is a
......@@ -149,43 +192,6 @@ taf-kit
cbs
C++ Benchmarking Suite.
Requirements
============
Vaucanson was tested with the `GNU Compiler Collection (GCC)`_ version
4.1.x and 4.2.x, and with ICC_ version 9 and 10.1. The code is fully
compliant with the ISO C++ standard (ISO-IEC 14882) to permit a higher
portability in the future.
.. _GNU Compiler Collection (GCC): http://gcc.gnu.org/
.. _ICC: http://www.intel.com/software/products/compilers/
TAF-Kit and some test cases can use the AT&T dot format to save
automaton in a human readable file. You should install Graphviz_ to
visualize these ``.dot`` files or run the test suite.
.. _Graphviz: http://www.research.att.com/sw/tools/graphviz/
The XML I/O system is based on the Apache `Xerces-C++`_ library
version 2.3 or above.
.. _Xerces-C++: http://xml.apache.org/xerces-c/
The C++ Application Binary Interface (ABI) of the Xerces-C++ library
must be the same as the C++ ABI of the compiler used to built
Vaucanson's XML I/O system. In particular, users of Fink or
DarwinPorts on MacOS should pay attention to the compiler that was
used to build their version of the Xerces-C++ library, as it might
differ from the one used to build Vaucanson.
.. _Boost: http://www.boost.org/
`Boost`_ has been introduced since Vaucanson 1.1. It is a C++ library
which provides many useful objects, including hash tables. Currently,
Boost is used in algorithms only, but its use shall be extended to
automata structures and other portions of code. You must install this
library on your system.
Using Vaucanson
===============
......
......@@ -15,7 +15,7 @@
include $(top_srcdir)/vaucanson.mk
AM_CPPFLAGS += $(CXXFLAGS_OPTIMIZE)
AM_LDFLAGS += $(TERMLIBS)
AM_LDFLAGS = $(TERMLIBS)
bin_PROGRAMS = vcsn-char-b vcsn-char-z vcsn-char-r vcsn-char-fmp-b \
vcsn-int-b vcsn-int-z vcsn-int-fmp-b \
......
## Vaucanson, a generic library for finite state machines.
## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008 The Vaucanson Group.
## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 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
......@@ -18,15 +18,12 @@ AM_CPPFLAGS = \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/cbs/include \
-I$(top_builddir)/cbs/include \
$(BOOST_CPPFLAGS)
-I$(top_builddir)/cbs/include
benchlib = $(top_builddir)/cbs/lib/libbench.la
AM_CXXFLAGS = $(CXXFLAGS_STRICT)
AM_LDFLAGS = $(BOOST_LDFLAGS)
# Add this to CPPFLAGS to use the shipped data.
XSD_CPPFLAGS = -DVCSN_DATA_PATH="\"$(top_srcdir)/data\""
......
Supports Markdown
0% or .