[cig-commits] r13592 - in cs/cigma/trunk: . build/tmp config
luis at geodynamics.org
luis at geodynamics.org
Tue Dec 9 18:15:24 PST 2008
Author: luis
Date: 2008-12-09 18:15:23 -0800 (Tue, 09 Dec 2008)
New Revision: 13592
Added:
cs/cigma/trunk/build/tmp/deb_boost_python.dpatch
cs/cigma/trunk/config/ax_boost_base.m4
cs/cigma/trunk/config/ax_boost_filesystem.m4
cs/cigma/trunk/config/ax_boost_program_options.m4
cs/cigma/trunk/config/ax_boost_python.m4
cs/cigma/trunk/config/ax_boost_regex.m4
cs/cigma/trunk/config/ax_python.m4
cs/cigma/trunk/config/ax_python_config_var.m4
cs/cigma/trunk/config/cigma_boost.m4
cs/cigma/trunk/config/cigma_cppunit.m4
cs/cigma/trunk/config/cigma_hdf5.m4
cs/cigma/trunk/config/cigma_python.m4
cs/cigma/trunk/config/cigma_vtk.m4
cs/cigma/trunk/config/cigma_zlib.m4
cs/cigma/trunk/config/deb_ax_boost_python.m4
cs/cigma/trunk/config/deb_ax_python.m4
Removed:
cs/cigma/trunk/config/deb_boost_python.dpatch
Modified:
cs/cigma/trunk/configure.ac
Log:
Keep autoconf macros in own config directory
Copied: cs/cigma/trunk/build/tmp/deb_boost_python.dpatch (from rev 13591, cs/cigma/trunk/config/deb_boost_python.dpatch)
===================================================================
--- cs/cigma/trunk/build/tmp/deb_boost_python.dpatch (rev 0)
+++ cs/cigma/trunk/build/tmp/deb_boost_python.dpatch 2008-12-10 02:15:23 UTC (rev 13592)
@@ -0,0 +1,136 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## f.dpatch by Carl Fürstenberg <azatoth at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad autoconf-archive-20070512~/m4/ax_boost_python.m4 autoconf-archive-20070512/m4/ax_boost_python.m4
+--- autoconf-archive-20070512~/m4/ax_boost_python.m4 2007-07-29 17:56:16.000000000 +0200
++++ autoconf-archive-20070512/m4/ax_boost_python.m4 2007-07-29 19:51:45.000000000 +0200
+@@ -14,18 +14,19 @@
+ # If the library is found, HAVE_BOOST_PYTHON is defined and
+ # BOOST_PYTHON_LIB is set to the name of the library.
+ #
+-# This macro calls AC_SUBST(BOOST_PYTHON_LIB).
++# This macro calls AC_SUBST(BOOST_PYTHON_LIBS).
+ #
+ # In order to ensure that the Python headers are specified on the
+ # include path, this macro requires AX_PYTHON to be called.
+ #
+ # LAST MODIFICATION
+ #
+-# 2005-05-20
++# 2007-07-29
+ #
+ # COPYLEFT
+ #
+ # Copyright (c) 2005 Michael Tindal <mtindal at paradoxpoint.com>
++# Copyright © 2007 Carl Fürstenberg <azatoth at gmail.com>
+ #
+ # This program is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU General Public License as
+@@ -59,34 +60,52 @@
+
+ AC_DEFUN([AX_BOOST_PYTHON],
+ [AC_REQUIRE([AX_PYTHON])dnl
+-AC_CACHE_CHECK(whether the Boost::Python library is available,
+-ac_cv_boost_python,
+-[AC_LANG_SAVE
+- AC_LANG_CPLUSPLUS
+- CPPFLAGS_SAVE=$CPPFLAGS
+- if test x$PYTHON_INCLUDE_DIR != x; then
+- CPPFLAGS=-I$PYTHON_INCLUDE_DIR $CPPFLAGS
+- fi
+- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[
+- #include <boost/python/module.hpp>
+- using namespace boost::python;
+- BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }]],
+- [[return 0;]]),
+- ac_cv_boost_python=yes, ac_cv_boost_python=no)
+- AC_LANG_RESTORE
+- CPPFLAGS=$CPPFLAGS_SAVE
++AS_VAR_PUSHDEF([ax_BoostPython], [ax_cv_boost_python])dnl
++AC_LANG_PUSH([C++])
++ax_cv_boost_python_save_CPPFLAGS=$CPPFLAGS
++CPPFLAGS="-I$PYTHON_INCLUDE_DIR $CPPFLAGS"
++AC_CHECK_HEADER([boost/python.hpp],
++ [AC_DEFINE([HAVE_BOOST_PYTHON],,[define if the Boost::Python library is available])]
++)
++CPPFLAGS=$ax_cv_boost_python_save_CPPFLAGS
++AC_LANG_POP([C++])
++BN=boost_python
++AC_ARG_WITH(
++ [boost-python],
++ [AS_HELP_STRING([--with-boost-python],[specify the boost python library to use])],
++ [ax_python_lib=$withval],
++ [for ax_lib in $BN $BN-mt $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
++ lib$BN lib$BN-mt lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \
++ $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s; do
++ ax_python_lib="$ax_python_lib $ax_lib";
++ done;
++ ax_python_lib="$ax_python_lib $ax_python_lib_extra"]
++)
++
++AS_VAR_PUSHDEF([ax_Search], [ax_cv_search])dnl
++AC_CACHE_CHECK([for Usable Boost::Python library], [ax_Search],
++[AC_LANG_PUSH([C++])
++ax_cv_search_save_CXXFLAGS=$CXXFLAGS
++CXXFLAGS="-I$PYTHON_INCLUDE_DIR $CXXFLAGS"
++ax_cv_search_save_LIBS=$LIBS
++for ax_current_lib in $ax_python_lib; do
++ ax_res=-l$ax_current_lib
++ LIBS="-l$ax_current_lib -l$PYTHON_LIB $ax_cv_search_save_LIBS"
++ AC_LINK_IFELSE([#include <boost/python/module.hpp>
++ using namespace boost::python;
++ BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }
++ int main() {return 0;}],
++ [AS_VAR_SET([ax_Search], [$ax_res])])
++ AS_VAR_SET_IF([ax_Search], [break])dnl
++done
++AS_VAR_SET_IF([ax_Search], , [AS_VAR_SET([ax_Search], [no])])
++LIBS=$ax_cv_search_save_LIBS
++CXXFLAGS=$ax_cv_search_save_CXXFLAGS
++AC_LANG_POP([C++])])
++ax_res=AS_VAR_GET([ax_Search])
++AS_IF([test "$ax_res" != "no"],
++ [BOOST_PYTHON_LIBS="$ax_res"
++ AC_SUBST(BOOST_PYTHON_LIBS)],
++ [AS_WARN([No suitable Boost::Python library found])])dnl
++AS_VAR_POPDEF([ax_Search])dnl
+ ])
+-if test "$ac_cv_boost_python" = "yes"; then
+- AC_DEFINE(HAVE_BOOST_PYTHON,,[define if the Boost::Python library is available])
+- ax_python_lib=boost_python
+- AC_ARG_WITH([boost-python],AS_HELP_STRING([--with-boost-python],[specify the boost python library or suffix to use]),
+- [if test "x$with_boost_python" != "xno"; then
+- ax_python_lib=$with_boost_python
+- ax_boost_python_lib=boost_python-$with_boost_python
+- fi])
+- for ax_lib in $ax_python_lib $ax_boost_python_lib boost_python; do
+- AC_CHECK_LIB($ax_lib, main, [BOOST_PYTHON_LIB=$ax_lib break])
+- done
+- AC_SUBST(BOOST_PYTHON_LIB)
+-fi
+-])dnl
+diff -urNad autoconf-archive-20070512~/m4/ax_python.m4 autoconf-archive-20070512/m4/ax_python.m4
+--- autoconf-archive-20070512~/m4/ax_python.m4 2007-07-29 17:56:16.000000000 +0200
++++ autoconf-archive-20070512/m4/ax_python.m4 2007-07-29 19:51:50.000000000 +0200
+@@ -21,7 +21,7 @@
+ #
+ # LAST MODIFICATION
+ #
+-# 2004-09-20
++# 2007-07-29
+ #
+ # COPYLEFT
+ #
+@@ -60,7 +60,7 @@
+ AC_DEFUN([AX_PYTHON],
+ [AC_MSG_CHECKING(for python build information)
+ AC_MSG_RESULT([])
+-for python in python2.4 python2.3 python2.2 python2.1 python; do
++for python in python2.5 python2.4 python2.3 python2.2 python2.1 python; do
+ AC_CHECK_PROGS(PYTHON_BIN, [$python])
+ ax_python_bin=$PYTHON_BIN
+ if test x$ax_python_bin != x; then
Added: cs/cigma/trunk/config/ax_boost_base.m4
===================================================================
--- cs/cigma/trunk/config/ax_boost_base.m4 (rev 0)
+++ cs/cigma/trunk/config/ax_boost_base.m4 2008-12-10 02:15:23 UTC (rev 13592)
@@ -0,0 +1,224 @@
+# ===========================================================================
+# 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 at 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"
+ export CPPFLAGS
+
+ LDFLAGS_SAVED="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export 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"
+ export CPPFLAGS
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export 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
+
+])
+# vim: syntax=config
Added: cs/cigma/trunk/config/ax_boost_filesystem.m4
===================================================================
--- cs/cigma/trunk/config/ax_boost_filesystem.m4 (rev 0)
+++ cs/cigma/trunk/config/ax_boost_filesystem.m4 2008-12-10 02:15:23 UTC (rev 13592)
@@ -0,0 +1,110 @@
+# ===========================================================================
+# http://autoconf-archive.cryp.to/ax_boost_filesystem.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_BOOST_FILESYSTEM
+#
+# DESCRIPTION
+#
+# Test for Filesystem library from the Boost C++ libraries. The macro
+# requires a preceding call to AX_BOOST_BASE. Further documentation is
+# available at <http://randspringer.de/boost/index.html>.
+#
+# This macro calls:
+#
+# AC_SUBST(BOOST_FILESYSTEM_LIB)
+#
+# And sets:
+#
+# HAVE_BOOST_FILESYSTEM
+#
+# LAST MODIFICATION
+#
+# 2008-04-12
+#
+# COPYLEFT
+#
+# Copyright (c) 2008 Thomas Porschberg <thomas at randspringer.de>
+# Copyright (c) 2008 Michael Tindal
+#
+# 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_FILESYSTEM],
+[
+ AC_ARG_WITH([boost-filesystem],
+ AS_HELP_STRING([--with-boost-filesystem@<:@=special-lib@:>@],
+ [use the Filesystem library from boost - it is possible to specify a certain library for the linker
+ e.g. --with-boost-filesystem=boost_filesystem-gcc-mt ]),
+ [
+ if test "$withval" = "no"; then
+ want_boost="no"
+ elif test "$withval" = "yes"; then
+ want_boost="yes"
+ ax_boost_user_filesystem_lib=""
+ else
+ want_boost="yes"
+ ax_boost_user_filesystem_lib="$withval"
+ fi
+ ],
+ [want_boost="yes"]
+ )
+
+ if test "x$want_boost" = "xyes"; then
+ AC_REQUIRE([AC_PROG_CC])
+ CPPFLAGS_SAVED="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ export CPPFLAGS
+
+ LDFLAGS_SAVED="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export LDFLAGS
+
+ AC_CACHE_CHECK(whether the Boost::Filesystem library is available,
+ ax_cv_boost_filesystem,
+ [AC_LANG_PUSH([C++])
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/filesystem/path.hpp>]],
+ [[using namespace boost::filesystem;
+ path my_path( "foo/bar/data.txt" );
+ return 0;]]),
+ ax_cv_boost_filesystem=yes, ax_cv_boost_filesystem=no)
+ AC_LANG_POP([C++])
+ ])
+ if test "x$ax_cv_boost_filesystem" = "xyes"; then
+ AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])
+ BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+ if test "x$ax_boost_user_filesystem_lib" = "x"; then
+ for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.{so,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_filesystem.*\)\.so.*$;\1;' -e 's;^lib\(boost_filesystem.*\)\.a*$;\1;'` ; do
+ ax_lib=${libextension}
+ AC_CHECK_LIB($ax_lib, exit,
+ [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
+ [link_filesystem="no"])
+ done
+ if test "x$link_program_options" != "xyes"; then
+ for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.dll.*$;\1;' -e 's;^\(boost_filesystem.*\)\.a*$;\1;'` ; do
+ ax_lib=${libextension}
+ AC_CHECK_LIB($ax_lib, exit,
+ [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
+ [link_filesystem="no"])
+ done
+ fi
+ else
+ for ax_lib in $ax_boost_user_filesystem_lib boost_filesystem-$ax_boost_user_filesystem_lib; do
+ AC_CHECK_LIB($ax_lib, exit,
+ [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
+ [link_filesystem="no"])
+ done
+
+ fi
+ if test "x$link_filesystem" != "xyes"; then
+ AC_MSG_ERROR(Could not link against $ax_lib !)
+ fi
+ fi
+
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
+ fi
+])
Added: cs/cigma/trunk/config/ax_boost_program_options.m4
===================================================================
--- cs/cigma/trunk/config/ax_boost_program_options.m4 (rev 0)
+++ cs/cigma/trunk/config/ax_boost_program_options.m4 2008-12-10 02:15:23 UTC (rev 13592)
@@ -0,0 +1,106 @@
+# ===========================================================================
+# http://autoconf-archive.cryp.to/ax_boost_program_options.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_BOOST_PROGRAM_OPTIONS
+#
+# DESCRIPTION
+#
+# Test for program options library from the Boost C++ libraries. The macro
+# requires a preceding call to AX_BOOST_BASE. Further documentation is
+# available at <http://randspringer.de/boost/index.html>.
+#
+# This macro calls:
+#
+# AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB)
+#
+# And sets:
+#
+# HAVE_BOOST_PROGRAM_OPTIONS
+#
+# LAST MODIFICATION
+#
+# 2008-04-12
+#
+# COPYLEFT
+#
+# Copyright (c) 2008 Thomas Porschberg <thomas at 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_PROGRAM_OPTIONS],
+[
+ AC_ARG_WITH([boost-program-options],
+ AS_HELP_STRING([--with-boost-program-options@<:@=special-lib@:>@],
+ [use the program options library from boost - it is possible to specify a certain library for the linker
+ e.g. --with-boost-program-options=boost_program_options-gcc-mt-1_33_1 ]),
+ [
+ if test "$withval" = "no"; then
+ want_boost="no"
+ elif test "$withval" = "yes"; then
+ want_boost="yes"
+ ax_boost_user_program_options_lib=""
+ else
+ want_boost="yes"
+ ax_boost_user_program_options_lib="$withval"
+ fi
+ ],
+ [want_boost="yes"]
+ )
+
+ if test "x$want_boost" = "xyes"; then
+ AC_REQUIRE([AC_PROG_CC])
+ export want_boost
+ CPPFLAGS_SAVED="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ export CPPFLAGS
+ LDFLAGS_SAVED="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export LDFLAGS
+ AC_CACHE_CHECK([whether the Boost::Program_Options library is available],
+ ax_cv_boost_program_options,
+ [AC_LANG_PUSH(C++)
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/program_options.hpp>
+ ]],
+ [[boost::program_options::options_description generic("Generic options");
+ return 0;]]),
+ ax_cv_boost_program_options=yes, ax_cv_boost_program_options=no)
+ AC_LANG_POP([C++])
+ ])
+ if test "$ax_cv_boost_program_options" = yes; then
+ AC_DEFINE(HAVE_BOOST_PROGRAM_OPTIONS,,[define if the Boost::PROGRAM_OPTIONS library is available])
+ BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+ if test "x$ax_boost_user_program_options_lib" = "x"; then
+ for libextension in `ls $BOOSTLIBDIR/libboost_program_options*.{so,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_program_options.*\)\.so.*$;\1;' -e 's;^lib\(boost_program_options.*\)\.a*$;\1;'` ; do
+ ax_lib=${libextension}
+ AC_CHECK_LIB($ax_lib, exit,
+ [BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes"; break],
+ [link_program_options="no"])
+ done
+ if test "x$link_program_options" != "xyes"; then
+ for libextension in `ls $BOOSTLIBDIR/boost_program_options*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_program_options.*\)\.dll.*$;\1;' -e 's;^\(boost_program_options.*\)\.a*$;\1;'` ; do
+ ax_lib=${libextension}
+ AC_CHECK_LIB($ax_lib, exit,
+ [BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes"; break],
+ [link_program_options="no"])
+ done
+ fi
+ else
+ for ax_lib in $ax_boost_user_program_options_lib boost_program_options-$ax_boost_user_program_options_lib; do
+ AC_CHECK_LIB($ax_lib, main,
+ [BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes"; break],
+ [link_program_options="no"])
+ done
+ fi
+ if test "x$link_program_options" != "xyes"; then
+ AC_MSG_ERROR([Could not link against [$ax_lib] !])
+ fi
+ fi
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
+ fi
+])
Added: cs/cigma/trunk/config/ax_boost_python.m4
===================================================================
--- cs/cigma/trunk/config/ax_boost_python.m4 (rev 0)
+++ cs/cigma/trunk/config/ax_boost_python.m4 2008-12-10 02:15:23 UTC (rev 13592)
@@ -0,0 +1,90 @@
+# ===========================================================================
+# http://autoconf-archive.cryp.to/ax_boost_python.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_BOOST_PYTHON
+#
+# DESCRIPTION
+#
+# This macro checks to see if the Boost.Python library is installed. It
+# also attempts to guess the currect library name using several attempts.
+# It tries to build the library name using a user supplied name or suffix
+# and then just the raw library.
+#
+# If the library is found, HAVE_BOOST_PYTHON is defined and
+# BOOST_PYTHON_LIB is set to the name of the library.
+#
+# This macro calls AC_SUBST(BOOST_PYTHON_LIB).
+#
+# In order to ensure that the Python headers are specified on the include
+# path, this macro requires AX_PYTHON to be called.
+#
+# LAST MODIFICATION
+#
+# 2008-04-12
+#
+# COPYLEFT
+#
+# Copyright (c) 2008 Michael Tindal
+#
+# 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.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception, the respective Autoconf Macro's copyright owner
+# gives unlimited permission to copy, distribute and modify the configure
+# scripts that are the output of Autoconf when processing the Macro. You
+# need not follow the terms of the GNU General Public License when using
+# or distributing such scripts, even though portions of the text of the
+# Macro appear in them. The GNU General Public License (GPL) does govern
+# all other use of the material that constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the Autoconf
+# Macro released by the Autoconf Macro Archive. When you make and
+# distribute a modified version of the Autoconf Macro, you may extend this
+# special exception to the GPL to apply to your modified version as well.
+
+AC_DEFUN([AX_BOOST_PYTHON],
+[AC_REQUIRE([AX_PYTHON])dnl
+AC_CACHE_CHECK(whether the Boost::Python library is available,
+ac_cv_boost_python,
+[AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ CPPFLAGS_SAVE=$CPPFLAGS
+ if test x$PYTHON_INCLUDE_DIR != x; then
+ CPPFLAGS=-I$PYTHON_INCLUDE_DIR $CPPFLAGS
+ fi
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[
+ #include <boost/python/module.hpp>
+ using namespace boost::python;
+ BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }]],
+ [[return 0;]]),
+ ac_cv_boost_python=yes, ac_cv_boost_python=no)
+ AC_LANG_RESTORE
+ CPPFLAGS=$CPPFLAGS_SAVE
+])
+if test "$ac_cv_boost_python" = "yes"; then
+ AC_DEFINE(HAVE_BOOST_PYTHON,,[define if the Boost::Python library is available])
+ ax_python_lib=boost_python
+ AC_ARG_WITH([boost-python],AS_HELP_STRING([--with-boost-python],[specify the boost python library or suffix to use]),
+ [if test "x$with_boost_python" != "xno"; then
+ ax_python_lib=$with_boost_python
+ ax_boost_python_lib=boost_python-$with_boost_python
+ fi])
+ for ax_lib in $ax_python_lib $ax_boost_python_lib boost_python; do
+ AC_CHECK_LIB($ax_lib, exit, [BOOST_PYTHON_LIB=$ax_lib break])
+ done
+ AC_SUBST(BOOST_PYTHON_LIB)
+fi
+])dnl
Added: cs/cigma/trunk/config/ax_boost_regex.m4
===================================================================
--- cs/cigma/trunk/config/ax_boost_regex.m4 (rev 0)
+++ cs/cigma/trunk/config/ax_boost_regex.m4 2008-12-10 02:15:23 UTC (rev 13592)
@@ -0,0 +1,109 @@
+# ===========================================================================
+# http://autoconf-archive.cryp.to/ax_boost_regex.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_BOOST_REGEX
+#
+# DESCRIPTION
+#
+# Test for Regex library from the Boost C++ libraries. The macro requires
+# a preceding call to AX_BOOST_BASE. Further documentation is available at
+# <http://randspringer.de/boost/index.html>.
+#
+# This macro calls:
+#
+# AC_SUBST(BOOST_REGEX_LIB)
+#
+# And sets:
+#
+# HAVE_BOOST_REGEX
+#
+# LAST MODIFICATION
+#
+# 2008-04-12
+#
+# COPYLEFT
+#
+# Copyright (c) 2008 Thomas Porschberg <thomas at randspringer.de>
+# Copyright (c) 2008 Michael Tindal
+#
+# 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_REGEX],
+[
+ AC_ARG_WITH([boost-regex],
+ AS_HELP_STRING([--with-boost-regex@<:@=special-lib@:>@],
+ [use the Regex library from boost - it is possible to specify a certain library for the linker
+ e.g. --with-boost-regex=boost_regex-gcc-mt-d-1_33_1 ]),
+ [
+ if test "$withval" = "no"; then
+ want_boost="no"
+ elif test "$withval" = "yes"; then
+ want_boost="yes"
+ ax_boost_user_regex_lib=""
+ else
+ want_boost="yes"
+ ax_boost_user_regex_lib="$withval"
+ fi
+ ],
+ [want_boost="yes"]
+ )
+
+ if test "x$want_boost" = "xyes"; then
+ AC_REQUIRE([AC_PROG_CC])
+ CPPFLAGS_SAVED="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ export CPPFLAGS
+
+ LDFLAGS_SAVED="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export LDFLAGS
+
+ AC_CACHE_CHECK(whether the Boost::Regex library is available,
+ ax_cv_boost_regex,
+ [AC_LANG_PUSH([C++])
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/regex.hpp>
+ ]],
+ [[boost::regex r(); return 0;]]),
+ ax_cv_boost_regex=yes, ax_cv_boost_regex=no)
+ AC_LANG_POP([C++])
+ ])
+ if test "x$ax_cv_boost_regex" = "xyes"; then
+ AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is available])
+ BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+ if test "x$ax_boost_user_regex_lib" = "x"; then
+ for libextension in `ls $BOOSTLIBDIR/libboost_regex*.{so,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_regex.*\)\.so.*$;\1;' -e 's;^lib\(boost_regex.*\)\.a*$;\1;'` ; do
+ ax_lib=${libextension}
+ AC_CHECK_LIB($ax_lib, exit,
+ [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
+ [link_regex="no"])
+ done
+ if test "x$link_regex" != "xyes"; then
+ for libextension in `ls $BOOSTLIBDIR/boost_regex*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a*$;\1;'` ; do
+ ax_lib=${libextension}
+ AC_CHECK_LIB($ax_lib, exit,
+ [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
+ [link_regex="no"])
+ done
+ fi
+
+ else
+ for ax_lib in $ax_boost_user_regex_lib boost_regex-$ax_boost_user_regex_lib; do
+ AC_CHECK_LIB($ax_lib, main,
+ [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
+ [link_regex="no"])
+ done
+ fi
+ if test "x$link_regex" != "xyes"; then
+ AC_MSG_ERROR(Could not link against $ax_lib !)
+ fi
+ fi
+
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
+ fi
+])
Added: cs/cigma/trunk/config/ax_python.m4
===================================================================
--- cs/cigma/trunk/config/ax_python.m4 (rev 0)
+++ cs/cigma/trunk/config/ax_python.m4 2008-12-10 02:15:23 UTC (rev 13592)
@@ -0,0 +1,99 @@
+# ===========================================================================
+# http://autoconf-archive.cryp.to/ax_python.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_PYTHON
+#
+# DESCRIPTION
+#
+# This macro does a complete Python development environment check.
+#
+# It recurses through several python versions (from 2.1 to 2.5 in this
+# version), looking for an executable. When it finds an executable, it
+# looks to find the header files and library.
+#
+# It sets PYTHON_BIN to the name of the python executable,
+# PYTHON_INCLUDE_DIR to the directory holding the header files, and
+# PYTHON_LIB to the name of the Python library.
+#
+# This macro calls AC_SUBST on PYTHON_BIN (via AC_CHECK_PROG),
+# PYTHON_INCLUDE_DIR and PYTHON_LIB.
+#
+# LAST MODIFICATION
+#
+# 2008-04-12
+#
+# COPYLEFT
+#
+# Copyright (c) 2008 Michael Tindal
+#
+# 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.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception, the respective Autoconf Macro's copyright owner
+# gives unlimited permission to copy, distribute and modify the configure
+# scripts that are the output of Autoconf when processing the Macro. You
+# need not follow the terms of the GNU General Public License when using
+# or distributing such scripts, even though portions of the text of the
+# Macro appear in them. The GNU General Public License (GPL) does govern
+# all other use of the material that constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the Autoconf
+# Macro released by the Autoconf Macro Archive. When you make and
+# distribute a modified version of the Autoconf Macro, you may extend this
+# special exception to the GPL to apply to your modified version as well.
+
+AC_DEFUN([AX_PYTHON],
+[AC_MSG_CHECKING(for python build information)
+AC_MSG_RESULT([])
+for python in python2.5 python2.4 python2.3 python2.2 python2.1 python; do
+AC_CHECK_PROGS(PYTHON_BIN, [$python])
+ax_python_bin=$PYTHON_BIN
+if test x$ax_python_bin != x; then
+ AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no)
+ AC_CHECK_HEADER([$ax_python_bin/Python.h],
+ [[ax_python_header=`locate $ax_python_bin/Python.h | sed -e s,/Python.h,,`]],
+ ax_python_header=no)
+ if test $ax_python_lib != no; then
+ if test $ax_python_header != no; then
+ break;
+ fi
+ fi
+fi
+done
+if test x$ax_python_bin = x; then
+ ax_python_bin=no
+fi
+if test x$ax_python_header = x; then
+ ax_python_header=no
+fi
+if test x$ax_python_lib = x; then
+ ax_python_lib=no
+fi
+
+AC_MSG_RESULT([ results of the Python check:])
+AC_MSG_RESULT([ Binary: $ax_python_bin])
+AC_MSG_RESULT([ Library: $ax_python_lib])
+AC_MSG_RESULT([ Include Dir: $ax_python_header])
+
+if test x$ax_python_header != xno; then
+ PYTHON_INCLUDE_DIR=$ax_python_header
+ AC_SUBST(PYTHON_INCLUDE_DIR)
+fi
+if test x$ax_python_lib != xno; then
+ PYTHON_LIB=$ax_python_lib
+ AC_SUBST(PYTHON_LIB)
+fi
+])dnl
Added: cs/cigma/trunk/config/ax_python_config_var.m4
===================================================================
--- cs/cigma/trunk/config/ax_python_config_var.m4 (rev 0)
+++ cs/cigma/trunk/config/ax_python_config_var.m4 2008-12-10 02:15:23 UTC (rev 13592)
@@ -0,0 +1,115 @@
+# ===========================================================================
+# http://autoconf-archive.cryp.to/ax_python_config_var.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_PYTHON_CONFIG_VAR(PYTHON_VARIABLE, [SHELL_VARIABLE])
+# AX_PYTHON_CONFIG_H
+# AX_PYTHON_MAKEFILE
+#
+# DESCRIPTION
+#
+# AX_PYTHON_CONFIG_VAR:
+#
+# Using the Python module distutils.sysconfig[1], return a Python
+# configuration variable. PYTHON_VARIABLE is the name of the variable to
+# request from Python, and SHELL_VARIABLE is the name of the shell
+# variable into which the results should be deposited. If SHELL_VARIABLE
+# is not specified, the macro wil prefix PY_ to the PYTHON_VARIABLE, e.g.,
+# LIBS -> PY_LIBS.
+#
+# SHELL_VARIABLE is AC_SUBST'd. No action is taken if an error occurs.
+# Note if $PYTHON is not set, AC_CHECK_PROG(PYTHON, python, python) will
+# be run.
+#
+# Example:
+#
+# AX_PYTHON_CONFIG_VAR(LINKFORSHARED, PY_LFS)
+#
+# AX_PYTHON_CONFIG_H:
+#
+# Using the Python module distutils.sysconfig[1], put the full pathname of
+# the config.h file used to compile Python into the shell variable
+# PY_CONFIG_H. PY_CONFIG_H is AC_SUBST'd. Note if $PYTHON is not set,
+# AC_CHECK_PROG(PYTHON, python, python) will be run.
+#
+# AX_PYTHON_MAKEFILE:
+#
+# Using the Python module distutils.sysconfig[1], put the full pathname of
+# the Makefile file used to compile Python into the shell variable
+# PY_MAKEFILE. PY_MAKEFILE is AC_SUBST'd. Note if $PYTHON is not set,
+# AC_CHECK_PROG(PYTHON, python, python) will be run.
+#
+# [1]
+# http://www.python.org/doc/current/dist/module-distutils.sysconfig.html
+#
+# LAST MODIFICATION
+#
+# 2008-04-12
+#
+# COPYLEFT
+#
+# Copyright (c) 2008 Dustin J. Mitchell <dustin at cs.uchicago.edu>
+#
+# 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_PYTHON_CONFIG_VAR],
+[
+ AC_MSG_CHECKING(for Python config variable $1)
+ if test -z "$PYTHON"
+ then
+ AC_CHECK_PROG(PYTHON,python,python)
+ fi
+ py_error="no"
+ pyval=`$PYTHON -c "from distutils import sysconfig;dnl
+print sysconfig.get_config_var('$1')"` || py_error="yes"
+ if test "$py_error" = "yes"
+ then
+ AC_MSG_RESULT(no - an error occurred)
+ else
+ AC_MSG_RESULT($pyval)
+ m4_ifval([$2],[$2],[PY_$1])="$pyval"
+ AC_SUBST(m4_ifval([$2],[$2],[PY_$1]))
+ fi
+])
+
+AC_DEFUN([AX_PYTHON_CONFIG_H],
+[
+ AC_MSG_CHECKING(location of Python's config.h)
+ if test -z "$PYTHON"
+ then
+ AC_CHECK_PROG(PYTHON,python,python)
+ fi
+ py_error="no"
+ PY_CONFIG_H=`$PYTHON -c "from distutils import sysconfig;dnl
+print sysconfig.get_config_h_filename()"` || py_error = "yes"
+ if test "$py_error" = "yes"
+ then
+ AC_MSG_RESULT(no - an error occurred)
+ else
+ AC_MSG_RESULT($PY_CONFIG_H)
+ AC_SUBST(PY_CONFIG_H)
+ fi
+])
+
+AC_DEFUN([AX_PYTHON_MAKEFILE],
+[
+ AC_MSG_CHECKING(location of Python's Makefile)
+ if test -z "$PYTHON"
+ then
+ AC_CHECK_PROG(PYTHON,python,python)
+ fi
+ py_error="no"
+ PY_MAKEFILE=`$PYTHON -c "from distutils import sysconfig;dnl
+print sysconfig.get_makefile_filename()"` || py_error = "yes"
+ if test "$py_error" = "yes"
+ then
+ AC_MSG_RESULT(no - an error occurred)
+ else
+ AC_MSG_RESULT($PY_MAKEFILE)
+ AC_SUBST(PY_MAKEFILE)
+ fi
+])
Added: cs/cigma/trunk/config/cigma_boost.m4
===================================================================
--- cs/cigma/trunk/config/cigma_boost.m4 (rev 0)
+++ cs/cigma/trunk/config/cigma_boost.m4 2008-12-10 02:15:23 UTC (rev 13592)
@@ -0,0 +1,822 @@
+# boost.m4: Locate Boost headers and libraries for autoconf-based projects.
+# Copyright (C) 2007 Benoit Sigoure <tsuna at lrde.epita.fr>
+#
+# 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 3 of the License, or
+# (at your option) any later version.
+#
+# Additional permission under section 7 of the GNU General Public
+# License, version 3 ("GPLv3"):
+#
+# If you convey this file as part of a work that contains a
+# configuration script generated by Autoconf, you may do so under
+# terms of your choice.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# serial 6
+# Original sources can be found at http://repo.or.cz/w/boost.m4.git
+# You can fetch the latest version of the script by doing:
+# wget 'http://repo.or.cz/w/boost.m4.git?a=blob_plain;f=build-aux/boost.m4;hb=HEAD' -O boost.m4
+
+# ------ #
+# README #
+# ------ #
+
+# This file provides several macros to use the various Boost libraries.
+# The first macro is BOOST_REQUIRE. It will simply check if it's possible to
+# find the Boost headers of a given (optional) minimum version and it will
+# define BOOST_CPPFLAGS accordingly. It will add an option --with-boost to
+# your configure so that users can specify non standard locations.
+# For more README and documentation, go to http://repo.or.cz/w/boost.m4.git
+# Note: THESE MACROS ASSUME THAT YOU USE LIBTOOL. If you don't, don't worry,
+# simply read the README, it will show you what to do step by step.
+
+m4_pattern_forbid([^_?BOOST_])
+
+# BOOST_REQUIRE([VERSION])
+# ------------------------
+# Look for Boost. If version is given, it must either be a literal of the form
+# "X.Y.Z" where X, Y and Z are integers (the ".Z" part being optional) or a
+# variable "$var".
+# Defines the value BOOST_CPPFLAGS. This macro only checks for headers with
+# the required version, it does not check for any of the Boost libraries.
+# FIXME: Add a 2nd optional argument so that it's not fatal if Boost isn't found
+# and add an AC_DEFINE to tell whether HAVE_BOOST.
+AC_DEFUN([BOOST_REQUIRE],
+[dnl First find out what kind of argument we have.
+dnl If we have an empty argument, there is no constraint on the version of
+dnl Boost to use. If it's a literal version number, we can split it in M4 (so
+dnl the resulting configure script will be smaller/faster). Otherwise we do
+dnl the splitting at runtime.
+m4_bmatch([$1],
+ [^ *$], [m4_pushdef([BOOST_VERSION_REQ], [])dnl
+ boost_version_major=0
+ boost_version_minor=0
+ boost_version_subminor=0
+],
+ [^[0-9]+\([-._][0-9]+\)*$],
+ [m4_pushdef([BOOST_VERSION_REQ], [ version >= $1])dnl
+ boost_version_major=m4_bregexp([$1], [^\([0-9]+\)], [\1])
+ boost_version_minor=m4_bregexp([$1], [^[0-9]+[-._]\([0-9]+\)], [\1])
+ boost_version_subminor=m4_bregexp([$1], [^[0-9]+[-._][0-9]+[-._]\([0-9]+\)], [\1])
+],
+ [^\$[a-zA-Z_]+$],
+ [m4_pushdef([BOOST_VERSION_REQ], [])dnl
+ boost_version_major=`expr "X$1" : 'X\([[^-._]]*\)'`
+ boost_version_minor=`expr "X$1" : 'X[[0-9]]*[[-._]]\([[^-._]]*\)'`
+ boost_version_subminor=`expr "X$1" : 'X[[0-9]]*[[-._]][[0-9]]*[[-._]]\([[0-9]]*\)'`
+ case $boost_version_major:$boost_version_minor in #(
+ *: | :* | *[[^0-9]]*:* | *:*[[^0-9]]*)
+ AC_MSG_ERROR([[Invalid argument for REQUIRE_BOOST: `$1']])
+ ;;
+ esac
+],
+ [m4_fatal(Invalid argument: `$1')]
+)dnl
+AC_ARG_WITH([boost],
+ [AS_HELP_STRING([--with-boost=DIR],
+ [prefix of Boost]BOOST_VERSION_REQ[ @<:@guess@:>@])])dnl
+AC_SUBST([DISTCHECK_CONFIGURE_FLAGS],
+ ["$DISTCHECK_CONFIGURE_FLAGS '--with-boost=$with_boost'"])
+ AC_CACHE_CHECK([for Boost headers[]BOOST_VERSION_REQ],
+ [boost_cv_inc_path],
+ [boost_cv_inc_path=no
+AC_LANG_PUSH([C++])dnl
+ boost_subminor_chk=
+ test x"$boost_version_subminor" != x \
+ && boost_subminor_chk="|| (B_V_MAJ == $boost_version_major \
+&& B_V_MIN == $boost_version_minor \
+&& B_V_SUB < $boost_version_subminor)"
+ for boost_dir in "$with_boost/include" '' \
+ /opt/local/include /usr/local/include /opt/include /usr/include \
+ "$with_boost" C:/Boost/include
+ do
+ # Without --layout=system, Boost (or at least some versions) installs
+ # itself in <prefix>/include/boost-<version>. This inner loop helps to
+ # find headers in such directories.
+ # I didn't indent this loop on purpose (to avoid over-indented code)
+ for boost_inc in "$boost_dir" "$boost_dir"/boost-*
+ do
+ # $boost_inc can often be a symlink, so keep -e here.
+ test -e "$boost_inc" || continue
+ # Ensure that version.hpp exists: we're going to read it. Moreover,
+ # Boost could be reachable thanks to the default include path so we can
+ # mistakenly accept a wrong include path without this check.
+ test -e "$boost_inc/boost/version.hpp" || continue
+ boost_save_CPPFLAGS=$CPPFLAGS
+ test x"$boost_inc" != x && CPPFLAGS="$CPPFLAGS -I$boost_inc"
+m4_pattern_allow([^BOOST_VERSION$])dnl
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <boost/version.hpp>
+#ifndef BOOST_VERSION
+# error BOOST_VERSION is not defined
+#endif
+#define B_V_MAJ (BOOST_VERSION / 100000)
+#define B_V_MIN (BOOST_VERSION / 100 % 1000)
+#define B_V_SUB (BOOST_VERSION % 100)
+#if (B_V_MAJ < $boost_version_major) \
+ || (B_V_MAJ == $boost_version_major \
+ && B_V_MIN < $boost_version_minor) $boost_subminor_chk
+# error Boost headers version < $1
+#endif
+]])], [boost_cv_inc_path=yes], [boost_cv_version=no])
+ CPPFLAGS=$boost_save_CPPFLAGS
+ if test x"$boost_cv_inc_path" = xyes; then
+ if test x"$boost_inc" != x; then
+ boost_cv_inc_path=$boost_inc
+ fi
+ break 2
+ fi
+ done
+ done
+AC_LANG_POP([C++])dnl
+ ])
+ case $boost_cv_inc_path in #(
+ no)
+ AC_MSG_ERROR([Could not find Boost headers[]BOOST_VERSION_REQ])
+ ;;#(
+ yes)
+ BOOST_CPPFLAGS=
+ ;;#(
+ *)
+ BOOST_CPPFLAGS="-I$boost_cv_inc_path"
+ ;;
+ esac
+AC_SUBST([BOOST_CPPFLAGS])dnl
+ AC_CACHE_CHECK([for Boost's header version],
+ [boost_cv_lib_version],
+ [m4_pattern_allow([^BOOST_LIB_VERSION$])dnl
+ boost_cv_lib_version=unknown
+ boost_sed_version='/^.*BOOST_LIB_VERSION.*"\([[^"]]*\)".*$/!d;s//\1/'
+ boost_version_hpp="$boost_inc/boost/version.hpp"
+ test -e "$boost_version_hpp" \
+ && boost_cv_lib_version=`sed "$boost_sed_version" "$boost_version_hpp"`
+ ])
+m4_popdef([BOOST_VERSION_REQ])dnl
+])# BOOST_REQUIRE
+
+
+# BOOST_FIND_HEADER([HEADER-NAME], [ACTION-IF-NOT-FOUND], [ACTION-IF-FOUND])
+# --------------------------------------------------------------------------
+# Wrapper around AC_CHECK_HEADER for Boost headers. Useful to check for
+# some parts of the Boost library which are only made of headers and don't
+# require linking (such as Boost.Foreach).
+#
+# Default ACTION-IF-NOT-FOUND: Fail with a fatal error.
+#
+# Default ACTION-IF-FOUND: define the preprocessor symbol HAVE_<HEADER-NAME> in
+# case of success # (where HEADER-NAME is written LIKE_THIS, e.g.,
+# HAVE_BOOST_FOREACH_HPP).
+AC_DEFUN([BOOST_FIND_HEADER],
+[AC_REQUIRE([BOOST_REQUIRE])dnl
+AC_LANG_PUSH([C++])dnl
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+AC_CHECK_HEADER([$1],
+ [m4_default([$3], [AC_DEFINE(AS_TR_CPP([HAVE_$1]), [1],
+ [Define to 1 if you have <$1>])])],
+ [m4_default([$2], [AC_MSG_ERROR([cannot find $1])])])
+CPPFLAGS=$boost_save_CPPFLAGS
+AC_LANG_POP([C++])dnl
+])# BOOST_FIND_HEADER
+
+
+# BOOST_FIND_LIB([LIB-NAME], [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST],
+# [CXX-PROLOGUE])
+# -------------------------------------------------------------------------
+# Look for the Boost library LIB-NAME (e.g., LIB-NAME = `thread', for
+# libboost_thread). Check that HEADER-NAME works and check that
+# libboost_LIB-NAME can link with the code CXX-TEST. The optional argument
+# CXX-PROLOGUE can be used to include some C++ code before the `main'
+# function.
+#
+# Invokes BOOST_FIND_HEADER([HEADER-NAME]) (see above).
+#
+# Boost libraries typically come compiled with several flavors (with different
+# runtime options) so PREFERRED-RT-OPT is the preferred suffix. A suffix is one
+# or more of the following letters: sgdpn (in that order). s = static
+# runtime, d = debug build, g = debug/diagnostic runtime, p = STLPort build,
+# n = (unsure) STLPort build without iostreams from STLPort (it looks like `n'
+# must always be used along with `p'). Additionally, PREFERRED-RT-OPT can
+# start with `mt-' to indicate that there is a preference for multi-thread
+# builds. Some sample values for PREFERRED-RT-OPT: (nothing), mt, d, mt-d, gdp
+# ... If you want to make sure you have a specific version of Boost
+# (eg, >= 1.33) you *must* invoke BOOST_REQUIRE before this macro.
+AC_DEFUN([BOOST_FIND_LIB],
+[AC_REQUIRE([_BOOST_FIND_COMPILER_TAG])dnl
+AC_REQUIRE([BOOST_REQUIRE])dnl
+AC_REQUIRE([_BOOST_GUESS_WHETHER_TO_USE_MT])dnl
+AC_LANG_PUSH([C++])dnl
+AS_VAR_PUSHDEF([Boost_lib], [boost_cv_lib_$1])dnl
+AS_VAR_PUSHDEF([Boost_lib_LDFLAGS], [boost_cv_lib_$1_LDFLAGS])dnl
+AS_VAR_PUSHDEF([Boost_lib_LIBS], [boost_cv_lib_$1_LIBS])dnl
+BOOST_FIND_HEADER([$3])
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+# Now let's try to find the library. The algorithm is as follows: first look
+# for a given library name according to the user's PREFERRED-RT-OPT. For each
+# library name, we prefer to use the ones that carry the tag (toolset name).
+# Each library is searched through the various standard paths were Boost is
+# usually installed. If we can't find the standard variants, we try to
+# enforce -mt (for instance on MacOSX, libboost_threads.dylib doesn't exist
+# but there's -obviously- libboost_threads-mt.dylib).
+AC_CACHE_CHECK([for the Boost $1 library], [Boost_lib],
+ [Boost_lib=no
+ case "$2" in #(
+ mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
+ mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X$2" : 'Xmt-*\(.*\)'`;; #(
+ *) boost_mt=; boost_rtopt=$2;;
+ esac
+ # If the PREFERRED-RT-OPT are not empty, prepend a `-'.
+ case $boost_rtopt in #(
+ *[[a-z0-9A-Z]]*) boost_rtopt="-$boost_rtopt";;
+ esac
+ $boost_guess_use_mt && boost_mt=-mt
+ # Look for the abs path the static archive.
+ # $libext is computed by Libtool but let's make sure it's non empty.
+ test -z "$libext" &&
+ AC_MSG_ERROR([the libext variable is empty, did you invoke Libtool?])
+ boost_save_ac_objext=$ac_objext
+ # Generate the test file.
+ AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <$3>
+$5], [$4])])
+dnl Optimization hacks: compiling C++ is slow, especially with Boost. What
+dnl we're trying to do here is guess the right combination of link flags
+dnl (LIBS / LDFLAGS) to use a given library. This can take several
+dnl iterations before it succeeds and is thus *very* slow. So what we do
+dnl instead is that we compile the code first (and thus get an object file,
+dnl typically conftest.o). Then we try various combinations of link flags
+dnl until we succeed to link conftest.o in an executable. The problem is
+dnl that the various TRY_LINK / COMPILE_IFELSE macros of Autoconf always
+dnl remove all the temporary files including conftest.o. So the trick here
+dnl is to temporarily change the value of ac_objext so that conftest.o is
+dnl preserved accross tests. This is obviously fragile and I will burn in
+dnl hell for not respecting Autoconf's documented interfaces, but in the
+dnl mean time, it optimizes the macro by a factor of 5 to 30.
+dnl Another small optimization: the first argument of AC_COMPILE_IFELSE left
+dnl empty because the test file is generated only once above (before we
+dnl start the for loops).
+ AC_COMPILE_IFELSE([],
+ [ac_objext=do_not_rm_me_plz],
+ [AC_MSG_ERROR([Cannot compile a test that uses Boost $1])])
+ ac_objext=$boost_save_ac_objext
+ boost_failed_libs=
+# Don't bother to ident the 6 nested for loops, only the 2 innermost ones
+# matter.
+for boost_tag_ in -$boost_cv_lib_tag ''; do
+for boost_ver_ in -$boost_cv_lib_version ''; do
+for boost_mt_ in $boost_mt -mt ''; do
+for boost_rtopt_ in $boost_rtopt '' -d; do
+ for boost_lib in \
+ boost_$1$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
+ boost_$1$boost_tag_$boost_mt_$boost_ver_ \
+ boost_$1$boost_tag_$boost_rtopt_$boost_ver_ \
+ boost_$1$boost_tag_$boost_mt_ \
+ boost_$1$boost_tag_$boost_ver_
+ do
+ # Avoid testing twice the same lib
+ case $boost_failed_libs in #(
+ *@$boost_lib@*) continue;;
+ esac
+ # If with_boost is empty, we'll search in /lib first, which is not quite
+ # right so instead we'll try to a location based on where the headers are.
+ boost_tmp_lib=$with_boost
+ test x"$with_boost" = x && boost_tmp_lib=${boost_cv_inc_path%/include}
+ for boost_ldpath in "$boost_tmp_lib/lib" '' \
+ /opt/local/lib /usr/local/lib /opt/lib /usr/lib \
+ "$with_boost" C:/Boost/lib /lib /usr/lib64 /lib64
+ do
+ test -e "$boost_ldpath" || continue
+ boost_save_LDFLAGS=$LDFLAGS
+ # Are we looking for a static library?
+ case $boost_ldpath:$boost_rtopt_ in #(
+ *?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
+ Boost_lib_LIBS="$boost_ldpath/lib$boost_lib.$libext"
+ test -e "$Boost_lib_LIBS" || continue;; #(
+ *) # No: use -lboost_foo to find the shared library.
+ Boost_lib_LIBS="-l$boost_lib";;
+ esac
+ boost_save_LIBS=$LIBS
+ LIBS="$Boost_lib_LIBS $LIBS"
+ test x"$boost_ldpath" != x && LDFLAGS="$LDFLAGS -L$boost_ldpath"
+dnl First argument of AC_LINK_IFELSE left empty because the test file is
+dnl generated only once above (before we start the for loops).
+ _BOOST_AC_LINK_IFELSE([],
+ [Boost_lib=yes], [Boost_lib=no])
+ ac_objext=$boost_save_ac_objext
+ LDFLAGS=$boost_save_LDFLAGS
+ LIBS=$boost_save_LIBS
+ if test x"$Boost_lib" = xyes; then
+ Boost_lib_LDFLAGS="-L$boost_ldpath -R$boost_ldpath"
+ break 6
+ else
+ boost_failed_libs="$boost_failed_libs@$boost_lib@"
+ fi
+ done
+ done
+done
+done
+done
+done
+rm -f conftest.$ac_objext
+])
+case $Boost_lib in #(
+ no) AC_MSG_ERROR([Could not find the flags to link with Boost $1])
+ ;;
+esac
+AC_SUBST(AS_TR_CPP([BOOST_$1_LDFLAGS]), [$Boost_lib_LDFLAGS])
+AC_SUBST(AS_TR_CPP([BOOST_$1_LIBS]), [$Boost_lib_LIBS])
+CPPFLAGS=$boost_save_CPPFLAGS
+AS_VAR_POPDEF([Boost_lib])dnl
+AS_VAR_POPDEF([Boost_lib_LDFLAGS])dnl
+AS_VAR_POPDEF([Boost_lib_LIBS])dnl
+AC_LANG_POP([C++])dnl
+])# BOOST_FIND_LIB
+
+
+# --------------------------------------- #
+# Checks for the various Boost libraries. #
+# --------------------------------------- #
+
+# List of boost libraries: http://www.boost.org/libs/libraries.htm
+# The page http://beta.boost.org/doc/libs is useful: it gives the first release
+# version of each library (among other things).
+
+
+# BOOST_BIND()
+# ------------
+# Look for Boost.Bind
+AC_DEFUN([BOOST_BIND],
+[BOOST_FIND_HEADER([boost/bind.hpp])])
+
+
+# BOOST_CONVERSION()
+# ------------------
+# Look for Boost.Conversion (cast / lexical_cast)
+AC_DEFUN([BOOST_CONVERSION],
+[BOOST_FIND_HEADER([boost/cast.hpp])
+BOOST_FIND_HEADER([boost/lexical_cast.hpp])
+])# BOOST_CONVERSION
+
+
+# BOOST_DATE_TIME([PREFERRED-RT-OPT])
+# -----------------------------------
+# Look for Boost.Date_Time. For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.
+AC_DEFUN([BOOST_DATE_TIME],
+[BOOST_FIND_LIB([date_time], [$1],
+ [boost/date_time/posix_time/posix_time.hpp],
+ [boost::posix_time::ptime t;])
+])# BOOST_DATE_TIME
+
+
+# BOOST_FILESYSTEM([PREFERRED-RT-OPT])
+# ------------------------------------
+# Look for Boost.Filesystem. For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.
+# Do not check for boost/filesystem.hpp because this file was introduced in 1.34.
+AC_DEFUN([BOOST_FILESYSTEM],
+[BOOST_FIND_LIB([filesystem], [$1],
+ [boost/filesystem/path.hpp], [boost::filesystem::path p;])
+])# BOOST_FILESYSTEM
+
+
+# BOOST_FOREACH()
+# ---------------
+# Look for Boost.Foreach
+AC_DEFUN([BOOST_FOREACH],
+[BOOST_FIND_HEADER([boost/foreach.hpp])])
+
+
+# BOOST_FORMAT()
+# --------------
+# Look for Boost.Format
+# Note: we can't check for boost/format/format_fwd.hpp because the header isn't
+# standalone. It can't be compiled because it triggers the following error:
+# boost/format/detail/config_macros.hpp:88: error: 'locale' in namespace 'std'
+# does not name a type
+AC_DEFUN([BOOST_FORMAT],
+[BOOST_FIND_HEADER([boost/format.hpp])])
+
+
+# BOOST_FUNCTION()
+# ----------------
+# Look for Boost.Function
+AC_DEFUN([BOOST_FUNCTION],
+[BOOST_FIND_HEADER([boost/function.hpp])])
+
+
+# BOOST_GRAPH([PREFERRED-RT-OPT])
+# -------------------------------
+# Look for Boost.Graphs. For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.
+AC_DEFUN([BOOST_GRAPH],
+[BOOST_FIND_LIB([graph], [$1],
+ [boost/graph/adjacency_list.hpp], [boost::adjacency_list<> g;])
+])# BOOST_GRAPH
+
+
+# BOOST_IOSTREAMS([PREFERRED-RT-OPT])
+# -------------------------------
+# Look for Boost.IOStreams. For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.
+AC_DEFUN([BOOST_IOSTREAMS],
+[BOOST_FIND_LIB([iostreams], [$1],
+ [boost/iostreams/device/file_descriptor.hpp],
+ [boost::iostreams::file_descriptor fd(0); fd.close();])
+])# BOOST_IOSTREAMS
+
+
+# BOOST_HASH()
+# ------------
+# Look for Boost.Functional/Hash
+AC_DEFUN([BOOST_HASH],
+[BOOST_FIND_HEADER([boost/functional/hash.hpp])])
+
+
+# BOOST_LAMBDA()
+# --------------
+# Look for Boost.Lambda
+AC_DEFUN([BOOST_LAMBDA],
+[BOOST_FIND_HEADER([boost/lambda/lambda.hpp])])
+
+
+# BOOST_PREPROCESSOR()
+# --------------------
+# Look for Boost.Preprocessor
+AC_DEFUN([BOOST_PREPROCESSOR],
+[BOOST_FIND_HEADER([boost/preprocessor/repeat.hpp])])
+
+
+# BOOST_PROGRAM_OPTIONS([PREFERRED-RT-OPT])
+# -----------------------------------------
+# Look for Boost.Program_options. For the documentation of PREFERRED-RT-OPT, see
+# the documentation of BOOST_FIND_LIB above.
+AC_DEFUN([BOOST_PROGRAM_OPTIONS],
+[BOOST_FIND_LIB([program_options], [$1],
+ [boost/program_options.hpp],
+ [boost::program_options::options_description d("test");])
+])# BOOST_PROGRAM_OPTIONS
+
+
+# BOOST_REF()
+# -----------
+# Look for Boost.Ref
+AC_DEFUN([BOOST_REF],
+[BOOST_FIND_HEADER([boost/ref.hpp])])
+
+
+# BOOST_REGEX([PREFERRED-RT-OPT])
+# -------------------------------
+# Look for Boost.Regex. For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.
+AC_DEFUN([BOOST_REGEX],
+[BOOST_FIND_LIB([regex], [$1],
+ [boost/regex.hpp],
+ [boost::regex exp("*"); boost::regex_match("foo", exp);])
+])# BOOST_REGEX
+
+
+# BOOST_SERIALIZATION([PREFERRED-RT-OPT])
+# ---------------------------------------
+# Look for Boost.Serialization. For the documentation of PREFERRED-RT-OPT, see
+# the documentation of BOOST_FIND_LIB above.
+AC_DEFUN([BOOST_SERIALIZATION],
+[BOOST_FIND_LIB([serialization], [$1],
+ [boost/archive/text_oarchive.hpp],
+ [std::ostream* o = 0; // Cheap way to get an ostream...
+ boost::archive::text_oarchive t(*o);])
+])# BOOST_SIGNALS
+
+
+# BOOST_SIGNALS([PREFERRED-RT-OPT])
+# ---------------------------------
+# Look for Boost.Signals. For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.
+AC_DEFUN([BOOST_SIGNALS],
+[BOOST_FIND_LIB([signals], [$1],
+ [boost/signal.hpp],
+ [boost::signal<void ()> s;])
+])# BOOST_SIGNALS
+
+
+# BOOST_SMART_PTR()
+# -----------------
+# Look for Boost.SmartPtr
+AC_DEFUN([BOOST_SMART_PTR],
+[BOOST_FIND_HEADER([boost/scoped_ptr.hpp])
+BOOST_FIND_HEADER([boost/shared_ptr.hpp])
+])
+
+
+# BOOST_STRING_ALGO()
+# -------------------
+# Look for Boost.StringAlgo
+AC_DEFUN([BOOST_STRING_ALGO],
+[BOOST_FIND_HEADER([boost/algorithm/string.hpp])
+])
+
+
+# BOOST_TEST([PREFERRED-RT-OPT])
+# ------------------------------
+# Look for Boost.Test. For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.
+AC_DEFUN([BOOST_TEST],
+[m4_pattern_allow([^BOOST_CHECK$])dnl
+BOOST_FIND_LIB([unit_test_framework], [$1],
+ [boost/test/unit_test.hpp], [BOOST_CHECK(2 == 2);],
+ [using boost::unit_test::test_suite;
+ test_suite* init_unit_test_suite(int argc, char ** argv)
+ { return NULL; }])
+])# BOOST_TEST
+
+
+# BOOST_THREADS([PREFERRED-RT-OPT])
+# ---------------------------------
+# Look for Boost.Thread. For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.
+# FIXME: Provide an alias "BOOST_THREAD".
+AC_DEFUN([BOOST_THREADS],
+[dnl Having the pthread flag is required at least on GCC3 where
+dnl boost/thread.hpp would complain if we try to compile without
+dnl -pthread on GNU/Linux.
+AC_REQUIRE([_BOOST_PTHREAD_FLAG])dnl
+boost_threads_save_LIBS=$LIBS
+boost_threads_save_CPPFLAGS=$CPPFLAGS
+LIBS="$LIBS $boost_cv_pthread_flag"
+# Yes, we *need* to put the -pthread thing in CPPFLAGS because with GCC3,
+# boost/thread.hpp will trigger a #error if -pthread isn't used:
+# boost/config/requires_threads.hpp:47:5: #error "Compiler threading support
+# is not turned on. Please set the correct command line options for
+# threading: -pthread (Linux), -pthreads (Solaris) or -mthreads (Mingw32)"
+CPPFLAGS="$CPPFLAGS $boost_cv_pthread_flag"
+BOOST_FIND_LIB([thread], [$1],
+ [boost/thread.hpp], [boost::thread t; boost::mutex m;])
+BOOST_THREAD_LIBS="$BOOST_THREAD_LIBS $boost_cv_pthread_flag"
+BOOST_CPPFLAGS="$BOOST_CPPFLAGS $boost_cv_pthread_flag"
+LIBS=$boost_threads_save_LIBS
+CPPFLAGS=$boost_threads_save_CPPFLAGS
+])# BOOST_THREADS
+
+
+# BOOST_TOKENIZER()
+# -----------------
+# Look for Boost.Tokenizer
+AC_DEFUN([BOOST_TOKENIZER],
+[BOOST_FIND_HEADER([boost/tokenizer.hpp])])
+
+
+# BOOST_TRIBOOL()
+# ---------------
+# Look for Boost.Tribool
+AC_DEFUN([BOOST_TRIBOOL],
+[BOOST_FIND_HEADER([boost/logic/tribool_fwd.hpp])
+BOOST_FIND_HEADER([boost/logic/tribool.hpp])
+])
+
+
+# BOOST_TUPLE()
+# -------------
+# Look for Boost.Tuple
+AC_DEFUN([BOOST_TUPLE],
+[BOOST_FIND_HEADER([boost/tuple/tuple.hpp])])
+
+
+# BOOST_UTILITY()
+# ---------------
+# Look for Boost.Utility (noncopyable, result_of, base-from-member idiom,
+# etc.)
+AC_DEFUN([BOOST_UTILITY],
+[BOOST_FIND_HEADER([boost/utility.hpp])])
+
+
+# BOOST_VARIANT()
+# ---------------
+# Look for Boost.Variant.
+AC_DEFUN([BOOST_VARIANT],
+[BOOST_FIND_HEADER([boost/variant/variant_fwd.hpp])
+BOOST_FIND_HEADER([boost/variant.hpp])])
+
+
+# BOOST_WAVE([PREFERRED-RT-OPT])
+# ------------------------------
+# Look for Boost.Wave. For the documentation of PREFERRED-RT-OPT, see the
+# documentation of BOOST_FIND_LIB above.
+AC_DEFUN([BOOST_WAVE],
+[BOOST_FIND_LIB([wave], [$1],
+ [boost/wave.hpp],
+ [boost::wave::token_id id; get_token_name(id);])])
+
+
+# ----------------- #
+# Internal helpers. #
+# ----------------- #
+
+
+# _BOOST_PTHREAD_FLAG()
+# ---------------------
+# Internal helper for BOOST_THREADS. Based on ACX_PTHREAD:
+# http://autoconf-archive.cryp.to/acx_pthread.html
+AC_DEFUN([_BOOST_PTHREAD_FLAG],
+[AC_REQUIRE([AC_PROG_CXX])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_LANG_PUSH([C++])dnl
+AC_CACHE_CHECK([for the flags needed to use pthreads], [boost_cv_pthread_flag],
+[ boost_cv_pthread_flag=
+ # The ordering *is* (sometimes) important. Some notes on the
+ # individual items follow:
+ # (none): in case threads are in libc; should be tried before -Kthread and
+ # other compiler flags to prevent continual compiler warnings
+ # -lpthreads: AIX (must check this before -lpthread)
+ # -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+ # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+ # -llthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+ # -pthread: GNU Linux/GCC (kernel threads), BSD/GCC (userland threads)
+ # -pthreads: Solaris/GCC
+ # -mthreads: MinGW32/GCC, Lynx/GCC
+ # -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+ # doesn't hurt to check since this sometimes defines pthreads too;
+ # also defines -D_REENTRANT)
+ # ... -mt is also the pthreads flag for HP/aCC
+ # -lpthread: GNU Linux, etc.
+ # --thread-safe: KAI C++
+ case $host_os in #(
+ *solaris*)
+ # On Solaris (at least, for some versions), libc contains stubbed
+ # (non-functional) versions of the pthreads routines, so link-based
+ # tests will erroneously succeed. (We need to link with -pthreads/-mt/
+ # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather
+ # a function called by this macro, so we could check for that, but
+ # who knows whether they'll stub that too in a future libc.) So,
+ # we'll just look for -pthreads and -lpthread first:
+ boost_pthread_flags="-pthreads -lpthread -mt -pthread";; #(
+ *)
+ boost_pthread_flags="-lpthreads -Kthread -kthread -llthread -pthread \
+ -pthreads -mthreads -lpthread --thread-safe -mt";;
+ esac
+ # Generate the test file.
+ AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <pthread.h>],
+ [pthread_t th; pthread_join(th, 0);
+ pthread_attr_init(0); pthread_cleanup_push(0, 0);
+ pthread_create(0,0,0,0); pthread_cleanup_pop(0);])])
+ for boost_pthread_flag in '' $boost_pthread_flags; do
+ boost_pthread_ok=false
+dnl Re-use the test file already generated.
+ boost_pthreads__save_LIBS=$LIBS
+ LIBS="$LIBS $boost_pthread_flag"
+ AC_LINK_IFELSE([],
+ [if grep ".*$boost_pthread_flag" conftest.err; then
+ echo "This flag seems to have triggered warnings" >&AS_MESSAGE_LOG_FD
+ else
+ boost_pthread_ok=:; boost_cv_pthread_flag=$boost_pthread_flag
+ fi])
+ LIBS=$boost_pthreads__save_LIBS
+ $boost_pthread_ok && break
+ done
+])
+AC_LANG_POP([C++])dnl
+])# _BOOST_PTHREAD_FLAG
+
+
+# _BOOST_gcc_test(MAJOR, MINOR)
+# -----------------------------
+# Internal helper for _BOOST_FIND_COMPILER_TAG.
+m4_define([_BOOST_gcc_test],
+["defined __GNUC__ && __GNUC__ == $1 && __GNUC_MINOR__ == $2 && !defined __ICC @ gcc$1$2"])dnl
+
+
+# _BOOST_FIND_COMPILER_TAG()
+# --------------------------
+# Internal. When Boost is installed without --layout=system, each library
+# filename will hold a suffix that encodes the compiler used during the
+# build. The Boost build system seems to call this a `tag'.
+AC_DEFUN([_BOOST_FIND_COMPILER_TAG],
+[AC_REQUIRE([AC_PROG_CXX])dnl
+AC_CACHE_CHECK([for the toolset name used by Boost for $CXX], [boost_cv_lib_tag],
+[AC_LANG_PUSH([C++])dnl
+ boost_cv_lib_tag=unknown
+ # The following tests are mostly inspired by boost/config/auto_link.hpp
+ # The list is sorted to most recent/common to oldest compiler (in order
+ # to increase the likelihood of finding the right compiler with the
+ # least number of compilation attempt).
+ # Beware that some tests are sensible to the order (for instance, we must
+ # look for MinGW before looking for GCC3).
+ # I used one compilation test per compiler with a #error to recognize
+ # each compiler so that it works even when cross-compiling (let me know
+ # if you know a better approach).
+ # Known missing tags (known from Boost's tools/build/v2/tools/common.jam):
+ # como, edg, kcc, bck, mp, sw, tru, xlc
+ # I'm not sure about my test for `il' (be careful: Intel's ICC pre-defines
+ # the same defines as GCC's).
+ # TODO: Move the test on GCC 4.3 up once it's released.
+ for i in \
+ _BOOST_gcc_test(4, 2) \
+ _BOOST_gcc_test(4, 1) \
+ _BOOST_gcc_test(4, 0) \
+ "defined __GNUC__ && __GNUC__ == 3 && !defined __ICC \
+ && (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
+ || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw" \
+ _BOOST_gcc_test(3, 4) \
+ _BOOST_gcc_test(3, 3) \
+ "defined _MSC_VER && _MSC_VER >= 1400 @ vc80" \
+ _BOOST_gcc_test(3, 2) \
+ "defined _MSC_VER && _MSC_VER == 1310 @ vc71" \
+ _BOOST_gcc_test(3, 1) \
+ _BOOST_gcc_test(3, 0) \
+ "defined __BORLANDC__ @ bcb" \
+ "defined __ICC && (defined __unix || defined __unix__) @ il" \
+ "defined __ICL @ iw" \
+ "defined _MSC_VER && _MSC_VER == 1300 @ vc7" \
+ _BOOST_gcc_test(4, 3) \
+ _BOOST_gcc_test(2, 95) \
+ "defined __MWERKS__ && __MWERKS__ <= 0x32FF @ cw9" \
+ "defined _MSC_VER && _MSC_VER < 1300 && !defined UNDER_CE @ vc6" \
+ "defined _MSC_VER && _MSC_VER < 1300 && defined UNDER_CE @ evc4" \
+ "defined __MWERKS__ && __MWERKS__ <= 0x31FF @ cw8"
+ do
+ boost_tag_test=`expr "X$i" : 'X\([[^@]]*\) @ '`
+ boost_tag=`expr "X$i" : 'X[[^@]]* @ \(.*\)'`
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#if $boost_tag_test
+/* OK */
+#else
+# error $boost_tag_test
+#endif
+]])], [boost_cv_lib_tag=$boost_tag; break], [])
+ done
+AC_LANG_POP([C++])dnl
+])
+ case $boost_cv_lib_tag in #(
+ # Some newer (>= 1.35?) versions of Boost seem to only use "gcc" as opposed
+ # to "gcc41" for instance.
+ gcc*)
+ # We can specify multiple tags in this variable because it's used by
+ # BOOST_FIND_LIB that does a `for tag in -$boost_cv_lib_tag' ...
+ boost_cv_lib_tag="$boost_cv_lib_tag -gcc"
+ ;; #(
+ unknown)
+ AC_MSG_WARN([[could not figure out which toolset name to use for $CXX]])
+ boost_cv_lib_tag=
+ ;;
+ esac
+])# _BOOST_FIND_COMPILER_TAG
+
+
+# _BOOST_GUESS_WHETHER_TO_USE_MT()
+# --------------------------------
+# Compile a small test to try to guess whether we should favor MT (Multi
+# Thread) flavors of Boost. Sets boost_guess_use_mt accordingly.
+AC_DEFUN([_BOOST_GUESS_WHETHER_TO_USE_MT],
+[# Check whether we do better use `mt' even though we weren't ask to.
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#if defined _REENTRANT || defined _MT || defined __MT__
+/* use -mt */
+#else
+# error MT not needed
+#endif
+]])], [boost_guess_use_mt=:], [boost_guess_use_mt=false])
+])
+
+# _BOOST_AC_LINK_IFELSE(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+# -------------------------------------------------------------------
+# Fork of _AC_LINK_IFELSE that preserves conftest.o across calls. Fragile,
+# will break when Autoconf changes its internals. Requires that you manually
+# rm -f conftest.$ac_objext in between to really different tests, otherwise
+# you will try to link a conftest.o left behind by a previous test.
+# Used to aggressively optimize BOOST_FIND_LIB (see the big comment in this
+# macro)
+m4_define([_BOOST_AC_LINK_IFELSE],
+[m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])dnl
+rm -f conftest$ac_exeext
+boost_ac_ext_save=$ac_ext
+boost_use_source=:
+# If we already have a .o, re-use it. We change $ac_ext so that $ac_link
+# tries to link the existing object file instead of compiling from source.
+test -f conftest.$ac_objext && ac_ext=$ac_objext && boost_use_source=false &&
+ _AS_ECHO_LOG([re-using the existing conftest.$ac_objext])
+AS_IF([_AC_DO_STDERR($ac_link) && {
+ test -z "$ac_[]_AC_LANG_ABBREV[]_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_executable_p conftest$ac_exeext
+dnl FIXME: use AS_TEST_X instead when 2.61 is widespread enough.
+ }],
+ [$2],
+ [if $boost_use_source; then
+ _AC_MSG_LOG_CONFTEST
+ fi
+ $3])
+dnl Delete also the IPA/IPO (Inter Procedural Analysis/Optimization)
+dnl information created by the PGI compiler (conftest_ipa8_conftest.oo),
+dnl as it would interfere with the next link command.
+rm -f core conftest.err conftest_ipa8_conftest.oo \
+ conftest$ac_exeext m4_ifval([$1], [conftest.$ac_ext])[]dnl
+])# _BOOST_AC_LINK_IFELSE
Added: cs/cigma/trunk/config/cigma_cppunit.m4
===================================================================
--- cs/cigma/trunk/config/cigma_cppunit.m4 (rev 0)
+++ cs/cigma/trunk/config/cigma_cppunit.m4 2008-12-10 02:15:23 UTC (rev 13592)
@@ -0,0 +1,92 @@
+dnl
+dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl
+AC_DEFUN([AM_PATH_CPPUNIT],
+[
+
+AC_ARG_WITH(cppunit-prefix,[ --with-cppunit-prefix=PFX Prefix where CppUnit is installed (optional)],
+ cppunit_config_prefix="$withval", cppunit_config_prefix="")
+AC_ARG_WITH(cppunit-exec-prefix,[ --with-cppunit-exec-prefix=PFX Exec prefix where CppUnit is installed (optional)],
+ cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="")
+
+ if test x$cppunit_config_exec_prefix != x ; then
+ cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
+ if test x${CPPUNIT_CONFIG+set} != xset ; then
+ CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
+ fi
+ fi
+ if test x$cppunit_config_prefix != x ; then
+ cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
+ if test x${CPPUNIT_CONFIG+set} != xset ; then
+ CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
+ fi
+ fi
+
+ AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
+ cppunit_version_min=$1
+
+ AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min)
+ no_cppunit=""
+ if test "$CPPUNIT_CONFIG" = "no" ; then
+ AC_MSG_RESULT(no)
+ no_cppunit=yes
+ else
+ CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
+ CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
+ cppunit_version=`$CPPUNIT_CONFIG --version`
+
+ cppunit_major_version=`echo $cppunit_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ cppunit_minor_version=`echo $cppunit_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ cppunit_micro_version=`echo $cppunit_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+ cppunit_major_min=`echo $cppunit_version_min | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ if test "x${cppunit_major_min}" = "x" ; then
+ cppunit_major_min=0
+ fi
+
+ cppunit_minor_min=`echo $cppunit_version_min | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ if test "x${cppunit_minor_min}" = "x" ; then
+ cppunit_minor_min=0
+ fi
+
+ cppunit_micro_min=`echo $cppunit_version_min | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ if test "x${cppunit_micro_min}" = "x" ; then
+ cppunit_micro_min=0
+ fi
+
+ cppunit_version_proper=`expr \
+ $cppunit_major_version \> $cppunit_major_min \| \
+ $cppunit_major_version \= $cppunit_major_min \& \
+ $cppunit_minor_version \> $cppunit_minor_min \| \
+ $cppunit_major_version \= $cppunit_major_min \& \
+ $cppunit_minor_version \= $cppunit_minor_min \& \
+ $cppunit_micro_version \>= $cppunit_micro_min `
+
+ if test "$cppunit_version_proper" = "1" ; then
+ AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
+ else
+ AC_MSG_RESULT(no)
+ no_cppunit=yes
+ fi
+ fi
+
+ if test "x$no_cppunit" = x ; then
+ ifelse([$2], , :, [$2])
+ else
+ CPPUNIT_CFLAGS=""
+ CPPUNIT_LIBS=""
+ ifelse([$3], , :, [$3])
+ fi
+
+ AC_SUBST(CPPUNIT_CFLAGS)
+ AC_SUBST(CPPUNIT_LIBS)
+])
+
+
+
Added: cs/cigma/trunk/config/cigma_hdf5.m4
===================================================================
--- cs/cigma/trunk/config/cigma_hdf5.m4 (rev 0)
+++ cs/cigma/trunk/config/cigma_hdf5.m4 2008-12-10 02:15:23 UTC (rev 13592)
@@ -0,0 +1,111 @@
+##############################################################################
+# -*- Autoconf -*-
+#
+#
+
+##############################################################################
+#
+# CIGMA_OPTIONS_HDF5
+#
+AC_DEFUN([CIGMA_OPTIONS_HDF5], [
+ AC_ARG_VAR(HDF5_HOME, [home path to HDF5 library])
+ AC_ARG_WITH([hdf5],
+ [AC_HELP_STRING([--with-hdf5],
+ [The prefix where HDF5 is installed @<:@default=/usr@:>@])],
+ [with_hdf5="$withval"],
+ [with_hdf5="/usr"])
+])
+
+##############################################################################
+#
+# CIGMA_PATH_HDF5([action-if-found], [action-if-not-found])
+#
+AC_DEFUN([CIGMA_PATH_HDF5],[
+
+ # AC_REQUIRE([CIGMA_PATH_ZLIB])
+
+
+ if [[ $with_hdf5 = "yes" ]]; then
+ dnl In case user wrote --with-hdf5=yes
+ with_hdf5="/usr"
+ fi
+
+
+ if [[ $with_hdf5 != "no" ]]; then
+
+ HDF5_PREFIX="$with_hdf5"
+
+ AC_CHECK_FILE([$HDF5_PREFIX/include/hdf5.h], [hdf5Found="OK"])
+ AC_MSG_CHECKING([if HDF5 is installed in $HDF5_PREFIX])
+
+ if [[ -z "$hdf5Found" ]]; then
+
+ dnl HDF5 not found!
+ AC_MSG_RESULT([no])
+ $2
+
+ else
+
+ dnl HDF5 found!
+
+ AC_MSG_RESULT([yes])
+
+ AC_CHECK_LIB(hdf5,main,[hdf5lib="OK"])
+
+ #HDF5_CFLAGS="-I$HDF5_PREFIX/include"
+ #HDF5_CXXFLAGS="$HDF5_CFLAGS"
+
+ HDF5_INCLUDES="-I$HDF5_PREFIX/include"
+ HDF5_LIBS="-lhdf5 -lz"
+ HDF5_LDFLAGS="-L$HDF5_PREFIX/lib $HDF5_LIBS"
+ $1
+
+ fi
+
+ else
+
+ dnl user specified --with-hdf5=no
+ dnl nothing to do?
+ /bin/false
+
+ fi
+
+])
+
+
+##############################################################################
+#
+# CIGMA_PARALLEL_HDF5(if-parallel, if-not)
+#
+AC_DEFUN([CIGMA_PARALLEL_HDF5],[
+ cigma_save_CPPFLAGS=$CPPFLAGS
+ cigma_save_LDFLAGS=$LDFLAGS
+ cigma_save_LIBS=$LIBS
+ CPPFLAGS="$HDF5_INCLUDES $cigma_save_CPPFLAGS"
+ LDFLAGS="$HDF5_LDFLAGS $cigma_save_LDFLAGS"
+ LIBS="$HDF5_LIBS $cigma_save_LIBS"
+ AC_MSG_CHECKING([for parallel HDF5])
+ AC_COMPILE_IFELSE([
+ AC_LANG_PROGRAM([[
+ #include <hdf5.h>
+ ]], [[
+ #ifdef H5_HAVE_PARALLEL
+ return 0;
+ #else
+ #error serial
+ return 1;
+ #endif
+ ]])
+ ],
+ [AC_MSG_RESULT([yes])
+ CPPFLAGS="$cit_MPI_CPPFLAGS $cigma_save_CPPFLAGS"
+ $1],
+ [AC_MSG_RESULT([no])
+ CPPFLAGS="$cigma_save_CPPFLAGS"
+ $2
+ ])
+ LDFLAGS=$cigma_save_LDFLAGS
+ LIBS=$cigma_save_LIBS
+])
+
+# vim: syntax=config
Added: cs/cigma/trunk/config/cigma_python.m4
===================================================================
--- cs/cigma/trunk/config/cigma_python.m4 (rev 0)
+++ cs/cigma/trunk/config/cigma_python.m4 2008-12-10 02:15:23 UTC (rev 13592)
@@ -0,0 +1,37 @@
+##############################################################################
+# -*- Autoconf -*-
+#
+#
+
+##############################################################################
+#
+# CIGMA_PATH_NUMPY
+#
+# Determine the directory containing <numpy/arrayobject.h>
+#
+AC_DEFUN([CIGMA_PATH_NUMPY],[
+
+ AC_REQUIRE([AM_PATH_PYTHON])
+
+ #AC_MSG_CHECKING([for $am_display_PYTHON numpy include directory])
+
+ NUMPY_INCDIR=`$PYTHON -c "import numpy; print numpy.get_include()" 2>/dev/null`
+ if [[ -n "$NUMPY_INCDIR" ]]; then
+ AC_CHECK_FILE([$NUMPY_INCDIR/numpy/arrayobject.h])
+ #AC_CHECK_FILE([$NUMPY_INCDIR/numpy/arrayobject.h], [numpyFound="OK"])
+ #if [[ -n "$numpyFound" ]]; then
+ # AC_MSG_RESULT([yes])
+ #else
+ # AC_MSG_RESULT([no])
+ #fi
+ #else
+ # AC_MSG_RESULT([no])
+ fi
+
+ NUMPY_INCLUDES="-I${NUMPY_INCDIR}"
+ AC_SUBST([NUMPY_INCLUDES], [$NUMPY_INCLUDES])
+
+])
+
+
+# vim: syntax=config
Added: cs/cigma/trunk/config/cigma_vtk.m4
===================================================================
--- cs/cigma/trunk/config/cigma_vtk.m4 (rev 0)
+++ cs/cigma/trunk/config/cigma_vtk.m4 2008-12-10 02:15:23 UTC (rev 13592)
@@ -0,0 +1,177 @@
+##############################################################################
+# -*- Autoconf -*-
+#
+# Implements the AM_OPTIONS_VTK and AM_PATH_VTK macros.
+# The AM_OPTIONS_VTK macro adds the --with-vtk=path option,
+# and the AM_PATH_VTK macro is used to detect VTK presence,
+# location and version.
+#
+# Modified from http://www.vtk.org/Wiki/VTK_Autoconf
+# Originally by Francesco Montorsi
+#
+
+
+##############################################################################
+#
+# CIGMA_OPTIONS_VTK
+#
+# Adds the --with-vtk=PATH option to the configure options
+#
+AC_DEFUN([CIGMA_OPTIONS_VTK],[
+ AC_ARG_WITH([vtk],
+ [AC_HELP_STRING(
+ [--with-vtk],
+ [The prefix where VTK is installed (default is /usr)])],
+ [with_vtk=$withval],
+ [with_vtk="/usr"])
+ AC_ARG_WITH([vtk-version],
+ [AC_HELP_STRING(
+ [--with-vtk-version],
+ [VTK's include directory name is vtk-suffix, e.g., vtk-5.0/.
+ What's the suffix? (Default -5.0)])],
+ [vtk_suffix=$withval],
+ [vtk_suffix="-5.0"])
+])
+
+##############################################################################
+#
+# AM_PATH_VTK([minimum-version], [action-if-found], [action-if-not-found])
+#
+# NOTE: [minimum-version] must be in the form [X.Y.Z]
+#
+AC_DEFUN([AM_PATH_VTK],[
+
+ dnl do we want to check for VTK?
+ if [[ $with_vtk = "yes" ]]; then
+ dnl in case user wrote --with-vtk=yes
+ with_vtk="/usr"
+ fi
+
+ if [[ $with_vtk != "no" ]]; then
+
+ VTK_PREFIX="$with_vtk"
+
+ AC_CHECK_FILE([$VTK_PREFIX/include/vtk$vtk_suffix/vtkCommonInstantiator.h],
+ [vtkFound="OK"])
+ AC_MSG_CHECKING([if VTK is installed in $VTK_PREFIX])
+
+ if [[ -z "$vtkFound" ]]; then
+
+ dnl VTK not found!
+ AC_MSG_RESULT([no])
+ $3
+
+ else
+
+ dnl VTK found!
+ AC_MSG_RESULT([yes])
+
+ dnl these are the VTK libraries of a default build
+
+ dnl figure out vtkCommon, vtkIO, vtkFiltering, plus dependencies (in case VTK libs are static)
+ dnl order of libs is significant
+ VTK_SUPPORT_LIBS="-lvtktiff -lvtkpng -lvtkjpeg -lvtkzlib -lvtkexpat -lvfw32 -lgdi32"
+ AC_CHECK_LIB(vtkIO, strcmp, [], [
+ VTK_SUPPORT_LIBS="-lvtktiff -lvtkpng -lvtkjpeg -lvtkzlib -lvtkexpat"
+ AC_CHECK_LIB(vtkIO, abort, [], [
+ VTK_SUPPORT_LIBS="-ltiff -lpng -ljpeg -lzlib -lexpat"
+ AC_CHECK_LIB(vtkIO, exit, [], [
+ VTK_SUPPORT_LIBS=""
+ AC_CHECK_LIB(vtkIO, strstr, [], [
+ AC_MSG_ERROR([cannot link against VTK libraries])
+ ], [$VTK_SUPPORT_LIBS])
+ ], [$VTK_SUPPORT_LIBS])
+ ], [$VTK_SUPPORT_LIBS])
+ ], [$VTK_SUPPORT_LIBS])
+ VTK_LIBS="-lvtkIO -lvtkDICOMParser -lvtkFiltering -lvtkCommon $VTK_SUPPORT_LIBS -lvtksys"
+
+ dnl set VTK c,cpp,ld flags
+ VTK_CFLAGS="-I$VTK_PREFIX/include/vtk$vtk_suffix"
+ VTK_CXXFLAGS="$VTK_CFLAGS"
+ VTK_INCLUDES="-I$VTK_PREFIX/include/vtk$vtk_suffix"
+ VTK_LDFLAGS="-L$VTK_PREFIX/lib/vtk$vtk_suffix -L$VTK_PREFIX/lib64/vtk$vtk_suffix"
+
+ dnl now, eventually check version
+ if [[ -n "$1" ]]; then
+
+ dnl the version of VTK we need
+ maj=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ min=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ rel=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ AC_MSG_CHECKING([if VTK version is at least $maj.$min.$rel])
+
+ dnl in order to be able to compile the following test program,
+ dnl we need to add to the current flags, the VTK settings...
+ OLD_CFLAGS=$CFLAGS
+ OLD_CXXFLAGS=$CXXFLAGS
+ OLD_LDFLAGS=$LDFLAGS
+ OLD_LIBS=$LIBS
+ CFLAGS="$VTK_CFLAGS $CFLAGS"
+ CXXFLAGS="$VTK_CXXFLAGS $CXXFLAGS"
+ LDFLAGS="$VTK_LDFLAGS $LDFLAGS"
+ LIBS="$VTK_LIBS $LIBS"
+
+ dnl check if the installed VTK is greater or not
+ AC_COMPILE_IFELSE([
+ AC_LANG_PROGRAM([
+ #include <vtk/vtkConfigure.h>
+ #include <stdio.h>
+ ],[
+ printf("VTK version is: %d.%d.%d",
+ VTK_MAJOR_VERSION,
+ VTK_MINOR_VERSION,
+ VTK_BUILD_VERSION);
+
+ #if VTK_MAJOR_VERSION < $maj
+ #error Installed VTK is too old!
+ #endif
+
+ #if VTK_MINOR_VERSION < $min
+ #error Installed VTK is too old!
+ #endif
+
+ #if VTK_BUILD_VERSION < $rel
+ #error Installed VTK is too old!
+ #endif
+ ])
+ ], [vtkVersion="OK"])
+
+ if [[ "$vtkVersion" = "OK" ]]; then
+
+ AC_MSG_RESULT([yes])
+
+ $2
+
+ else
+
+ AC_MSG_RESULT([no])
+
+ dnl restore all flags without VTK values
+ CFLAGS=$OLD_CFLAGS
+ CXXFLAGS=$OLD_CXXFLAGS
+ LDFLAGS=$OLD_LDFLAGS
+ LIBS=$OLD_LIBS
+
+ $3
+ fi # if [[ $vtkVersion = "OK ]];
+
+ else
+
+ dnl if we don't have to check for minimum version
+ dnl (because the user did not set that option),
+ dnl then we can execute here the block action-if-found
+ CFLAGS="$VTK_CFLAGS $CFLAGS"
+ CXXFLAGS="$VTK_CXXFLAGS $CXXFLAGS"
+ LDFLAGS="$VTK_LDFLAGS $LDFLAGS"
+
+ $2
+
+ fi #if [[ -n "$1" ]];
+
+ fi # if [[ -z "$vtkFound" ]];
+ fi # $with_vtk != "no"
+])
+
+
+
+# vim: syntax=config
Added: cs/cigma/trunk/config/cigma_zlib.m4
===================================================================
--- cs/cigma/trunk/config/cigma_zlib.m4 (rev 0)
+++ cs/cigma/trunk/config/cigma_zlib.m4 2008-12-10 02:15:23 UTC (rev 13592)
@@ -0,0 +1,56 @@
+##############################################################################
+# -*- Autoconf -*-
+#
+# ZLIB is needed for compiling HDF5
+#
+
+##############################################################################
+#
+# CIGMA_OPTIONS_ZLIB
+#
+AC_DEFUN([CIGMA_OPTIONS_ZLIB], [
+ AC_ARG_WITH([zlib],
+ [AC_HELP_STRING([--with-zlib],
+ [The prefix where zlib is installed @<:@default=/usr@:>@])],
+ [with_zlib="$withval"],
+ [with_zlib="/usr"])
+])
+
+##############################################################################
+#
+# CIGMA_PATH_ZLIB([action-if-found], [action-if-not-found])
+#
+AC_DEFUN([CIGMA_PATH_ZLIB],[
+
+
+ dnl Check for zlib
+
+ if [[ $with_zlib = "yes" ]]; then
+ dnl In case user wrote --with-zlib=yes
+ with_zlib="/usr"
+ fi
+
+ if [[ $with_zlib="no" ]]; then
+
+ ZLIB_PREFIX="$with_zlib"
+
+ AC_CHECK_LIB(z,main,[zlibFound="OK"])
+
+ if [[ -n "$zlibFound" ]]; then
+ ZLIB_LIBS="-lz"
+ ZLIB_CFLAGS="-I$ZLIB_PREFIX/include -I$ZLIB_PREFIX"
+ ZLIB_LDFLAGS="-L$ZLIB_PREFIX/lib -L$ZLIB_PREFIX"
+ fi
+
+ else
+ dnl ZLIB not specified...fail?
+ /bin/false
+ fi
+
+ AC_SUBST(ZLIB_LIBS)
+ AC_SUBST(ZLIB_CFLAGS)
+ AC_SUBST(ZLIB_LDFLAGS)
+
+])
+
+# vim: syntax=config
Added: cs/cigma/trunk/config/deb_ax_boost_python.m4
===================================================================
--- cs/cigma/trunk/config/deb_ax_boost_python.m4 (rev 0)
+++ cs/cigma/trunk/config/deb_ax_boost_python.m4 2008-12-10 02:15:23 UTC (rev 13592)
@@ -0,0 +1,112 @@
+##### http://autoconf-archive.cryp.to/ax_boost_python.html
+#
+# SYNOPSIS
+#
+# DEB_AX_BOOST_PYTHON
+#
+# DESCRIPTION
+#
+# This macro checks to see if the Boost.Python library is installed.
+# It also attempts to guess the currect library name using several
+# attempts. It tries to build the library name using a user supplied
+# name or suffix and then just the raw library.
+#
+# If the library is found, HAVE_BOOST_PYTHON is defined and
+# BOOST_PYTHON_LIB is set to the name of the library.
+#
+# This macro calls AC_SUBST(BOOST_PYTHON_LIBS).
+#
+# In order to ensure that the Python headers are specified on the
+# include path, this macro requires AX_PYTHON to be called.
+#
+# LAST MODIFICATION
+#
+# 2007-07-29
+#
+# COPYLEFT
+#
+# Copyright (c) 2005 Michael Tindal <mtindal at paradoxpoint.com>
+# Copyright © 2007 Carl Fürstenberg <azatoth at gmail.com>
+#
+# 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.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+#
+# As a special exception, the respective Autoconf Macro's copyright
+# owner gives unlimited permission to copy, distribute and modify the
+# configure scripts that are the output of Autoconf when processing
+# the Macro. You need not follow the terms of the GNU General Public
+# License when using or distributing such scripts, even though
+# portions of the text of the Macro appear in them. The GNU General
+# Public License (GPL) does govern all other use of the material that
+# constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the
+# Autoconf Macro released by the Autoconf Macro Archive. When you
+# make and distribute a modified version of the Autoconf Macro, you
+# may extend this special exception to the GPL to apply to your
+# modified version as well.
+
+AC_DEFUN([DEB_AX_BOOST_PYTHON],[
+ AC_REQUIRE([DEB_AX_PYTHON])dnl
+
+ AS_VAR_PUSHDEF([ax_BoostPython], [ax_cv_boost_python])dnl
+ AC_LANG_PUSH([C++])
+ ax_cv_boost_python_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="-I$PYTHON_INCLUDE_DIR $CPPFLAGS"
+ AC_CHECK_HEADER([boost/python.hpp],
+ [AC_DEFINE([HAVE_BOOST_PYTHON],,[define if the Boost::Python library is available])])
+ CPPFLAGS=$ax_cv_boost_python_save_CPPFLAGS
+ AC_LANG_POP([C++])
+
+ ax_python_lib=boost_python
+ AC_ARG_WITH([boost-python],
+ AS_HELP_STRING([--with-boost-python],[specify the boost python library to use]),
+ [ax_python_lib=$withval],
+ [for suffix in mt st gcc-mt gcc gcc41-mt gcc41 gcc42-mt gcc42; do
+ ax_python_lib_extra="$ax_python_lib_extra $ax_python_lib-$suffix";
+ done;
+ ax_python_lib="$ax_python_lib $ax_python_lib_extra"]
+ )
+
+ AS_VAR_PUSHDEF([ax_Search], [ax_cv_search])dnl
+ AC_CACHE_CHECK([for Usable Boost::Python library], [ax_Search],
+ [AC_LANG_PUSH([C++])
+ ax_cv_search_save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="-I$PYTHON_INCLUDE_DIR $CXXFLAGS"
+ ax_cv_search_save_LIBS=$LIBS
+ for ax_current_lib in $ax_python_lib; do
+ ax_res=-l$ax_current_lib
+ LIBS="-l$ax_current_lib -l$PYTHON_LIB $ax_cv_search_save_LIBS"
+ AC_LINK_IFELSE([#include <boost/python/module.hpp>
+ using namespace boost::python;
+ BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }
+ int main() {return 0;}],
+ [AS_VAR_SET([ax_Search], [$ax_res])])
+ AS_VAR_SET_IF([ax_Search], [break])dnl
+ done
+ AS_VAR_SET_IF([ax_Search], , [AS_VAR_SET([ax_Search], [no])])
+ LIBS=$ax_cv_search_save_LIBS
+ AC_LANG_POP([C++])]
+ )
+
+ ax_res=AS_VAR_GET([ax_Search])
+ AS_IF([test "$ax_res" != "no"],
+ [BOOST_PYTHON_LIBS="$ax_res"
+ AC_SUBST(BOOST_PYTHON_LIBS)
+ AC_DEFINE([HAVE_BOOST_PYTHON],,[define if the Boost::Python library is available])],
+ [AS_WARN([No suitable Boost::Python library found])])dnl
+ AS_VAR_POPDEF([ax_Search])dnl
+])
+# vim: syntax=config
Added: cs/cigma/trunk/config/deb_ax_python.m4
===================================================================
--- cs/cigma/trunk/config/deb_ax_python.m4 (rev 0)
+++ cs/cigma/trunk/config/deb_ax_python.m4 2008-12-10 02:15:23 UTC (rev 13592)
@@ -0,0 +1,109 @@
+##### http://autoconf-archive.cryp.to/ax_python.html
+#
+# SYNOPSIS
+#
+# DEB_AX_PYTHON
+#
+# DESCRIPTION
+#
+# This macro does a complete Python development environment check.
+#
+# It recurses through several python versions (from 2.1 to 2.4 in
+# this version), looking for an executable. When it finds an
+# executable, it looks to find the header files and library.
+#
+# It sets PYTHON_BIN to the name of the python executable,
+# PYTHON_INCLUDE_DIR to the directory holding the header files, and
+# PYTHON_LIB to the name of the Python library.
+#
+# This macro calls AC_SUBST on PYTHON_BIN (via AC_CHECK_PROG),
+# PYTHON_INCLUDE_DIR and PYTHON_LIB.
+#
+# LAST MODIFICATION
+#
+# 2007-07-29
+#
+# COPYLEFT
+#
+# Copyright (c) 2004 Michael Tindal <mtindal at paradoxpoint.com>
+#
+# 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.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+#
+# As a special exception, the respective Autoconf Macro's copyright
+# owner gives unlimited permission to copy, distribute and modify the
+# configure scripts that are the output of Autoconf when processing
+# the Macro. You need not follow the terms of the GNU General Public
+# License when using or distributing such scripts, even though
+# portions of the text of the Macro appear in them. The GNU General
+# Public License (GPL) does govern all other use of the material that
+# constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the
+# Autoconf Macro released by the Autoconf Macro Archive. When you
+# make and distribute a modified version of the Autoconf Macro, you
+# may extend this special exception to the GPL to apply to your
+# modified version as well.
+
+AC_DEFUN([DEB_AX_PYTHON],[
+ AC_MSG_CHECKING(for python build information)
+ AC_MSG_RESULT([])
+
+ for python in python2.5 python2.4 python2.3 python2.2 python2.1 python; do
+ AC_CHECK_PROGS(PYTHON_BIN, [$python])
+ ax_python_bin=$PYTHON_BIN
+ if test "x$ax_python_bin" != x; then
+ AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no)
+ AC_CHECK_HEADER([$ax_python_bin/Python.h],
+ [[ax_python_header=`locate $ax_python_bin/Python.h | sed -e s,/Python.h,,`]],
+ ax_python_header=no)
+
+ if test "$ax_python_lib" != no; then
+ if test "$ax_python_header" != no; then
+ break;
+ fi
+ fi
+
+ fi
+ done
+
+ if test "x$ax_python_bin" = x; then
+ ax_python_bin=no
+ fi
+
+ if test "x$ax_python_header" = x; then
+ ax_python_header=no
+ fi
+
+ if test "x$ax_python_lib" = x; then
+ ax_python_lib=no
+ fi
+
+ AC_MSG_RESULT([ results of the Python check:])
+ AC_MSG_RESULT([ Binary: $ax_python_bin])
+ AC_MSG_RESULT([ Library: $ax_python_lib])
+ AC_MSG_RESULT([ Include Dir: $ax_python_header])
+
+ if test "x$ax_python_header" != xno; then
+ PYTHON_INCLUDE_DIR=$ax_python_header
+ AC_SUBST(PYTHON_INCLUDE_DIR)
+ fi
+
+ if test "x$ax_python_lib" != xno; then
+ PYTHON_LIB=$ax_python_lib
+ AC_SUBST(PYTHON_LIB)
+ fi
+])dnl
+# vim: syntax=config
Deleted: cs/cigma/trunk/config/deb_boost_python.dpatch
===================================================================
--- cs/cigma/trunk/config/deb_boost_python.dpatch 2008-12-10 02:15:21 UTC (rev 13591)
+++ cs/cigma/trunk/config/deb_boost_python.dpatch 2008-12-10 02:15:23 UTC (rev 13592)
@@ -1,136 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## f.dpatch by Carl Fürstenberg <azatoth at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad autoconf-archive-20070512~/m4/ax_boost_python.m4 autoconf-archive-20070512/m4/ax_boost_python.m4
---- autoconf-archive-20070512~/m4/ax_boost_python.m4 2007-07-29 17:56:16.000000000 +0200
-+++ autoconf-archive-20070512/m4/ax_boost_python.m4 2007-07-29 19:51:45.000000000 +0200
-@@ -14,18 +14,19 @@
- # If the library is found, HAVE_BOOST_PYTHON is defined and
- # BOOST_PYTHON_LIB is set to the name of the library.
- #
--# This macro calls AC_SUBST(BOOST_PYTHON_LIB).
-+# This macro calls AC_SUBST(BOOST_PYTHON_LIBS).
- #
- # In order to ensure that the Python headers are specified on the
- # include path, this macro requires AX_PYTHON to be called.
- #
- # LAST MODIFICATION
- #
--# 2005-05-20
-+# 2007-07-29
- #
- # COPYLEFT
- #
- # Copyright (c) 2005 Michael Tindal <mtindal at paradoxpoint.com>
-+# Copyright © 2007 Carl Fürstenberg <azatoth at gmail.com>
- #
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License as
-@@ -59,34 +60,52 @@
-
- AC_DEFUN([AX_BOOST_PYTHON],
- [AC_REQUIRE([AX_PYTHON])dnl
--AC_CACHE_CHECK(whether the Boost::Python library is available,
--ac_cv_boost_python,
--[AC_LANG_SAVE
-- AC_LANG_CPLUSPLUS
-- CPPFLAGS_SAVE=$CPPFLAGS
-- if test x$PYTHON_INCLUDE_DIR != x; then
-- CPPFLAGS=-I$PYTHON_INCLUDE_DIR $CPPFLAGS
-- fi
-- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[
-- #include <boost/python/module.hpp>
-- using namespace boost::python;
-- BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }]],
-- [[return 0;]]),
-- ac_cv_boost_python=yes, ac_cv_boost_python=no)
-- AC_LANG_RESTORE
-- CPPFLAGS=$CPPFLAGS_SAVE
-+AS_VAR_PUSHDEF([ax_BoostPython], [ax_cv_boost_python])dnl
-+AC_LANG_PUSH([C++])
-+ax_cv_boost_python_save_CPPFLAGS=$CPPFLAGS
-+CPPFLAGS="-I$PYTHON_INCLUDE_DIR $CPPFLAGS"
-+AC_CHECK_HEADER([boost/python.hpp],
-+ [AC_DEFINE([HAVE_BOOST_PYTHON],,[define if the Boost::Python library is available])]
-+)
-+CPPFLAGS=$ax_cv_boost_python_save_CPPFLAGS
-+AC_LANG_POP([C++])
-+BN=boost_python
-+AC_ARG_WITH(
-+ [boost-python],
-+ [AS_HELP_STRING([--with-boost-python],[specify the boost python library to use])],
-+ [ax_python_lib=$withval],
-+ [for ax_lib in $BN $BN-mt $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
-+ lib$BN lib$BN-mt lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \
-+ $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s; do
-+ ax_python_lib="$ax_python_lib $ax_lib";
-+ done;
-+ ax_python_lib="$ax_python_lib $ax_python_lib_extra"]
-+)
-+
-+AS_VAR_PUSHDEF([ax_Search], [ax_cv_search])dnl
-+AC_CACHE_CHECK([for Usable Boost::Python library], [ax_Search],
-+[AC_LANG_PUSH([C++])
-+ax_cv_search_save_CXXFLAGS=$CXXFLAGS
-+CXXFLAGS="-I$PYTHON_INCLUDE_DIR $CXXFLAGS"
-+ax_cv_search_save_LIBS=$LIBS
-+for ax_current_lib in $ax_python_lib; do
-+ ax_res=-l$ax_current_lib
-+ LIBS="-l$ax_current_lib -l$PYTHON_LIB $ax_cv_search_save_LIBS"
-+ AC_LINK_IFELSE([#include <boost/python/module.hpp>
-+ using namespace boost::python;
-+ BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }
-+ int main() {return 0;}],
-+ [AS_VAR_SET([ax_Search], [$ax_res])])
-+ AS_VAR_SET_IF([ax_Search], [break])dnl
-+done
-+AS_VAR_SET_IF([ax_Search], , [AS_VAR_SET([ax_Search], [no])])
-+LIBS=$ax_cv_search_save_LIBS
-+CXXFLAGS=$ax_cv_search_save_CXXFLAGS
-+AC_LANG_POP([C++])])
-+ax_res=AS_VAR_GET([ax_Search])
-+AS_IF([test "$ax_res" != "no"],
-+ [BOOST_PYTHON_LIBS="$ax_res"
-+ AC_SUBST(BOOST_PYTHON_LIBS)],
-+ [AS_WARN([No suitable Boost::Python library found])])dnl
-+AS_VAR_POPDEF([ax_Search])dnl
- ])
--if test "$ac_cv_boost_python" = "yes"; then
-- AC_DEFINE(HAVE_BOOST_PYTHON,,[define if the Boost::Python library is available])
-- ax_python_lib=boost_python
-- AC_ARG_WITH([boost-python],AS_HELP_STRING([--with-boost-python],[specify the boost python library or suffix to use]),
-- [if test "x$with_boost_python" != "xno"; then
-- ax_python_lib=$with_boost_python
-- ax_boost_python_lib=boost_python-$with_boost_python
-- fi])
-- for ax_lib in $ax_python_lib $ax_boost_python_lib boost_python; do
-- AC_CHECK_LIB($ax_lib, main, [BOOST_PYTHON_LIB=$ax_lib break])
-- done
-- AC_SUBST(BOOST_PYTHON_LIB)
--fi
--])dnl
-diff -urNad autoconf-archive-20070512~/m4/ax_python.m4 autoconf-archive-20070512/m4/ax_python.m4
---- autoconf-archive-20070512~/m4/ax_python.m4 2007-07-29 17:56:16.000000000 +0200
-+++ autoconf-archive-20070512/m4/ax_python.m4 2007-07-29 19:51:50.000000000 +0200
-@@ -21,7 +21,7 @@
- #
- # LAST MODIFICATION
- #
--# 2004-09-20
-+# 2007-07-29
- #
- # COPYLEFT
- #
-@@ -60,7 +60,7 @@
- AC_DEFUN([AX_PYTHON],
- [AC_MSG_CHECKING(for python build information)
- AC_MSG_RESULT([])
--for python in python2.4 python2.3 python2.2 python2.1 python; do
-+for python in python2.5 python2.4 python2.3 python2.2 python2.1 python; do
- AC_CHECK_PROGS(PYTHON_BIN, [$python])
- ax_python_bin=$PYTHON_BIN
- if test x$ax_python_bin != x; then
Modified: cs/cigma/trunk/configure.ac
===================================================================
--- cs/cigma/trunk/configure.ac 2008-12-10 02:15:21 UTC (rev 13591)
+++ cs/cigma/trunk/configure.ac 2008-12-10 02:15:23 UTC (rev 13592)
@@ -22,6 +22,10 @@
AX_BOOST_BASE([1.33])
AX_BOOST_FILESYSTEM
AX_BOOST_PROGRAM_OPTIONS
+DEB_AX_PYTHON
+echo "PYTHON_BIN is '$PYTHON_BIN'"
+echo "PYTHON_INCLUDE_DIR is '$PYTHON_INCLUDE_DIR'"
+echo "PYTHON_LIB is '$PYTHON_LIB'"
DEB_AX_BOOST_PYTHON
echo "BOOST_PYTHON_LIBS is '$BOOST_PYTHON_LIBS'"
if test -z "$BOOST_PYTHON_LIBS"; then
More information about the CIG-COMMITS
mailing list