callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use $CUPS_CONFIG instead of hardcoded cups-config. (#495574, Richard Hult)

Browse Source 
2007-11-26  Matthias Clasen  <mclasen@redhat.com>

        * configure.in: Use $CUPS_CONFIG instead of hardcoded cups-config.
        (#495574, Richard Hult)



svn path=/trunk/; revision=19062
This commit is contained in:
Matthias Clasen
2007-11-26 19:05:38 +00:00
committed by Matthias Clasen
parent fa0328da18
commit f5034f4080
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-11-26 Matthias Clasen <mclasen@redhat.com>
* configure.in: Use $CUPS_CONFIG instead of hardcoded cups-config.
(#495574, Richard Hult)
2007-11-26 Matthias Clasen <mclasen@redhat.com> 2007-11-26 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprintunixdialog.c: Change some labels to be clearer. * gtk/gtkprintunixdialog.c: Change some labels to be clearer.

6
configure.in
View File

@ -1574,10 +1574,10 @@ AC_SUBST(GTK_XIM_FLAGS)
AC_PATH_PROG(CUPS_CONFIG, cups-config, no) AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
if test "x$CUPS_CONFIG" != "xno"; then if test "x$CUPS_CONFIG" != "xno"; then
CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
CUPS_LIBS=`cups-config --libs` 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_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'` CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`