diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2010-08-20 23:26:12 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2010-08-20 23:26:12 +0300 |
| commit | 6f505bc82d1d4a9d6ebb3665db8fc7ce8128bd66 (patch) | |
| tree | 7fb5bc18703724f32c7c4f87152a7a630d84b6e5 /msdos | |
| parent | e8a6cc19a3127188a95d407cb74d4442b04bc1db (diff) | |
| download | emacs-6f505bc82d1d4a9d6ebb3665db8fc7ce8128bd66.tar.gz | |
Fix the MSDOS build broken by the ImageMagick support.
sed1v2.inp (IMAGEMAGICK_LIBS, IMAGEMAGICK_CFLAGS): Edit to empty.
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 4 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 7227b8b8b51..c4c7981e907 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,7 @@ +2010-08-20 Eli Zaretskii <eliz@gnu.org> + + * sed1v2.inp (IMAGEMAGICK_LIBS, IMAGEMAGICK_CFLAGS): Edit to empty. + 2010-08-15 Eli Zaretskii <eliz@gnu.org> * mainmake.v2 (version): Update due to change in emacs.c. diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 4be1bccefdf..e9dfc9dea3d 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -88,6 +88,8 @@ s/\.h\.in/.h-in/ /^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@// /^RSVG_LIBS *=/s/@RSVG_LIBS@// /^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@// +/^IMAGEMAGICK_LIBS *=/s/@IMAGEMAGICK_LIBS@// +/^IMAGEMAGICK_CFLAGS *=/s/@IMAGEMAGICK_CFLAGS@// /^WIDGET_OBJ *=/s/@WIDGET_OBJ@// /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@// /^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o w16select.o/ |