Mercurial > emacs
changeset 109894:ba993cbd403a
Fix the MSDOS build broken by the ImageMagick support.
sed1v2.inp (IMAGEMAGICK_LIBS, IMAGEMAGICK_CFLAGS): Edit to empty.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 20 Aug 2010 23:26:12 +0300 |
| parents | 2c97f9b178b4 |
| children | d25d73314584 f29ba15f9d49 |
| files | msdos/ChangeLog msdos/sed1v2.inp |
| diffstat | 2 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/msdos/ChangeLog Fri Aug 20 23:07:29 2010 +0300 +++ b/msdos/ChangeLog Fri Aug 20 23:26:12 2010 +0300 @@ -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.
--- a/msdos/sed1v2.inp Fri Aug 20 23:07:29 2010 +0300 +++ b/msdos/sed1v2.inp Fri Aug 20 23:26:12 2010 +0300 @@ -88,6 +88,8 @@ /^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/