From 87ebc2af1f0417b3bc38a233e28ff673eff4fa51 Mon Sep 17 00:00:00 2001
From: Alessio Treglia <alessio@debian.org>
Date: Sat, 27 Aug 2011 10:54:21 +0200
Subject: Imported Upstream version 3.1.5

---
 configure.ac | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index a8788a3..24afcd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,17 +1,18 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(configure.ac)
-AM_INIT_AUTOMAKE(simple-scan, 2.32.0.2)
+AM_INIT_AUTOMAKE(simple-scan, 3.1.5)
+AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 GNOME_MAINTAINER_MODE_DEFINES
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 AC_ISC_POSIX
-AC_PROG_CC_C_O
-AM_PROG_CC_STDC
+AM_PROG_VALAC([0.13.0])
+AM_PROG_CC_C_O
 AC_HEADER_STDC
 
-AM_GCONF_SOURCE_2
+GLIB_GSETTINGS
 
 GNOME_COMPILE_WARNINGS(maximum)
 
@@ -23,21 +24,21 @@ dnl Run-time dependencies:
 dnl * gnome-icon-theme
 dnl * xdg-utils (for xdg-email)
 
-GTK_REQUIRED=2.18.0
-
 PKG_CHECK_MODULES(SIMPLE_SCAN, [
-    gtk+-2.0 >= $GTK_REQUIRED
-    gconf-2.0
+    gtk+-3.0
     gmodule-export-2.0
     gthread-2.0
     zlib
     cairo
     gdk-pixbuf-2.0
-    cairo-pdf
-    dbus-glib-1
     gudev-1.0
 ])
 
+PKG_CHECK_MODULES(COLORD, [
+    colord
+], have_colord=yes, have_colord=no)
+AM_CONDITIONAL(HAVE_COLORD, test $have_colord = yes)
+
 AC_CHECK_HEADERS([sane/sane.h],[],[AC_MSG_ERROR([SANE not found])])
 AC_CHECK_HEADERS([sane/saneopts.h],[],[AC_MSG_ERROR([SANE not found])])
 AC_CHECK_HEADERS([jpeglib.h],[],[AC_MSG_ERROR([libjpeg not found])])
-- 
cgit v1.2.3