* 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
Show replies by date