June 2009 - Olena-patches

[PATCH 20/27] Add tentative support for GDCM in the build system.
by Roland Levillain 03 Jun '09

03 Jun '09

* mln/io/all.hh [HAVE_GDCM]: Include mln/io/dicom/all.hh. * mln/io/dicom/load.hh: Fix paths of included GDCM headers. Aesthetic changes. * tests/io/Makefile.am (SUBDIRS) [HAVE_GDCM]: Add dicom. * tests/io/dicom/Makefile.am: Aesthetic changes. * tests/io/dicom/dicom.cc: Remove useless header inclusions. --- milena/ChangeLog | 11 +++++++++++ milena/mln/io/all.hh | 5 ++++- milena/mln/io/dicom/load.hh | 19 +++++++++---------- milena/tests/io/Makefile.am | 5 ++++- milena/tests/io/dicom/Makefile.am | 7 ++++--- milena/tests/io/dicom/dicom.cc | 7 +++---- 6 files changed, 35 insertions(+), 19 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5a9da7d..8560482 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2009-06-02 Roland Levillain <roland(a)lrde.epita.fr> + Add tentative support for GDCM in the build system. + + * mln/io/all.hh [HAVE_GDCM]: Include mln/io/dicom/all.hh. + * mln/io/dicom/load.hh: Fix paths of included GDCM headers. + Aesthetic changes. + * tests/io/Makefile.am (SUBDIRS) [HAVE_GDCM]: Add dicom. + * tests/io/dicom/Makefile.am: Aesthetic changes. + * tests/io/dicom/dicom.cc: Remove useless header inclusions. + +2009-06-02 Roland Levillain <roland(a)lrde.epita.fr> + * mln/io/dicom/all.hh: New file. 2009-06-02 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/mln/io/all.hh b/milena/mln/io/all.hh index bbb47d7..767cd7d 100644 --- a/milena/mln/io/all.hh +++ b/milena/mln/io/all.hh @@ -52,7 +52,6 @@ namespace mln # include <mln/io/cloud/all.hh> # include <mln/io/dump/all.hh> -# include <mln/io/dicom/load.hh> # include <mln/io/pbm/all.hh> # include <mln/io/pfm/all.hh> # include <mln/io/pgm/all.hh> @@ -66,6 +65,10 @@ namespace mln | I/O routines depending on a third-party library. | `--------------------------------------------------*/ +# ifdef HAVE_GDCM +# include <mln/io/dicom/all.hh> +# endif // ! HAVE_GDCM + # ifdef HAVE_CFITSIO # include <mln/io/fits/all.hh> # endif // ! HAVE_CFITSIO diff --git a/milena/mln/io/dicom/load.hh b/milena/mln/io/dicom/load.hh index b41eddb..d296442 100644 --- a/milena/mln/io/dicom/load.hh +++ b/milena/mln/io/dicom/load.hh @@ -28,21 +28,19 @@ #ifndef MLN_IO_DICOM_LOAD_HH # define MLN_IO_DICOM_LOAD_HH -/// \file mln/io/magick/load.hh -/// -/// \brief Define a function which loads an image of kind magick with -/// given path. +/// \file mln/io/magick/load.hh +/// \brief Define a function which loads a GDCM image. # include <mln/core/image/image2d.hh> # include <mln/core/image/image3d.hh> # include <mln/algebra/vec.hh> -# include <gdcmReader.h> -# include <gdcmImageReader.h> -# include <gdcmWriter.h> -# include <gdcmDataSet.h> -# include <gdcmAttribute.h> +# include <gdcm-2.0/gdcmReader.h> +# include <gdcm-2.0/gdcmImageReader.h> +# include <gdcm-2.0/gdcmWriter.h> +# include <gdcm-2.0/gdcmDataSet.h> +# include <gdcm-2.0/gdcmAttribute.h> namespace mln @@ -54,7 +52,7 @@ namespace mln namespace dicom { - /// Load a dicom image in a Milena image. + /// Load a DICOM file in a Milena image. /// /// \param[out] ima A reference to the image which will receive /// data. @@ -63,6 +61,7 @@ namespace mln void load(Image<I>& ima, const std::string& filename); + # ifndef MLN_INCLUDE_ONLY template <typename V> diff --git a/milena/tests/io/Makefile.am b/milena/tests/io/Makefile.am index 867e846..6f91495 100644 --- a/milena/tests/io/Makefile.am +++ b/milena/tests/io/Makefile.am @@ -7,7 +7,6 @@ include $(top_srcdir)/milena/tests/tests.mk ## ---------------------- ## SUBDIRS = \ - dicom \ dump \ off \ pbm \ @@ -20,6 +19,10 @@ SUBDIRS = \ ## I/O routines depending on a third-party library. ## ## ------------------------------------------------- ## +if HAVE_GDCM + SUBDIRS += dicom +endif HAVE_GDCM + if HAVE_CFITSIO SUBDIRS += fits endif HAVE_CFITSIO diff --git a/milena/tests/io/dicom/Makefile.am b/milena/tests/io/dicom/Makefile.am index 07646c8..5321b1c 100644 --- a/milena/tests/io/dicom/Makefile.am +++ b/milena/tests/io/dicom/Makefile.am @@ -1,10 +1,11 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk -check_PROGRAMS = \ - dicom +check_PROGRAMS = dicom +# FIXME: Upon completion, if this test only read (not write) images, +# rename it as load.cc dicom_SOURCES = dicom.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/dicom/dicom.cc b/milena/tests/io/dicom/dicom.cc index cd30c06..1239d60 100644 --- a/milena/tests/io/dicom/dicom.cc +++ b/milena/tests/io/dicom/dicom.cc @@ -31,20 +31,19 @@ #include <mln/core/image/image2d.hh> #include <mln/io/dicom/load.hh> -#include <mln/io/dump/save.hh> #include <mln/data/compare.hh> #include <mln/value/int_u12.hh> -#include "tests/data.hh" - #include <mln/debug/println.hh> +#include "tests/data.hh" + int main() { using namespace mln; - return 0; + // FIXME: This test is empty! } -- 1.6.1.2

1 0

[PATCH 19/27] mln/io/dicom/all.hh: New file.
by Roland Levillain 03 Jun '09

03 Jun '09

--- milena/ChangeLog | 4 +++ milena/mln/io/dicom/all.hh | 48 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) create mode 100644 milena/mln/io/dicom/all.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index e1d15ff..5a9da7d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2009-06-02 Roland Levillain <roland(a)lrde.epita.fr> + * mln/io/dicom/all.hh: New file. + +2009-06-02 Roland Levillain <roland(a)lrde.epita.fr> + Add support for Magick++ in the build system. * mln/io/all.hh [HAVE_MAGICKXX]: Include mln/io/magick/all.hh. diff --git a/milena/mln/io/dicom/all.hh b/milena/mln/io/dicom/all.hh new file mode 100644 index 0000000..6facbcb --- /dev/null +++ b/milena/mln/io/dicom/all.hh @@ -0,0 +1,48 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_IO_DICOM_ALL_HH +# define MLN_IO_DICOM_ALL_HH + +/// \file mln/io/dicom/all.hh +/// \brief Inclusion of all DICOM I/O routines. + + +namespace mln +{ + + namespace io + { + /// Namespace of DICOM input/output handling. + namespace dicom {} + } + +} + +# include <mln/io/dicom/load.hh> + +#endif // ! MLN_IO_DICOM_ALL_HH -- 1.6.1.2

1 0

[PATCH 18/27] Add tentative support for GDCM in the configuration system.
by Roland Levillain 03 Jun '09

03 Jun '09

* configure.ac: Find GDCM using OLN_WITH_LIB. --- ChangeLog | 6 ++++++ configure.ac | 7 +++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index bdf50ef..8fba8f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ 2009-06-03 Roland Levillain <roland(a)lrde.epita.fr> + + Add tentative support for GDCM in the configuration system. + + * configure.ac: Find GDCM using OLN_WITH_LIB. + +2009-06-03 Roland Levillain <roland(a)lrde.epita.fr> Add support for Magick++ in the configuration system. diff --git a/configure.ac b/configure.ac index d82540d..ce0af7f 100644 --- a/configure.ac +++ b/configure.ac @@ -145,6 +145,13 @@ OLN_WITH_LIB([Magick++], [Magick++.h], [Magick++], [magickxx], [MAGICKXX]) # TIFF library. OLN_WITH_LIB([TIFF], [tiff.h], [tiff]) +# Grassroots DiCoM (GDCM). +# FIXME: Linking against the sole libgdcmCommon.{a,so,dylib} is +# probably not enough in many cases (there are other libraries in the +# GDCM package). Write a decent test first (in +# milena/tests/io/dicom/), and improve the configuration. +OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm], [GDCM]) + ## ---------------------------- ## ## (Bundled) trimesh2 library. ## -- 1.6.1.2

1 0

[PATCH 17/27] Add support for Magick++ in the build system.
by Roland Levillain 03 Jun '09

03 Jun '09

* mln/io/all.hh [HAVE_MAGICKXX]: Include mln/io/magick/all.hh. * tests/io/Makefile.am (SUBDIRS) [HAVE_MAGICKXX]: Add magick. * tests/io/magick/Makefile.am (AM_CPPFLAGS): Add $(MAGICKXX_CPPFLAGS) (AM_LDFLAGS): Remove -lMagick++. Add $(MAGICKXX_LDFLAGS). --- milena/ChangeLog | 11 +++++++++++ milena/mln/io/all.hh | 5 ++++- milena/tests/io/Makefile.am | 5 ++++- milena/tests/io/magick/Makefile.am | 8 +++----- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a394c72..e1d15ff 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2009-06-02 Roland Levillain <roland(a)lrde.epita.fr> + Add support for Magick++ in the build system. + + * mln/io/all.hh [HAVE_MAGICKXX]: Include mln/io/magick/all.hh. + * tests/io/Makefile.am (SUBDIRS) [HAVE_MAGICKXX]: Add magick. + * tests/io/magick/Makefile.am + (AM_CPPFLAGS): Add $(MAGICKXX_CPPFLAGS) + (AM_LDFLAGS): Remove -lMagick++. + Add $(MAGICKXX_LDFLAGS). + +2009-06-02 Roland Levillain <roland(a)lrde.epita.fr> + Add support for TIFF in the build system. * mln/io/all.hh [HAVE_TIFF]: Include mln/io/tiff/all.hh. diff --git a/milena/mln/io/all.hh b/milena/mln/io/all.hh index 9ee7dd8..bbb47d7 100644 --- a/milena/mln/io/all.hh +++ b/milena/mln/io/all.hh @@ -53,7 +53,6 @@ namespace mln # include <mln/io/cloud/all.hh> # include <mln/io/dump/all.hh> # include <mln/io/dicom/load.hh> -# include <mln/io/magick/all.hh> # include <mln/io/pbm/all.hh> # include <mln/io/pfm/all.hh> # include <mln/io/pgm/all.hh> @@ -71,6 +70,10 @@ namespace mln # include <mln/io/fits/all.hh> # endif // ! HAVE_CFITSIO +# ifdef HAVE_MAGICKXX +# include <mln/io/magick/all.hh> +# endif // ! HAVE_MAGICKXX + # ifdef HAVE_TIFF # include <mln/io/tiff/all.hh> # endif // ! HAVE_LIBTIFF diff --git a/milena/tests/io/Makefile.am b/milena/tests/io/Makefile.am index ec9a83f..867e846 100644 --- a/milena/tests/io/Makefile.am +++ b/milena/tests/io/Makefile.am @@ -9,7 +9,6 @@ include $(top_srcdir)/milena/tests/tests.mk SUBDIRS = \ dicom \ dump \ - magick \ off \ pbm \ pfm \ @@ -25,6 +24,10 @@ if HAVE_CFITSIO SUBDIRS += fits endif HAVE_CFITSIO +if HAVE_MAGICKXX + SUBDIRS += magick +endif HAVE_MAGICKXX + if HAVE_TIFF SUBDIRS += tiff endif HAVE_TIFF diff --git a/milena/tests/io/magick/Makefile.am b/milena/tests/io/magick/Makefile.am index c636677..62993e4 100644 --- a/milena/tests/io/magick/Makefile.am +++ b/milena/tests/io/magick/Makefile.am @@ -1,10 +1,9 @@ -## Process this file through Automake to create Makefile.in -*- Makefile -*- +## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk -# FIXME: We should not use a hard-coded value. Rely on a variable set -# by configure instead. -AM_LDFLAGS = -lMagick++ +AM_CPPFLAGS += $(MAGICKXX_CPPFLAGS) +AM_LDFLAGS = $(MAGICKXX_LDFLAGS) check_PROGRAMS = \ load \ @@ -14,5 +13,4 @@ load_SOURCES = load.cc save_SOURCES = save.cc TESTS = $(check_PROGRAMS) - XFAIL_TESTS = save -- 1.6.1.2

1 0

[PATCH 16/27] Add support for Magick++ in the configuration system.
by Roland Levillain 03 Jun '09

03 Jun '09

* configure.ac: Find Magick++ using OLN_WITH_LIB. --- ChangeLog | 6 ++++++ configure.ac | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87ba37a..bdf50ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-06-03 Roland Levillain <roland(a)lrde.epita.fr> + Add support for Magick++ in the configuration system. + + * configure.ac: Find Magick++ using OLN_WITH_LIB. + +2009-06-02 Roland Levillain <roland(a)lrde.epita.fr> + Add support for TIFF in the configuration system. * configure.ac: Find libtiff using OLN_WITH_LIB. diff --git a/configure.ac b/configure.ac index 18bbdfd..d82540d 100644 --- a/configure.ac +++ b/configure.ac @@ -136,6 +136,12 @@ AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin']) # CFITSIO library. OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio]) +# Magick++. +# FIXME: We should handle Magick++ using pkgconfig (and/or +# Magick++-config?) instead of OLN_WITH_LIB. See how other projects +# handle this. +OLN_WITH_LIB([Magick++], [Magick++.h], [Magick++], [magickxx], [MAGICKXX]) + # TIFF library. OLN_WITH_LIB([TIFF], [tiff.h], [tiff]) -- 1.6.1.2

1 0

[PATCH 15/27] Add support for TIFF in the build system.
by Roland Levillain 03 Jun '09

03 Jun '09

* mln/io/all.hh [HAVE_TIFF]: Include mln/io/tiff/all.hh. * tests/io/Makefile.am (SUBDIRS) [HAVE_TIFF]: Add tiff. * tests/io/tiff/Makefile.am (load_LDFLAGS): Remove. (AM_CPPFLAGS): Add $(TIFF_CPPFLAGS). (AM_LDFLAGS): New. Add $(TIFF_LDFLAGS). --- milena/ChangeLog | 10 ++++++++++ milena/mln/io/all.hh | 5 ++++- milena/tests/io/Makefile.am | 7 +++++-- milena/tests/io/tiff/Makefile.am | 6 +++--- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index cac6609..a394c72 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,13 @@ +2009-06-02 Roland Levillain <roland(a)lrde.epita.fr> + + Add support for TIFF in the build system. + + * mln/io/all.hh [HAVE_TIFF]: Include mln/io/tiff/all.hh. + * tests/io/Makefile.am (SUBDIRS) [HAVE_TIFF]: Add tiff. + * tests/io/tiff/Makefile.am (load_LDFLAGS): Remove. + (AM_CPPFLAGS): Add $(TIFF_CPPFLAGS). + (AM_LDFLAGS): New. Add $(TIFF_LDFLAGS). + 2009-06-01 Roland Levillain <roland(a)lrde.epita.fr> Disable support for FreeImagePlus in Milena. diff --git a/milena/mln/io/all.hh b/milena/mln/io/all.hh index 0e081b5..9ee7dd8 100644 --- a/milena/mln/io/all.hh +++ b/milena/mln/io/all.hh @@ -60,7 +60,6 @@ namespace mln # include <mln/io/plot/all.hh> # include <mln/io/pnm/all.hh> # include <mln/io/ppm/all.hh> -# include <mln/io/tiff/all.hh> # include <mln/io/txt/all.hh> # include <mln/io/off/all.hh> @@ -72,4 +71,8 @@ namespace mln # include <mln/io/fits/all.hh> # endif // ! HAVE_CFITSIO +# ifdef HAVE_TIFF +# include <mln/io/tiff/all.hh> +# endif // ! HAVE_LIBTIFF + #endif // ! MLN_IO_ALL_HH diff --git a/milena/tests/io/Makefile.am b/milena/tests/io/Makefile.am index 6ebcd67..ec9a83f 100644 --- a/milena/tests/io/Makefile.am +++ b/milena/tests/io/Makefile.am @@ -15,8 +15,7 @@ SUBDIRS = \ pfm \ pgm \ pnm \ - ppm \ - tiff + ppm ## ------------------------------------------------- ## ## I/O routines depending on a third-party library. ## @@ -25,3 +24,7 @@ SUBDIRS = \ if HAVE_CFITSIO SUBDIRS += fits endif HAVE_CFITSIO + +if HAVE_TIFF + SUBDIRS += tiff +endif HAVE_TIFF diff --git a/milena/tests/io/tiff/Makefile.am b/milena/tests/io/tiff/Makefile.am index c94eeb1..682f004 100644 --- a/milena/tests/io/tiff/Makefile.am +++ b/milena/tests/io/tiff/Makefile.am @@ -2,10 +2,10 @@ include $(top_srcdir)/milena/tests/tests.mk -load_LDFLAGS=-ltiff +AM_CPPFLAGS += $(TIFF_CPPFLAGS) +AM_LDFLAGS = $(TIFF_LDFLAGS) -check_PROGRAMS = \ - load +check_PROGRAMS = load load_SOURCES = load.cc -- 1.6.1.2

1 0

[PATCH 13/27] Factor M4 code using OLN_WITH_LIB.
by Roland Levillain 03 Jun '09

03 Jun '09

* m4/cfitsio.m4, m4/freeimageplus.m4: Remove. * configure: Use OLN_WITH_LIB instead of OLN_WITH_FREEIMAGEPLUS and OLN_WITH_CFITSIO. --- ChangeLog | 8 ++++++++ configure.ac | 6 ++---- m4/cfitsio.m4 | 48 ------------------------------------------------ m4/freeimageplus.m4 | 48 ------------------------------------------------ 4 files changed, 10 insertions(+), 100 deletions(-) delete mode 100644 m4/cfitsio.m4 delete mode 100644 m4/freeimageplus.m4 diff --git a/ChangeLog b/ChangeLog index 46cd626..7b81428 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2009-06-03 Roland Levillain <roland(a)lrde.epita.fr> + Factor M4 code using OLN_WITH_LIB. + + * m4/cfitsio.m4, m4/freeimageplus.m4: Remove. + * configure: Use OLN_WITH_LIB instead of OLN_WITH_FREEIMAGEPLUS + and OLN_WITH_CFITSIO. + +2009-06-02 Roland Levillain <roland(a)lrde.epita.fr> + Add an Automake macro OLN_WITH_LIB to factor common code. * m4/oln-with-lib.m4: New. diff --git a/configure.ac b/configure.ac index 3480481..071aff6 100644 --- a/configure.ac +++ b/configure.ac @@ -131,12 +131,10 @@ AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin']) ## -------------------- ## ### Support for FreeImagePlus has been disabled for Olena 1.0. -## OLN_WITH_FREEIMAGEPLUS -## AM_CONDITIONAL([HAVE_FREEIMAGEPLUS], [test x$oln_have_freeimageplus = xyes]) +## OLN_WITH_LIB([FreeImagePlus], [FreeImagePlus.h], [freeimageplus]) # CFITSIO library. -OLN_WITH_CFITSIO -AM_CONDITIONAL([HAVE_CFITSIO], [test x$oln_have_cfitsio = xyes]) +OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio]) ## ---------------------------- ## diff --git a/m4/cfitsio.m4 b/m4/cfitsio.m4 deleted file mode 100644 index 0660968..0000000 --- a/m4/cfitsio.m4 +++ /dev/null @@ -1,48 +0,0 @@ -# -*- Autoconf -*- - -# OLN_WITH_CFITSIO -# ---------------------- -# Checks whether the CFITSIO library is available from C++ -# programs. -# -# This macro sets CFITSIO_CXXFLAGS and CFITSIO_LDFLAGS if -# the library is found and its functions available from C++. -AC_DEFUN([OLN_WITH_CFITSIO], -[dnl - AC_REQUIRE([AC_PROG_CXX]) - AC_LANG_PUSH([C++]) - - AC_ARG_WITH([cfitsio], - [AC_HELP_STRING([--with-cfitsio@<:@=DIR@:>@], - [using CFITSIO (DIR = prefix for CFITSIO installation)])]) - CFITSIO_CXXFLAGS='' - CFITSIO_LDFLAGS='' - if test "x$with_cfitsio" != xno; then - if test -n "$with_cfitsio"; then - CFITSIO_CXXFLAGS="-I${with_cfitsio}/include" - CFITSIO_LDFLAGS="-L${with_cfitsio}/lib" - fi - oln_save_CXXFLAGS=$CXXFLAGS - oln_save_LDFLAGS=$LDFLAGS - CXXFLAGS="$CXXFLAGS $CFITSIO_CXXFLAGS" - LDFLAGS="$LDFLAGS $CFITSIO_LDFLAGS" - oln_have_cfitsio=no - AC_CHECK_HEADER([fitsio.h], - [AC_CHECK_LIB([cfitsio], - [main], - [oln_have_cfitsio=yes - CFITSIO_LDFLAGS="$CFITSIO_LDFLAGS -lcfitsio" - AC_DEFINE([HAVE_CFITSIO], 1, - [Define to 1 if we can use CFITSIO]) - ] - )] - ) - CXXFLAGS=$oln_save_CXXFLAGS - LDFLAGS=$oln_save_LDFLAGS - TOOLS_LDFLAGS="$TOOLS_LDFLAGS $CFITSIO_LDFLAGS" - fi - AC_SUBST([CFITSIO_CXXFLAGS]) - AC_SUBST([CFITSIO_LDFLAGS]) - - AC_LANG_POP([C++]) -]) diff --git a/m4/freeimageplus.m4 b/m4/freeimageplus.m4 deleted file mode 100644 index 660b77b..0000000 --- a/m4/freeimageplus.m4 +++ /dev/null @@ -1,48 +0,0 @@ -# -*- Autoconf -*- - -# OLN_WITH_FREEIMAGEPLUS -# ---------------------- -# Checks whether the FreeImagePlus library is available from C++ -# programs. -# -# This macro sets FREEIMAGEPLUS_CXXFLAGS and FREEIMAGEPLUS_LDFLAGS if -# the library is found and its functions available from C++. -AC_DEFUN([OLN_WITH_FREEIMAGEPLUS], -[dnl - AC_REQUIRE([AC_PROG_CXX]) - AC_LANG_PUSH([C++]) - - AC_ARG_WITH([freeimageplus], - [AC_HELP_STRING([--with-freeimageplus@<:@=DIR@:>@], - [using FreeImagePlus (DIR = prefix for FreeImagePlus installation)])]) - FREEIMAGEPLUS_CXXFLAGS='' - FREEIMAGEPLUS_LDFLAGS='' - if test "x$with_freeimageplus" != xno; then - if test -n "$with_freeimageplus"; then - FREEIMAGEPLUS_CXXFLAGS="-I${with_freeimageplus}/include" - FREEIMAGEPLUS_LDFLAGS="-L${with_freeimageplus}/lib" - fi - oln_save_CXXFLAGS=$CXXFLAGS - oln_save_LDFLAGS=$LDFLAGS - CXXFLAGS="$CXXFLAGS $FREEIMAGEPLUS_CXXFLAGS" - LDFLAGS="$LDFLAGS $FREEIMAGEPLUS_LDFLAGS" - oln_have_freeimageplus=no - AC_CHECK_HEADER([FreeImagePlus.h], - [AC_CHECK_LIB([freeimageplus], - [main], - [oln_have_freeimageplus=yes - FREEIMAGEPLUS_LDFLAGS="$FREEIMAGEPLUS_LDFLAGS -lfreeimageplus" - AC_DEFINE([HAVE_FREEIMAGEPLUS], 1, - [Define to 1 if we can use FreeImage]) - ] - )] - ) - CXXFLAGS=$oln_save_CXXFLAGS - LDFLAGS=$oln_save_LDFLAGS - TOOLS_LDFLAGS="$TOOLS_LDFLAGS $FREEIMAGEPLUS_LDFLAGS" - fi - AC_SUBST([FREEIMAGEPLUS_CXXFLAGS]) - AC_SUBST([FREEIMAGEPLUS_LDFLAGS]) - - AC_LANG_POP([C++]) -]) -- 1.6.1.2

1 0

[PATCH 14/27] Add support for TIFF in the configuration system.
by Roland Levillain 03 Jun '09

03 Jun '09

* configure.ac: Find libtiff using OLN_WITH_LIB. --- ChangeLog | 6 ++++++ configure.ac | 3 +++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b81428..87ba37a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-06-03 Roland Levillain <roland(a)lrde.epita.fr> + Add support for TIFF in the configuration system. + + * configure.ac: Find libtiff using OLN_WITH_LIB. + +2009-06-02 Roland Levillain <roland(a)lrde.epita.fr> + Factor M4 code using OLN_WITH_LIB. * m4/cfitsio.m4, m4/freeimageplus.m4: Remove. diff --git a/configure.ac b/configure.ac index 071aff6..18bbdfd 100644 --- a/configure.ac +++ b/configure.ac @@ -136,6 +136,9 @@ AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin']) # CFITSIO library. OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio]) +# TIFF library. +OLN_WITH_LIB([TIFF], [tiff.h], [tiff]) + ## ---------------------------- ## ## (Bundled) trimesh2 library. ## -- 1.6.1.2

1 0

[PATCH 12/27] Add an Automake macro OLN_WITH_LIB to factor common code.
by Roland Levillain 03 Jun '09

03 Jun '09

* m4/oln-with-lib.m4: New. --- ChangeLog | 6 ++++ m4/oln-with-lib.m4 | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 0 deletions(-) create mode 100644 m4/oln-with-lib.m4 diff --git a/ChangeLog b/ChangeLog index 1b0d496..46cd626 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-06-03 Roland Levillain <roland(a)lrde.epita.fr> + Add an Automake macro OLN_WITH_LIB to factor common code. + + * m4/oln-with-lib.m4: New. + +2009-06-02 Roland Levillain <roland(a)lrde.epita.fr> + Disable support for FreeImagePlus in Olena. * configure.ac: Here. diff --git a/m4/oln-with-lib.m4 b/m4/oln-with-lib.m4 new file mode 100644 index 0000000..16997c9 --- /dev/null +++ b/m4/oln-with-lib.m4 @@ -0,0 +1,78 @@ +# -*- Autoconf -*- + +# OLN_WITH_LIB(PACKAGE, HEADER, LIBRARY, [SHELL_NAME], [CPP_NAME]) +# ---------------------------------------------------------------- +# Checks whether library PACKAGE is available from C++ programs. +# HEADER and LIBRARY are respectively a header and the library name +# (object) that are checked to assess the usability of the library. +# SHELL_NAME is a name used in shell variables (preferably in lower +# case), while CPP_NAME is used in the name of C++ preprocessor macros +# and flags (preferably in upper case). +# +# If they are not given, SHELL_NAME defaults to m4_tolower([LIBRARY]) +# and CPP_NAME defaults to m4_toupper([LIBRARY]). +# +# This macro sets the shell variable oln_have_`SHELL_NAME' to `yes' if +# the library is found and if it is working (and to `no' otherwise), +# and defines a CPP macro and an Automake conditional both named +# HAVE_`CPP_NAME'. It also sets `CPP_NAME'_CXXFLAGS and +# `CPP_NAME'_LDFLAGS. +# +# Examples of use: +# +# OLN_WITH_LIB([FreeImagePlus], [FreeImagePlus.h], [freeimageplus]) +# OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio]) +# OLN_WITH_LIB([Zlib], [zlib.h], [z], [zlib], [ZLIB]) +# +AC_DEFUN([OLN_WITH_LIB], +[dnl Do some sanity checking of the arguments. +m4_if([$1], , [AC_FATAL([$0: missing argument 1])])dnl +m4_if([$2], , [AC_FATAL([$0: missing argument 2])])dnl +m4_if([$3], , [AC_FATAL([$0: missing argument 3])])dnl +_OLN_WITH_LIB([$1], [$2], [$3],dnl +dnl Process optional arguments. +m4_default([$4], m4_tolower([$3])),dnl +m4_default([$5], m4_toupper([$3])))dnl +])# OLN_WITH_LIB + + +# _OLN_WITH_LIB(PACKAGE, HEADER, LIBRARY, SHELL_NAME, CPP_NAME) +# ------------------------------------------------------------- +# Actual implementation of OLN_WITH_LIB. +AC_DEFUN([_OLN_WITH_LIB], +[dnl + AC_REQUIRE([AC_PROG_CXX]) + AC_LANG_PUSH([C++]) + AC_ARG_WITH([$4], + [AC_HELP_STRING([--with-$4@<:@=DIR@:>@], + [use $1 (DIR = prefix for $1 installation)])]) + $5_CXXFLAGS='' + $5_LDFLAGS='' + if test "x$with_$4" != xno; then + if test -n "$with_$4"; then + $5_CXXFLAGS="-I${with_$4}/include" + $5_LDFLAGS="-L${with_$4}/lib" + fi + oln_save_CXXFLAGS=$CXXFLAGS + oln_save_LDFLAGS=$LDFLAGS + CXXFLAGS="$CXXFLAGS $$5_CXXFLAGS" + LDFLAGS="$LDFLAGS $$5_LDFLAGS" + oln_have_$4=no + AC_CHECK_HEADER([$2], + [AC_CHECK_LIB([$3], + [main], + [oln_have_$4=yes + $5_LDFLAGS="$$5_LDFLAGS -l$3" + AC_DEFINE([HAVE_$5], 1, [Define to 1 if we can use $1]) + ] + )] + ) + CXXFLAGS=$oln_save_CXXFLAGS + LDFLAGS=$oln_save_LDFLAGS + TOOLS_LDFLAGS="$TOOLS_LDFLAGS $$5_LDFLAGS" + fi + AC_SUBST([$5_CXXFLAGS]) + AC_SUBST([$5_LDFLAGS]) + AM_CONDITIONAL([HAVE_$5], [test x$oln_have_$4 = xyes]) + AC_LANG_POP([C++]) +])# _OLN_WITH_LIB -- 1.6.1.2

1 0

[PATCH 11/27] Disable support for FreeImagePlus in Olena.
by Roland Levillain 03 Jun '09

03 Jun '09

* configure.ac: Here. (FREEIMAGEPLUS): Disable conditional and rename it as... (HAVE_FREEIMAGEPLUS): ...this. --- ChangeLog | 8 ++++++++ configure.ac | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c57d30..1b0d496 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2009-06-03 Roland Levillain <roland(a)lrde.epita.fr> + Disable support for FreeImagePlus in Olena. + + * configure.ac: Here. + (FREEIMAGEPLUS): Disable conditional and rename it as... + (HAVE_FREEIMAGEPLUS): ...this. + +2009-06-03 Roland Levillain <roland(a)lrde.epita.fr> + Rename CFITSIO conditional. * configure.ac (CFITSIO): Rename conditional as... diff --git a/configure.ac b/configure.ac index e4ad13a..3480481 100644 --- a/configure.ac +++ b/configure.ac @@ -130,9 +130,9 @@ AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin']) ## External libraries. ## ## -------------------- ## -# FreeImage library. -OLN_WITH_FREEIMAGEPLUS -AM_CONDITIONAL([FREEIMAGEPLUS], [test x$oln_have_freeimageplus = xyes]) +### Support for FreeImagePlus has been disabled for Olena 1.0. +## OLN_WITH_FREEIMAGEPLUS +## AM_CONDITIONAL([HAVE_FREEIMAGEPLUS], [test x$oln_have_freeimageplus = xyes]) # CFITSIO library. OLN_WITH_CFITSIO -- 1.6.1.2

1 0