applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: improve CUPS detection

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=644064
This commit is contained in:
Saleem Abdulrasool 2011-03-02 11:00:18 -08:00 • committed by Bastien Nocera
parent 3789666fac
commit 9b1dff0166
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
configure.ac
View file

@ -137,12 +137,14 @@ AC_ARG_ENABLE([cups],
[enable_cups=yes]) [enable_cups=yes])
if test x"$enable_cups" != x"no" ; then if test x"$enable_cups" != x"no" ; then
AC_PROG_SED
AC_PATH_PROG(CUPS_CONFIG, cups-config, AC_PATH_PROG(CUPS_CONFIG, cups-config,
AC_MSG_ERROR([cups-config not found but CUPS support requested])) AC_MSG_ERROR([cups-config not found but CUPS support requested]))
CUPS_API_VERSION=`$CUPS_CONFIG --api-version` CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | sed -e "s/\./\n/g" | sed -n "1p"` CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1`
CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | sed -e "s/\./\n/g" | sed -n "2p"` CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2`
AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h],, AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h],,
AC_MSG_ERROR([CUPS headers not found but CUPS support requested])) AC_MSG_ERROR([CUPS headers not found but CUPS support requested]))
@ -152,7 +154,9 @@ if test x"$enable_cups" != x"no" ; then
AC_MSG_ERROR([CUPS 1.4 or newer not found, but CUPS support requested]) AC_MSG_ERROR([CUPS 1.4 or newer not found, but CUPS support requested])
fi fi
CUPS_LIBS=-lcups CUPS_CFLAGS=`$CUPS_CONFIG --cflags | $SED -e '/-O\w*//g' -e 's/-m\w*//g'`
CUPS_LIBS=`$CUPS_CONFIG --libs`
AC_SUBST(CUPS_CFLAGS)
AC_SUBST(CUPS_LIBS) AC_SUBST(CUPS_LIBS)
fi fi