Index: tracker/Makefile.in
===================================================================
--- tracker.orig/Makefile.in 2010-09-21 05:07:07.681936114 +0200
+++ tracker/Makefile.in 2010-09-21 05:06:59.765929534 +0200
@@ -151,8 +151,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -275,6 +273,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -308,6 +308,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/aclocal.m4
===================================================================
--- tracker.orig/aclocal.m4 2010-09-21 05:07:07.777936892 +0200
+++ tracker/aclocal.m4 2010-09-21 05:06:31.069935857 +0200
@@ -301,7 +301,7 @@
dnl These rules are solely for the distribution goal. While doing this
dnl we only have to keep exactly one list of the available catalogs
- dnl in configure.in.
+ dnl in configure.ac.
for lang in $ALL_LINGUAS; do
GMOFILES="$GMOFILES $lang.gmo"
POFILES="$POFILES $lang.po"
@@ -430,7 +430,7 @@
dnl
dnl Now the definitions that aclocal will find
dnl
-ifdef(glib_configure_in,[],[
+ifdef(glib_configure_ac,[],[
AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
])dnl
@@ -452,8 +452,9 @@
fi])
-# nls.m4 serial 3 (gettext-0.15)
-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -471,20 +472,21 @@
dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-AC_PREREQ(2.50)
+AC_PREREQ([2.50])
AC_DEFUN([AM_NLS],
[
AC_MSG_CHECKING([whether NLS is requested])
dnl Default is enabled NLS
- AC_ARG_ENABLE(nls,
+ AC_ARG_ENABLE([nls],
[ --disable-nls do not use Native Language Support],
USE_NLS=$enableval, USE_NLS=yes)
- AC_MSG_RESULT($USE_NLS)
- AC_SUBST(USE_NLS)
+ AC_MSG_RESULT([$USE_NLS])
+ AC_SUBST([USE_NLS])
])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
#
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
#
@@ -512,7 +514,10 @@
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
@@ -525,7 +530,6 @@
AC_MSG_RESULT([no])
PKG_CONFIG=""
fi
-
fi[]dnl
])# PKG_PROG_PKG_CONFIG
@@ -534,34 +538,31 @@
# Check to see whether a particular set of modules exists. Similar
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
- m4_ifval([$2], [$2], [:])
+ m4_default([$2], [:])
m4_ifvaln([$3], [else
$3])dnl
fi])
-
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
- if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- else
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- fi
-else
- pkg_failed=untried
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
@@ -603,16 +604,17 @@
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
+ AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
- ifelse([$4], , [AC_MSG_ERROR(dnl
+ m4_default([$4], [AC_MSG_ERROR(
[Package requirements ($2) were not met:
$$1_PKG_ERRORS
@@ -620,25 +622,24 @@
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-_PKG_TEXT
-])],
- [AC_MSG_RESULT([no])
- $4])
+_PKG_TEXT])dnl
+ ])
elif test $pkg_failed = untried; then
- ifelse([$4], , [AC_MSG_FAILURE(dnl
+ AC_MSG_RESULT([no])
+ m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
_PKG_TEXT
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
- [$4])
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
+ ])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
AC_MSG_RESULT([yes])
- ifelse([$3], , :, [$3])
+ $3
fi[]dnl
])# PKG_CHECK_MODULES
Index: tracker/config.guess
===================================================================
--- tracker.orig/config.guess 2010-09-21 05:07:10.289933707 +0200
+++ tracker/config.guess 2010-09-21 05:06:34.369935509 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
-timestamp='2009-06-10'
+timestamp='2009-12-30'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@
# the same distribution terms that you use for the rest of that program.
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner. Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
#
# This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and
# exits with 0. Otherwise, it exits with 1.
#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -56,8 +56,9 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -333,6 +334,9 @@
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+ echo i386-pc-auroraux${UNAME_RELEASE}
+ exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
eval $set_cc_for_build
SUN_ARCH="i386"
@@ -807,12 +811,12 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- *:Interix*:[3456]*)
+ *:Interix*:*)
case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
- EM64T | authenticamd | genuineintel)
+ authenticamd | genuineintel | EM64T)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
@@ -854,6 +858,20 @@
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+ EV56) UNAME_MACHINE=alphaev56 ;;
+ PCA56) UNAME_MACHINE=alphapca56 ;;
+ PCA57) UNAME_MACHINE=alphapca56 ;;
+ EV6) UNAME_MACHINE=alphaev6 ;;
+ EV67) UNAME_MACHINE=alphaev67 ;;
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep -q ld.so.1
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -876,6 +894,17 @@
frv:Linux:*:*)
echo frv-unknown-linux-gnu
exit ;;
+ i*86:Linux:*:*)
+ LIBC=gnu
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
@@ -901,39 +930,18 @@
#endif
#endif
EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^CPU/{
- s: ::g
- p
- }'`"
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
echo or32-unknown-linux-gnu
exit ;;
- ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
- exit ;;
- ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
- exit ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- EV5) UNAME_MACHINE=alphaev5 ;;
- EV56) UNAME_MACHINE=alphaev56 ;;
- PCA56) UNAME_MACHINE=alphapca56 ;;
- PCA57) UNAME_MACHINE=alphapca56 ;;
- EV6) UNAME_MACHINE=alphaev6 ;;
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
- objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit ;;
padre:Linux:*:*)
echo sparc-unknown-linux-gnu
exit ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ echo hppa64-unknown-linux-gnu
+ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -942,8 +950,11 @@
*) echo hppa-unknown-linux-gnu ;;
esac
exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
+ ppc64:Linux:*:*)
+ echo powerpc64-unknown-linux-gnu
+ exit ;;
+ ppc:Linux:*:*)
+ echo powerpc-unknown-linux-gnu
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
@@ -966,58 +977,6 @@
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
- i*86:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
- # first see if it will tell us. cd to the root directory to prevent
- # problems with other programs or directories called `ld' in the path.
- # Set LC_ALL=C to ensure ld outputs messages in English.
- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
- | sed -ne '/supported targets:/!d
- s/[ ][ ]*/ /g
- s/.*supported targets: *//
- s/ .*//
- p'`
- case "$ld_supported_targets" in
- elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
- esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <features.h>
- #ifdef __ELF__
- # ifdef __GLIBC__
- # if __GLIBC__ >= 2
- LIBC=gnu
- # else
- LIBC=gnulibc1
- # endif
- # else
- LIBC=gnulibc1
- # endif
- #else
- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
- LIBC=gnu
- #else
- LIBC=gnuaout
- #endif
- #endif
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^LIBC/{
- s: ::g
- p
- }'`"
- test x"${LIBC}" != x && {
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- exit
- }
- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
- ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
@@ -1247,6 +1206,16 @@
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
+ i386)
+ eval $set_cc_for_build
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ UNAME_PROCESSOR="x86_64"
+ fi
+ fi ;;
unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
Index: tracker/config.h.in
===================================================================
--- tracker.orig/config.h.in 2010-09-21 05:07:07.897936252 +0200
+++ tracker/config.h.in 2010-09-21 05:06:42.469930655 +0200
@@ -19,9 +19,6 @@
don't. */
#undef HAVE_DECL_POSIX_FADVISE
-/* Define if we have DEVKIT_POWER */
-#undef HAVE_DEVKIT_POWER
-
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
@@ -181,6 +178,9 @@
/* Define if we have GLib unit test framework */
#undef HAVE_UNIT_TEST
+/* Define if we have UPOWER */
+#undef HAVE_UPOWER
+
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
Index: tracker/config.sub
===================================================================
--- tracker.orig/config.sub 2010-09-21 05:07:13.185934711 +0200
+++ tracker/config.sub 2010-09-21 05:06:34.413931897 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
-timestamp='2009-06-11'
+timestamp='2010-01-22'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@
# Please send patches to <config-patches@gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
# If it is invalid, we print an error message on stderr and exit with code 1.
# Otherwise, we print the canonical config type on stdout and succeed.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
# that are meaningful with *any* GNU software.
@@ -72,8 +75,9 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,7 +153,7 @@
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray)
+ -apple | -axis | -knuth | -cray | -microblaze)
os=
basic_machine=$1
;;
@@ -284,6 +288,7 @@
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
+ | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
@@ -291,13 +296,14 @@
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
| spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
+ | ubicom32 \
| v850 | v850e \
| we32k \
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12)
+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
os=-none
@@ -340,7 +346,7 @@
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -368,15 +374,17 @@
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
- | romp-* | rs6000-* \
+ | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tile-* | tilegx-* \
| tron-* \
+ | ubicom32-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -726,6 +734,9 @@
basic_machine=ns32k-utek
os=-sysv
;;
+ microblaze)
+ basic_machine=microblaze-xilinx
+ ;;
mingw32)
basic_machine=i386-pc
os=-mingw32
@@ -1076,6 +1087,11 @@
basic_machine=tic6x-unknown
os=-coff
;;
+ # This must be matched before tile*.
+ tilegx*)
+ basic_machine=tilegx-unknown
+ os=-linux-gnu
+ ;;
tile*)
basic_machine=tile-unknown
os=-linux-gnu
@@ -1247,6 +1263,9 @@
# First match some system type aliases
# that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
+ -auroraux)
+ os=-auroraux
+ ;;
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
@@ -1268,8 +1287,8 @@
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -kopensolaris* \
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+ | -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1290,7 +1309,7 @@
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1423,6 +1442,8 @@
-dicos*)
os=-dicos
;;
+ -nacl*)
+ ;;
-none)
;;
*)
Index: tracker/configure
===================================================================
--- tracker.orig/configure 2010-09-21 05:07:16.013941571 +0200
+++ tracker/configure 2010-09-21 05:06:41.945929551 +0200
@@ -891,10 +891,10 @@
HAVE_HAL_TRUE
HAL_LIBS
HAL_CFLAGS
-HAVE_DEVKIT_POWER_FALSE
-HAVE_DEVKIT_POWER_TRUE
-DEVKIT_POWER_LIBS
-DEVKIT_POWER_CFLAGS
+HAVE_UPOWER_FALSE
+HAVE_UPOWER_TRUE
+UPOWER_LIBS
+UPOWER_CFLAGS
HAVE_MAEMO_FALSE
HAVE_MAEMO_TRUE
HAVE_UNIT_TESTS_FALSE
@@ -981,6 +981,8 @@
GTHREAD_CFLAGS
GLIB2_LIBS
GLIB2_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
PKG_CONFIG
CXXCPP
CPP
@@ -1131,7 +1133,7 @@
enable_unit_tests
enable_maemo
enable_gstreamer_tagreadbin
-enable_devkit_power
+enable_upower
enable_hal
enable_libxml2
enable_gdkpixbuf
@@ -1183,6 +1185,8 @@
CPP
CXXCPP
PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
GLIB2_CFLAGS
GLIB2_LIBS
GTHREAD_CFLAGS
@@ -1205,8 +1209,8 @@
ENCA_LIBS
LIBSTREAMANALYZER_CFLAGS
LIBSTREAMANALYZER_LIBS
-DEVKIT_POWER_CFLAGS
-DEVKIT_POWER_LIBS
+UPOWER_CFLAGS
+UPOWER_LIBS
HAL_CFLAGS
HAL_LIBS
LIBXML2_CFLAGS
@@ -1890,8 +1894,8 @@
--enable-maemo enable maemo ontology [[default=no]]
--enable-gstreamer-tagreadbin
enable tagreadbin in gstreamer [[default=no]]
- --disable-devkit-power disable DeviceKit-power support for AC power
- detection [[default=auto]]
+ --disable-upower disable UPower support for AC power detection
+ [[default=auto]]
--disable-hal disable HAL support for AC power detection
[[default=auto]]
--disable-libxml2 disable HTML/XML extractors [[default=yes]]
@@ -1978,6 +1982,10 @@
CPP C preprocessor
CXXCPP C++ preprocessor
PKG_CONFIG path to pkg-config utility
+ PKG_CONFIG_PATH
+ directories to add to pkg-config's search path
+ PKG_CONFIG_LIBDIR
+ path overriding pkg-config's built-in search path
GLIB2_CFLAGS
C compiler flags for GLIB2, overriding pkg-config
GLIB2_LIBS linker flags for GLIB2, overriding pkg-config
@@ -2011,10 +2019,9 @@
C compiler flags for LIBSTREAMANALYZER, overriding pkg-config
LIBSTREAMANALYZER_LIBS
linker flags for LIBSTREAMANALYZER, overriding pkg-config
- DEVKIT_POWER_CFLAGS
- C compiler flags for DEVKIT_POWER, overriding pkg-config
- DEVKIT_POWER_LIBS
- linker flags for DEVKIT_POWER, overriding pkg-config
+ UPOWER_CFLAGS
+ C compiler flags for UPOWER, overriding pkg-config
+ UPOWER_LIBS linker flags for UPOWER, overriding pkg-config
HAL_CFLAGS C compiler flags for HAL, overriding pkg-config
HAL_LIBS linker flags for HAL, overriding pkg-config
LIBXML2_CFLAGS
@@ -6665,13 +6672,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:6668: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:6675: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:6671: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:6678: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:6674: output\"" >&5)
+ (eval echo "\"\$as_me:6681: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -7865,7 +7872,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7868 "configure"' > conftest.$ac_ext
+ echo '#line 7875 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9892,11 +9899,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9895: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9902: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9899: \$? = $ac_status" >&5
+ echo "$as_me:9906: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -10231,11 +10238,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10234: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10241: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10238: \$? = $ac_status" >&5
+ echo "$as_me:10245: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -10336,11 +10343,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10339: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10346: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10343: \$? = $ac_status" >&5
+ echo "$as_me:10350: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10391,11 +10398,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10394: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10401: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10398: \$? = $ac_status" >&5
+ echo "$as_me:10405: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12775,7 +12782,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12778 "configure"
+#line 12785 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12871,7 +12878,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12874 "configure"
+#line 12881 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14827,11 +14834,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14830: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14837: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14834: \$? = $ac_status" >&5
+ echo "$as_me:14841: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14926,11 +14933,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14929: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14936: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14933: \$? = $ac_status" >&5
+ echo "$as_me:14940: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14978,11 +14985,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14981: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14988: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14985: \$? = $ac_status" >&5
+ echo "$as_me:14992: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16162,7 +16169,7 @@
LIBXML2_REQUIRED=2.6
LIBNOTIFY_REQUIRED=0.4.3
HAL_REQUIRED=0.5
-DEVKIT_POWER_REQUIRED=007
+UPOWER_REQUIRED=0.9.0
GDKPIXBUF_REQUIRED=2.12.0
QUILL_REQUIRED=1.0.0
UNAC_REQUIRED=1.0.0
@@ -16187,6 +16194,10 @@
# Library Checks
+
+
+
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -16299,18 +16310,16 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-
fi
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB2" >&5
$as_echo_n "checking for GLIB2... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$GLIB2_CFLAGS"; then
- pkg_cv_GLIB2_CFLAGS="$GLIB2_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GLIB2_CFLAGS"; then
+ pkg_cv_GLIB2_CFLAGS="$GLIB2_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED") 2>&5
ac_status=$?
@@ -16320,15 +16329,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GLIB2_LIBS"; then
- pkg_cv_GLIB2_LIBS="$GLIB2_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GLIB2_LIBS"; then
+ pkg_cv_GLIB2_LIBS="$GLIB2_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED") 2>&5
ac_status=$?
@@ -16338,14 +16345,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -16353,9 +16361,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GLIB2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED"`
+ GLIB2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED" 2>&1`
else
- GLIB2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED"`
+ GLIB2_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GLIB2_PKG_ERRORS" >&5
@@ -16369,9 +16377,10 @@
Alternatively, you may set the environment variables GLIB2_CFLAGS
and GLIB2_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -16389,7 +16398,7 @@
GLIB2_LIBS=$pkg_cv_GLIB2_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -16400,11 +16409,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTHREAD" >&5
$as_echo_n "checking for GTHREAD... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$GTHREAD_CFLAGS"; then
- pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GTHREAD_CFLAGS"; then
+ pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= \$GLIB_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "gthread-2.0 >= $GLIB_REQUIRED") 2>&5
ac_status=$?
@@ -16414,15 +16422,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GTHREAD_LIBS"; then
- pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GTHREAD_LIBS"; then
+ pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= \$GLIB_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "gthread-2.0 >= $GLIB_REQUIRED") 2>&5
ac_status=$?
@@ -16432,14 +16438,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -16447,9 +16454,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gthread-2.0 >= $GLIB_REQUIRED"`
+ GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gthread-2.0 >= $GLIB_REQUIRED" 2>&1`
else
- GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0 >= $GLIB_REQUIRED"`
+ GTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors "gthread-2.0 >= $GLIB_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GTHREAD_PKG_ERRORS" >&5
@@ -16463,9 +16470,10 @@
Alternatively, you may set the environment variables GTHREAD_CFLAGS
and GTHREAD_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -16483,7 +16491,7 @@
GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -16494,11 +16502,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOBJECT" >&5
$as_echo_n "checking for GOBJECT... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$GOBJECT_CFLAGS"; then
- pkg_cv_GOBJECT_CFLAGS="$GOBJECT_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GOBJECT_CFLAGS"; then
+ pkg_cv_GOBJECT_CFLAGS="$GOBJECT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= \$GLIB_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "gobject-2.0 >= $GLIB_REQUIRED") 2>&5
ac_status=$?
@@ -16508,15 +16515,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GOBJECT_LIBS"; then
- pkg_cv_GOBJECT_LIBS="$GOBJECT_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GOBJECT_LIBS"; then
+ pkg_cv_GOBJECT_LIBS="$GOBJECT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= \$GLIB_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "gobject-2.0 >= $GLIB_REQUIRED") 2>&5
ac_status=$?
@@ -16526,14 +16531,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -16541,9 +16547,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gobject-2.0 >= $GLIB_REQUIRED"`
+ GOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-2.0 >= $GLIB_REQUIRED" 2>&1`
else
- GOBJECT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gobject-2.0 >= $GLIB_REQUIRED"`
+ GOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-2.0 >= $GLIB_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GOBJECT_PKG_ERRORS" >&5
@@ -16557,9 +16563,10 @@
Alternatively, you may set the environment variables GOBJECT_CFLAGS
and GOBJECT_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -16577,7 +16584,7 @@
GOBJECT_LIBS=$pkg_cv_GOBJECT_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -16588,11 +16595,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5
$as_echo_n "checking for GMODULE... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$GMODULE_CFLAGS"; then
- pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GMODULE_CFLAGS"; then
+ pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= \$GLIB_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= $GLIB_REQUIRED") 2>&5
ac_status=$?
@@ -16602,15 +16608,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GMODULE_LIBS"; then
- pkg_cv_GMODULE_LIBS="$GMODULE_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GMODULE_LIBS"; then
+ pkg_cv_GMODULE_LIBS="$GMODULE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= \$GLIB_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= $GLIB_REQUIRED") 2>&5
ac_status=$?
@@ -16620,14 +16624,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -16635,9 +16640,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gmodule-2.0 >= $GLIB_REQUIRED"`
+ GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmodule-2.0 >= $GLIB_REQUIRED" 2>&1`
else
- GMODULE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmodule-2.0 >= $GLIB_REQUIRED"`
+ GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmodule-2.0 >= $GLIB_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GMODULE_PKG_ERRORS" >&5
@@ -16651,9 +16656,10 @@
Alternatively, you may set the environment variables GMODULE_CFLAGS
and GMODULE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -16671,7 +16677,7 @@
GMODULE_LIBS=$pkg_cv_GMODULE_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -16682,11 +16688,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO" >&5
$as_echo_n "checking for GIO... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$GIO_CFLAGS"; then
- pkg_cv_GIO_CFLAGS="$GIO_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GIO_CFLAGS"; then
+ pkg_cv_GIO_CFLAGS="$GIO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GLIB_REQUIRED gio-unix-2.0 >= \$GLIB_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED") 2>&5
ac_status=$?
@@ -16696,15 +16701,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GIO_LIBS"; then
- pkg_cv_GIO_LIBS="$GIO_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GIO_LIBS"; then
+ pkg_cv_GIO_LIBS="$GIO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GLIB_REQUIRED gio-unix-2.0 >= \$GLIB_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED") 2>&5
ac_status=$?
@@ -16714,14 +16717,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -16729,9 +16733,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED"`
+ GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED" 2>&1`
else
- GIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED"`
+ GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GIO_PKG_ERRORS" >&5
@@ -16745,9 +16749,10 @@
Alternatively, you may set the environment variables GIO_CFLAGS
and GIO_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -16765,7 +16770,7 @@
GIO_LIBS=$pkg_cv_GIO_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -16776,11 +16781,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO" >&5
$as_echo_n "checking for PANGO... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$PANGO_CFLAGS"; then
- pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$PANGO_CFLAGS"; then
+ pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED") 2>&5
ac_status=$?
@@ -16790,15 +16794,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$PANGO_LIBS"; then
- pkg_cv_PANGO_LIBS="$PANGO_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$PANGO_LIBS"; then
+ pkg_cv_PANGO_LIBS="$PANGO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED") 2>&5
ac_status=$?
@@ -16808,14 +16810,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -16823,9 +16826,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pango >= $PANGO_REQUIRED"`
+ PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pango >= $PANGO_REQUIRED" 2>&1`
else
- PANGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= $PANGO_REQUIRED"`
+ PANGO_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango >= $PANGO_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$PANGO_PKG_ERRORS" >&5
@@ -16839,9 +16842,10 @@
Alternatively, you may set the environment variables PANGO_CFLAGS
and PANGO_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -16859,7 +16863,7 @@
PANGO_LIBS=$pkg_cv_PANGO_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -16870,11 +16874,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
$as_echo_n "checking for DBUS... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$DBUS_CFLAGS"; then
- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$DBUS_CFLAGS"; then
+ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
+ 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 dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
ac_status=$?
@@ -16884,15 +16887,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$DBUS_LIBS"; then
- pkg_cv_DBUS_LIBS="$DBUS_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$DBUS_LIBS"; then
+ pkg_cv_DBUS_LIBS="$DBUS_LIBS"
+ 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 dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
ac_status=$?
@@ -16902,14 +16903,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -16917,9 +16919,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
+ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1`
else
- DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
+ DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$DBUS_PKG_ERRORS" >&5
@@ -16933,9 +16935,10 @@
Alternatively, you may set the environment variables DBUS_CFLAGS
and DBUS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -16953,7 +16956,7 @@
DBUS_LIBS=$pkg_cv_DBUS_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -16964,11 +16967,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPNG" >&5
$as_echo_n "checking for LIBPNG... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBPNG_CFLAGS"; then
- pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBPNG_CFLAGS"; then
+ pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng >= 1.2\""; } >&5
($PKG_CONFIG --exists --print-errors "libpng >= 1.2") 2>&5
ac_status=$?
@@ -16978,15 +16980,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBPNG_LIBS"; then
- pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBPNG_LIBS"; then
+ pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng >= 1.2\""; } >&5
($PKG_CONFIG --exists --print-errors "libpng >= 1.2") 2>&5
ac_status=$?
@@ -16996,14 +16996,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -17011,9 +17012,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpng >= 1.2"`
+ LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpng >= 1.2" 2>&1`
else
- LIBPNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpng >= 1.2"`
+ LIBPNG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpng >= 1.2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBPNG_PKG_ERRORS" >&5
@@ -17027,9 +17028,10 @@
Alternatively, you may set the environment variables LIBPNG_CFLAGS
and LIBPNG_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -17047,7 +17049,7 @@
LIBPNG_LIBS=$pkg_cv_LIBPNG_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -17058,11 +17060,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UUID" >&5
$as_echo_n "checking for UUID... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$UUID_CFLAGS"; then
- pkg_cv_UUID_CFLAGS="$UUID_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$UUID_CFLAGS"; then
+ pkg_cv_UUID_CFLAGS="$UUID_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"uuid\""; } >&5
($PKG_CONFIG --exists --print-errors "uuid") 2>&5
ac_status=$?
@@ -17072,15 +17073,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$UUID_LIBS"; then
- pkg_cv_UUID_LIBS="$UUID_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$UUID_LIBS"; then
+ pkg_cv_UUID_LIBS="$UUID_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"uuid\""; } >&5
($PKG_CONFIG --exists --print-errors "uuid") 2>&5
ac_status=$?
@@ -17090,14 +17089,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -17105,9 +17105,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- UUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "uuid"`
+ UUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "uuid" 2>&1`
else
- UUID_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "uuid"`
+ UUID_PKG_ERRORS=`$PKG_CONFIG --print-errors "uuid" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$UUID_PKG_ERRORS" >&5
@@ -17121,9 +17121,10 @@
Alternatively, you may set the environment variables UUID_CFLAGS
and UUID_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -17141,7 +17142,7 @@
UUID_LIBS=$pkg_cv_UUID_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -17162,11 +17163,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ENCA" >&5
$as_echo_n "checking for ENCA... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$ENCA_CFLAGS"; then
- pkg_cv_ENCA_CFLAGS="$ENCA_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$ENCA_CFLAGS"; then
+ pkg_cv_ENCA_CFLAGS="$ENCA_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enca >= 1.9\""; } >&5
($PKG_CONFIG --exists --print-errors "enca >= 1.9") 2>&5
ac_status=$?
@@ -17176,15 +17176,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$ENCA_LIBS"; then
- pkg_cv_ENCA_LIBS="$ENCA_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$ENCA_LIBS"; then
+ pkg_cv_ENCA_LIBS="$ENCA_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enca >= 1.9\""; } >&5
($PKG_CONFIG --exists --print-errors "enca >= 1.9") 2>&5
ac_status=$?
@@ -17194,14 +17192,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -17209,17 +17208,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- ENCA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "enca >= 1.9"`
+ ENCA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "enca >= 1.9" 2>&1`
else
- ENCA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "enca >= 1.9"`
+ ENCA_PKG_ERRORS=`$PKG_CONFIG --print-errors "enca >= 1.9" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$ENCA_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_enca=no
+ have_enca=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_enca=no
else
ENCA_CFLAGS=$pkg_cv_ENCA_CFLAGS
@@ -17461,11 +17460,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSTREAMANALYZER" >&5
$as_echo_n "checking for LIBSTREAMANALYZER... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBSTREAMANALYZER_CFLAGS"; then
- pkg_cv_LIBSTREAMANALYZER_CFLAGS="$LIBSTREAMANALYZER_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBSTREAMANALYZER_CFLAGS"; then
+ pkg_cv_LIBSTREAMANALYZER_CFLAGS="$LIBSTREAMANALYZER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libstreamanalyzer >= \$LIBSTREAMANALYZER_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "libstreamanalyzer >= $LIBSTREAMANALYZER_REQUIRED") 2>&5
ac_status=$?
@@ -17475,15 +17473,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBSTREAMANALYZER_LIBS"; then
- pkg_cv_LIBSTREAMANALYZER_LIBS="$LIBSTREAMANALYZER_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBSTREAMANALYZER_LIBS"; then
+ pkg_cv_LIBSTREAMANALYZER_LIBS="$LIBSTREAMANALYZER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libstreamanalyzer >= \$LIBSTREAMANALYZER_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "libstreamanalyzer >= $LIBSTREAMANALYZER_REQUIRED") 2>&5
ac_status=$?
@@ -17493,14 +17489,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -17508,17 +17505,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBSTREAMANALYZER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libstreamanalyzer >= $LIBSTREAMANALYZER_REQUIRED"`
+ LIBSTREAMANALYZER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libstreamanalyzer >= $LIBSTREAMANALYZER_REQUIRED" 2>&1`
else
- LIBSTREAMANALYZER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libstreamanalyzer >= $LIBSTREAMANALYZER_REQUIRED"`
+ LIBSTREAMANALYZER_PKG_ERRORS=`$PKG_CONFIG --print-errors "libstreamanalyzer >= $LIBSTREAMANALYZER_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBSTREAMANALYZER_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_libstreamanalyzer=no
+ have_libstreamanalyzer=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_libstreamanalyzer=no
else
LIBSTREAMANALYZER_CFLAGS=$pkg_cv_LIBSTREAMANALYZER_CFLAGS
@@ -19001,63 +18998,61 @@
##################################################################
-# Check for DeviceKit-power
+# Check for UPower
##################################################################
-# Check whether --enable-devkit_power was given.
-if test "${enable_devkit_power+set}" = set; then :
- enableval=$enable_devkit_power;
+# Check whether --enable-upower was given.
+if test "${enable_upower+set}" = set; then :
+ enableval=$enable_upower;
else
- enable_devkit_power=auto
+ enable_upower=auto
fi
-if test "x$enable_devkit_power" != "xno"; then
+if test "x$enable_upower" != "xno"; then
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEVKIT_POWER" >&5
-$as_echo_n "checking for DEVKIT_POWER... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UPOWER" >&5
+$as_echo_n "checking for UPOWER... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$DEVKIT_POWER_CFLAGS"; then
- pkg_cv_DEVKIT_POWER_CFLAGS="$DEVKIT_POWER_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED") 2>&5
+if test -n "$UPOWER_CFLAGS"; then
+ pkg_cv_UPOWER_CFLAGS="$UPOWER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"upower-glib >= \$UPOWER_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "upower-glib >= $UPOWER_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_DEVKIT_POWER_CFLAGS=`$PKG_CONFIG --cflags "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED" 2>/dev/null`
+ pkg_cv_UPOWER_CFLAGS=`$PKG_CONFIG --cflags "upower-glib >= $UPOWER_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$DEVKIT_POWER_LIBS"; then
- pkg_cv_DEVKIT_POWER_LIBS="$DEVKIT_POWER_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED") 2>&5
+if test -n "$UPOWER_LIBS"; then
+ pkg_cv_UPOWER_LIBS="$UPOWER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"upower-glib >= \$UPOWER_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "upower-glib >= $UPOWER_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_DEVKIT_POWER_LIBS=`$PKG_CONFIG --libs "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED" 2>/dev/null`
+ pkg_cv_UPOWER_LIBS=`$PKG_CONFIG --libs "upower-glib >= $UPOWER_REQUIRED" 2>/dev/null`
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19065,49 +19060,49 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- DEVKIT_POWER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED"`
+ UPOWER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "upower-glib >= $UPOWER_REQUIRED" 2>&1`
else
- DEVKIT_POWER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED"`
+ UPOWER_PKG_ERRORS=`$PKG_CONFIG --print-errors "upower-glib >= $UPOWER_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$DEVKIT_POWER_PKG_ERRORS" >&5
+ echo "$UPOWER_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_devkit_power=no
+ have_upower=no
elif test $pkg_failed = untried; then
- have_devkit_power=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ have_upower=no
else
- DEVKIT_POWER_CFLAGS=$pkg_cv_DEVKIT_POWER_CFLAGS
- DEVKIT_POWER_LIBS=$pkg_cv_DEVKIT_POWER_LIBS
+ UPOWER_CFLAGS=$pkg_cv_UPOWER_CFLAGS
+ UPOWER_LIBS=$pkg_cv_UPOWER_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- have_devkit_power=yes
+ have_upower=yes
fi
- if test "x$have_devkit_power" = "xyes"; then
+ if test "x$have_upower" = "xyes"; then
-$as_echo "#define HAVE_DEVKIT_POWER /**/" >>confdefs.h
+$as_echo "#define HAVE_UPOWER /**/" >>confdefs.h
fi
else
- have_devkit_power="no (disabled)"
+ have_upower="no (disabled)"
fi
-if test "x$enable_devkit_power" = "xyes"; then
- if test "x$have_devkit_power" != "xyes"; then
- as_fn_error "Couldn't find devkit_power >= $DEVKIT_POWER_REQUIRED." "$LINENO" 5
+if test "x$enable_upower" = "xyes"; then
+ if test "x$have_upower" != "xyes"; then
+ as_fn_error "Couldn't find upower >= $UPOWER_REQUIRED." "$LINENO" 5
fi
fi
- if test "x$have_devkit_power" = "xyes"; then
- HAVE_DEVKIT_POWER_TRUE=
- HAVE_DEVKIT_POWER_FALSE='#'
+ if test "x$have_upower" = "xyes"; then
+ HAVE_UPOWER_TRUE=
+ HAVE_UPOWER_FALSE='#'
else
- HAVE_DEVKIT_POWER_TRUE='#'
- HAVE_DEVKIT_POWER_FALSE=
+ HAVE_UPOWER_TRUE='#'
+ HAVE_UPOWER_FALSE=
fi
@@ -19123,17 +19118,16 @@
fi
-if test "x$have_devkit_power" != "xyes" && test "x$enable_hal" != "xno"; then
+if test "x$have_upower" != "xyes" && test "x$enable_hal" != "xno"; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HAL" >&5
$as_echo_n "checking for HAL... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$HAL_CFLAGS"; then
- pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$HAL_CFLAGS"; then
+ pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal >= \$HAL_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "hal >= $HAL_REQUIRED") 2>&5
ac_status=$?
@@ -19143,15 +19137,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$HAL_LIBS"; then
- pkg_cv_HAL_LIBS="$HAL_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$HAL_LIBS"; then
+ pkg_cv_HAL_LIBS="$HAL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal >= \$HAL_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "hal >= $HAL_REQUIRED") 2>&5
ac_status=$?
@@ -19161,14 +19153,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19176,17 +19169,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hal >= $HAL_REQUIRED"`
+ HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal >= $HAL_REQUIRED" 2>&1`
else
- HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hal >= $HAL_REQUIRED"`
+ HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "hal >= $HAL_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$HAL_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_hal=no
+ have_hal=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_hal=no
else
HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
@@ -19208,8 +19201,8 @@
fi
if test "x$enable_hal" = "xyes"; then
- if test "x$have_devkit_power" = "xyes"; then
- as_fn_error "Only one of DeviceKit-power and HAL can be used." "$LINENO" 5
+ if test "x$have_upower" = "xyes"; then
+ as_fn_error "Only one of UPower and HAL can be used." "$LINENO" 5
elif test "x$have_hal" != "xyes"; then
as_fn_error "Couldn't find hal >= $HAL_REQUIRED." "$LINENO" 5
fi
@@ -19242,11 +19235,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXML2" >&5
$as_echo_n "checking for LIBXML2... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBXML2_CFLAGS"; then
- pkg_cv_LIBXML2_CFLAGS="$LIBXML2_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBXML2_CFLAGS"; then
+ pkg_cv_LIBXML2_CFLAGS="$LIBXML2_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML2_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML2_REQUIRED") 2>&5
ac_status=$?
@@ -19256,15 +19248,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBXML2_LIBS"; then
- pkg_cv_LIBXML2_LIBS="$LIBXML2_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBXML2_LIBS"; then
+ pkg_cv_LIBXML2_LIBS="$LIBXML2_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML2_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML2_REQUIRED") 2>&5
ac_status=$?
@@ -19274,14 +19264,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19289,17 +19280,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml-2.0 >= $LIBXML2_REQUIRED"`
+ LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= $LIBXML2_REQUIRED" 2>&1`
else
- LIBXML2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 >= $LIBXML2_REQUIRED"`
+ LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= $LIBXML2_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBXML2_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_libxml2=no
+ have_libxml2=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_libxml2=no
else
LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS
@@ -19373,11 +19364,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QUILL" >&5
$as_echo_n "checking for QUILL... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$QUILL_CFLAGS"; then
- pkg_cv_QUILL_CFLAGS="$QUILL_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$QUILL_CFLAGS"; then
+ pkg_cv_QUILL_CFLAGS="$QUILL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"quill >= \$QUILL_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "quill >= $QUILL_REQUIRED") 2>&5
ac_status=$?
@@ -19387,15 +19377,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$QUILL_LIBS"; then
- pkg_cv_QUILL_LIBS="$QUILL_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$QUILL_LIBS"; then
+ pkg_cv_QUILL_LIBS="$QUILL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"quill >= \$QUILL_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "quill >= $QUILL_REQUIRED") 2>&5
ac_status=$?
@@ -19405,14 +19393,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19420,17 +19409,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- QUILL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "quill >= $QUILL_REQUIRED"`
+ QUILL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "quill >= $QUILL_REQUIRED" 2>&1`
else
- QUILL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "quill >= $QUILL_REQUIRED"`
+ QUILL_PKG_ERRORS=`$PKG_CONFIG --print-errors "quill >= $QUILL_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$QUILL_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_quill=no
+ have_quill=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_quill=no
else
QUILL_CFLAGS=$pkg_cv_QUILL_CFLAGS
@@ -19477,11 +19466,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDKPIXBUF" >&5
$as_echo_n "checking for GDKPIXBUF... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$GDKPIXBUF_CFLAGS"; then
- pkg_cv_GDKPIXBUF_CFLAGS="$GDKPIXBUF_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GDKPIXBUF_CFLAGS"; then
+ pkg_cv_GDKPIXBUF_CFLAGS="$GDKPIXBUF_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDKPIXBUF_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED") 2>&5
ac_status=$?
@@ -19491,15 +19479,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GDKPIXBUF_LIBS"; then
- pkg_cv_GDKPIXBUF_LIBS="$GDKPIXBUF_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GDKPIXBUF_LIBS"; then
+ pkg_cv_GDKPIXBUF_LIBS="$GDKPIXBUF_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDKPIXBUF_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED") 2>&5
ac_status=$?
@@ -19509,14 +19495,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19524,17 +19511,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GDKPIXBUF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED"`
+ GDKPIXBUF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED" 2>&1`
else
- GDKPIXBUF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED"`
+ GDKPIXBUF_PKG_ERRORS=`$PKG_CONFIG --print-errors "gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GDKPIXBUF_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_gdkpixbuf=no
+ have_gdkpixbuf=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_gdkpixbuf=no
else
GDKPIXBUF_CFLAGS=$pkg_cv_GDKPIXBUF_CFLAGS
@@ -19589,11 +19576,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5
$as_echo_n "checking for GSTREAMER... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$GSTREAMER_CFLAGS"; then
- pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GSTREAMER_CFLAGS"; then
+ pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= 0.10.12 gstreamer-tag-0.10 >= 0.10.12\""; } >&5
($PKG_CONFIG --exists --print-errors "gstreamer-0.10 >= 0.10.12 gstreamer-tag-0.10 >= 0.10.12") 2>&5
ac_status=$?
@@ -19603,15 +19589,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GSTREAMER_LIBS"; then
- pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GSTREAMER_LIBS"; then
+ pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= 0.10.12 gstreamer-tag-0.10 >= 0.10.12\""; } >&5
($PKG_CONFIG --exists --print-errors "gstreamer-0.10 >= 0.10.12 gstreamer-tag-0.10 >= 0.10.12") 2>&5
ac_status=$?
@@ -19621,14 +19605,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19636,17 +19621,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-0.10 >= 0.10.12 gstreamer-tag-0.10 >= 0.10.12"`
+ GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gstreamer-0.10 >= 0.10.12 gstreamer-tag-0.10 >= 0.10.12" 2>&1`
else
- GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-0.10 >= 0.10.12 gstreamer-tag-0.10 >= 0.10.12"`
+ GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gstreamer-0.10 >= 0.10.12 gstreamer-tag-0.10 >= 0.10.12" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GSTREAMER_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_libgstreamer=no
+ have_libgstreamer=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_libgstreamer=no
else
GSTREAMER_CFLAGS=$pkg_cv_GSTREAMER_CFLAGS
@@ -19664,11 +19649,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XINE" >&5
$as_echo_n "checking for XINE... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$XINE_CFLAGS"; then
- pkg_cv_XINE_CFLAGS="$XINE_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$XINE_CFLAGS"; then
+ pkg_cv_XINE_CFLAGS="$XINE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxine >= 1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libxine >= 1.0") 2>&5
ac_status=$?
@@ -19678,15 +19662,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$XINE_LIBS"; then
- pkg_cv_XINE_LIBS="$XINE_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$XINE_LIBS"; then
+ pkg_cv_XINE_LIBS="$XINE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxine >= 1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libxine >= 1.0") 2>&5
ac_status=$?
@@ -19696,14 +19678,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19711,17 +19694,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- XINE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxine >= 1.0"`
+ XINE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxine >= 1.0" 2>&1`
else
- XINE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxine >= 1.0"`
+ XINE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxine >= 1.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$XINE_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_libxine=no
+ have_libxine=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_libxine=no
else
XINE_CFLAGS=$pkg_cv_XINE_CFLAGS
@@ -20007,11 +19990,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLITE3" >&5
$as_echo_n "checking for SQLITE3... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$SQLITE3_CFLAGS"; then
- pkg_cv_SQLITE3_CFLAGS="$SQLITE3_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$SQLITE3_CFLAGS"; then
+ pkg_cv_SQLITE3_CFLAGS="$SQLITE3_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= \$SQLITE_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "sqlite3 >= $SQLITE_REQUIRED") 2>&5
ac_status=$?
@@ -20021,15 +20003,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$SQLITE3_LIBS"; then
- pkg_cv_SQLITE3_LIBS="$SQLITE3_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$SQLITE3_LIBS"; then
+ pkg_cv_SQLITE3_LIBS="$SQLITE3_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= \$SQLITE_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "sqlite3 >= $SQLITE_REQUIRED") 2>&5
ac_status=$?
@@ -20039,14 +20019,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20054,9 +20035,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- SQLITE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sqlite3 >= $SQLITE_REQUIRED"`
+ SQLITE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sqlite3 >= $SQLITE_REQUIRED" 2>&1`
else
- SQLITE3_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sqlite3 >= $SQLITE_REQUIRED"`
+ SQLITE3_PKG_ERRORS=`$PKG_CONFIG --print-errors "sqlite3 >= $SQLITE_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$SQLITE3_PKG_ERRORS" >&5
@@ -20070,9 +20051,10 @@
Alternatively, you may set the environment variables SQLITE3_CFLAGS
and SQLITE3_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -20090,7 +20072,7 @@
SQLITE3_LIBS=$pkg_cv_SQLITE3_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -20113,11 +20095,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNAC" >&5
$as_echo_n "checking for UNAC... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$UNAC_CFLAGS"; then
- pkg_cv_UNAC_CFLAGS="$UNAC_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$UNAC_CFLAGS"; then
+ pkg_cv_UNAC_CFLAGS="$UNAC_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unac >= \$UNAC_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "unac >= $UNAC_REQUIRED") 2>&5
ac_status=$?
@@ -20127,15 +20108,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$UNAC_LIBS"; then
- pkg_cv_UNAC_LIBS="$UNAC_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$UNAC_LIBS"; then
+ pkg_cv_UNAC_LIBS="$UNAC_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unac >= \$UNAC_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "unac >= $UNAC_REQUIRED") 2>&5
ac_status=$?
@@ -20145,14 +20124,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20160,17 +20140,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- UNAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "unac >= $UNAC_REQUIRED"`
+ UNAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "unac >= $UNAC_REQUIRED" 2>&1`
else
- UNAC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "unac >= $UNAC_REQUIRED"`
+ UNAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "unac >= $UNAC_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$UNAC_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_unac=no
+ have_unac=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_unac=no
else
UNAC_CFLAGS=$pkg_cv_UNAC_CFLAGS
@@ -20224,11 +20204,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_KEYRING" >&5
$as_echo_n "checking for GNOME_KEYRING... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$GNOME_KEYRING_CFLAGS"; then
- pkg_cv_GNOME_KEYRING_CFLAGS="$GNOME_KEYRING_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GNOME_KEYRING_CFLAGS"; then
+ pkg_cv_GNOME_KEYRING_CFLAGS="$GNOME_KEYRING_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED \""; } >&5
($PKG_CONFIG --exists --print-errors " gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED ") 2>&5
ac_status=$?
@@ -20238,15 +20217,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GNOME_KEYRING_LIBS"; then
- pkg_cv_GNOME_KEYRING_LIBS="$GNOME_KEYRING_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GNOME_KEYRING_LIBS"; then
+ pkg_cv_GNOME_KEYRING_LIBS="$GNOME_KEYRING_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED \""; } >&5
($PKG_CONFIG --exists --print-errors " gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED ") 2>&5
ac_status=$?
@@ -20256,14 +20233,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20271,17 +20249,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GNOME_KEYRING_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED "`
+ GNOME_KEYRING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED " 2>&1`
else
- GNOME_KEYRING_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED "`
+ GNOME_KEYRING_PKG_ERRORS=`$PKG_CONFIG --print-errors " gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GNOME_KEYRING_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_gnome_keyring=no
+ have_gnome_keyring=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_gnome_keyring=no
else
GNOME_KEYRING_CFLAGS=$pkg_cv_GNOME_KEYRING_CFLAGS
@@ -20335,11 +20313,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVOLUTION_PLUGIN" >&5
$as_echo_n "checking for EVOLUTION_PLUGIN... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$EVOLUTION_PLUGIN_CFLAGS"; then
- pkg_cv_EVOLUTION_PLUGIN_CFLAGS="$EVOLUTION_PLUGIN_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$EVOLUTION_PLUGIN_CFLAGS"; then
+ pkg_cv_EVOLUTION_PLUGIN_CFLAGS="$EVOLUTION_PLUGIN_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
evolution-plugin >= \$EVO_REQUIRED
evolution-data-server-1.2 >= \$EDS_REQUIRED\""; } >&5
@@ -20355,15 +20332,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$EVOLUTION_PLUGIN_LIBS"; then
- pkg_cv_EVOLUTION_PLUGIN_LIBS="$EVOLUTION_PLUGIN_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$EVOLUTION_PLUGIN_LIBS"; then
+ pkg_cv_EVOLUTION_PLUGIN_LIBS="$EVOLUTION_PLUGIN_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
evolution-plugin >= \$EVO_REQUIRED
evolution-data-server-1.2 >= \$EDS_REQUIRED\""; } >&5
@@ -20379,14 +20354,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20394,21 +20370,21 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
+ EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
evolution-plugin >= $EVO_REQUIRED
- evolution-data-server-1.2 >= $EDS_REQUIRED"`
+ evolution-data-server-1.2 >= $EDS_REQUIRED" 2>&1`
else
- EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+ EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "
evolution-plugin >= $EVO_REQUIRED
- evolution-data-server-1.2 >= $EDS_REQUIRED"`
+ evolution-data-server-1.2 >= $EDS_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$EVOLUTION_PLUGIN_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_miner_evolution=no
+ have_miner_evolution=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_miner_evolution=no
else
EVOLUTION_PLUGIN_CFLAGS=$pkg_cv_EVOLUTION_PLUGIN_CFLAGS
@@ -20522,11 +20498,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGRSS" >&5
$as_echo_n "checking for LIBGRSS... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBGRSS_CFLAGS"; then
- pkg_cv_LIBGRSS_CFLAGS="$LIBGRSS_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBGRSS_CFLAGS"; then
+ pkg_cv_LIBGRSS_CFLAGS="$LIBGRSS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgrss-0 >= \$LIBGRSS_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "libgrss-0 >= $LIBGRSS_REQUIRED") 2>&5
ac_status=$?
@@ -20536,15 +20511,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBGRSS_LIBS"; then
- pkg_cv_LIBGRSS_LIBS="$LIBGRSS_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBGRSS_LIBS"; then
+ pkg_cv_LIBGRSS_LIBS="$LIBGRSS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgrss-0 >= \$LIBGRSS_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "libgrss-0 >= $LIBGRSS_REQUIRED") 2>&5
ac_status=$?
@@ -20554,14 +20527,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20569,17 +20543,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBGRSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgrss-0 >= $LIBGRSS_REQUIRED"`
+ LIBGRSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgrss-0 >= $LIBGRSS_REQUIRED" 2>&1`
else
- LIBGRSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgrss-0 >= $LIBGRSS_REQUIRED"`
+ LIBGRSS_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgrss-0 >= $LIBGRSS_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBGRSS_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_miner_rss=no
+ have_miner_rss=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_miner_rss=no
else
LIBGRSS_CFLAGS=$pkg_cv_LIBGRSS_CFLAGS
@@ -20630,11 +20604,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TRACKER_APPS" >&5
$as_echo_n "checking for TRACKER_APPS... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$TRACKER_APPS_CFLAGS"; then
- pkg_cv_TRACKER_APPS_CFLAGS="$TRACKER_APPS_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$TRACKER_APPS_CFLAGS"; then
+ pkg_cv_TRACKER_APPS_CFLAGS="$TRACKER_APPS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" \$APP_REQUIREMENTS \""; } >&5
($PKG_CONFIG --exists --print-errors " $APP_REQUIREMENTS ") 2>&5
ac_status=$?
@@ -20644,15 +20617,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$TRACKER_APPS_LIBS"; then
- pkg_cv_TRACKER_APPS_LIBS="$TRACKER_APPS_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$TRACKER_APPS_LIBS"; then
+ pkg_cv_TRACKER_APPS_LIBS="$TRACKER_APPS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" \$APP_REQUIREMENTS \""; } >&5
($PKG_CONFIG --exists --print-errors " $APP_REQUIREMENTS ") 2>&5
ac_status=$?
@@ -20662,14 +20633,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20677,17 +20649,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- TRACKER_APPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " $APP_REQUIREMENTS "`
+ TRACKER_APPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " $APP_REQUIREMENTS " 2>&1`
else
- TRACKER_APPS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " $APP_REQUIREMENTS "`
+ TRACKER_APPS_PKG_ERRORS=`$PKG_CONFIG --print-errors " $APP_REQUIREMENTS " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$TRACKER_APPS_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_app_requirements=no
+ have_app_requirements=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_app_requirements=no
else
TRACKER_APPS_CFLAGS=$pkg_cv_TRACKER_APPS_CFLAGS
@@ -20705,11 +20677,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TRACKER_APPLETS" >&5
$as_echo_n "checking for TRACKER_APPLETS... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$TRACKER_APPLETS_CFLAGS"; then
- pkg_cv_TRACKER_APPLETS_CFLAGS="$TRACKER_APPLETS_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$TRACKER_APPLETS_CFLAGS"; then
+ pkg_cv_TRACKER_APPLETS_CFLAGS="$TRACKER_APPLETS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" \$APPLET_REQUIREMENTS \""; } >&5
($PKG_CONFIG --exists --print-errors " $APPLET_REQUIREMENTS ") 2>&5
ac_status=$?
@@ -20719,15 +20690,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$TRACKER_APPLETS_LIBS"; then
- pkg_cv_TRACKER_APPLETS_LIBS="$TRACKER_APPLETS_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$TRACKER_APPLETS_LIBS"; then
+ pkg_cv_TRACKER_APPLETS_LIBS="$TRACKER_APPLETS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" \$APPLET_REQUIREMENTS \""; } >&5
($PKG_CONFIG --exists --print-errors " $APPLET_REQUIREMENTS ") 2>&5
ac_status=$?
@@ -20737,14 +20706,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20752,17 +20722,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- TRACKER_APPLETS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " $APPLET_REQUIREMENTS "`
+ TRACKER_APPLETS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " $APPLET_REQUIREMENTS " 2>&1`
else
- TRACKER_APPLETS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " $APPLET_REQUIREMENTS "`
+ TRACKER_APPLETS_PKG_ERRORS=`$PKG_CONFIG --print-errors " $APPLET_REQUIREMENTS " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$TRACKER_APPLETS_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_applet_requirements=no
+ have_applet_requirements=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_applet_requirements=no
else
TRACKER_APPLETS_CFLAGS=$pkg_cv_TRACKER_APPLETS_CFLAGS
@@ -20780,11 +20750,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TRACKER_VALA" >&5
$as_echo_n "checking for TRACKER_VALA... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$TRACKER_VALA_CFLAGS"; then
- pkg_cv_TRACKER_VALA_CFLAGS="$TRACKER_VALA_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$TRACKER_VALA_CFLAGS"; then
+ pkg_cv_TRACKER_VALA_CFLAGS="$TRACKER_VALA_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" \$VALA_REQUIREMENTS \""; } >&5
($PKG_CONFIG --exists --print-errors " $VALA_REQUIREMENTS ") 2>&5
ac_status=$?
@@ -20794,15 +20763,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$TRACKER_VALA_LIBS"; then
- pkg_cv_TRACKER_VALA_LIBS="$TRACKER_VALA_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$TRACKER_VALA_LIBS"; then
+ pkg_cv_TRACKER_VALA_LIBS="$TRACKER_VALA_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" \$VALA_REQUIREMENTS \""; } >&5
($PKG_CONFIG --exists --print-errors " $VALA_REQUIREMENTS ") 2>&5
ac_status=$?
@@ -20812,14 +20779,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20827,17 +20795,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- TRACKER_VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " $VALA_REQUIREMENTS "`
+ TRACKER_VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " $VALA_REQUIREMENTS " 2>&1`
else
- TRACKER_VALA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " $VALA_REQUIREMENTS "`
+ TRACKER_VALA_PKG_ERRORS=`$PKG_CONFIG --print-errors " $VALA_REQUIREMENTS " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$TRACKER_VALA_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_vala_requirements=no
+ have_vala_requirements=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_vala_requirements=no
else
TRACKER_VALA_CFLAGS=$pkg_cv_TRACKER_VALA_CFLAGS
@@ -21124,11 +21092,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POPPLER_GLIB" >&5
$as_echo_n "checking for POPPLER_GLIB... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$POPPLER_GLIB_CFLAGS"; then
- pkg_cv_POPPLER_GLIB_CFLAGS="$POPPLER_GLIB_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$POPPLER_GLIB_CFLAGS"; then
+ pkg_cv_POPPLER_GLIB_CFLAGS="$POPPLER_GLIB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler-glib >= \$POPPLER_GLIB_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "poppler-glib >= $POPPLER_GLIB_REQUIRED") 2>&5
ac_status=$?
@@ -21138,15 +21105,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$POPPLER_GLIB_LIBS"; then
- pkg_cv_POPPLER_GLIB_LIBS="$POPPLER_GLIB_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$POPPLER_GLIB_LIBS"; then
+ pkg_cv_POPPLER_GLIB_LIBS="$POPPLER_GLIB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler-glib >= \$POPPLER_GLIB_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "poppler-glib >= $POPPLER_GLIB_REQUIRED") 2>&5
ac_status=$?
@@ -21156,14 +21121,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -21171,17 +21137,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "poppler-glib >= $POPPLER_GLIB_REQUIRED"`
+ POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "poppler-glib >= $POPPLER_GLIB_REQUIRED" 2>&1`
else
- POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "poppler-glib >= $POPPLER_GLIB_REQUIRED"`
+ POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "poppler-glib >= $POPPLER_GLIB_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$POPPLER_GLIB_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_poppler_glib=no
+ have_poppler_glib=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_poppler_glib=no
else
POPPLER_GLIB_CFLAGS=$pkg_cv_POPPLER_GLIB_CFLAGS
@@ -21236,11 +21202,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEXIF" >&5
$as_echo_n "checking for LIBEXIF... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBEXIF_CFLAGS"; then
- pkg_cv_LIBEXIF_CFLAGS="$LIBEXIF_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBEXIF_CFLAGS"; then
+ pkg_cv_LIBEXIF_CFLAGS="$LIBEXIF_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif >= \$LIBEXIF_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "libexif >= $LIBEXIF_REQUIRED") 2>&5
ac_status=$?
@@ -21250,15 +21215,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBEXIF_LIBS"; then
- pkg_cv_LIBEXIF_LIBS="$LIBEXIF_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBEXIF_LIBS"; then
+ pkg_cv_LIBEXIF_LIBS="$LIBEXIF_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexif >= \$LIBEXIF_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "libexif >= $LIBEXIF_REQUIRED") 2>&5
ac_status=$?
@@ -21268,14 +21231,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -21283,17 +21247,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBEXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libexif >= $LIBEXIF_REQUIRED"`
+ LIBEXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libexif >= $LIBEXIF_REQUIRED" 2>&1`
else
- LIBEXIF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libexif >= $LIBEXIF_REQUIRED"`
+ LIBEXIF_PKG_ERRORS=`$PKG_CONFIG --print-errors "libexif >= $LIBEXIF_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBEXIF_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_libexif=no
+ have_libexif=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_libexif=no
else
LIBEXIF_CFLAGS=$pkg_cv_LIBEXIF_CFLAGS
@@ -21348,11 +21312,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBIPTCDATA" >&5
$as_echo_n "checking for LIBIPTCDATA... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBIPTCDATA_CFLAGS"; then
- pkg_cv_LIBIPTCDATA_CFLAGS="$LIBIPTCDATA_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBIPTCDATA_CFLAGS"; then
+ pkg_cv_LIBIPTCDATA_CFLAGS="$LIBIPTCDATA_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiptcdata\""; } >&5
($PKG_CONFIG --exists --print-errors "libiptcdata") 2>&5
ac_status=$?
@@ -21362,15 +21325,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBIPTCDATA_LIBS"; then
- pkg_cv_LIBIPTCDATA_LIBS="$LIBIPTCDATA_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBIPTCDATA_LIBS"; then
+ pkg_cv_LIBIPTCDATA_LIBS="$LIBIPTCDATA_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiptcdata\""; } >&5
($PKG_CONFIG --exists --print-errors "libiptcdata") 2>&5
ac_status=$?
@@ -21380,14 +21341,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -21395,17 +21357,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBIPTCDATA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libiptcdata"`
+ LIBIPTCDATA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libiptcdata" 2>&1`
else
- LIBIPTCDATA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libiptcdata"`
+ LIBIPTCDATA_PKG_ERRORS=`$PKG_CONFIG --print-errors "libiptcdata" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBIPTCDATA_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_libiptcdata=no
+ have_libiptcdata=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_libiptcdata=no
else
LIBIPTCDATA_CFLAGS=$pkg_cv_LIBIPTCDATA_CFLAGS
@@ -21460,11 +21422,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGSF" >&5
$as_echo_n "checking for LIBGSF... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBGSF_CFLAGS"; then
- pkg_cv_LIBGSF_CFLAGS="$LIBGSF_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBGSF_CFLAGS"; then
+ pkg_cv_LIBGSF_CFLAGS="$LIBGSF_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgsf-1 >= \$LIBGSF_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "libgsf-1 >= $LIBGSF_REQUIRED") 2>&5
ac_status=$?
@@ -21474,15 +21435,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBGSF_LIBS"; then
- pkg_cv_LIBGSF_LIBS="$LIBGSF_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBGSF_LIBS"; then
+ pkg_cv_LIBGSF_LIBS="$LIBGSF_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgsf-1 >= \$LIBGSF_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "libgsf-1 >= $LIBGSF_REQUIRED") 2>&5
ac_status=$?
@@ -21492,14 +21451,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -21507,17 +21467,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBGSF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgsf-1 >= $LIBGSF_REQUIRED"`
+ LIBGSF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgsf-1 >= $LIBGSF_REQUIRED" 2>&1`
else
- LIBGSF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgsf-1 >= $LIBGSF_REQUIRED"`
+ LIBGSF_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgsf-1 >= $LIBGSF_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBGSF_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_libgsf=no
+ have_libgsf=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_libgsf=no
else
LIBGSF_CFLAGS=$pkg_cv_LIBGSF_CFLAGS
@@ -21786,11 +21746,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBVORBIS" >&5
$as_echo_n "checking for LIBVORBIS... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBVORBIS_CFLAGS"; then
- pkg_cv_LIBVORBIS_CFLAGS="$LIBVORBIS_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBVORBIS_CFLAGS"; then
+ pkg_cv_LIBVORBIS_CFLAGS="$LIBVORBIS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vorbisfile >= \$LIBVORBIS_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "vorbisfile >= $LIBVORBIS_REQUIRED") 2>&5
ac_status=$?
@@ -21800,15 +21759,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBVORBIS_LIBS"; then
- pkg_cv_LIBVORBIS_LIBS="$LIBVORBIS_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBVORBIS_LIBS"; then
+ pkg_cv_LIBVORBIS_LIBS="$LIBVORBIS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vorbisfile >= \$LIBVORBIS_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "vorbisfile >= $LIBVORBIS_REQUIRED") 2>&5
ac_status=$?
@@ -21818,14 +21775,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -21833,17 +21791,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBVORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "vorbisfile >= $LIBVORBIS_REQUIRED"`
+ LIBVORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vorbisfile >= $LIBVORBIS_REQUIRED" 2>&1`
else
- LIBVORBIS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "vorbisfile >= $LIBVORBIS_REQUIRED"`
+ LIBVORBIS_PKG_ERRORS=`$PKG_CONFIG --print-errors "vorbisfile >= $LIBVORBIS_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBVORBIS_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_libvorbis=no
+ have_libvorbis=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_libvorbis=no
else
LIBVORBIS_CFLAGS=$pkg_cv_LIBVORBIS_CFLAGS
@@ -21898,11 +21856,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBFLAC" >&5
$as_echo_n "checking for LIBFLAC... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBFLAC_CFLAGS"; then
- pkg_cv_LIBFLAC_CFLAGS="$LIBFLAC_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBFLAC_CFLAGS"; then
+ pkg_cv_LIBFLAC_CFLAGS="$LIBFLAC_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac >= \$LIBFLAC_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "flac >= $LIBFLAC_REQUIRED") 2>&5
ac_status=$?
@@ -21912,15 +21869,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBFLAC_LIBS"; then
- pkg_cv_LIBFLAC_LIBS="$LIBFLAC_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBFLAC_LIBS"; then
+ pkg_cv_LIBFLAC_LIBS="$LIBFLAC_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac >= \$LIBFLAC_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "flac >= $LIBFLAC_REQUIRED") 2>&5
ac_status=$?
@@ -21930,14 +21885,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -21945,17 +21901,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBFLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "flac >= $LIBFLAC_REQUIRED"`
+ LIBFLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "flac >= $LIBFLAC_REQUIRED" 2>&1`
else
- LIBFLAC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "flac >= $LIBFLAC_REQUIRED"`
+ LIBFLAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "flac >= $LIBFLAC_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBFLAC_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_libflac=no
+ have_libflac=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_libflac=no
else
LIBFLAC_CFLAGS=$pkg_cv_LIBFLAC_CFLAGS
@@ -22063,11 +22019,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXEMPI" >&5
$as_echo_n "checking for EXEMPI... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$EXEMPI_CFLAGS"; then
- pkg_cv_EXEMPI_CFLAGS="$EXEMPI_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$EXEMPI_CFLAGS"; then
+ pkg_cv_EXEMPI_CFLAGS="$EXEMPI_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= \$EXEMPI_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "exempi-2.0 >= $EXEMPI_REQUIRED") 2>&5
ac_status=$?
@@ -22077,15 +22032,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$EXEMPI_LIBS"; then
- pkg_cv_EXEMPI_LIBS="$EXEMPI_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$EXEMPI_LIBS"; then
+ pkg_cv_EXEMPI_LIBS="$EXEMPI_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= \$EXEMPI_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "exempi-2.0 >= $EXEMPI_REQUIRED") 2>&5
ac_status=$?
@@ -22095,14 +22048,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -22110,17 +22064,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- EXEMPI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "exempi-2.0 >= $EXEMPI_REQUIRED"`
+ EXEMPI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "exempi-2.0 >= $EXEMPI_REQUIRED" 2>&1`
else
- EXEMPI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "exempi-2.0 >= $EXEMPI_REQUIRED"`
+ EXEMPI_PKG_ERRORS=`$PKG_CONFIG --print-errors "exempi-2.0 >= $EXEMPI_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$EXEMPI_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_exempi=no
+ have_exempi=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_exempi=no
else
EXEMPI_CFLAGS=$pkg_cv_EXEMPI_CFLAGS
@@ -22175,11 +22129,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TOTEM_PL_PARSER" >&5
$as_echo_n "checking for TOTEM_PL_PARSER... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$TOTEM_PL_PARSER_CFLAGS"; then
- pkg_cv_TOTEM_PL_PARSER_CFLAGS="$TOTEM_PL_PARSER_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$TOTEM_PL_PARSER_CFLAGS"; then
+ pkg_cv_TOTEM_PL_PARSER_CFLAGS="$TOTEM_PL_PARSER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"totem-plparser\""; } >&5
($PKG_CONFIG --exists --print-errors "totem-plparser") 2>&5
ac_status=$?
@@ -22189,15 +22142,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$TOTEM_PL_PARSER_LIBS"; then
- pkg_cv_TOTEM_PL_PARSER_LIBS="$TOTEM_PL_PARSER_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$TOTEM_PL_PARSER_LIBS"; then
+ pkg_cv_TOTEM_PL_PARSER_LIBS="$TOTEM_PL_PARSER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"totem-plparser\""; } >&5
($PKG_CONFIG --exists --print-errors "totem-plparser") 2>&5
ac_status=$?
@@ -22207,14 +22158,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -22222,17 +22174,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- TOTEM_PL_PARSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "totem-plparser"`
+ TOTEM_PL_PARSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "totem-plparser" 2>&1`
else
- TOTEM_PL_PARSER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "totem-plparser"`
+ TOTEM_PL_PARSER_PKG_ERRORS=`$PKG_CONFIG --print-errors "totem-plparser" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$TOTEM_PL_PARSER_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_playlist=no
+ have_playlist=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_playlist=no
else
TOTEM_PL_PARSER_CFLAGS=$pkg_cv_TOTEM_PL_PARSER_CFLAGS
@@ -22303,11 +22255,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NAUTILUS_EXTENSION" >&5
$as_echo_n "checking for NAUTILUS_EXTENSION... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$NAUTILUS_EXTENSION_CFLAGS"; then
- pkg_cv_NAUTILUS_EXTENSION_CFLAGS="$NAUTILUS_EXTENSION_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$NAUTILUS_EXTENSION_CFLAGS"; then
+ pkg_cv_NAUTILUS_EXTENSION_CFLAGS="$NAUTILUS_EXTENSION_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension\""; } >&5
($PKG_CONFIG --exists --print-errors "libnautilus-extension") 2>&5
ac_status=$?
@@ -22317,15 +22268,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$NAUTILUS_EXTENSION_LIBS"; then
- pkg_cv_NAUTILUS_EXTENSION_LIBS="$NAUTILUS_EXTENSION_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$NAUTILUS_EXTENSION_LIBS"; then
+ pkg_cv_NAUTILUS_EXTENSION_LIBS="$NAUTILUS_EXTENSION_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension\""; } >&5
($PKG_CONFIG --exists --print-errors "libnautilus-extension") 2>&5
ac_status=$?
@@ -22335,14 +22284,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -22350,17 +22300,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- NAUTILUS_EXTENSION_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnautilus-extension"`
+ NAUTILUS_EXTENSION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnautilus-extension" 2>&1`
else
- NAUTILUS_EXTENSION_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnautilus-extension"`
+ NAUTILUS_EXTENSION_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnautilus-extension" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$NAUTILUS_EXTENSION_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_nautilus_extension=no
+ have_nautilus_extension=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_nautilus_extension=no
else
NAUTILUS_EXTENSION_CFLAGS=$pkg_cv_NAUTILUS_EXTENSION_CFLAGS
@@ -23105,8 +23055,8 @@
as_fn_error "conditional \"HAVE_MAEMO\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${HAVE_DEVKIT_POWER_TRUE}" && test -z "${HAVE_DEVKIT_POWER_FALSE}"; then
- as_fn_error "conditional \"HAVE_DEVKIT_POWER\" was never defined.
+if test -z "${HAVE_UPOWER_TRUE}" && test -z "${HAVE_UPOWER_FALSE}"; then
+ as_fn_error "conditional \"HAVE_UPOWER\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_HAL_TRUE}" && test -z "${HAVE_HAL_FALSE}"; then
@@ -25932,8 +25882,8 @@
Enable unit tests: $have_unit_tests
Support for ioprio: $tracker_cv_have_ioprio
- Support for HAL: $have_hal
- Support for DeviceKit-power: $have_devkit_power
+ Support for HAL: $have_hal
+ Support for UPower: $have_upower
Support for file monitoring: $have_file_monitor
Support for accent stripping (unac): $have_unac
Support for Cyrillic languages (enca): $have_enca
Index: tracker/data/Makefile.in
===================================================================
--- tracker.orig/data/Makefile.in 2010-09-21 05:07:08.009946343 +0200
+++ tracker/data/Makefile.in 2010-09-21 05:06:43.425930912 +0200
@@ -164,8 +164,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -288,6 +286,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -321,6 +321,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/data/db/Makefile.in
===================================================================
--- tracker.orig/data/db/Makefile.in 2010-09-21 05:07:08.069932201 +0200
+++ tracker/data/db/Makefile.in 2010-09-21 05:06:43.541929775 +0200
@@ -119,8 +119,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -243,6 +241,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -276,6 +276,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/data/dbus/Makefile.in
===================================================================
--- tracker.orig/data/dbus/Makefile.in 2010-09-21 05:07:08.361936710 +0200
+++ tracker/data/dbus/Makefile.in 2010-09-21 05:06:43.665929649 +0200
@@ -121,8 +121,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -245,6 +243,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -278,6 +278,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/data/icons/16x16/Makefile.in
===================================================================
--- tracker.orig/data/icons/16x16/Makefile.in 2010-09-21 05:07:08.697936507 +0200
+++ tracker/data/icons/16x16/Makefile.in 2010-09-21 05:06:43.785930125 +0200
@@ -119,8 +119,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -243,6 +241,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -276,6 +276,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/data/icons/22x22/Makefile.in
===================================================================
--- tracker.orig/data/icons/22x22/Makefile.in 2010-09-21 05:07:08.485935473 +0200
+++ tracker/data/icons/22x22/Makefile.in 2010-09-21 05:06:43.945934300 +0200
@@ -119,8 +119,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -243,6 +241,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -276,6 +276,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/data/icons/24x24/Makefile.in
===================================================================
--- tracker.orig/data/icons/24x24/Makefile.in 2010-09-21 05:07:08.749934750 +0200
+++ tracker/data/icons/24x24/Makefile.in 2010-09-21 05:06:44.109932852 +0200
@@ -119,8 +119,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -243,6 +241,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -276,6 +276,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/data/icons/32x32/Makefile.in
===================================================================
--- tracker.orig/data/icons/32x32/Makefile.in 2010-09-21 05:07:08.537932603 +0200
+++ tracker/data/icons/32x32/Makefile.in 2010-09-21 05:06:44.241929830 +0200
@@ -119,8 +119,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -243,6 +241,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -276,6 +276,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/data/icons/48x48/Makefile.in
===================================================================
--- tracker.orig/data/icons/48x48/Makefile.in 2010-09-21 05:07:08.589934202 +0200
+++ tracker/data/icons/48x48/Makefile.in 2010-09-21 05:06:44.377933175 +0200
@@ -119,8 +119,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -243,6 +241,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -276,6 +276,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/data/icons/Makefile.in
===================================================================
--- tracker.orig/data/icons/Makefile.in 2010-09-21 05:07:08.433931637 +0200
+++ tracker/data/icons/Makefile.in 2010-09-21 05:06:44.621932705 +0200
@@ -135,8 +135,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -259,6 +257,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -292,6 +292,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/data/icons/scalable/Makefile.in
===================================================================
--- tracker.orig/data/icons/scalable/Makefile.in 2010-09-21 05:07:08.641935240 +0200
+++ tracker/data/icons/scalable/Makefile.in 2010-09-21 05:06:44.821932194 +0200
@@ -119,8 +119,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -243,6 +241,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -276,6 +276,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/data/languages/Makefile.in
===================================================================
--- tracker.orig/data/languages/Makefile.in 2010-09-21 05:07:08.125933470 +0200
+++ tracker/data/languages/Makefile.in 2010-09-21 05:06:44.957930243 +0200
@@ -119,8 +119,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -243,6 +241,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -276,6 +276,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/data/miners/Makefile.in
===================================================================
--- tracker.orig/data/miners/Makefile.in 2010-09-21 05:07:08.197933704 +0200
+++ tracker/data/miners/Makefile.in 2010-09-21 05:06:45.149933199 +0200
@@ -121,8 +121,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -245,6 +243,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -278,6 +278,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/data/ontologies/Makefile.in
===================================================================
--- tracker.orig/data/ontologies/Makefile.in 2010-09-21 05:07:08.257935480 +0200
+++ tracker/data/ontologies/Makefile.in 2010-09-21 05:06:45.285932918 +0200
@@ -123,8 +123,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -247,6 +245,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -280,6 +280,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/docs/Makefile.in
===================================================================
--- tracker.orig/docs/Makefile.in 2010-09-21 05:07:08.805934058 +0200
+++ tracker/docs/Makefile.in 2010-09-21 05:06:45.897934326 +0200
@@ -136,8 +136,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -260,6 +258,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -293,6 +293,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/docs/design/Makefile.in
===================================================================
--- tracker.orig/docs/design/Makefile.in 2010-09-21 05:07:09.653935102 +0200
+++ tracker/docs/design/Makefile.in 2010-09-21 05:06:46.029929922 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/docs/manpages/Makefile.in
===================================================================
--- tracker.orig/docs/manpages/Makefile.in 2010-09-21 05:07:09.573935805 +0200
+++ tracker/docs/manpages/Makefile.in 2010-09-21 05:06:46.165931326 +0200
@@ -121,8 +121,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -245,6 +243,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -278,6 +278,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/docs/reference/Makefile.in
===================================================================
--- tracker.orig/docs/reference/Makefile.in 2010-09-21 05:07:08.857932856 +0200
+++ tracker/docs/reference/Makefile.in 2010-09-21 05:06:46.293929746 +0200
@@ -135,8 +135,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -259,6 +257,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -292,6 +292,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/docs/reference/libtracker-client/Makefile.in
===================================================================
--- tracker.orig/docs/reference/libtracker-client/Makefile.in 2010-09-21 05:07:09.345937759 +0200
+++ tracker/docs/reference/libtracker-client/Makefile.in 2010-09-21 05:06:46.481934140 +0200
@@ -102,8 +102,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -226,6 +224,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -259,6 +259,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/docs/reference/libtracker-common/Makefile.in
===================================================================
--- tracker.orig/docs/reference/libtracker-common/Makefile.in 2010-09-21 05:07:09.217936268 +0200
+++ tracker/docs/reference/libtracker-common/Makefile.in 2010-09-21 05:06:46.673931786 +0200
@@ -102,8 +102,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -226,6 +224,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -259,6 +259,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/docs/reference/libtracker-extract/Makefile.in
===================================================================
--- tracker.orig/docs/reference/libtracker-extract/Makefile.in 2010-09-21 05:07:08.909936129 +0200
+++ tracker/docs/reference/libtracker-extract/Makefile.in 2010-09-21 05:06:46.833934838 +0200
@@ -102,8 +102,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -226,6 +224,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -259,6 +259,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/docs/reference/libtracker-miner/Makefile.in
===================================================================
--- tracker.orig/docs/reference/libtracker-miner/Makefile.in 2010-09-21 05:07:09.449934248 +0200
+++ tracker/docs/reference/libtracker-miner/Makefile.in 2010-09-21 05:06:47.065934789 +0200
@@ -102,8 +102,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -226,6 +224,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -259,6 +259,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/docs/reference/ontology/Makefile.in
===================================================================
--- tracker.orig/docs/reference/ontology/Makefile.in 2010-09-21 05:07:09.013935419 +0200
+++ tracker/docs/reference/ontology/Makefile.in 2010-09-21 05:06:47.597929926 +0200
@@ -102,8 +102,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -226,6 +224,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -259,6 +259,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/docs/tools/Makefile.in
===================================================================
--- tracker.orig/docs/tools/Makefile.in 2010-09-21 05:07:09.709933854 +0200
+++ tracker/docs/tools/Makefile.in 2010-09-21 05:06:47.769934513 +0200
@@ -139,8 +139,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -263,6 +261,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -296,6 +296,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/examples/Makefile.in
===================================================================
--- tracker.orig/examples/Makefile.in 2010-09-21 05:07:10.061935396 +0200
+++ tracker/examples/Makefile.in 2010-09-21 05:06:47.889931351 +0200
@@ -135,8 +135,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -259,6 +257,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -292,6 +292,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/examples/libtracker-extract/Makefile.in
===================================================================
--- tracker.orig/examples/libtracker-extract/Makefile.in 2010-09-21 05:07:10.113934758 +0200
+++ tracker/examples/libtracker-extract/Makefile.in 2010-09-21 05:06:48.037932338 +0200
@@ -131,8 +131,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -255,6 +253,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -288,6 +288,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/examples/libtracker-miner/Makefile.in
===================================================================
--- tracker.orig/examples/libtracker-miner/Makefile.in 2010-09-21 05:07:10.169935467 +0200
+++ tracker/examples/libtracker-miner/Makefile.in 2010-09-21 05:06:48.177929222 +0200
@@ -133,8 +133,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -257,6 +255,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -290,6 +290,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/examples/rss-reader/Makefile.in
===================================================================
--- tracker.orig/examples/rss-reader/Makefile.in 2010-09-21 05:07:10.225934218 +0200
+++ tracker/examples/rss-reader/Makefile.in 2010-09-21 05:06:48.293930026 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/Makefile.in
===================================================================
--- tracker.orig/src/Makefile.in 2010-09-21 05:07:13.289935942 +0200
+++ tracker/src/Makefile.in 2010-09-21 05:06:48.421930123 +0200
@@ -145,8 +145,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -269,6 +267,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -302,6 +302,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/libinotify/Makefile.in
===================================================================
--- tracker.orig/src/libinotify/Makefile.in 2010-09-21 05:07:14.589935053 +0200
+++ tracker/src/libinotify/Makefile.in 2010-09-21 05:06:48.605931225 +0200
@@ -128,8 +128,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -252,6 +250,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -285,6 +285,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/libstemmer/Makefile.in
===================================================================
--- tracker.orig/src/libstemmer/Makefile.in 2010-09-21 05:07:13.929935333 +0200
+++ tracker/src/libstemmer/Makefile.in 2010-09-21 05:06:48.814760890 +0200
@@ -135,8 +135,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -259,6 +257,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -292,6 +292,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/libtracker-client/Makefile.in
===================================================================
--- tracker.orig/src/libtracker-client/Makefile.in 2010-09-21 05:07:15.213936880 +0200
+++ tracker/src/libtracker-client/Makefile.in 2010-09-21 05:06:49.001932220 +0200
@@ -163,8 +163,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -287,6 +285,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -320,6 +320,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/libtracker-common/Makefile.in
===================================================================
--- tracker.orig/src/libtracker-common/Makefile.in 2010-09-21 05:07:14.913935808 +0200
+++ tracker/src/libtracker-common/Makefile.in 2010-09-21 05:06:49.201935073 +0200
@@ -92,7 +92,7 @@
am__libtracker_common_la_SOURCES_DIST = tracker-marshal.h \
tracker-marshal.c tracker-os-dependant-unix.c \
tracker-os-dependant-win.c tracker-power-hal.c \
- tracker-power-devicekit.c tracker-config-file.c \
+ tracker-power-upower.c tracker-config-file.c \
tracker-date-time.c tracker-dbus.c tracker-file-utils.c \
tracker-ioprio.c tracker-keyfile-object.c tracker-language.c \
tracker-log.c tracker-type-utils.c tracker-utils.c \
@@ -100,9 +100,9 @@
am__objects_1 = tracker-marshal.lo
@OS_WIN32_FALSE@am__objects_2 = tracker-os-dependant-unix.lo
@OS_WIN32_TRUE@am__objects_2 = tracker-os-dependant-win.lo
-@HAVE_DEVKIT_POWER_FALSE@@HAVE_HAL_TRUE@am__objects_3 = \
-@HAVE_DEVKIT_POWER_FALSE@@HAVE_HAL_TRUE@ tracker-power-hal.lo
-@HAVE_DEVKIT_POWER_TRUE@am__objects_3 = tracker-power-devicekit.lo
+@HAVE_HAL_TRUE@@HAVE_UPOWER_FALSE@am__objects_3 = \
+@HAVE_HAL_TRUE@@HAVE_UPOWER_FALSE@ tracker-power-hal.lo
+@HAVE_UPOWER_TRUE@am__objects_3 = tracker-power-upower.lo
am_libtracker_common_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
$(am__objects_3) tracker-config-file.lo tracker-date-time.lo \
tracker-dbus.lo tracker-file-utils.lo tracker-ioprio.lo \
@@ -182,8 +182,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -306,6 +304,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -339,6 +339,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
@@ -411,33 +413,32 @@
-DSHAREDIR=\""$(datadir)"\" \
-DG_LOG_DOMAIN=\"Tracker\" \
-DTRACKER_COMPILATION \
- -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE \
-I$(top_srcdir)/src \
$(WARN_CFLAGS) \
$(GLIB2_CFLAGS) \
$(GCOV_CFLAGS) \
$(GIO_CFLAGS) \
$(HAL_CFLAGS) \
- $(DEVKIT_POWER_CFLAGS) \
+ $(UPOWER_CFLAGS) \
$(DBUS_CFLAGS)
libtracker_commondir = $(libdir)/tracker-$(TRACKER_API_VERSION)
libtracker_common_LTLIBRARIES = libtracker-common.la
@OS_WIN32_FALSE@os_sources = tracker-os-dependant-unix.c
@OS_WIN32_TRUE@os_sources = tracker-os-dependant-win.c
-@HAVE_DEVKIT_POWER_FALSE@@HAVE_HAL_TRUE@power_headers = \
-@HAVE_DEVKIT_POWER_FALSE@@HAVE_HAL_TRUE@ tracker-power.h
+@HAVE_HAL_TRUE@@HAVE_UPOWER_FALSE@power_headers = \
+@HAVE_HAL_TRUE@@HAVE_UPOWER_FALSE@ tracker-power.h
-# Prefer DeviceKit-power for the power data if it's available, else fall back to HAL
-@HAVE_DEVKIT_POWER_TRUE@power_headers = \
-@HAVE_DEVKIT_POWER_TRUE@ tracker-power.h
+# Prefer UPower for the power data if it's available, else fall back to HAL
+@HAVE_UPOWER_TRUE@power_headers = \
+@HAVE_UPOWER_TRUE@ tracker-power.h
-@HAVE_DEVKIT_POWER_FALSE@@HAVE_HAL_TRUE@power_sources = \
-@HAVE_DEVKIT_POWER_FALSE@@HAVE_HAL_TRUE@ tracker-power-hal.c
+@HAVE_HAL_TRUE@@HAVE_UPOWER_FALSE@power_sources = \
+@HAVE_HAL_TRUE@@HAVE_UPOWER_FALSE@ tracker-power-hal.c
-@HAVE_DEVKIT_POWER_TRUE@power_sources = \
-@HAVE_DEVKIT_POWER_TRUE@ tracker-power-devicekit.c
+@HAVE_UPOWER_TRUE@power_sources = \
+@HAVE_UPOWER_TRUE@ tracker-power-upower.c
libtracker_common_la_SOURCES = \
$(marshal_sources) \
@@ -478,7 +479,7 @@
libtracker_common_la_LIBADD = \
$(top_builddir)/src/libstemmer/libstemmer.la \
$(HAL_LIBS) \
- $(DEVKIT_POWER_LIBS) \
+ $(UPOWER_LIBS) \
$(DBUS_LIBS) \
$(GIO_LIBS) \
$(GCOV_LIBS) \
@@ -583,8 +584,8 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tracker-marshal.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tracker-os-dependant-unix.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tracker-os-dependant-win.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tracker-power-devicekit.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tracker-power-hal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tracker-power-upower.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tracker-type-utils.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tracker-utils.Plo@am__quote@
Index: tracker/src/libtracker-data/Makefile.in
===================================================================
--- tracker.orig/src/libtracker-data/Makefile.in 2010-09-21 05:07:15.109935366 +0200
+++ tracker/src/libtracker-data/Makefile.in 2010-09-21 05:06:49.397932371 +0200
@@ -165,8 +165,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -289,6 +287,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -322,6 +322,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/libtracker-db/Makefile.in
===================================================================
--- tracker.orig/src/libtracker-db/Makefile.in 2010-09-21 05:07:14.225931704 +0200
+++ tracker/src/libtracker-db/Makefile.in 2010-09-21 05:06:49.561933161 +0200
@@ -134,8 +134,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -258,6 +256,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -291,6 +291,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/libtracker-extract/Makefile.in
===================================================================
--- tracker.orig/src/libtracker-extract/Makefile.in 2010-09-21 05:07:13.341935578 +0200
+++ tracker/src/libtracker-extract/Makefile.in 2010-09-21 05:06:49.757931029 +0200
@@ -164,8 +164,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -288,6 +286,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -321,6 +321,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/libtracker-fts/Makefile.in
===================================================================
--- tracker.orig/src/libtracker-fts/Makefile.in 2010-09-21 05:07:14.653935664 +0200
+++ tracker/src/libtracker-fts/Makefile.in 2010-09-21 05:06:50.005932450 +0200
@@ -132,8 +132,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -256,6 +254,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -289,6 +289,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/libtracker-miner/Makefile.in
===================================================================
--- tracker.orig/src/libtracker-miner/Makefile.in 2010-09-21 05:07:15.281936599 +0200
+++ tracker/src/libtracker-miner/Makefile.in 2010-09-21 05:06:50.177929781 +0200
@@ -200,8 +200,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -324,6 +322,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -357,6 +357,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/miners/Makefile.in
===================================================================
--- tracker.orig/src/miners/Makefile.in 2010-09-21 05:07:14.037935690 +0200
+++ tracker/src/miners/Makefile.in 2010-09-21 05:06:50.301930206 +0200
@@ -136,8 +136,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -260,6 +258,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -293,6 +293,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/miners/fs/Makefile.in
===================================================================
--- tracker.orig/src/miners/fs/Makefile.in 2010-09-21 05:07:14.093936401 +0200
+++ tracker/src/miners/fs/Makefile.in 2010-09-21 05:06:50.453933364 +0200
@@ -138,8 +138,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -262,6 +260,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -295,6 +295,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/miners/rss/Makefile.in
===================================================================
--- tracker.orig/src/miners/rss/Makefile.in 2010-09-21 05:07:14.165935516 +0200
+++ tracker/src/miners/rss/Makefile.in 2010-09-21 05:06:50.601932112 +0200
@@ -133,8 +133,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -257,6 +255,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -290,6 +290,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/plugins/Makefile.in
===================================================================
--- tracker.orig/src/plugins/Makefile.in 2010-09-21 05:07:13.409934739 +0200
+++ tracker/src/plugins/Makefile.in 2010-09-21 05:06:50.777929665 +0200
@@ -138,8 +138,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -262,6 +260,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -295,6 +295,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/plugins/evolution/Makefile.in
===================================================================
--- tracker.orig/src/plugins/evolution/Makefile.in 2010-09-21 05:07:13.589937009 +0200
+++ tracker/src/plugins/evolution/Makefile.in 2010-09-21 05:06:50.933929977 +0200
@@ -162,8 +162,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -286,6 +284,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -319,6 +319,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/plugins/kmail/Makefile.in
===================================================================
--- tracker.orig/src/plugins/kmail/Makefile.in 2010-09-21 05:07:13.525933043 +0200
+++ tracker/src/plugins/kmail/Makefile.in 2010-09-21 05:06:51.089930583 +0200
@@ -161,8 +161,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -285,6 +283,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -318,6 +318,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/plugins/nautilus/Makefile.in
===================================================================
--- tracker.orig/src/plugins/nautilus/Makefile.in 2010-09-21 05:07:13.465936850 +0200
+++ tracker/src/plugins/nautilus/Makefile.in 2010-09-21 05:06:51.237930997 +0200
@@ -156,8 +156,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -280,6 +278,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -313,6 +313,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/tracker-control/Makefile.in
===================================================================
--- tracker.orig/src/tracker-control/Makefile.in 2010-09-21 05:07:13.869935230 +0200
+++ tracker/src/tracker-control/Makefile.in 2010-09-21 05:06:51.389932747 +0200
@@ -137,8 +137,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -261,6 +259,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -294,6 +294,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/tracker-explorer/Makefile.in
===================================================================
--- tracker.orig/src/tracker-explorer/Makefile.in 2010-09-21 05:07:14.793935892 +0200
+++ tracker/src/tracker-explorer/Makefile.in 2010-09-21 05:06:51.541930054 +0200
@@ -157,8 +157,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -281,6 +279,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -314,6 +314,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/tracker-extract/Makefile.in
===================================================================
--- tracker.orig/src/tracker-extract/Makefile.in 2010-09-21 05:07:14.469936242 +0200
+++ tracker/src/tracker-extract/Makefile.in 2010-09-21 05:06:51.945934580 +0200
@@ -472,8 +472,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -596,6 +594,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -629,6 +629,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/tracker-preferences/Makefile.in
===================================================================
--- tracker.orig/src/tracker-preferences/Makefile.in 2010-09-21 05:07:14.301934676 +0200
+++ tracker/src/tracker-preferences/Makefile.in 2010-09-21 05:06:52.121929352 +0200
@@ -157,8 +157,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -281,6 +279,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -314,6 +314,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/tracker-search-bar/Makefile.in
===================================================================
--- tracker.orig/src/tracker-search-bar/Makefile.in 2010-09-21 05:07:14.721937341 +0200
+++ tracker/src/tracker-search-bar/Makefile.in 2010-09-21 05:06:52.309935136 +0200
@@ -163,8 +163,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -287,6 +285,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -320,6 +320,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/tracker-search-tool/Makefile.in
===================================================================
--- tracker.orig/src/tracker-search-tool/Makefile.in 2010-09-21 05:07:13.789936501 +0200
+++ tracker/src/tracker-search-tool/Makefile.in 2010-09-21 05:06:52.513929838 +0200
@@ -166,8 +166,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -290,6 +288,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -323,6 +323,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/tracker-status-icon/Makefile.in
===================================================================
--- tracker.orig/src/tracker-status-icon/Makefile.in 2010-09-21 05:07:13.713935763 +0200
+++ tracker/src/tracker-status-icon/Makefile.in 2010-09-21 05:06:52.673930668 +0200
@@ -159,8 +159,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -283,6 +281,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -316,6 +316,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/tracker-store/Makefile.in
===================================================================
--- tracker.orig/src/tracker-store/Makefile.in 2010-09-21 05:07:14.369934671 +0200
+++ tracker/src/tracker-store/Makefile.in 2010-09-21 05:06:52.829930697 +0200
@@ -145,8 +145,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -269,6 +267,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -302,6 +302,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/tracker-utils/Makefile.in
===================================================================
--- tracker.orig/src/tracker-utils/Makefile.in 2010-09-21 05:07:13.649935713 +0200
+++ tracker/src/tracker-utils/Makefile.in 2010-09-21 05:06:53.021931696 +0200
@@ -162,8 +162,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -286,6 +284,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -319,6 +319,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/tracker-writeback/Makefile.in
===================================================================
--- tracker.orig/src/tracker-writeback/Makefile.in 2010-09-21 05:07:15.025934999 +0200
+++ tracker/src/tracker-writeback/Makefile.in 2010-09-21 05:06:53.193929584 +0200
@@ -187,8 +187,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -311,6 +309,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -344,6 +344,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/src/vapi/Makefile.in
===================================================================
--- tracker.orig/src/vapi/Makefile.in 2010-09-21 05:07:14.853932635 +0200
+++ tracker/src/vapi/Makefile.in 2010-09-21 05:06:53.313929778 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/Makefile.in
===================================================================
--- tracker.orig/tests/Makefile.in 2010-09-21 05:07:10.341935578 +0200
+++ tracker/tests/Makefile.in 2010-09-21 05:06:53.441930717 +0200
@@ -139,8 +139,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -263,6 +261,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -296,6 +296,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/common/Makefile.in
===================================================================
--- tracker.orig/tests/common/Makefile.in 2010-09-21 05:07:10.957931919 +0200
+++ tracker/tests/common/Makefile.in 2010-09-21 05:06:53.585930074 +0200
@@ -126,8 +126,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -250,6 +248,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -283,6 +283,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/functional-tests/Makefile.in
===================================================================
--- tracker.orig/tests/functional-tests/Makefile.in 2010-09-21 05:07:10.505936361 +0200
+++ tracker/tests/functional-tests/Makefile.in 2010-09-21 05:06:53.721929798 +0200
@@ -159,8 +159,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -283,6 +281,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -316,6 +316,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/functional-tests/data/Images/Makefile.in
===================================================================
--- tracker.orig/tests/functional-tests/data/Images/Makefile.in 2010-09-21 05:07:10.609934808 +0200
+++ tracker/tests/functional-tests/data/Images/Makefile.in 2010-09-21 05:06:53.903903523 +0200
@@ -119,8 +119,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -243,6 +241,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -276,6 +276,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/functional-tests/data/Makefile.in
===================================================================
--- tracker.orig/tests/functional-tests/data/Makefile.in 2010-09-21 05:07:10.557935166 +0200
+++ tracker/tests/functional-tests/data/Makefile.in 2010-09-21 05:06:54.045930284 +0200
@@ -159,8 +159,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -283,6 +281,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -316,6 +316,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/functional-tests/data/Music/Makefile.in
===================================================================
--- tracker.orig/tests/functional-tests/data/Music/Makefile.in 2010-09-21 05:07:10.665931046 +0200
+++ tracker/tests/functional-tests/data/Music/Makefile.in 2010-09-21 05:06:54.169929600 +0200
@@ -119,8 +119,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -243,6 +241,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -276,6 +276,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/functional-tests/data/Text/Makefile.in
===================================================================
--- tracker.orig/tests/functional-tests/data/Text/Makefile.in 2010-09-21 05:07:10.781935761 +0200
+++ tracker/tests/functional-tests/data/Text/Makefile.in 2010-09-21 05:06:54.297931373 +0200
@@ -119,8 +119,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -243,6 +241,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -276,6 +276,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/functional-tests/data/Video/Makefile.in
===================================================================
--- tracker.orig/tests/functional-tests/data/Video/Makefile.in 2010-09-21 05:07:10.721935106 +0200
+++ tracker/tests/functional-tests/data/Video/Makefile.in 2010-09-21 05:06:54.421931799 +0200
@@ -119,8 +119,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -243,6 +241,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -276,6 +276,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-client/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-client/Makefile.in 2010-09-21 05:07:13.037935132 +0200
+++ tracker/tests/libtracker-client/Makefile.in 2010-09-21 05:06:54.569929152 +0200
@@ -131,8 +131,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -255,6 +253,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -288,6 +288,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-common/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-common/Makefile.in 2010-09-21 05:07:11.333934838 +0200
+++ tracker/tests/libtracker-common/Makefile.in 2010-09-21 05:06:54.733930208 +0200
@@ -160,8 +160,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -284,6 +282,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -317,6 +317,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-data/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-data/Makefile.in 2010-09-21 05:07:11.453937276 +0200
+++ tracker/tests/libtracker-data/Makefile.in 2010-09-21 05:06:54.913931617 +0200
@@ -185,8 +185,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -309,6 +307,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -342,6 +342,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-data/aggregates/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-data/aggregates/Makefile.in 2010-09-21 05:07:12.149935713 +0200
+++ tracker/tests/libtracker-data/aggregates/Makefile.in 2010-09-21 05:06:55.065930598 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-data/algebra/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-data/algebra/Makefile.in 2010-09-21 05:07:11.801934117 +0200
+++ tracker/tests/libtracker-data/algebra/Makefile.in 2010-09-21 05:06:55.185930241 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-data/anon/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-data/anon/Makefile.in 2010-09-21 05:07:12.729934448 +0200
+++ tracker/tests/libtracker-data/anon/Makefile.in 2010-09-21 05:06:55.305932112 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-data/ask/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-data/ask/Makefile.in 2010-09-21 05:07:12.437932442 +0200
+++ tracker/tests/libtracker-data/ask/Makefile.in 2010-09-21 05:06:55.421929564 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-data/backup/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-data/backup/Makefile.in 2010-09-21 05:07:11.585935661 +0200
+++ tracker/tests/libtracker-data/backup/Makefile.in 2010-09-21 05:06:55.537929824 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-data/basic/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-data/basic/Makefile.in 2010-09-21 05:07:11.901934278 +0200
+++ tracker/tests/libtracker-data/basic/Makefile.in 2010-09-21 05:06:55.657929748 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-data/bnode-coreference/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-data/bnode-coreference/Makefile.in 2010-09-21 05:07:11.737934908 +0200
+++ tracker/tests/libtracker-data/bnode-coreference/Makefile.in 2010-09-21 05:06:55.777931341 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-data/bound/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-data/bound/Makefile.in 2010-09-21 05:07:12.089932818 +0200
+++ tracker/tests/libtracker-data/bound/Makefile.in 2010-09-21 05:06:55.933930256 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-data/datetime/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-data/datetime/Makefile.in 2010-09-21 05:07:12.501936410 +0200
+++ tracker/tests/libtracker-data/datetime/Makefile.in 2010-09-21 05:06:56.077930172 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-data/error/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-data/error/Makefile.in 2010-09-21 05:07:12.573933852 +0200
+++ tracker/tests/libtracker-data/error/Makefile.in 2010-09-21 05:06:56.193929863 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-data/expr-ops/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-data/expr-ops/Makefile.in 2010-09-21 05:07:12.881932566 +0200
+++ tracker/tests/libtracker-data/expr-ops/Makefile.in 2010-09-21 05:06:56.313933689 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-data/functions/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-data/functions/Makefile.in 2010-09-21 05:07:12.349936596 +0200
+++ tracker/tests/libtracker-data/functions/Makefile.in 2010-09-21 05:06:56.429929746 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-data/graph/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-data/graph/Makefile.in 2010-09-21 05:07:12.809936253 +0200
+++ tracker/tests/libtracker-data/graph/Makefile.in 2010-09-21 05:06:56.549932750 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-data/nie/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-data/nie/Makefile.in 2010-09-21 05:07:11.645935203 +0200
+++ tracker/tests/libtracker-data/nie/Makefile.in 2010-09-21 05:06:56.669930997 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-data/nmo/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-data/nmo/Makefile.in 2010-09-21 05:07:11.977937541 +0200
+++ tracker/tests/libtracker-data/nmo/Makefile.in 2010-09-21 05:06:56.789931472 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-data/optional/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-data/optional/Makefile.in 2010-09-21 05:07:12.961935781 +0200
+++ tracker/tests/libtracker-data/optional/Makefile.in 2010-09-21 05:06:56.981930788 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-data/regex/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-data/regex/Makefile.in 2010-09-21 05:07:12.217935714 +0200
+++ tracker/tests/libtracker-data/regex/Makefile.in 2010-09-21 05:06:57.105930387 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-data/sort/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-data/sort/Makefile.in 2010-09-21 05:07:11.505932450 +0200
+++ tracker/tests/libtracker-data/sort/Makefile.in 2010-09-21 05:06:57.221929518 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-data/subqueries/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-data/subqueries/Makefile.in 2010-09-21 05:07:12.281934923 +0200
+++ tracker/tests/libtracker-data/subqueries/Makefile.in 2010-09-21 05:06:57.337930598 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-data/turtle/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-data/turtle/Makefile.in 2010-09-21 05:07:12.657929469 +0200
+++ tracker/tests/libtracker-data/turtle/Makefile.in 2010-09-21 05:06:57.457929405 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-db/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-db/Makefile.in 2010-09-21 05:07:10.901935116 +0200
+++ tracker/tests/libtracker-db/Makefile.in 2010-09-21 05:06:57.609930058 +0200
@@ -143,8 +143,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -267,6 +265,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -300,6 +300,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-extract/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-extract/Makefile.in 2010-09-21 05:07:10.449932016 +0200
+++ tracker/tests/libtracker-extract/Makefile.in 2010-09-21 05:06:57.821929959 +0200
@@ -145,8 +145,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -269,6 +267,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -302,6 +302,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-fts/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-fts/Makefile.in 2010-09-21 05:07:11.133937586 +0200
+++ tracker/tests/libtracker-fts/Makefile.in 2010-09-21 05:06:57.977930278 +0200
@@ -173,8 +173,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -297,6 +295,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -330,6 +330,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-fts/limits/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-fts/limits/Makefile.in 2010-09-21 05:07:11.185937505 +0200
+++ tracker/tests/libtracker-fts/limits/Makefile.in 2010-09-21 05:06:58.105930666 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-fts/prefix/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-fts/prefix/Makefile.in 2010-09-21 05:07:11.265936239 +0200
+++ tracker/tests/libtracker-fts/prefix/Makefile.in 2010-09-21 05:06:58.221930356 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/libtracker-miner/Makefile.in
===================================================================
--- tracker.orig/tests/libtracker-miner/Makefile.in 2010-09-21 05:07:13.097933558 +0200
+++ tracker/tests/libtracker-miner/Makefile.in 2010-09-21 05:06:58.393935492 +0200
@@ -155,8 +155,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -289,6 +287,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -322,6 +322,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/tracker-extract/Makefile.in
===================================================================
--- tracker.orig/tests/tracker-extract/Makefile.in 2010-09-21 05:07:11.077933803 +0200
+++ tracker/tests/tracker-extract/Makefile.in 2010-09-21 05:06:58.549931353 +0200
@@ -99,8 +99,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -223,6 +221,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -256,6 +256,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/tracker-miner-fs/Makefile.in
===================================================================
--- tracker.orig/tests/tracker-miner-fs/Makefile.in 2010-09-21 05:07:10.393934934 +0200
+++ tracker/tests/tracker-miner-fs/Makefile.in 2010-09-21 05:06:58.713929896 +0200
@@ -141,8 +141,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -265,6 +263,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -298,6 +298,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/tracker-store/Makefile.in
===================================================================
--- tracker.orig/tests/tracker-store/Makefile.in 2010-09-21 05:07:11.021935886 +0200
+++ tracker/tests/tracker-store/Makefile.in 2010-09-21 05:06:58.837930319 +0200
@@ -99,8 +99,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -223,6 +221,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -256,6 +256,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/tests/tracker-writeback/Makefile.in
===================================================================
--- tracker.orig/tests/tracker-writeback/Makefile.in 2010-09-21 05:07:11.397930694 +0200
+++ tracker/tests/tracker-writeback/Makefile.in 2010-09-21 05:06:58.965933218 +0200
@@ -119,8 +119,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -243,6 +241,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -276,6 +276,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/utils/Makefile.in
===================================================================
--- tracker.orig/utils/Makefile.in 2010-09-21 05:07:09.777935808 +0200
+++ tracker/utils/Makefile.in 2010-09-21 05:06:59.097930206 +0200
@@ -135,8 +135,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -259,6 +257,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -292,6 +292,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/utils/gtk-sparql/Makefile.in
===================================================================
--- tracker.orig/utils/gtk-sparql/Makefile.in 2010-09-21 05:07:09.829936283 +0200
+++ tracker/utils/gtk-sparql/Makefile.in 2010-09-21 05:06:59.213929896 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/utils/lyrics/Makefile.in
===================================================================
--- tracker.orig/utils/lyrics/Makefile.in 2010-09-21 05:07:09.945932345 +0200
+++ tracker/utils/lyrics/Makefile.in 2010-09-21 05:06:59.333934559 +0200
@@ -95,8 +95,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -219,6 +217,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -252,6 +252,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/utils/playlists/Makefile.in
===================================================================
--- tracker.orig/utils/playlists/Makefile.in 2010-09-21 05:07:09.889930512 +0200
+++ tracker/utils/playlists/Makefile.in 2010-09-21 05:06:59.477930557 +0200
@@ -131,8 +131,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -255,6 +253,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -288,6 +288,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
Index: tracker/utils/services/Makefile.in
===================================================================
--- tracker.orig/utils/services/Makefile.in 2010-09-21 05:07:09.997936738 +0200
+++ tracker/utils/services/Makefile.in 2010-09-21 05:06:59.629930651 +0200
@@ -140,8 +140,6 @@
DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -264,6 +262,8 @@
PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
@@ -297,6 +297,8 @@
TRACKER_VERSION = @TRACKER_VERSION@
UNAC_CFLAGS = @UNAC_CFLAGS@
UNAC_LIBS = @UNAC_LIBS@
+UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
UUID_CFLAGS = @UUID_CFLAGS@
UUID_LIBS = @UUID_LIBS@
![[patchlogo]](http://patch-tracker.debian.org/static/img/swirlpatch.png)