Commit 5f642e0e authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

	Fix a compilation issue and configure tests. 
	
	The LDFLAGS and CPPFLAGS were not set properly after a configure.
	A Makefile was not generated in the src/bench directory. 

	* ../build-aux/vcsn-boost.m4: Set LDFLAGS and CPPFLAGS correctly.
	* ../build-aux/vcsn-xml.m4: Improve the path resolution for xerces.
	* ../src/benchs/eps_removal/Makefile.am,
	* ../src/benchs/eps_removal/eps_removal-bench.cc,
	* ../src/benchs/generate_benchs.sh: Fix a missing file generation.
parent a4d1d4a5
2007-09-19 Guillaume Lazzara <z@lrde.epita.fr>
Fix a compilation issue and configure tests.
The LDFLAGS and CPPFLAGS were not set properly after a configure.
A Makefile was not generated in the src/bench directory.
* ../build-aux/vcsn-boost.m4: Set LDFLAGS and CPPFLAGS correctly.
* ../build-aux/vcsn-xml.m4: Improve the path resolution for xerces.
* ../src/benchs/eps_removal/Makefile.am,
* ../src/benchs/eps_removal/eps_removal-bench.cc,
* ../src/benchs/generate_benchs.sh: Fix a missing file generation.
2007-09-13 Alexandre Duret-Lutz <adl@lrde.epita.fr>
* configure.ac (AC_CONFIG_FILES): Add missing
......
......@@ -180,6 +180,9 @@ if test "x$want_boost" = "xyes"; then
fi
if test "$succeeded" != "yes" ; then
CPPFLAGS="$CPPFLAGS_SAVED"
LDFLAGS="$LDFLAGS_SAVED"
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
......@@ -190,9 +193,6 @@ if test "x$want_boost" = "xyes"; then
AC_SUBST(BOOST_LDFLAGS)
AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
fi
CPPFLAGS="$CPPFLAGS_SAVED"
LDFLAGS="$LDFLAGS_SAVED"
fi
])
......@@ -25,7 +25,14 @@ AC_DEFUN([_VCSN_CHECK_XML],
else
XERCES_EXTRA_CPPFLAGS=''
XERCES_EXTRA_LDFLAGS=''
fi
for ac_xerces_path_tmp in /usr /usr/local /opt /opt/local ; do
if test -d "$ac_xerces_path_tmp/include/xercesc" && test -r "$ac_xerces_path_tmp/include/xercesc"; then
XERCES_EXTRA_LDFLAGS="-L$ac_xerces_path_tmp/lib"
XERCES_EXTRA_CPPFLAGS="-I$ac_xerces_path_tmp/include"
break;
fi
done
fi
AC_LANG_PUSH([C++])
......
# eps_removal/Makefile.am -*- Makefile -*-
#
# Vaucanson, a generic library for finite state machines.
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 The Vaucanson Group.
# DO NOT EDIT BY HAND - Generated by ./generate_benchs.sh
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# The complete GNU General Public Licence Notice can be found as the
# `COPYING' file in the root directory.
#
# The Vaucanson Group consists of people listed in the `AUTHORS' file.
#
include $(top_srcdir)/src/benchs/common/bench.mk
EXTRA_PROGRAMS = eps_removal_boolean-bench eps_removal_z-bench
COMMON_SOURCES = eps_removal-bench.cc eps_removal_bench.hh
eps_removal_boolean_bench_SOURCES = $(COMMON_SOURCES)
eps_removal_boolean_bench_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=boolean_automaton
eps_removal_z_bench_SOURCES = $(COMMON_SOURCES)
eps_removal_z_bench_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=z_automaton
benchs: $(EXTRA_PROGRAMS)
@echo '======================='; \
echo '|Epsilon removal bench|'; \
echo '======================='; \
for n_states in $$(seq 14 20); do \
echo "----------------------For $$n_states states"; \
echo "--------------VCSN boolean:"; \
./eps_removal_boolean-bench $$n_states; \
echo "--------------VCSN Z:"; \
./eps_removal_z-bench $$n_states; \
done;
EXTRA_PROGRAMS =
EXTRA_PROGRAMS += eps_removal-bench
eps_removal_bench_SOURCES = eps_removal-bench.cc eps_removal_bench.hh
//
// DO NOT EDIT BY HAND - Generated by ./generate_benchs.sh
//
// Vaucanson, a generic library for finite state machines.
// Copyright (C) 2006, 2007 The Vaucanson Group.
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 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
......
......@@ -100,7 +100,7 @@ case $1:$# in
--all:1)
BENCH_DIRS="determinization \
minimization_debruijn derived_terms minimization_2n \
quotient composition"
quotient composition eps_removal"
;;
--all:* | *:0)
echo >&2 "invalid arguments: $@"
......
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