Auto-commit of generated files.

diff --git a/autogen/configure b/autogen/configure
index 76128388c8bd73c50d1908ed8c631ed0b6ae8c84..9b9e915f759504e5920e5202d1ec636ad4f68f63 100755 (executable)
--- a/autogen/configure
+++ b/autogen/configure
@@ -11166,7 +11166,7 @@ $as_echo "#define HAVE_GSETTINGS 1" >>confdefs.h
 fi
 
 HAVE_GCONF=no
-if test "${HAVE_GSETTINGS}" = "no" && test "${HAVE_X11}" = "yes" && test "${with_gconf}" = "yes"; then
+if test "${HAVE_X11}" = "yes" && test "${with_gconf}" = "yes"; then
 
   succeeded=no
 
@@ -11265,8 +11265,8 @@ $as_echo "no" >&6; }
 
 $as_echo "#define HAVE_GCONF 1" >>confdefs.h
 
-            SETTINGS_CFLAGS="$GCONF_CFLAGS"
-      SETTINGS_LIBS="$GCONF_LIBS"
+            SETTINGS_CFLAGS="$SETTINGS_CFLAGS $GCONF_CFLAGS"
+      SETTINGS_LIBS="$SETTINGS_LIBS $GCONF_LIBS"
    fi
 fi