# HG changeset patch # User Eli Zaretskii # Date 1282336119 -10800 # Node ID d25d7331458444fdae90ca3afcc4030c2e88b0ca # Parent 2c97f9b178b45d4735c56ccb94e75f5ca7c3e266# Parent ba993cbd403a8f1e4c6adfff53b096e8a69a6b18 Fix the MSDOS build broken by the ImageMagick support. sed1v2.inp (IMAGEMAGICK_LIBS, IMAGEMAGICK_CFLAGS): Edit to empty. diff -r 2c97f9b178b4 -r d25d73314584 msdos/ChangeLog --- a/msdos/ChangeLog Fri Aug 20 23:07:29 2010 +0300 +++ b/msdos/ChangeLog Fri Aug 20 23:28:39 2010 +0300 @@ -1,3 +1,7 @@ +2010-08-20 Eli Zaretskii + + * sed1v2.inp (IMAGEMAGICK_LIBS, IMAGEMAGICK_CFLAGS): Edit to empty. + 2010-08-15 Eli Zaretskii * mainmake.v2 (version): Update due to change in emacs.c. diff -r 2c97f9b178b4 -r d25d73314584 msdos/sed1v2.inp --- a/msdos/sed1v2.inp Fri Aug 20 23:07:29 2010 +0300 +++ b/msdos/sed1v2.inp Fri Aug 20 23:28:39 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/