1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
--- configure.ac.old 2011-10-27 00:29:36.497119410 +0200
+++ configure.ac 2011-10-27 00:31:04.576795968 +0200
@@ -49,14 +49,13 @@
GCONF_REQUIRED=2.6.0
EXIV2_REQUIRED=0.18
CLUTTER_REQUIRED=1.0.0
-CLUTTER_GTK_REQUIRED=0.10.0
+CLUTTER_GTK_REQUIRED=1.0.0
GSTREAMER_REQUIRED=0.10
OPENRAW_REQUIRED=0.0.8
-UNIQUE_REQUIRED=1.1.2
-LIBSOUP_REQUIRED=2.26
-GNOME_KEYRING_REQUIRED=2.28
-LIBBRASERO_REQUIRED=2.28
-LIBCHAMPLAIN_REQUIRED=0.8.0
+LIBSOUP_REQUIRED=2.36
+GNOME_KEYRING_REQUIRED=3.2.0
+LIBBRASERO_REQUIRED=3.2.0
+LIBCHAMPLAIN_REQUIRED=0.12.0
dnl ===========================================================================
@@ -159,22 +158,6 @@
dnl ===========================================================================
-AC_ARG_ENABLE([unique],
- [AS_HELP_STRING([--disable-unique],[do not compile code that uses the libunique library])],,
- [enable_unique=yes])
-
-if test x$enable_unique = xyes ; then
- PKG_CHECK_MODULES(UNIQUE,
- unique-1.0 >= $UNIQUE_REQUIRED,
- [enable_unique=yes],
- [enable_unique=no])
-fi
-AC_SUBST(UNIQUE_LIBS)
-AC_SUBST(UNIQUE_CFLAGS)
-AM_CONDITIONAL(ENABLE_UNIQUE, test "x$enable_unique" = xyes)
-
-dnl ===========================================================================
-
AC_ARG_ENABLE([exiv2],
[AS_HELP_STRING([--disable-exiv2],[do not compile code that uses the exiv2 library])],,
[enable_exiv2=yes])
@@ -201,7 +184,7 @@
if test x$enable_clutter = xyes ; then
PKG_CHECK_MODULES(CLUTTER,
[clutter-1.0 >= $CLUTTER_REQUIRED
- clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED],
+ clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED],
[enable_clutter=yes],
[enable_clutter=no])
fi
@@ -239,8 +222,8 @@
if test x$enable_libchamplain = xyes ; then
PKG_CHECK_MODULES(LIBCHAMPLAIN,
- [champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED
- champlain-gtk-0.8 >= $LIBCHAMPLAIN_REQUIRED],
+ [champlain-0.12 >= $LIBCHAMPLAIN_REQUIRED
+ champlain-gtk-0.12 >= $LIBCHAMPLAIN_REQUIRED],
[enable_libchamplain=yes],
[enable_libchamplain=no])
fi
@@ -508,7 +491,7 @@
if test x$enable_libbrasero = xyes ; then
PKG_CHECK_MODULES(LIBBRASERO,
- [libbrasero-burn >= $LIBBRASERO_REQUIRED],
+ [libbrasero-burn3 >= $LIBBRASERO_REQUIRED],
[AC_DEFINE(HAVE_LIBBRASERO, 1, [Have libbrasero])
enable_libbrasero=yes],
[enable_libbrasero=no])
|