[Emacs-diffs] /srv/bzr/emacs/trunk r104961: Auto-commit of generated files.

[Glenn Morris]

------------------------------------------------------------
revno: 104961
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2011-07-05 06:19:43 -0400
message:
  Auto-commit of generated files.
modified:
  autogen/configure

=== modified file 'autogen/configure'
--- a/autogen/configure 2011-07-02 10:18:42 +0000
+++ b/autogen/configure 2011-07-05 10:19:43 +0000
@@ -11166,7 +11166,7 @@
 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 "#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