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
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
|
--- configure.orig 2015-07-21 23:39:50.000000000 +0200
+++ configure 2015-08-14 14:37:54.000000000 +0200
@@ -21334,8 +21334,6 @@
# First test for 3_3_5
TRACKER_MINER_EVOLUTION_3_3_5_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
evolution-shell-3.0 >= 3.1
- evolution-plugin-3.0
- libemail-utils
libemail-engine
evolution-data-server-1.2 >= $EDS_REQUIRED
camel-1.2 >= $CAMEL_REQUIRED"
@@ -21429,7 +21427,6 @@
# Second test for 3_2
TRACKER_MINER_EVOLUTION_3_2_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
evolution-shell-3.0 >= 3.1
- evolution-plugin-3.0
evolution-data-server-1.2 >= $EDS_REQUIRED
camel-1.2 >= $CAMEL_REQUIRED"
@@ -21519,7 +21516,6 @@
# Third test for 2_91
TRACKER_MINER_EVOLUTION_2_91_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
evolution-shell-3.0
- evolution-plugin-3.0
evolution-data-server-1.2 >= $EDS_REQUIRED
camel-1.2 >= $CAMEL_REQUIRED"
@@ -21605,7 +21601,6 @@
# Fourth test others (do we really want support for anything < 3.2)?
TRACKER_MINER_EVOLUTION_LAST_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
evolution-shell >= $EVO_SHELL_REQUIRED
- evolution-plugin >= $EVO_REQUIRED
evolution-data-server-1.2 >= $EDS_REQUIRED
camel-1.2 >= $CAMEL_REQUIRED"
@@ -24247,14 +24242,14 @@
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= \$DBUS_REQUIRED
- hal >= \$HAL_REQUIRED\""; } >&5
+ hal >= \$HAL_REQUIRED dbus-glib-1\""; } >&5
($PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED
- hal >= $HAL_REQUIRED") 2>&5
+ hal >= $HAL_REQUIRED dbus-glib-1"; ) >&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= $DBUS_REQUIRED
- hal >= $HAL_REQUIRED" 2>/dev/null`
+ hal >= $HAL_REQUIRED dbus-glib-1" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -24267,14 +24262,16 @@
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= \$DBUS_REQUIRED
- hal >= \$HAL_REQUIRED\""; } >&5
+ hal >= \$HAL_REQUIRED dbus-glib-1\""; } >&5
($PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED
- hal >= $HAL_REQUIRED") 2>&5
+ hal >= $HAL_REQUIRED
+ dbus-glib-1") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "dbus-1 >= $DBUS_REQUIRED
- hal >= $HAL_REQUIRED" 2>/dev/null`
+ hal >= $HAL_REQUIRED
+ dbus-glib-1" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -24296,10 +24293,12 @@
fi
if test $_pkg_short_errors_supported = yes; then
HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= $DBUS_REQUIRED
- hal >= $HAL_REQUIRED" 2>&1`
+ hal >= $HAL_REQUIRED
+ dbus-glib-1" 2>&1`
else
HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= $DBUS_REQUIRED
- hal >= $HAL_REQUIRED" 2>&1`
+ hal >= $HAL_REQUIRED
+ dbus-glib-1" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$HAL_PKG_ERRORS" >&5
@@ -25497,7 +25496,6 @@
if test "${with_evolution_plugin_dir+set}" = set; then :
withval=$with_evolution_plugin_dir;
fi
-,
tracker_miner_evolution_install_dir=$withval,
tracker_miner_evolution_install_dir=`$PKG_CONFIG $evolution_plugin_name --variable=plugindir`,
@@ -27296,7 +27294,6 @@
OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
CFLAGS=""
-LDFLAGS=""
LIBS=""
# Check whether --enable-libgif was given.
@@ -27406,7 +27403,6 @@
OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
CFLAGS=""
-LDFLAGS=""
LIBS=""
# Check whether --enable-libjpeg was given.
@@ -27516,7 +27512,6 @@
OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
CFLAGS=""
-LDFLAGS=""
LIBS=""
# Check whether --enable-libtiff was given.
@@ -27626,7 +27621,6 @@
OLD_LDFLAGS="$LDFLAGS"
OLD_LIBS="$LIBS"
CFLAGS=""
-LDFLAGS=""
LIBS=""
# Check whether --enable-libpng was given.
|
