diff options
author | Alessio Treglia <alessio@debian.org> | 2010-07-12 19:34:33 +0200 |
---|---|---|
committer | Alessio Treglia <alessio@debian.org> | 2010-07-12 19:34:33 +0200 |
commit | 88ed5294e45c9a82b309c08aa5533388d90b1a1f (patch) | |
tree | 0f7ecf0420c14bed82d615e98005327e8e613fe8 /configure.ac | |
parent | 046e95e38e048f663efbf421894f3f84a212525b (diff) | |
parent | c15dc3b14e35850849f3559ac0305b4cac4a7046 (diff) |
Merge commit 'upstream/2.31.5.bzr424'
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index ab2b8b9..3d5a225 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(configure.ac) -AM_INIT_AUTOMAKE(simple-scan, 2.31.1) +AM_INIT_AUTOMAKE(simple-scan, 2.31.4) AM_MAINTAINER_MODE GNOME_MAINTAINER_MODE_DEFINES m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) @@ -13,7 +13,7 @@ AC_HEADER_STDC AM_GCONF_SOURCE_2 -GNOME_COMPILE_WARNINGS(yes) +GNOME_COMPILE_WARNINGS(maximum) dnl ########################################################################### dnl Dependencies @@ -23,11 +23,14 @@ 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+-2.0 >= $GTK_REQUIRED gconf-2.0 gmodule-export-2.0 gthread-2.0 + zlib cairo gdk-pixbuf-2.0 cairo-pdf @@ -37,6 +40,7 @@ PKG_CHECK_MODULES(SIMPLE_SCAN, [ 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])]) dnl ########################################################################### dnl Documentation |