diff options
| author | Glenn Morris | 2011-07-01 13:53:59 -0400 |
|---|---|---|
| committer | Glenn Morris | 2011-07-01 13:53:59 -0400 |
| commit | 3279eb878e4b1699f5da8b8817cf03806b3fa35b (patch) | |
| tree | dfc3ed74db5d7b92b22b963584aef2099d96780e /src | |
| parent | eb604e34e566f3f8b03d2f77f178d75e5e4743c1 (diff) | |
| download | emacs-3279eb878e4b1699f5da8b8817cf03806b3fa35b.tar.gz emacs-3279eb878e4b1699f5da8b8817cf03806b3fa35b.zip | |
Fix typos that break xsettings.c compilation.
* configure.in (SETTINGS_CFLAGS, SETTINGS_LIBS) [HAVE_GCONF]: Fix typo.
* src/Makefile.in (SETTINGS_LIBS): Fix typo.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2f7e192fbac..5ee7a3d7e6c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-07-01 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (SETTINGS_LIBS): Fix typo. | ||
| 4 | |||
| 1 | 2011-07-01 Kazuhiro Ito <kzhr@d1.dion.ne.jp> (tiny patch) | 5 | 2011-07-01 Kazuhiro Ito <kzhr@d1.dion.ne.jp> (tiny patch) |
| 2 | 6 | ||
| 3 | * coding.c (Fencode_coding_string): Record the last coding system | 7 | * 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@ | |||
| 153 | DBUS_OBJ = @DBUS_OBJ@ | 153 | DBUS_OBJ = @DBUS_OBJ@ |
| 154 | 154 | ||
| 155 | SETTINGS_CFLAGS = @SETTINGS_CFLAGS@ | 155 | SETTINGS_CFLAGS = @SETTINGS_CFLAGS@ |
| 156 | SETTINGS_LIBS = @SETTINGS_CFLAGS@ | 156 | SETTINGS_LIBS = @SETTINGS_LIBS@ |
| 157 | 157 | ||
| 158 | ## gtkutil.o if USE_GTK, else empty. | 158 | ## gtkutil.o if USE_GTK, else empty. |
| 159 | GTK_OBJ=@GTK_OBJ@ | 159 | GTK_OBJ=@GTK_OBJ@ |