Index: printing-systems/cups/Makefile.am
===================================================================
--- printing-systems/cups/Makefile.am	(revision 14458)
+++ printing-systems/cups/Makefile.am	(working copy)
@@ -3,22 +3,24 @@
 plugin_LTLIBRARIES = cups_plugin.la
 
 cups_plugin_la_SOURCES =                                                \
-	cups.c								
+        cups.c
 
 cups_plugin_la_CFLAGS =                                                 \
         -I$(top_srcdir)                                                 \
-	-I$(top_srcdir)/common                                          \
-	@LIBXFCEGUI4_CFLAGS@ 						\
-	@GMODULE_CFLAGS@						\
-	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"                           \
-	-DCUPS_DATA_DIR=\"@CUPS_DATA@\"                                 \
-	-DPRINTCAP_PATH=\"@PRINTCAP_PATH@\"
+        -I$(top_srcdir)/common                                          \
+        @LIBXFCEGUI4_CFLAGS@                                            \
+        @GMODULE_CFLAGS@                                                \
+        @CUPS_CFLAGS@                                                   \
+       -DPACKAGE_LOCALE_DIR=\"$(localedir)\"                            \
+       -DCUPS_DATA_DIR=\"@CUPS_DATA@\"                                  \
+       -DPRINTCAP_PATH=\"@PRINTCAP_PATH@\"
 
 cups_plugin_la_LDFLAGS =                                                \
+        @CUPS_LDFLAGS@                                                  \
         -avoid-version                                                  \
-	-module
+        -module
 
 cups_plugin_la_LIBADD =                                                 \
-	@LIBXFCEGUI4_LIBS@                                              \
-	@GMODULE_LIBS@							\
-	@CUPS_LIBS@
+        @LIBXFCEGUI4_LIBS@                                              \
+        @GMODULE_LIBS@                                                  \
+        @CUPS_LIBS@
Index: configure.ac
===================================================================
--- configure.ac	(revision 14458)
+++ configure.ac	(working copy)
@@ -45,7 +45,7 @@
 dnl check for basic programs
 AC_PROG_CC()
 AC_PROG_INSTALL()
-AC_PROG_INTLTOOL()
+AC_PROG_INTLTOOL([0.31], [no-xml])
 AC_PROG_LIBTOOL()
 
 dnl check for standard header files
@@ -111,6 +111,8 @@
   AC_PATH_PROG(cups_config,cups-config)
   if test -n "$cups_config"; then
     CUPS_LIBS=`$cups_config --libs`
+    CUPS_CFLAGS=`$cups_config --cflags`
+    CUPS_LDFLAGS=`$cups_config --ldflags`
     CUPS_DATA=`$cups_config --datadir`
     cups_found="yes"	    
   else
@@ -118,7 +120,7 @@
   fi 
 fi
 AM_CONDITIONAL([BUILD_CUPS_SUPPORT], [test "x$cups_found" = "xyes"])
-AC_SUBST([CUPS_LIBS CUPS_DATA])
+AC_SUBST([CUPS_LIBS CUPS_CFLAGS CUPS_LDFLAGS CUPS_DATA])
 if test x"$cups_found" = x"yes"; then
   AC_DEFINE(HAVE_CUPS, 1, Define if CUPS support is available)
 fi