[Olena] oln 10.16: fix swilena

Index: ChangeLog from Nicolas Burrus &lt;burrus_n(a)lrde.epita.fr&gt; * configure.ac: Improve python headers lookup. Index: tools/swilena/ChangeLog from Nicolas Burrus &lt;burrus_n(a)lrde.epita.fr&gt; * meta/swilena_image.i: Copy constructor parameter is not const. +2003-09-15 Nicolas Burrus &lt;burrus_n(a)lrde.epita.fr&gt; + + * expand.sh (AM_LDFLAGS): Add ZLIB_LDFLAGS. + (INCLUDES): Use PYTHON_CPPFLAGS. + 2003-07-30 Nicolas Burrus &lt;burrus_n(a)lrde.epita.fr&gt; * expand.sh: Fix data types prefix. Index: configure.ac --- configure.ac Mon, 25 Aug 2003 13:50:56 +0200 raph (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.9 640) +++ configure.ac Mon, 15 Sep 2003 17:23:46 +0200 burrus_n (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.10 640) @@ -364,15 +364,20 @@ [ AM_PATH_PYTHON([2.1]) save_CPPFLAGS=$CPPFLAGS - # FIXME: find python path automatically! - CPPFLAGS="$CPPFLAGS -I/usr/include/python2.2" + + AC_ARG_VAR([PYTHON_CPPFLAGS], [Path to Python.h]) + AC_ARG_WITH([python-includedir], [Include path for Python.h], + [PYTHON_CPPFLAGS="-I $withval"], + [PYTHON_CPPFLAGS="-I/usr/include/python$PYTHON_VERSION"]) + + CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" AC_CHECK_HEADERS([Python.h],, AC_MSG_ERROR( - [You need Python development files to compile the Python interface. Specify --without-swilena to configure to disable it.])) + [You need Python development files to compile the Python interface. Specify --with-python-includedir to set it manually or --without-swilena to disable it.])) + CPPFLAGS=$save_CPPFLAGS ], [python])dnl End of OLN_COMPONENT([tools/swilena/python]) - ])dnl End of OLN_COLLECTION([OLN_SWILENA]) ], [swilena])dnl End of OLN_COMPONENT([tools/swilena]) @@ -383,7 +388,6 @@ ])dnl End of OLN_COLLECTION([OLN_TOP]) - AC_OUTPUT if test "x$oln_cxxflags_clean" = xno; then Index: tools/swilena/Makefile.am --- tools/swilena/Makefile.am Tue, 06 May 2003 06:56:14 +0200 raph (oln/o/25_Makefile.a 1.4 640) +++ tools/swilena/Makefile.am Mon, 15 Sep 2003 17:23:46 +0200 burrus_n (oln/o/25_Makefile.a 1.5 640) @@ -1,4 +1,3 @@ ## Process this file through Automake to produce Makefile.in -*- Makefile -*- SUBDIRS = meta src doc $(OLN_SWILENA_SUBDIRS) - Index: tools/swilena/expand.sh --- tools/swilena/expand.sh Wed, 30 Jul 2003 16:42:01 +0200 burrus_n (oln/s/25_expand.sh 1.4 750) +++ tools/swilena/expand.sh Mon, 15 Sep 2003 17:23:46 +0200 burrus_n (oln/s/25_expand.sh 1.5 750) @@ -58,10 +58,10 @@ ## NOTE: this file was generated automatically by expand.sh ## -INCLUDES = -I/usr/include/python2.2 -I\$(srcdir)/../src +INCLUDES = \$(PYTHON_PATH) -I\$(srcdir)/../src AM_CPPFLAGS = -DOLN_EXCEPTIONS -# AM_CXXFLAGS = \$(CXXFLAGS_OPTIMIZE) -AM_LDFLAGS = -shared -lswigpy +AM_CXXFLAGS = \$(CXXFLAGS_OPTIMIZE) +AM_LDFLAGS = -shared -lswigpy \$(ZLIB_LDFLAGS) EOF } Index: tools/swilena/meta/swilena_point.i --- tools/swilena/meta/swilena_point.i Tue, 29 Jul 2003 18:21:22 +0200 david (oln/s/29_swilena_po 1.2 640) +++ tools/swilena/meta/swilena_point.i Mon, 15 Sep 2003 17:23:46 +0200 burrus_n (oln/s/29_swilena_po 1.3 640) @@ -125,7 +125,3 @@ } %enddef - - - - Index: tools/swilena/meta/swilena_image.i --- tools/swilena/meta/swilena_image.i Tue, 29 Jul 2003 18:21:22 +0200 david (oln/s/36_swilena_im 1.2 640) +++ tools/swilena/meta/swilena_image.i Mon, 15 Sep 2003 17:23:46 +0200 burrus_n (oln/s/36_swilena_im 1.3 640) @@ -10,7 +10,7 @@ // default constructor T(); T(const image ## Dim ## d_size&); - T(const T& other); + T(T& other); // operators T clone() const; @@ -149,4 +149,3 @@ %define make_image(name, Dim, T) %template(name) oln::image ## Dim ## d<T >; %enddef -