Commit fe112f1b authored by Akim Demaille's avatar Akim Demaille
Browse files

2006-06-01 Akim Demaille <akim@lrde.epita.fr>

	Multipurpose patch, don't do that at home.

	* src/taf-kit/main.cc: Remove useless extern "C".

        * src/tests/design_pattern/Makefile.am: Adjust.

        * src/tests/bin/generate-test-suite.sh: Revamp it.
	Use lower case names for non env vars.
	Factor some code.

        * src/tests/Makefile.am: License.
	* src/tests/check/Makefile.check, src/tests/check/Makefile.flags:
	Rename as...
	* src/tests/check/check.mk, src/tests/check/check-flags.mk:
	these.
	Adjust all dependencies.

        * argp/configure.ac: Remove obsolete invocation to
	AM_PROG_CC_STDC.
	
        * build-aux/vcsn-xml.m4: s/vcsn_cv_xml_user_hint/with_xerces/
	to please expert users of config.site.

        * configure.ac: Stop pretending CXX can be CC.
	
        * doc/makefiles/vcsn-Makefile: 

        * Makefile.am (SUBDIRS): Compile src first then doc. 

	NOTICE is named COPYING.
parent 73f14e7a
2006-06-01 Akim Demaille <akim@lrde.epita.fr>
Multipurpose patch, don't do that at home.
* src/taf-kit/main.cc: Remove useless extern "C".
* src/tests/design_pattern/Makefile.am: Adjust.
* src/tests/bin/generate-test-suite.sh: Revamp it.
Use lower case names for non env vars.
Factor some code.
* src/tests/Makefile.am: License.
* src/tests/check/Makefile.check, src/tests/check/Makefile.flags:
Rename as...
* src/tests/check/check.mk, src/tests/check/check-flags.mk:
these.
Adjust all dependencies.
* argp/configure.ac: Remove obsolete invocation to
AM_PROG_CC_STDC.
* build-aux/vcsn-xml.m4: s/vcsn_cv_xml_user_hint/with_xerces/
to please expert users of config.site.
* configure.ac: Stop pretending CXX can be CC.
* doc/makefiles/vcsn-Makefile:
* Makefile.am (SUBDIRS): Compile src first then doc.
NOTICE is named COPYING.
2006-05-31 Akim Demaille <akim@lrde.epita.fr>
Bind taf-kit to argp.
......
# Makefile.am
#
#
# $Id$
## Vaucanson, a generic library for finite state machines.
## 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
## 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.
SUBDIRS = argp include doc src debian
SUBDIRS = argp include src doc debian
EXTRA_DIST = vaucanson.spec ChangeLog.1 ChangeLog.2
###
......
......@@ -17,9 +17,8 @@ AC_GNU_SOURCE
AC_PROG_CC
AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
AM_PROG_CC_STDC
if test "x$am_cv_prog_cc_stdc" = xno ; then
if test "x$ac_cv_prog_cc_stdc" = xno ; then
AC_ERROR([the C compiler doesn't handle ANSI-C])
fi
......
......@@ -8,7 +8,7 @@
# of the License, or (at your option) any later version.
#
# The complete GNU General Public Licence Notice can be found as the
# `NOTICE' file in the root directory.
# `COPYING' file in the root directory.
#
# The Vaucanson Group consists of people listed in the `AUTHORS' file.
......
# xml.m4 -*- Autoconf -*-
# vcsn-xml.m4 -*- Autoconf -*-
# Vaucanson, a generic library for finite state machines.
# Copyright (C) 2005, 2006 The Vaucanson Group.
#
......@@ -8,7 +8,7 @@
# of the License, or (at your option) any later version.
#
# The complete GNU General Public Licence Notice can be found as the
# `NOTICE' file in the root directory.
# `COPYING' file in the root directory.
#
# The Vaucanson Group consists of people listed in the `AUTHORS' file.
......@@ -17,9 +17,9 @@
AC_DEFUN([_VCSN_CHECK_XML],
[dnl
# User-specified directory overrides any other definition
if test "x$vcsn_cv_xml_user_hint" != xno; then
XERCES_EXTRA_CPPFLAGS="-I$vcsn_cv_xml_user_hint/include"
XERCES_EXTRA_LDFLAGS="-L$vcsn_cv_xml_user_hint/lib"
if test "x$with_xerces" != x; then
XERCES_EXTRA_CPPFLAGS="-I$with_xerces/include"
XERCES_EXTRA_LDFLAGS="-L$with_xerces/lib"
else
XERCES_EXTRA_CPPFLAGS=''
XERCES_EXTRA_LDFLAGS=''
......@@ -36,13 +36,13 @@ AC_DEFUN([_VCSN_CHECK_XML],
CPPFLAGS="$CPPFLAGS $XERCES_EXTRA_CPPFLAGS"
AC_CHECK_HEADER([xercesc/util/XercesVersion.hpp],
[AC_COMPILE_IFELSE([AC_LANG_SOURCE([
@%:@include <xercesc/util/XercesVersion.hpp>
@%:@if XERCES_VERSION_MAJOR != 2
@%:@ error "Bad Xerces-C++ major version."
@%:@endif
@%:@if XERCES_VERSION_MINOR < 3
@%:@ error "Bad Xerces-C++ minor version."
@%:@endif
#include <xercesc/util/XercesVersion.hpp>
#if XERCES_VERSION_MAJOR != 2
# error "Bad Xerces-C++ major version."
#endif
#if XERCES_VERSION_MINOR < 3
# error "Bad Xerces-C++ minor version."
#endif
])],
[vcsn_cv_xerces=yes])])
CPPFLAGS=$vcsn_save_CPPFLAGS
......@@ -62,8 +62,8 @@ AC_DEFUN([_VCSN_CHECK_XML],
LDFLAGS="$LDFLAGS $XERCES_EXTRA_LDFLAGS"
LIBS="$LIBS -lxerces-c"
AC_LINK_IFELSE([AC_LANG_SOURCE([
@%:@include <xercesc/util/XMLUniDefs.hpp>
@%:@include <xercesc/util/XMLString.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/util/XMLString.hpp>
int main() {
const char *foo = "foo";
......@@ -101,19 +101,15 @@ AC_DEFUN([VCSN_XML],
[enable_vcsn_xml=yes])
AC_CACHE_CHECK([for Xerces-C++ in user-specified directory],
[vcsn_cv_xml_user_hint],
[vcsn_cv_xml_user_hint=no
AC_ARG_WITH([xerces],
[with_xerces],
[AC_ARG_WITH([xerces],
[AC_HELP_STRING([--with-xerces=DIR],
[base directory where Xerces-C++ is installed])],
[if test -r "$withval/include/xercesc"; then
vcsn_cv_xml_user_hint=$withval
fi])])
[base directory where Xerces-C++ is installed])])])
AC_ARG_ENABLE([xml-tests],
[AC_HELP_STRING([--disable-xml-tests],
[disable tests of XML features])],
[enable_xml_tests=$enableval],
[],
[enable_xml_tests=yes])
if test x$enable_vcsn_xml = xyes; then
......
......@@ -9,7 +9,7 @@
# of the License, or (at your option) any later version.
#
# The complete GNU General Public Licence Notice can be found as the
# `NOTICE' file in the root directory.
# `COPYING' file in the root directory.
#
# The Vaucanson Group consists of people listed in the `AUTHORS' file.
......
......@@ -7,7 +7,7 @@
# of the License, or (at your option) any later version.
#
# The complete GNU General Public Licence Notice can be found as the
# `NOTICE' file in the root directory.
# `COPYING' file in the root directory.
#
# The Vaucanson Group consists of people listed in the `AUTHORS' file.
......@@ -23,10 +23,7 @@ AC_CONFIG_HEADERS([config.h:config.hin] [include/vaucanson/config/pconf.hh])
VCSN_PRE_RELEASE
# Some C and C++ code used.
# Using $CXX as the C compiler is a hack to allow building shared
# modules from C++ source with libtool.
AC_PROG_CXX
CC=$CXX
AC_PROG_CC
# Use included Vaucanson version.
......
## Vaucanson, a generic library for finite state machines.
## 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
## 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.
# VCSN_USE_XML is tested in the `xml' subdirectory.
SUBDIRS = makefiles manual xml
......
# -*- Makefile -*-
## Vaucanson, a generic library for finite state machines.
## 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
## 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.
# Issue these rules before including tex.mk so that txt -> html is
# preferred over txt -> tex -> html. The latter is longer, but
......
......@@ -11,7 +11,7 @@
# of the License, or (at your option) any later version.
#
# The complete GNU General Public Licence Notice can be found as the
# `NOTICE' file in the root directory.
# `COPYING' file in the root directory.
#
# The Vaucanson Group consists of people listed in the `AUTHORS' file.
#
......
## Vaucanson, a generic library for finite state machines.
## 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
## 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.
## ---------------------------------------------------------- ##
## Generating $(manual).pdf from $(manual).tex using dvipdf. ##
## ---------------------------------------------------------- ##
......
# Makefile.am
#
#
# $Id$
## Vaucanson, a generic library for finite state machines.
## 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
## 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.
SUBDIRS = tests \
benchs \
......
......@@ -9,7 +9,7 @@
# of the License, or (at your option) any later version.
#
# The complete GNU General Public Licence Notice can be found as the
# `NOTICE' file in the root directory.
# `COPYING' file in the root directory.
#
# The Vaucanson Group consists of people listed in the `AUTHORS' file.
......@@ -45,7 +45,7 @@ EOF
// of the License, or (at your option) any later version.
//
// The complete GNU General Public Licence Notice can be found as the
// \`NOTICE' file in the root directory.
// \`COPYING' file in the root directory.
//
// The Vaucanson Group consists of people listed in the \`AUTHORS' file.
EOF
......
......@@ -7,7 +7,7 @@
# of the License, or (at your option) any later version.
#
# The complete GNU General Public Licence Notice can be found as the
# `NOTICE' file in the root directory.
# `COPYING' file in the root directory.
#
# The Vaucanson Group consists of people listed in the `AUTHORS' file.
#
......
......@@ -22,10 +22,7 @@
* Main file, common to all TAF-Kit binaries.
*/
extern "C" {
#include <argp.h>
}
#include <string>
#include <iostream>
#include <stdexcept>
......
# Makefile.am
#
#
# $Id$
## Vaucanson, a generic library for finite state machines.
## 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
## 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.
# VCSN_USE_XML is tested in the `xml' directory.
......
......@@ -3,7 +3,7 @@
# $Id$
include $(top_srcdir)/src/tests/check/Makefile.check
include $(top_srcdir)/src/tests/check/check.mk
SUBDIRS = derivations \
boolean \
......
......@@ -3,7 +3,7 @@
# $Id: Makefile.am 596 2004-04-01 01:37:27Z fosse_l $
include $(top_srcdir)/src/tests/check/Makefile.check
include $(top_srcdir)/src/tests/check/check.mk
EXTRA_DIST = \
krat_exp_cderivation_linear_test.hh
......@@ -3,7 +3,7 @@
# $Id$
include $(top_srcdir)/src/tests/check/Makefile.check
include $(top_srcdir)/src/tests/check/check.mk
SUBDIRS = cderivation derivation partial_derivation
EXTRA_DIST = derivations_common.hh
......@@ -3,7 +3,7 @@
#
# $Id$
include $(top_srcdir)/src/tests/check/Makefile.check
include $(top_srcdir)/src/tests/check/check.mk
EXTRA_DIST = \
krat_exp_cderivation_identity_test.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