This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Olena, a generic and efficient image processing platform".
The branch autoconfiscate-subprojects has been updated
discards ae9a8715e6cb27af6b7f0e838953287e8fadcca6 (commit)
discards e0bd3016c3669933fe34cdfd7589d7c7b837427c (commit)
discards 7f1221803f2ef0af6b72c02d4b2b798d7fe03205 (commit)
discards 4ef7d30107fff85bf3827f1aecba3bc01ca48281 (commit)
discards 06ad42f116d869c3486bd1d28fde46ddd5e1627d (commit)
discards 2725412dd4e6ad101a657f545f6d91f2c4678bb1 (commit)
discards f9da35e3e8d4ed5fc5b564bef7c80d96481ef504 (commit)
discards 4964cd17fede1b717b8da295081c7e1bf381a790 (commit)
discards 1585c7112b9b4fb133ed85b86414613b02f6b3b6 (commit)
via b3254677c33f7ac5457779e2e69d61a9f29081c5 (commit)
via 922978ed4a34312333fc7853bd13ce7cdc697df4 (commit)
via 3706c50bfcdc246480edba2933e84fabafd788c9 (commit)
via 2032fc779c354a639385e7544404d05f1a2a09d6 (commit)
via b03c4c49f4b42bcaa6f0d3f7bbc20dd83034ab2b (commit)
via 65fbf085bce31f866656b35435079a6ae1af6683 (commit)
via e476c25b557700065bea970afba39830d738f31c (commit)
via 84757c4326e72e5f226554a292efd746177ca23b (commit)
via e4db2b58005dc58aac4f2cbfef4e52f5cd883a9f (commit)
via 0d8813e68ce7b27f4e0af6ee0a6004d0564b5945 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (ae9a8715e6cb27af6b7f0e838953287e8fadcca6)
\
N -- N -- N (b3254677c33f7ac5457779e2e69d61a9f29081c5)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
b325467 Add advice about the release process.
922978e Have Milena be in charge of its own configuration and distribution.
3706c50 Autoconfiscate Milena.
2032fc7 Move trimesh2 into Milena.
b03c4c4 Have Scribo be in charge of its own configuration.
65fbf08 Autoconfiscate Scribo.
e476c25 Factor .gitignore files.
84757c4 Have Swilena be in charge of its own configuration.
e4db2b5 Autoconfiscate Swilena.
-----------------------------------------------------------------------
Summary of changes:
milena/ChangeLog | 12 ++++++++++++
milena/mln/io/magick/load.hh | 17 +++++++++++------
milena/mln/io/magick/save.hh | 30 ++++++++++++++++++++++--------
3 files changed, 45 insertions(+), 14 deletions(-)
hooks/post-receive
--
Olena, a generic and efficient image processing platform
---
extatica/ChangeLog | 4 +
extatica/config/swig.m4 | 153 ++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 156 insertions(+), 1 deletions(-)
mode change 120000 => 100644 extatica/config/swig.m4
diff --git a/extatica/ChangeLog b/extatica/ChangeLog
index 524156e..fa86dc3 100644
--- a/extatica/ChangeLog
+++ b/extatica/ChangeLog
@@ -1,5 +1,9 @@
2010-11-03 Roland Levillain <roland(a)lrde.epita.fr>
+ * config/swig.m4: Catch up with Swilena's version.
+
+2010-11-03 Roland Levillain <roland(a)lrde.epita.fr>
+
Revamp the configuration of Extatica's SWIG Python bindings.
* configure.ac: Here.
diff --git a/extatica/config/swig.m4 b/extatica/config/swig.m4
deleted file mode 120000
index c45fb81..46672c5
--- a/extatica/config/swig.m4
+++ /dev/null
@@ -1 +0,0 @@
-../../m4/swig.m4
\ No newline at end of file
diff --git a/extatica/config/swig.m4 b/extatica/config/swig.m4
new file mode 100644
index c45fb81..46672c5
--- /dev/null
+++ b/extatica/config/swig.m4
@@ -0,0 +1,152 @@
+dnl @synopsis AC_PROG_SWIG([major.minor.micro])
+dnl
+dnl This macro searches for a SWIG installation on your system. If found you
+dnl should call SWIG via $(SWIG). You can use the optional first argument to
+dnl check if the version of the available SWIG is greater than or equal to the
+dnl value of the argument. It should have the format: N[.N[.N]] (N is a
+dnl number between 0 and 999. Only the first N is mandatory.)
+dnl
+dnl If the version argument is given (e.g. 1.3.17), AC_PROG_SWIG checks that the
+dnl swig package is this version number or higher.
+dnl
+dnl In configure.in, use as:
+dnl
+dnl AC_PROG_SWIG(1.3.17)
+dnl SWIG_ENABLE_CXX
+dnl SWIG_MULTI_MODULE_SUPPORT
+dnl SWIG_PYTHON
+dnl
+dnl @author Sebastian Huber <sebastian-huber(a)web.de>, Alan W. Irwin <irwin(a)beluga.phys.uvic.ca>, Rafael Laboissiere <rafael(a)laboissiere.net>, and Andrew Collier <abcollier(a)yahoo.com>.
+dnl @version $Id: ac_pkg_swig.m4,v 1.2 2004/12/24 01:20:01 guidod Exp $
+dnl
+AC_DEFUN([AC_PROG_SWIG],[
+ AC_PATH_PROG([SWIG],[swig])
+ if test -z "$SWIG" ; then
+ AC_MSG_WARN([cannot find 'swig' program. You should look at http://www.swig.org])
+ SWIG='echo "Error: SWIG is not installed. You should look at http://www.swig.org" ; false'
+ elif test -n "$1" ; then
+ AC_MSG_CHECKING([for SWIG version])
+ [swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`]
+ AC_MSG_RESULT([$swig_version])
+ if test -n "$swig_version" ; then
+ # Calculate the required version number components
+ [required=$1]
+ [required_major=`echo $required | sed 's/[^0-9].*//'`]
+ if test -z "$required_major" ; then
+ [required_major=0]
+ fi
+ [required=`echo $required | sed 's/[0-9]*[^0-9]//'`]
+ [required_minor=`echo $required | sed 's/[^0-9].*//'`]
+ if test -z "$required_minor" ; then
+ [required_minor=0]
+ fi
+ [required=`echo $required | sed 's/[0-9]*[^0-9]//'`]
+ [required_patch=`echo $required | sed 's/[^0-9].*//'`]
+ if test -z "$required_patch" ; then
+ [required_patch=0]
+ fi
+ # Calculate the available version number components
+ [available=$swig_version]
+ [available_major=`echo $available | sed 's/[^0-9].*//'`]
+ if test -z "$available_major" ; then
+ [available_major=0]
+ fi
+ [available=`echo $available | sed 's/[0-9]*[^0-9]//'`]
+ [available_minor=`echo $available | sed 's/[^0-9].*//'`]
+ if test -z "$available_minor" ; then
+ [available_minor=0]
+ fi
+ [available=`echo $available | sed 's/[0-9]*[^0-9]//'`]
+ [available_patch=`echo $available | sed 's/[^0-9].*//'`]
+ if test -z "$available_patch" ; then
+ [available_patch=0]
+ fi
+ if test \
+ $available_major -lt $required_major \
+ -o \( $available_major -eq $required_major \
+ -a \( $available_minor -lt $required_minor \
+ -o \( $available_minor -eq $required_minor \
+ -a $available_patch -lt $required_patch \) \) \) ; then
+ AC_MSG_WARN([SWIG version >= $1 is required. You have $swig_version. You should look at http://www.swig.org])
+ SWIG='echo "Error: SWIG version >= $1 is required. You have '"$swig_version"'. You should look at http://www.swig.org" ; false'
+ else
+ AC_MSG_NOTICE([SWIG executable is '$SWIG'])
+ SWIG_LIB=`$SWIG -swiglib`
+ AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB'])
+ fi
+ else
+ AC_MSG_WARN([cannot determine SWIG version])
+ SWIG='echo "Error: Cannot determine SWIG version. You should look at http://www.swig.org" ; false'
+ fi
+ fi
+ AC_SUBST([SWIG_LIB])
+])
+
+# SWIG_ENABLE_CXX()
+#
+# Enable SWIG C++ support. This affects all invocations of $(SWIG).
+AC_DEFUN([SWIG_ENABLE_CXX],[
+ AC_REQUIRE([AC_PROG_SWIG])
+ AC_REQUIRE([AC_PROG_CXX])
+ SWIG="$SWIG -c++"
+])
+
+# SWIG_MULTI_MODULE_SUPPORT()
+#
+# Enable support for multiple modules. This effects all invocations
+# of $(SWIG). You have to link all generated modules against the
+# appropriate SWIG runtime library. If you want to build Python
+# modules for example, use the SWIG_PYTHON() macro and link the
+# modules against $(SWIG_PYTHON_LIBS).
+#
+AC_DEFUN([SWIG_MULTI_MODULE_SUPPORT],[
+ AC_REQUIRE([AC_PROG_SWIG])
+ SWIG="$SWIG -noruntime"
+])
+
+# SWIG_PYTHON([use-shadow-classes = {no, yes}])
+#
+# Checks for Python and provides the $(SWIG_PYTHON_CPPFLAGS),
+# and $(SWIG_PYTHON_OPT) output variables.
+#
+# $(SWIG_PYTHON_OPT) contains all necessary SWIG options to generate
+# code for Python. Shadow classes are enabled unless the value of the
+# optional first argument is exactly 'no'. If you need multi module
+# support (provided by the SWIG_MULTI_MODULE_SUPPORT() macro) use
+# $(SWIG_PYTHON_LIBS) to link against the appropriate library. It
+# contains the SWIG Python runtime library that is needed by the type
+# check system for example.
+AC_DEFUN([SWIG_PYTHON],[
+ AC_REQUIRE([AC_PROG_SWIG])
+ AC_REQUIRE([AC_PYTHON_DEVEL])
+ test "x$1" != "xno" || swig_shadow=" -noproxy"
+ AC_SUBST([SWIG_PYTHON_OPT],[-python$swig_shadow])
+ AC_SUBST([SWIG_PYTHON_CPPFLAGS],[$PYTHON_CPPFLAGS])
+])
+
+
+dnl @synopsis AC_LIB_WAD
+dnl
+dnl This macro searches for installed WAD library.
+dnl
+AC_DEFUN([AC_LIB_WAD],
+[
+ AC_REQUIRE([AC_PYTHON_DEVEL])
+ AC_ARG_ENABLE(wad,
+ AC_HELP_STRING([--enable-wad], [enable wad module]),
+ [
+ case "${enableval}" in
+ no) ;;
+ *) if test "x${enableval}" = xyes;
+ then
+ check_wad="yes"
+ fi ;;
+ esac
+ ], [])
+
+ if test -n "$check_wad";
+ then
+ AC_CHECK_LIB(wadpy, _init, [WADPY=-lwadpy], [], $PYTHON_LDFLAGS $PYTHON_EXTRA_LIBS)
+ AC_SUBST(WADPY)
+ fi
+])
--
1.5.6.5
* configure.ac: Here.
Lower requirements to SWIG 1.3.35 and Python 2.4.
Warn about Python 2.6 and greater.
* Makefile.am (SUBDIRS): Remove swig.
(SUBDIRS) [SWIG_PYTHON_BINDINGS]: Add swig.
---
extatica/ChangeLog | 10 +++++
extatica/Makefile.am | 9 +++-
extatica/configure.ac | 101 ++++++++++++++++++++++++++++++------------------
3 files changed, 80 insertions(+), 40 deletions(-)
diff --git a/extatica/ChangeLog b/extatica/ChangeLog
index 3ab3311..524156e 100644
--- a/extatica/ChangeLog
+++ b/extatica/ChangeLog
@@ -1,5 +1,15 @@
2010-11-03 Roland Levillain <roland(a)lrde.epita.fr>
+ Revamp the configuration of Extatica's SWIG Python bindings.
+
+ * configure.ac: Here.
+ Lower requirements to SWIG 1.3.35 and Python 2.4.
+ Warn about Python 2.6 and greater.
+ * Makefile.am (SUBDIRS): Remove swig.
+ (SUBDIRS) [SWIG_PYTHON_BINDINGS]: Add swig.
+
+2010-11-03 Roland Levillain <roland(a)lrde.epita.fr>
+
Use std::string uniformly.
* src/data.hh (dyn::data::is_const)
diff --git a/extatica/Makefile.am b/extatica/Makefile.am
index 737a9f9..44f7b5f 100644
--- a/extatica/Makefile.am
+++ b/extatica/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2005, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2005, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,11 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-SUBDIRS = libltdl libmd5 bin src config data test swig
+SUBDIRS = libltdl libmd5 bin src config data test
+
+if SWIG_PYTHON_BINDINGS
+ SUBDIRS += swig
+endif SWIG_PYTHON_BINDINGS
ACLOCAL_AMFLAGS = -I config -I libltdl
diff --git a/extatica/configure.ac b/extatica/configure.ac
index 9f0c0d7..8761e82 100644
--- a/extatica/configure.ac
+++ b/extatica/configure.ac
@@ -1,4 +1,5 @@
-# Copyright (C) 2005, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2005, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -104,57 +105,81 @@ AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin'])
BOOST_FILESYSTEM
BOOST_STRING_ALGO
-## ------ ##
-## Swig. ##
-## ------ ##
+## ---------------------- ##
+## SWIG Python bindings. ##
+## ---------------------- ##
-# FIXME: Unify the Autoconf machinery w.r.t. SWIG and Python with Olena's.
+AC_ARG_ENABLE([swig-python-bindings],
+ [AS_HELP_STRING([--enable-swig-python-bindings],
+ [build SWIG Python bindings @<:@default=auto@:>@])],
+ [],
+ [enable_swig_python_bindings=auto])
-AC_ARG_WITH([swig],
- [AC_HELP_STRING([--with-swig],
- [require Swig modules (defaults to auto)])],
- [],
- [with_swig=auto])
+# Trick borrowed from autotroll.m4 to get a decent flow control with 'break'.
+for xtc_ignored in once; do
-if test x$with_swig != xno; then
- has_swig=yes
+ # Ensure dynamic libraries are enabled.
+ if test "x$enable_shared" = xno; then
+ if test "x$enable_swig_python_bindings" != xauto; then
+ AC_MSG_ERROR([`--enable-swig-python-bindings' was passed, but dynamic
+libraries are disabled. Try to invoke configure with `--enable-shared'.])
+ fi
+ break
+ fi
+
+ # Check for SWIG.
+ AC_PROG_SWIG([1.3.35])
+ if (eval "$SWIG -version") >/dev/null 2>&1; then :; else
+ if test "x$enable_swig_python_bindings" != xauto; then
+ AC_MSG_ERROR([`--enable-swig-python-bindings' was passed, but SWIG 1.3.35
+(or greater) cannot be found.])
+ fi
+ break
+ fi
# Check for Python.
- AM_PATH_PYTHON([2.5])
- adl_CHECK_PYTHON
+ AM_PATH_PYTHON([2.4], [], [xtc_have_python=no])
+ if test "x$xtc_have_python" = xno; then
+ if test "x$enable_swig_python_bindings" != xauto; then
+ AC_MSG_ERROR([`--enable-swig-python-bindings' was passed, but Python 2.4
+(or greater) cannot be found.])
+ fi
+ break
+ fi
+
+ # Warn about Python 2.6 which probably won't work with our bindings
+ # (for the moment).
+ AS_VERSION_COMPARE([2.5], [$am_cv_python_version],
+ [AC_MSG_WARN([Python 2.6 and greater may not work with SWIG Python bindings.])])
- # Check for Python and SWIG.
+ # Set PYTHONINC path.
+ adl_CHECK_PYTHON
+ # Check for Python headers.
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$PYTHONINC"
- AC_CHECK_HEADERS([Python.h],
- [python_headers=yes],
- [python_headers=no])
-
- if test x$python_headers = xno; then
- oln_has_swig=no
- if test x$with_swig = xyes; then
- AC_MSG_ERROR(
- [Python.h is required to build SWIG modules.
- Add `-I python_include_path' to `CPPFLAGS'
- or `--without-swig' to disable SWIG modules.])
+ AC_CHECK_HEADERS([Python.h], [], [xtc_have_python_h=no])
+ CPPFLAGS=$save_CPPFLAGS
+ if test "x$xtc_have_python_h" = xno; then
+ if test "x$enable_swig_python_bindings" != xauto; then
+ AC_MSG_ERROR([`--enable-swig-python-bindings' was passed, but `Python.h'
+cannot be found. Try adding `-I <Python include path>' to `CPPFLAGS'.])
fi
+ break
fi
- CPPFLAGS=$save_CPPFLAGS
-
- AC_PROG_SWIG([1.3.36])
- if (eval "$SWIG -version") >/dev/null 2>&1; then :; else
- has_swig=no
- fi
+ # All tests passed: enable SWIG Python bindings.
+ xtc_swig_python_bindings=yes
+done
- case $with_swig:$has_swig in
- yes:no)
- AC_MSG_ERROR([SWIG 1.3.36 is required.
- Use `--without-swig' to disable SWIG modules.]);;
- esac
+AC_MSG_CHECKING([whether to build SWIG Python bindings])
+if test "x$xtc_swig_python_bindings" = "xyes"; then
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no])
fi
-AC_MSG_RESULT([$has_swig])
+AM_CONDITIONAL([SWIG_PYTHON_BINDINGS],
+ [test "x$xtc_swig_python_bindings" = "xyes"])
AC_CONFIG_FILES([swig/Makefile
swig/python/Makefile])
--
1.5.6.5