diff options
| author | Eli Zaretskii | 2010-09-18 16:13:09 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2010-09-18 16:13:09 +0200 |
| commit | 0d4afaf7ffb6d1881c9acf9ef03f386cc87254e6 (patch) | |
| tree | 7152c41cb4ecd70b35424f4683c839b5f4373301 /src | |
| parent | bf5ba10b08798317749077578a87b687d8d4b7e7 (diff) | |
| parent | f3ec267ad61a020d81af44ebb3c090ea11c69278 (diff) | |
| download | emacs-0d4afaf7ffb6d1881c9acf9ef03f386cc87254e6.tar.gz emacs-0d4afaf7ffb6d1881c9acf9ef03f386cc87254e6.zip | |
Fix MSDOS build broken by 2010-09-10T16:44:35Z!larsi@gnus.org, support MSDOS build with libxml2.
config.bat: Detect that libxml2 is installed and if so, build with it.
src/deps.mk (xml.o): Add dependencies.
msdos/sed1v2.inp (LIBXML2_LIBS, LIBXML2_CFLAGS): Edit to empty.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/deps.mk | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 88030b7b4ce..13184191725 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2010-09-18 Eli Zaretskii <eliz@gnu.org> | 1 | 2010-09-18 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * deps.mk (xml.o): Add dependencies. | ||
| 4 | |||
| 5 | 2010-09-18 Eli Zaretskii <eliz@gnu.org> | ||
| 6 | |||
| 3 | * xdisp.c (Fcurrent_bidi_paragraph_direction): Call | 7 | * xdisp.c (Fcurrent_bidi_paragraph_direction): Call |
| 4 | bidi_paragraph_init with NO_DEFAULT_P non-zero. (Bug#7038) | 8 | bidi_paragraph_init with NO_DEFAULT_P non-zero. (Bug#7038) |
| 5 | 9 | ||
diff --git a/src/deps.mk b/src/deps.mk index d00be96744b..eebf98ec003 100644 --- a/src/deps.mk +++ b/src/deps.mk | |||
| @@ -230,6 +230,7 @@ xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h buffer.h \ | |||
| 230 | charset.h keyboard.h $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h \ | 230 | charset.h keyboard.h $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h \ |
| 231 | systime.h gtkutil.h msdos.h coding.h menu.h lisp.h $(config_h) composite.h \ | 231 | systime.h gtkutil.h msdos.h coding.h menu.h lisp.h $(config_h) composite.h \ |
| 232 | keymap.h sysselect.h | 232 | keymap.h sysselect.h |
| 233 | xml.o: xml.c buffer.h lisp.h $(config_h) | ||
| 233 | xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h buffer.h \ | 234 | xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h buffer.h \ |
| 234 | dispextern.h frame.h disptab.h blockinput.h atimer.h systime.h syssignal.h \ | 235 | dispextern.h frame.h disptab.h blockinput.h atimer.h systime.h syssignal.h \ |
| 235 | keyboard.h emacs-icon.h character.h charset.h ccl.h fontset.h composite.h \ | 236 | keyboard.h emacs-icon.h character.h charset.h ccl.h fontset.h composite.h \ |