mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-01 20:06:00 +00:00
Code Issues Releases Activity

Fix typos that break xsettings.c compilation.

Browse Source 
* configure.in (SETTINGS_CFLAGS, SETTINGS_LIBS) [HAVE_GCONF]: Fix typo.

* src/Makefile.in (SETTINGS_LIBS): Fix typo.
This commit is contained in:
Glenn Morris 2011-07-01 13:53:59 -04:00
parent eb604e34e5
commit 3279eb878e
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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,

4
configure.in
View File

@ -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

4
src/ChangeLog
View File

@ -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

2
src/Makefile.in
View File

@ -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@