135
151
CK_COMPILE_SOLARIS_FALSE
136
152
CK_COMPILE_SOLARIS_TRUE
137
153
CK_COMPILE_FREEBSD_FALSE
138
@@ -6277,13 +6279,13 @@
140
lt_cv_nm_interface="BSD nm"
141
echo "int some_variable = 0;" > conftest.$ac_ext
142
- (eval echo "\"\$as_me:6280: $ac_compile\"" >&5)
143
+ (eval echo "\"\$as_me:6282: $ac_compile\"" >&5)
144
(eval "$ac_compile" 2>conftest.err)
146
- (eval echo "\"\$as_me:6283: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
147
+ (eval echo "\"\$as_me:6285: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
148
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
150
- (eval echo "\"\$as_me:6286: output\"" >&5)
151
+ (eval echo "\"\$as_me:6288: output\"" >&5)
153
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
154
lt_cv_nm_interface="MS dumpbin"
155
@@ -6753,7 +6755,7 @@
158
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
159
- *) ac_optarg=yes ;;
160
+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
162
+ *) ac_optarg=yes ;;
165
# Accept the important Cygnus configure options, so we can diagnose typos.
166
@@ -1591,7 +1594,7 @@
167
if $ac_init_version; then
169
ConsoleKit configure 0.4.2
170
-generated by GNU Autoconf 2.66
171
+generated by GNU Autoconf 2.67
173
Copyright (C) 2010 Free Software Foundation, Inc.
174
This configure script is free software; the Free Software Foundation
175
@@ -1663,7 +1666,7 @@
176
mv -f conftest.er1 conftest.err
178
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
179
- test $ac_status = 0; } >/dev/null && {
180
+ test $ac_status = 0; } > conftest.i && {
181
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
182
test ! -s conftest.err
184
@@ -1726,7 +1729,7 @@
188
-rm -f conftest.err conftest.$ac_ext
189
+rm -f conftest.err conftest.i conftest.$ac_ext
190
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
191
$as_echo "$ac_header_preproc" >&6; }
193
@@ -1960,7 +1963,7 @@
194
running configure, to aid debugging if configure makes a mistake.
196
It was created by ConsoleKit $as_me 0.4.2, which was
197
-generated by GNU Autoconf 2.66. Invocation command line was
198
+generated by GNU Autoconf 2.67. Invocation command line was
202
@@ -2218,7 +2221,7 @@
203
|| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
204
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
205
as_fn_error $? "failed to load site script $ac_site_file
206
-See \`config.log' for more details" "$LINENO" 5; }
207
+See \`config.log' for more details" "$LINENO" 5 ; }
211
@@ -2445,11 +2448,11 @@
214
*[\\\"\#\$\&\'\`$am_lf]*)
215
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
216
+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
219
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
220
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
221
+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
224
# Do `set' in a subshell so we don't clobber the current shell's
225
@@ -3217,7 +3220,7 @@
226
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
227
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
228
as_fn_error $? "no acceptable C compiler found in \$PATH
229
-See \`config.log' for more details" "$LINENO" 5; }
230
+See \`config.log' for more details" "$LINENO" 5 ; }
232
# Provide some information about the compiler.
233
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
234
@@ -3332,7 +3335,7 @@
235
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
236
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
237
as_fn_error 77 "C compiler cannot create executables
238
-See \`config.log' for more details" "$LINENO" 5; }
239
+See \`config.log' for more details" "$LINENO" 5 ; }
241
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
242
$as_echo "yes" >&6; }
243
@@ -3375,7 +3378,7 @@
244
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
245
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
246
as_fn_error $? "cannot compute suffix of executables: cannot compile and link
247
-See \`config.log' for more details" "$LINENO" 5; }
248
+See \`config.log' for more details" "$LINENO" 5 ; }
250
rm -f conftest conftest$ac_cv_exeext
251
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
252
@@ -3434,7 +3437,7 @@
253
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
254
as_fn_error $? "cannot run C compiled programs.
255
If you meant to cross compile, use \`--host'.
256
-See \`config.log' for more details" "$LINENO" 5; }
257
+See \`config.log' for more details" "$LINENO" 5 ; }
261
@@ -3486,7 +3489,7 @@
262
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
263
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
264
as_fn_error $? "cannot compute suffix of object files: cannot compile
265
-See \`config.log' for more details" "$LINENO" 5; }
266
+See \`config.log' for more details" "$LINENO" 5 ; }
268
rm -f conftest.$ac_cv_objext conftest.$ac_ext
270
@@ -3876,7 +3879,7 @@
271
# Broken: fails on valid input.
274
-rm -f conftest.err conftest.$ac_ext
275
+rm -f conftest.err conftest.i conftest.$ac_ext
277
# OK, works on sane cases. Now check whether nonexistent headers
278
# can be detected and how.
279
@@ -3892,11 +3895,11 @@
283
-rm -f conftest.err conftest.$ac_ext
284
+rm -f conftest.err conftest.i conftest.$ac_ext
287
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
288
-rm -f conftest.err conftest.$ac_ext
289
+rm -f conftest.i conftest.err conftest.$ac_ext
290
if $ac_preproc_ok; then :
293
@@ -3935,7 +3938,7 @@
294
# Broken: fails on valid input.
297
-rm -f conftest.err conftest.$ac_ext
298
+rm -f conftest.err conftest.i conftest.$ac_ext
300
# OK, works on sane cases. Now check whether nonexistent headers
301
# can be detected and how.
302
@@ -3951,18 +3954,18 @@
306
-rm -f conftest.err conftest.$ac_ext
307
+rm -f conftest.err conftest.i conftest.$ac_ext
310
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
311
-rm -f conftest.err conftest.$ac_ext
312
+rm -f conftest.i conftest.err conftest.$ac_ext
313
if $ac_preproc_ok; then :
316
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
317
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
318
as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
319
-See \`config.log' for more details" "$LINENO" 5; }
320
+See \`config.log' for more details" "$LINENO" 5 ; }
324
@@ -4651,7 +4654,7 @@
325
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
326
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
327
as_fn_error $? "no acceptable C compiler found in \$PATH
328
-See \`config.log' for more details" "$LINENO" 5; }
329
+See \`config.log' for more details" "$LINENO" 5 ; }
331
# Provide some information about the compiler.
332
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
333
@@ -5207,7 +5210,7 @@
334
$as_echo "$ac_cv_build" >&6; }
337
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
338
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
341
ac_save_IFS=$IFS; IFS='-'
342
@@ -5240,7 +5243,7 @@
343
$as_echo "$ac_cv_host" >&6; }
346
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
347
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
350
ac_save_IFS=$IFS; IFS='-'
351
@@ -6278,7 +6281,7 @@
156
352
lt_cv_deplibs_check_method=pass_all
161
357
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
162
358
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
164
@@ -7488,7 +7490,7 @@
167
# Find out which ABI we are using.
168
- echo '#line 7491 "configure"' > conftest.$ac_ext
169
+ echo '#line 7493 "configure"' > conftest.$ac_ext
170
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
171
(eval $ac_compile) 2>&5
173
@@ -8823,11 +8825,11 @@
174
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
175
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
176
-e 's:$: $lt_compiler_flag:'`
177
- (eval echo "\"\$as_me:8826: $lt_compile\"" >&5)
178
+ (eval echo "\"\$as_me:8828: $lt_compile\"" >&5)
179
(eval "$lt_compile" 2>conftest.err)
182
- echo "$as_me:8830: \$? = $ac_status" >&5
183
+ echo "$as_me:8832: \$? = $ac_status" >&5
184
if (exit $ac_status) && test -s "$ac_outfile"; then
185
# The compiler can only warn and ignore the option if not recognized
186
# So say no if there are warnings other than the usual output.
187
@@ -9162,11 +9164,11 @@
188
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
189
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
190
-e 's:$: $lt_compiler_flag:'`
191
- (eval echo "\"\$as_me:9165: $lt_compile\"" >&5)
192
+ (eval echo "\"\$as_me:9167: $lt_compile\"" >&5)
193
(eval "$lt_compile" 2>conftest.err)
196
- echo "$as_me:9169: \$? = $ac_status" >&5
197
+ echo "$as_me:9171: \$? = $ac_status" >&5
198
if (exit $ac_status) && test -s "$ac_outfile"; then
199
# The compiler can only warn and ignore the option if not recognized
200
# So say no if there are warnings other than the usual output.
201
@@ -9267,11 +9269,11 @@
202
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
203
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
204
-e 's:$: $lt_compiler_flag:'`
205
- (eval echo "\"\$as_me:9270: $lt_compile\"" >&5)
206
+ (eval echo "\"\$as_me:9272: $lt_compile\"" >&5)
207
(eval "$lt_compile" 2>out/conftest.err)
209
cat out/conftest.err >&5
210
- echo "$as_me:9274: \$? = $ac_status" >&5
211
+ echo "$as_me:9276: \$? = $ac_status" >&5
212
if (exit $ac_status) && test -s out/conftest2.$ac_objext
214
# The compiler can only warn and ignore the option if not recognized
215
@@ -9322,11 +9324,11 @@
216
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
217
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
218
-e 's:$: $lt_compiler_flag:'`
219
- (eval echo "\"\$as_me:9325: $lt_compile\"" >&5)
220
+ (eval echo "\"\$as_me:9327: $lt_compile\"" >&5)
221
(eval "$lt_compile" 2>out/conftest.err)
223
cat out/conftest.err >&5
224
- echo "$as_me:9329: \$? = $ac_status" >&5
225
+ echo "$as_me:9331: \$? = $ac_status" >&5
226
if (exit $ac_status) && test -s out/conftest2.$ac_objext
228
# The compiler can only warn and ignore the option if not recognized
229
@@ -9441,6 +9443,9 @@
360
@@ -8894,6 +8897,9 @@
282
429
version_type=sunos
283
430
need_lib_prefix=no
284
@@ -12122,7 +12140,7 @@
285
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
286
lt_status=$lt_dlunknown
287
cat > conftest.$ac_ext <<_LT_EOF
288
-#line 12125 "configure"
289
+#line 12143 "configure"
290
#include "confdefs.h"
293
@@ -12218,7 +12236,7 @@
294
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
295
lt_status=$lt_dlunknown
296
cat > conftest.$ac_ext <<_LT_EOF
297
-#line 12221 "configure"
298
+#line 12239 "configure"
299
#include "confdefs.h"
302
@@ -15109,10 +15127,11 @@
303
{ $as_echo "$as_me:$LINENO: checking for CONSOLE_KIT" >&5
304
$as_echo_n "checking for CONSOLE_KIT... " >&6; }
306
-if test -n "$CONSOLE_KIT_CFLAGS"; then
307
- pkg_cv_CONSOLE_KIT_CFLAGS="$CONSOLE_KIT_CFLAGS"
308
- elif test -n "$PKG_CONFIG"; then
309
- if test -n "$PKG_CONFIG" && \
310
+if test -n "$PKG_CONFIG"; then
311
+ if test -n "$CONSOLE_KIT_CFLAGS"; then
312
+ pkg_cv_CONSOLE_KIT_CFLAGS="$CONSOLE_KIT_CFLAGS"
314
+ if test -n "$PKG_CONFIG" && \
315
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQUIRED_VERSION
316
gobject-2.0 >= \$GLIB_REQUIRED_VERSION
317
gthread-2.0 >= \$GLIB_REQUIRED_VERSION
318
@@ -15131,13 +15150,15 @@
328
-if test -n "$CONSOLE_KIT_LIBS"; then
329
- pkg_cv_CONSOLE_KIT_LIBS="$CONSOLE_KIT_LIBS"
330
- elif test -n "$PKG_CONFIG"; then
331
- if test -n "$PKG_CONFIG" && \
332
+if test -n "$PKG_CONFIG"; then
333
+ if test -n "$CONSOLE_KIT_LIBS"; then
334
+ pkg_cv_CONSOLE_KIT_LIBS="$CONSOLE_KIT_LIBS"
336
+ if test -n "$PKG_CONFIG" && \
337
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQUIRED_VERSION
338
gobject-2.0 >= \$GLIB_REQUIRED_VERSION
339
gthread-2.0 >= \$GLIB_REQUIRED_VERSION
340
@@ -15156,8 +15177,9 @@
352
@@ -15170,15 +15192,15 @@
353
_pkg_short_errors_supported=no
355
if test $_pkg_short_errors_supported = yes; then
356
- CONSOLE_KIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_REQUIRED_VERSION
357
+ CONSOLE_KIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQUIRED_VERSION
358
gobject-2.0 >= $GLIB_REQUIRED_VERSION
359
gthread-2.0 >= $GLIB_REQUIRED_VERSION
363
- CONSOLE_KIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_REQUIRED_VERSION
364
+ CONSOLE_KIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQUIRED_VERSION
365
gobject-2.0 >= $GLIB_REQUIRED_VERSION
366
gthread-2.0 >= $GLIB_REQUIRED_VERSION
370
# Put the nasty error message in config.log where it belongs
371
echo "$CONSOLE_KIT_PKG_ERRORS" >&5
372
@@ -15249,10 +15271,11 @@
373
{ $as_echo "$as_me:$LINENO: checking for POLKIT" >&5
374
$as_echo_n "checking for POLKIT... " >&6; }
376
-if test -n "$POLKIT_CFLAGS"; then
377
- pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS"
378
- elif test -n "$PKG_CONFIG"; then
379
- if test -n "$PKG_CONFIG" && \
380
+if test -n "$PKG_CONFIG"; then
381
+ if test -n "$POLKIT_CFLAGS"; then
382
+ pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS"
384
+ if test -n "$PKG_CONFIG" && \
385
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"polkit-gobject-1 >= \$POLKIT_REQUIRED_VERSION\"") >&5
386
($PKG_CONFIG --exists --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION") 2>&5
388
@@ -15262,13 +15285,15 @@
398
-if test -n "$POLKIT_LIBS"; then
399
- pkg_cv_POLKIT_LIBS="$POLKIT_LIBS"
400
- elif test -n "$PKG_CONFIG"; then
401
- if test -n "$PKG_CONFIG" && \
402
+if test -n "$PKG_CONFIG"; then
403
+ if test -n "$POLKIT_LIBS"; then
404
+ pkg_cv_POLKIT_LIBS="$POLKIT_LIBS"
406
+ if test -n "$PKG_CONFIG" && \
407
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"polkit-gobject-1 >= \$POLKIT_REQUIRED_VERSION\"") >&5
408
($PKG_CONFIG --exists --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION") 2>&5
410
@@ -15278,8 +15303,9 @@
422
@@ -15292,9 +15318,9 @@
423
_pkg_short_errors_supported=no
425
if test $_pkg_short_errors_supported = yes; then
426
- POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>&1`
427
+ POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION"`
429
- POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>&1`
430
+ POLKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION"`
432
# Put the nasty error message in config.log where it belongs
433
echo "$POLKIT_PKG_ERRORS" >&5
434
@@ -15333,10 +15359,11 @@
435
{ $as_echo "$as_me:$LINENO: checking for LIBDBUS" >&5
436
$as_echo_n "checking for LIBDBUS... " >&6; }
438
-if test -n "$LIBDBUS_CFLAGS"; then
439
- pkg_cv_LIBDBUS_CFLAGS="$LIBDBUS_CFLAGS"
440
- elif test -n "$PKG_CONFIG"; then
441
- if test -n "$PKG_CONFIG" && \
442
+if test -n "$PKG_CONFIG"; then
443
+ if test -n "$LIBDBUS_CFLAGS"; then
444
+ pkg_cv_LIBDBUS_CFLAGS="$LIBDBUS_CFLAGS"
446
+ if test -n "$PKG_CONFIG" && \
447
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= \$DBUS_REQUIRED_VERSION
449
($PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION
450
@@ -15349,13 +15376,15 @@
460
-if test -n "$LIBDBUS_LIBS"; then
461
- pkg_cv_LIBDBUS_LIBS="$LIBDBUS_LIBS"
462
- elif test -n "$PKG_CONFIG"; then
463
- if test -n "$PKG_CONFIG" && \
464
+if test -n "$PKG_CONFIG"; then
465
+ if test -n "$LIBDBUS_LIBS"; then
466
+ pkg_cv_LIBDBUS_LIBS="$LIBDBUS_LIBS"
468
+ if test -n "$PKG_CONFIG" && \
469
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= \$DBUS_REQUIRED_VERSION
471
($PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION
472
@@ -15368,8 +15397,9 @@
484
@@ -15382,11 +15412,11 @@
485
_pkg_short_errors_supported=no
487
if test $_pkg_short_errors_supported = yes; then
488
- LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION
490
+ LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION
493
- LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION
495
+ LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION
498
# Put the nasty error message in config.log where it belongs
499
echo "$LIBDBUS_PKG_ERRORS" >&5
500
@@ -15452,10 +15482,11 @@
501
{ $as_echo "$as_me:$LINENO: checking for TOOLS" >&5
502
$as_echo_n "checking for TOOLS... " >&6; }
504
-if test -n "$TOOLS_CFLAGS"; then
505
- pkg_cv_TOOLS_CFLAGS="$TOOLS_CFLAGS"
506
- elif test -n "$PKG_CONFIG"; then
507
- if test -n "$PKG_CONFIG" && \
508
+if test -n "$PKG_CONFIG"; then
509
+ if test -n "$TOOLS_CFLAGS"; then
510
+ pkg_cv_TOOLS_CFLAGS="$TOOLS_CFLAGS"
512
+ if test -n "$PKG_CONFIG" && \
513
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 >= \$X11_REQUIRED_VERSION
514
glib-2.0 >= \$GLIB_REQUIRED_VERSION
516
@@ -15471,13 +15502,15 @@
526
-if test -n "$TOOLS_LIBS"; then
527
- pkg_cv_TOOLS_LIBS="$TOOLS_LIBS"
528
- elif test -n "$PKG_CONFIG"; then
529
- if test -n "$PKG_CONFIG" && \
530
+if test -n "$PKG_CONFIG"; then
531
+ if test -n "$TOOLS_LIBS"; then
532
+ pkg_cv_TOOLS_LIBS="$TOOLS_LIBS"
534
+ if test -n "$PKG_CONFIG" && \
535
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 >= \$X11_REQUIRED_VERSION
536
glib-2.0 >= \$GLIB_REQUIRED_VERSION
538
@@ -15493,8 +15526,9 @@
550
@@ -15507,13 +15541,13 @@
551
_pkg_short_errors_supported=no
553
if test $_pkg_short_errors_supported = yes; then
554
- TOOLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 >= $X11_REQUIRED_VERSION
555
+ TOOLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 >= $X11_REQUIRED_VERSION
556
glib-2.0 >= $GLIB_REQUIRED_VERSION
560
- TOOLS_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 >= $X11_REQUIRED_VERSION
561
+ TOOLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 >= $X11_REQUIRED_VERSION
562
glib-2.0 >= $GLIB_REQUIRED_VERSION
566
# Put the nasty error message in config.log where it belongs
567
echo "$TOOLS_PKG_ERRORS" >&5
568
@@ -15582,10 +15616,11 @@
569
{ $as_echo "$as_me:$LINENO: checking for HISTORY" >&5
570
$as_echo_n "checking for HISTORY... " >&6; }
572
-if test -n "$HISTORY_CFLAGS"; then
573
- pkg_cv_HISTORY_CFLAGS="$HISTORY_CFLAGS"
574
- elif test -n "$PKG_CONFIG"; then
575
- if test -n "$PKG_CONFIG" && \
576
+if test -n "$PKG_CONFIG"; then
577
+ if test -n "$HISTORY_CFLAGS"; then
578
+ pkg_cv_HISTORY_CFLAGS="$HISTORY_CFLAGS"
580
+ if test -n "$PKG_CONFIG" && \
581
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION
583
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
584
@@ -15598,13 +15633,15 @@
594
-if test -n "$HISTORY_LIBS"; then
595
- pkg_cv_HISTORY_LIBS="$HISTORY_LIBS"
596
- elif test -n "$PKG_CONFIG"; then
597
- if test -n "$PKG_CONFIG" && \
598
+if test -n "$PKG_CONFIG"; then
599
+ if test -n "$HISTORY_LIBS"; then
600
+ pkg_cv_HISTORY_LIBS="$HISTORY_LIBS"
602
+ if test -n "$PKG_CONFIG" && \
603
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION
605
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
606
@@ -15617,8 +15654,9 @@
618
@@ -15631,11 +15669,11 @@
619
_pkg_short_errors_supported=no
621
if test $_pkg_short_errors_supported = yes; then
622
- HISTORY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
624
+ HISTORY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
627
- HISTORY_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
629
+ HISTORY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
632
# Put the nasty error message in config.log where it belongs
633
echo "$HISTORY_PKG_ERRORS" >&5
634
@@ -16237,7 +16275,7 @@
431
@@ -12760,7 +12775,6 @@
432
Alternatively, you may set the environment variables CONSOLE_KIT_CFLAGS
433
and CONSOLE_KIT_LIBS to avoid the need to call pkg-config.
434
See the pkg-config man page for more details." "$LINENO" 5
436
elif test $pkg_failed = untried; then
437
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
439
@@ -12775,8 +12789,7 @@
440
See the pkg-config man page for more details.
442
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
443
-See \`config.log' for more details" "$LINENO" 5; }
445
+See \`config.log' for more details" "$LINENO" 5 ; }
447
CONSOLE_KIT_CFLAGS=$pkg_cv_CONSOLE_KIT_CFLAGS
448
CONSOLE_KIT_LIBS=$pkg_cv_CONSOLE_KIT_LIBS
449
@@ -12945,7 +12958,6 @@
450
Alternatively, you may set the environment variables LIBDBUS_CFLAGS
451
and LIBDBUS_LIBS to avoid the need to call pkg-config.
452
See the pkg-config man page for more details." "$LINENO" 5
454
elif test $pkg_failed = untried; then
455
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
457
@@ -12960,8 +12972,7 @@
458
See the pkg-config man page for more details.
460
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
461
-See \`config.log' for more details" "$LINENO" 5; }
463
+See \`config.log' for more details" "$LINENO" 5 ; }
465
LIBDBUS_CFLAGS=$pkg_cv_LIBDBUS_CFLAGS
466
LIBDBUS_LIBS=$pkg_cv_LIBDBUS_LIBS
467
@@ -13054,7 +13065,6 @@
468
Alternatively, you may set the environment variables TOOLS_CFLAGS
469
and TOOLS_LIBS to avoid the need to call pkg-config.
470
See the pkg-config man page for more details." "$LINENO" 5
472
elif test $pkg_failed = untried; then
473
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
475
@@ -13069,8 +13079,7 @@
476
See the pkg-config man page for more details.
478
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
479
-See \`config.log' for more details" "$LINENO" 5; }
481
+See \`config.log' for more details" "$LINENO" 5 ; }
483
TOOLS_CFLAGS=$pkg_cv_TOOLS_CFLAGS
484
TOOLS_LIBS=$pkg_cv_TOOLS_LIBS
485
@@ -13155,7 +13164,6 @@
486
Alternatively, you may set the environment variables HISTORY_CFLAGS
487
and HISTORY_LIBS to avoid the need to call pkg-config.
488
See the pkg-config man page for more details." "$LINENO" 5
490
elif test $pkg_failed = untried; then
491
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
493
@@ -13170,8 +13178,7 @@
494
See the pkg-config man page for more details.
496
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
497
-See \`config.log' for more details" "$LINENO" 5; }
499
+See \`config.log' for more details" "$LINENO" 5 ; }
501
HISTORY_CFLAGS=$pkg_cv_HISTORY_CFLAGS
502
HISTORY_LIBS=$pkg_cv_HISTORY_LIBS
503
@@ -13502,7 +13509,7 @@
639
508
+ *-*-freebsd* | *-*-kfreebsd*-gnu)
640
509
CK_BACKEND="freebsd"
641
{ $as_echo "$as_me:$LINENO: checking for kvm_openfiles in -lkvm" >&5
510
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_openfiles in -lkvm" >&5
642
511
$as_echo_n "checking for kvm_openfiles in -lkvm... " >&6; }
643
@@ -16322,6 +16360,9 @@
512
@@ -13556,6 +13563,9 @@
645
514
CK_BACKEND="solaris"
668
@@ -17388,6 +17437,13 @@
669
Usually this means the macro was only invoked conditionally." >&2;}
670
{ (exit 1); exit 1; }; }
537
@@ -14177,6 +14195,10 @@
538
as_fn_error $? "conditional \"CK_COMPILE_SOLARIS\" was never defined.
539
Usually this means the macro was only invoked conditionally." "$LINENO" 5
672
541
+if test -z "${CK_COMPILE_GNU_TRUE}" && test -z "${CK_COMPILE_GNU_FALSE}"; then
673
+ { { $as_echo "$as_me:$LINENO: error: conditional \"CK_COMPILE_GNU\" was never defined.
674
+Usually this means the macro was only invoked conditionally." >&5
675
+$as_echo "$as_me: error: conditional \"CK_COMPILE_GNU\" was never defined.
676
+Usually this means the macro was only invoked conditionally." >&2;}
677
+ { (exit 1); exit 1; }; }
542
+ as_fn_error $? "conditional \"CK_COMPILE_GNU\" was never defined.
543
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
679
545
if test -z "${HAVE_PAM_TRUE}" && test -z "${HAVE_PAM_FALSE}"; then
680
{ { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_PAM\" was never defined.
681
Usually this means the macro was only invoked conditionally." >&5
546
as_fn_error $? "conditional \"HAVE_PAM\" was never defined.
547
Usually this means the macro was only invoked conditionally." "$LINENO" 5
548
@@ -14606,7 +14628,7 @@
549
# values after options handling.
551
This file was extended by ConsoleKit $as_me 0.4.2, which was
552
-generated by GNU Autoconf 2.66. Invocation command line was
553
+generated by GNU Autoconf 2.67. Invocation command line was
555
CONFIG_FILES = $CONFIG_FILES
556
CONFIG_HEADERS = $CONFIG_HEADERS
557
@@ -14672,7 +14694,7 @@
558
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
560
ConsoleKit config.status 0.4.2
561
-configured by $0, generated by GNU Autoconf 2.66,
562
+configured by $0, generated by GNU Autoconf 2.67,
563
with options \\"\$ac_cs_config\\"
565
Copyright (C) 2010 Free Software Foundation, Inc.
566
@@ -14693,11 +14715,16 @@
572
ac_option=`expr "X$1" : 'X\([^=]*\)='`
573
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
577
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
584
@@ -14719,6 +14746,7 @@
587
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
588
+ '') as_fn_error $? "missing file argument" ;;
590
as_fn_append CONFIG_FILES " '$ac_optarg'"
591
ac_need_defaults=false;;
592
@@ -15073,7 +15101,7 @@
593
"pam-ck-connector/Makefile") CONFIG_FILES="$CONFIG_FILES pam-ck-connector/Makefile" ;;
594
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
596
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
597
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
601
@@ -15389,7 +15417,7 @@
603
case $ac_mode$ac_tag in
605
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
606
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
608
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
610
@@ -15417,7 +15445,7 @@
612
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
614
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
615
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
617
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
618
as_fn_append ac_file_inputs " '$ac_f'"
619
@@ -15444,7 +15472,7 @@
622
*:-:* | *:-) cat >"$tmp/stdin" \
623
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
624
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
682
628
Index: consolekit/src/Makefile.in
683
629
===================================================================
684
--- consolekit.orig/src/Makefile.in 2009-11-04 19:45:33.418020671 +0100
685
+++ consolekit/src/Makefile.in 2009-11-04 19:44:57.430016634 +0100
630
--- consolekit.orig/src/Makefile.in 2010-09-20 03:08:41.129094222 +0200
631
+++ consolekit/src/Makefile.in 2010-09-20 03:08:01.029091854 +0200
687
633
@CK_COMPILE_FREEBSD_TRUE@ ck-sysdeps-freebsd.c \
688
634
@CK_COMPILE_FREEBSD_TRUE@ $(NULL)