diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-07-01 13:53:59 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-07-01 13:53:59 -0400 |
| commit | 3279eb878e4b1699f5da8b8817cf03806b3fa35b (patch) | |
| tree | dfc3ed74db5d7b92b22b963584aef2099d96780e | |
| parent | eb604e34e566f3f8b03d2f77f178d75e5e4743c1 (diff) | |
Fix typos that break xsettings.c compilation.
* configure.in (SETTINGS_CFLAGS, SETTINGS_LIBS) [HAVE_GCONF]: Fix typo.
* src/Makefile.in (SETTINGS_LIBS): Fix typo.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index c6eae422264..a93142648c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-07-01 Glenn Morris <rgm@gnu.org> + + * configure.in (SETTINGS_CFLAGS, SETTINGS_LIBS) [HAVE_GCONF]: Fix typo. + 2011-06-30 Lars Magne Ingebrigtsen <larsi@gnus.org> * configure.in (HAVE_GSETTINGS): Fix syntax for GSETTINGS tests, diff --git a/configure.in b/configure.in index 92fd6847d53..e5452f5122b 100644 --- a/configure.in +++ b/configure.in @@ -2001,8 +2001,8 @@ if test "${HAVE_GSETTINGS}" = "no" && test "${HAVE_X11}" = "yes" && test "${with 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 diff --git a/src/ChangeLog b/src/ChangeLog index 2f7e192fbac..5ee7a3d7e6c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-07-01 Glenn Morris <rgm@gnu.org> + + * Makefile.in (SETTINGS_LIBS): Fix typo. + 2011-07-01 Kazuhiro Ito <kzhr@d1.dion.ne.jp> (tiny patch) * coding.c (Fencode_coding_string): Record the last coding system diff --git a/src/Makefile.in b/src/Makefile.in index 3f7953d16ba..f628c321f70 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -153,7 +153,7 @@ DBUS_LIBS = @DBUS_LIBS@ DBUS_OBJ = @DBUS_OBJ@ SETTINGS_CFLAGS = @SETTINGS_CFLAGS@ -SETTINGS_LIBS = @SETTINGS_CFLAGS@ +SETTINGS_LIBS = @SETTINGS_LIBS@ ## gtkutil.o if USE_GTK, else empty. GTK_OBJ=@GTK_OBJ@ |