PREFERRED_VERSION_atk ?= "1.20.0"
-PREFERRED_VERSION_gtk+ ?= "2.12.1"
+PREFERRED_VERSION_gtk+ ?= "2.12.2"
PREFERRED_VERSION_gnome-keyring ?= "2.20"
PREFERRED_VERSION_gnome-vfs ?= "2.20.0"
@@ -1554,22 +1554 @@
-AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
-if test "x$CUPS_CONFIG" != "xno"; then
-- CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
-- CUPS_LIBS=`cups-config --libs`
+- CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
+- CUPS_LIBS=`$CUPS_CONFIG --libs`
-
-- CUPS_API_VERSION=`cups-config --api-version`
+- CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
- CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
- CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
-