[Emacs-diffs] /srv/bzr/emacs/trunk r104855: Fix typos that break xsettings.c compilation.

[Glenn Morris]

------------------------------------------------------------
revno: 104855
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2011-07-01 13:53:59 -0400
message:
  Fix typos that break xsettings.c compilation.
  
  * configure.in (SETTINGS_CFLAGS, SETTINGS_LIBS) [HAVE_GCONF]: Fix typo.
  
  * src/Makefile.in (SETTINGS_LIBS): Fix typo.
modified:
  ChangeLog
  configure.in
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-06-30 14:32:07 +0000
+++ b/ChangeLog 2011-07-01 17:53:59 +0000
@@ -1,3 +1,7 @@
+2011-07-01  Glenn Morris  <address@hidden>
+
+       * configure.in (SETTINGS_CFLAGS, SETTINGS_LIBS) [HAVE_GCONF]: Fix typo.
+
 2011-06-30  Lars Magne Ingebrigtsen  <address@hidden>
 
        * configure.in (HAVE_GSETTINGS): Fix syntax for GSETTINGS tests,

=== modified file 'configure.in'
--- a/configure.in      2011-06-30 14:32:07 +0000
+++ b/configure.in      2011-07-01 17:53:59 +0000
@@ -2001,8 +2001,8 @@
    if test "$HAVE_GCONF" = yes; then
       AC_DEFINE(HAVE_GCONF, 1, [Define to 1 if using GConf.])
       dnl Newer GConf doesn't link with g_objects, so this is not defined.
-      SETTINGS_CFLAGS="$GSETTINGS_CFLAGS"
-      SETTINGS_LIBS="$GSETTINGS_LIBS"
+      SETTINGS_CFLAGS="$GCONF_CFLAGS"
+      SETTINGS_LIBS="$GCONF_LIBS"
    fi
 fi
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-07-01 11:03:55 +0000
+++ b/src/ChangeLog     2011-07-01 17:53:59 +0000
@@ -1,3 +1,7 @@
+2011-07-01  Glenn Morris  <address@hidden>
+
+       * Makefile.in (SETTINGS_LIBS): Fix typo.
+
 2011-07-01  Kazuhiro Ito  <address@hidden>  (tiny patch)
 
        * coding.c (Fencode_coding_string): Record the last coding system

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2011-06-30 14:00:26 +0000
+++ b/src/Makefile.in   2011-07-01 17:53:59 +0000
@@ -153,7 +153,7 @@
 DBUS_OBJ = @DBUS_OBJ@
 
 SETTINGS_CFLAGS = @SETTINGS_CFLAGS@
-SETTINGS_LIBS = @SETTINGS_CFLAGS@
+SETTINGS_LIBS = @SETTINGS_LIBS@
 
 ## gtkutil.o if USE_GTK, else empty.
 address@hidden@