1 diff -Naur gnome-utils-3.2.1.orig/configure gnome-utils-3.2.1/configure
2 --- gnome-utils-3.2.1.orig/configure 2011-10-17 16:29:42.000000000 +0200
3 +++ gnome-utils-3.2.1/configure 2011-12-20 17:25:38.639812257 +0100
4 @@ -18552,42 +18552,42 @@
9 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DESKTOP_GSETTINGS" >&5
10 -$as_echo_n "checking for DESKTOP_GSETTINGS... " >&6; }
12 -if test -n "$DESKTOP_GSETTINGS_CFLAGS"; then
13 - pkg_cv_DESKTOP_GSETTINGS_CFLAGS="$DESKTOP_GSETTINGS_CFLAGS"
14 - elif test -n "$PKG_CONFIG"; then
15 - if test -n "$PKG_CONFIG" && \
16 - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gsettings-desktop-schemas\""; } >&5
17 - ($PKG_CONFIG --exists --print-errors "gsettings-desktop-schemas") 2>&5
19 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
20 - test $ac_status = 0; }; then
21 - pkg_cv_DESKTOP_GSETTINGS_CFLAGS=`$PKG_CONFIG --cflags "gsettings-desktop-schemas" 2>/dev/null`
28 -if test -n "$DESKTOP_GSETTINGS_LIBS"; then
29 - pkg_cv_DESKTOP_GSETTINGS_LIBS="$DESKTOP_GSETTINGS_LIBS"
30 - elif test -n "$PKG_CONFIG"; then
31 - if test -n "$PKG_CONFIG" && \
32 - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gsettings-desktop-schemas\""; } >&5
33 - ($PKG_CONFIG --exists --print-errors "gsettings-desktop-schemas") 2>&5
35 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
36 - test $ac_status = 0; }; then
37 - pkg_cv_DESKTOP_GSETTINGS_LIBS=`$PKG_CONFIG --libs "gsettings-desktop-schemas" 2>/dev/null`
45 +#{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DESKTOP_GSETTINGS" >&5
46 +#$as_echo_n "checking for DESKTOP_GSETTINGS... " >&6; }
48 +#if test -n "$DESKTOP_GSETTINGS_CFLAGS"; then
49 + #pkg_cv_DESKTOP_GSETTINGS_CFLAGS="$DESKTOP_GSETTINGS_CFLAGS"
50 + #elif test -n "$PKG_CONFIG"; then
51 + #if test -n "$PKG_CONFIG" && \
52 + #{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gsettings-desktop-schemas\""; } >&5
53 + #($PKG_CONFIG --exists --print-errors "gsettings-desktop-schemas") 2>&5
55 + #$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
56 + #test $ac_status = 0; }; then
57 + #pkg_cv_DESKTOP_GSETTINGS_CFLAGS=`$PKG_CONFIG --cflags "gsettings-desktop-schemas" 2>/dev/null`
64 +#if test -n "$DESKTOP_GSETTINGS_LIBS"; then
65 + #pkg_cv_DESKTOP_GSETTINGS_LIBS="$DESKTOP_GSETTINGS_LIBS"
66 + #elif test -n "$PKG_CONFIG"; then
67 + #if test -n "$PKG_CONFIG" && \
68 + #{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gsettings-desktop-schemas\""; } >&5
69 + #($PKG_CONFIG --exists --print-errors "gsettings-desktop-schemas") 2>&5
71 + #$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
72 + #test $ac_status = 0; }; then
73 + #pkg_cv_DESKTOP_GSETTINGS_LIBS=`$PKG_CONFIG --libs "gsettings-desktop-schemas" 2>/dev/null`
83 @@ -18646,42 +18646,42 @@
88 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCONF" >&5
89 -$as_echo_n "checking for GCONF... " >&6; }
91 -if test -n "$GCONF_CFLAGS"; then
92 - pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS"
93 - elif test -n "$PKG_CONFIG"; then
94 - if test -n "$PKG_CONFIG" && \
95 - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
96 - ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
98 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
99 - test $ac_status = 0; }; then
100 - pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0" 2>/dev/null`
107 -if test -n "$GCONF_LIBS"; then
108 - pkg_cv_GCONF_LIBS="$GCONF_LIBS"
109 - elif test -n "$PKG_CONFIG"; then
110 - if test -n "$PKG_CONFIG" && \
111 - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
112 - ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
114 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
115 - test $ac_status = 0; }; then
116 - pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0" 2>/dev/null`
124 +#{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCONF" >&5
125 +#$as_echo_n "checking for GCONF... " >&6; }
127 +#if test -n "$GCONF_CFLAGS"; then
128 + #pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS"
129 + #elif test -n "$PKG_CONFIG"; then
130 + #if test -n "$PKG_CONFIG" && \
131 + #{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
132 + #($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
134 + #$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
135 + #test $ac_status = 0; }; then
136 + #pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0" 2>/dev/null`
141 + #pkg_failed=untried
143 +#if test -n "$GCONF_LIBS"; then
144 + #pkg_cv_GCONF_LIBS="$GCONF_LIBS"
145 + #elif test -n "$PKG_CONFIG"; then
146 + #if test -n "$PKG_CONFIG" && \
147 + #{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
148 + #($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
150 + #$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
151 + #test $ac_status = 0; }; then
152 + #pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0" 2>/dev/null`
157 + #pkg_failed=untried
162 @@ -18871,44 +18871,44 @@
164 # for anything which calls gconftool-2 correctly
165 # Extract the first word of "gconftool-2", so it can be a program name with args.
166 -set dummy gconftool-2; ac_word=$2
167 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
168 -$as_echo_n "checking for $ac_word... " >&6; }
169 -if ${ac_cv_path_GCONFTOOL+:} false; then :
170 - $as_echo_n "(cached) " >&6
174 - ac_cv_path_GCONFTOOL="$GCONFTOOL" # Let the user override the test with a path.
177 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
181 - test -z "$as_dir" && as_dir=.
182 - for ac_exec_ext in '' $ac_executable_extensions; do
183 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
184 - ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
185 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
192 - test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
196 -GCONFTOOL=$ac_cv_path_GCONFTOOL
197 -if test -n "$GCONFTOOL"; then
198 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5
199 -$as_echo "$GCONFTOOL" >&6; }
201 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
202 -$as_echo "no" >&6; }
204 +#set dummy gconftool-2; ac_word=$2
205 +#{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
206 +#$as_echo_n "checking for $ac_word... " >&6; }
207 +#if ${ac_cv_path_GCONFTOOL+:} false; then :
208 + #$as_echo_n "(cached) " >&6
210 + #case $GCONFTOOL in
211 + #[\\/]* | ?:[\\/]*)
212 + #ac_cv_path_GCONFTOOL="$GCONFTOOL" # Let the user override the test with a path.
215 + #as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
216 +#for as_dir in $PATH
219 + #test -z "$as_dir" && as_dir=.
220 + #for ac_exec_ext in '' $ac_executable_extensions; do
221 + #if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
222 + #ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
223 + #$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
230 + #test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
234 +#GCONFTOOL=$ac_cv_path_GCONFTOOL
235 +#if test -n "$GCONFTOOL"; then
236 + #{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5
237 +#$as_echo "$GCONFTOOL" >&6; }
239 + #{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
240 +#$as_echo "no" >&6; }
244 if test "x$GCONFTOOL" = "xno"; then :
245 @@ -19012,42 +19012,42 @@
250 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCANBERRA_GTK" >&5
251 -$as_echo_n "checking for LIBCANBERRA_GTK... " >&6; }
253 -if test -n "$LIBCANBERRA_GTK_CFLAGS"; then
254 - pkg_cv_LIBCANBERRA_GTK_CFLAGS="$LIBCANBERRA_GTK_CFLAGS"
255 - elif test -n "$PKG_CONFIG"; then
256 - if test -n "$PKG_CONFIG" && \
257 - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk3 >= \$LIBCANBERRA_GTK_REQUIRED\""; } >&5
258 - ($PKG_CONFIG --exists --print-errors "libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED") 2>&5
260 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
261 - test $ac_status = 0; }; then
262 - pkg_cv_LIBCANBERRA_GTK_CFLAGS=`$PKG_CONFIG --cflags "libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED" 2>/dev/null`
269 -if test -n "$LIBCANBERRA_GTK_LIBS"; then
270 - pkg_cv_LIBCANBERRA_GTK_LIBS="$LIBCANBERRA_GTK_LIBS"
271 - elif test -n "$PKG_CONFIG"; then
272 - if test -n "$PKG_CONFIG" && \
273 - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk3 >= \$LIBCANBERRA_GTK_REQUIRED\""; } >&5
274 - ($PKG_CONFIG --exists --print-errors "libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED") 2>&5
276 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
277 - test $ac_status = 0; }; then
278 - pkg_cv_LIBCANBERRA_GTK_LIBS=`$PKG_CONFIG --libs "libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED" 2>/dev/null`
286 +#{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCANBERRA_GTK" >&5
287 +#$as_echo_n "checking for LIBCANBERRA_GTK... " >&6; }
289 +#if test -n "$LIBCANBERRA_GTK_CFLAGS"; then
290 + #pkg_cv_LIBCANBERRA_GTK_CFLAGS="$LIBCANBERRA_GTK_CFLAGS"
291 + #elif test -n "$PKG_CONFIG"; then
292 + #if test -n "$PKG_CONFIG" && \
293 + #{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk3 >= \$LIBCANBERRA_GTK_REQUIRED\""; } >&5
294 + #($PKG_CONFIG --exists --print-errors "libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED") 2>&5
296 + #$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
297 + #test $ac_status = 0; }; then
298 + #pkg_cv_LIBCANBERRA_GTK_CFLAGS=`$PKG_CONFIG --cflags "libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED" 2>/dev/null`
303 + #pkg_failed=untried
305 +#if test -n "$LIBCANBERRA_GTK_LIBS"; then
306 + #pkg_cv_LIBCANBERRA_GTK_LIBS="$LIBCANBERRA_GTK_LIBS"
307 + #elif test -n "$PKG_CONFIG"; then
308 + #if test -n "$PKG_CONFIG" && \
309 + #{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk3 >= \$LIBCANBERRA_GTK_REQUIRED\""; } >&5
310 + #($PKG_CONFIG --exists --print-errors "libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED") 2>&5
312 + #$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
313 + #test $ac_status = 0; }; then
314 + #pkg_cv_LIBCANBERRA_GTK_LIBS=`$PKG_CONFIG --libs "libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED" 2>/dev/null`
319 + #pkg_failed=untried