updated ChangeLog file

[geeqie.git] / configure.in

diff --git a/configure.in b/configure.in
index b390258..21553d9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.  -*- Autoconf
  -*-
 
 dnl This file is a part of Geeqie project (http://geeqie.sourceforge.net/).
-dnl Copyright (C) 2008 - 2010 The Geeqie Team
+dnl Copyright (C) 2008 - 2012 The Geeqie Team
 dnl
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
 
 AC_PREREQ(2.57)
-AC_INIT(geeqie, 1.0, geeqie-devel@lists.sourceforge.net)
+AC_INIT(geeqie, 1.1, geeqie-devel@lists.sourceforge.net)
 
 # Check for rightly dirs
 AC_CONFIG_SRCDIR([src/main.c])
@@ -128,6 +128,7 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_STDC_HEADERS
 AC_ARG_PROGRAM
+AC_SYS_LARGEFILE
 IT_PROG_INTLTOOL([0.35.0])
 
 
@@ -301,7 +302,8 @@ AC_ARG_ENABLE([jpeg],
 if test "x${libjpeg}" != "xno"; then
   AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
       HAVE_JPEG=yes
-      JPEG_LIBS=-ljpeg,
+      JPEG_LIBS=-ljpeg
+      AC_DEFINE(HAVE_JPEG, 1, [define to enable use of custom jpeg loader]),
       HAVE_JPEG=no)
 else
   HAVE_JPEG=disabled
@@ -312,6 +314,28 @@ AC_SUBST(JPEG_CFLAGS)
 AC_SUBST(JPEG_LIBS)
 
 
+#  libtiff support
+# ----------------------------------------------------------------------
+
+AC_ARG_ENABLE([tiff],
+  AC_HELP_STRING([--disable-tiff], [disable direct tiff support]),
+    [libtiff=$enableval], [libtiff=auto])
+
+if test "x${libtiff}" != "xno"; then
+  AC_CHECK_LIB(tiff, TIFFClientOpen,
+      HAVE_TIFF=yes
+      TIFF_LIBS=-ltiff
+      AC_DEFINE(HAVE_TIFF, 1, [define to enable use of custom tiff loader]),
+      HAVE_TIFF=no)
+else
+  HAVE_TIFF=disabled
+fi
+
+AM_CONDITIONAL(HAVE_TIFF, [test "x$HAVE_TIFF" = xyes])
+AC_SUBST(TIFF_CFLAGS)
+AC_SUBST(TIFF_LIBS)
+
+
 #  Exiv2 support
 # ----------------------------------------------------------------------
 
@@ -404,7 +428,7 @@ AH_TOP([
 
 /*
  *  This file is a part of Geeqie project (http://geeqie.sourceforge.net/).
- *  Copyright (C) 2008 - 2010 The Geeqie Team
+ *  Copyright (C) 2008 - 2012 The Geeqie Team
  *
  *  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
@@ -469,7 +493,7 @@ Flags:
   Gtk:           $GTK_CFLAGS
   Glib:          $GLIB_CFLAGS
   Thread:        $GTHREAD_LIBS
-  Others:       $JPEG_LIBS $LCMS_LIBS $EXIV2_LIBS $LIBCHAMPLAIN_LIBS $LIBCHAMPLAIN_GTK_LIBS
+  Others:       $JPEG_LIBS $TIFF_LIBS $LCMS_LIBS $EXIV2_LIBS $LIBCHAMPLAIN_LIBS $LIBCHAMPLAIN_GTK_LIBS
 
 Localization:
   NLS support:   $USE_NLS