From f5034f4080fcd09a984f137d1171378e9ced9512 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 26 Nov 2007 19:05:38 +0000 Subject: [PATCH] Use $CUPS_CONFIG instead of hardcoded cups-config. (#495574, Richard Hult) 2007-11-26 Matthias Clasen * configure.in: Use $CUPS_CONFIG instead of hardcoded cups-config. (#495574, Richard Hult) svn path=/trunk/; revision=19062 --- ChangeLog | 5 +++++ configure.in | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a76c9b258d..c387610221 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-11-26 Matthias Clasen + + * configure.in: Use $CUPS_CONFIG instead of hardcoded cups-config. + (#495574, Richard Hult) + 2007-11-26 Matthias Clasen * gtk/gtkprintunixdialog.c: Change some labels to be clearer. diff --git a/configure.in b/configure.in index 8fc527f8a2..01578035a4 100644 --- a/configure.in +++ b/configure.in @@ -1574,10 +1574,10 @@ AC_SUBST(GTK_XIM_FLAGS) 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}'`