[gnome-settings-daemon] xsettings: Rename variables for xsettings plugin

[Bastien Nocera <hadess src gnome org>]

commit 9d8da049d7104aa496a379bcbcf238777dfaa7c0
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Jul 2 14:54:37 2012 +0100

    xsettings: Rename variables for xsettings plugin

 configure.ac                  |    4 ++--
 plugins/xsettings/Makefile.am |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 614d2b6..25c02e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,10 +166,10 @@ dnl ---------------------------------------------------------------------------
 PKG_CHECK_MODULES(CURSOR, xfixes)
 
 dnl ---------------------------------------------------------------------------
-dnl - Fontconfig
+dnl - xsettings
 dnl ---------------------------------------------------------------------------
 
-PKG_CHECK_MODULES(FONTCONFIG, fontconfig)
+PKG_CHECK_MODULES(XSETTINGS, fontconfig)
 
 dnl ---------------------------------------------------------------------------
 dnl - Keyboard plugin stuff
diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am
index 9ada319..84dbacc 100644
--- a/plugins/xsettings/Makefile.am
+++ b/plugins/xsettings/Makefile.am
@@ -16,7 +16,7 @@ test_gtk_modules_CFLAGS =		\
 
 test_gtk_modules_LDADD =					\
 	$(top_builddir)/gnome-settings-daemon/libgsd.la		\
-	$(FONTCONFIG_LIBS)					\
+	$(XSETTINGS_LIBS)					\
 	$(SETTINGS_PLUGIN_LIBS)
 
 test_gtk_modules_CPPFLAGS =				\
@@ -71,7 +71,7 @@ libxsettings_la_CPPFLAGS =					\
 
 libxsettings_la_CFLAGS = \
 	$(SETTINGS_PLUGIN_CFLAGS)	\
-	$(FONTCONFIG_CFLAGS)		\
+	$(XSETTINGS_CFLAGS)		\
 	$(AM_CFLAGS)
 
 libxsettings_la_LDFLAGS = 	\
@@ -81,7 +81,7 @@ libxsettings_la_LDFLAGS = 	\
 libxsettings_la_LIBADD  =					\
 	$(top_builddir)/gnome-settings-daemon/libgsd.la		\
 	$(SETTINGS_PLUGIN_LIBS)					\
-	$(FONTCONFIG_LIBS)					\
+	$(XSETTINGS_LIBS)					\
 	$(NULL)
 
 plugin_in_files = 		\