[Emacs-diffs] /srv/bzr/emacs/trunk r101148: Fix the MSDOS build broken by the ImageMagick support.

[Eli Zaretskii]

------------------------------------------------------------
revno: 101148 [merge]
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2010-08-20 23:28:39 +0300
message:
  Fix the MSDOS build broken by the ImageMagick support.
  
   sed1v2.inp (IMAGEMAGICK_LIBS, IMAGEMAGICK_CFLAGS): Edit to empty.
modified:
  msdos/ChangeLog
  msdos/sed1v2.inp

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2010-08-20 19:45:24 +0000
+++ b/msdos/ChangeLog   2010-08-20 20:26:12 +0000
@@ -1,3 +1,7 @@
+2010-08-20  Eli Zaretskii  <address@hidden>
+
+       * sed1v2.inp (IMAGEMAGICK_LIBS, IMAGEMAGICK_CFLAGS): Edit to empty.
+
 2010-08-15  Eli Zaretskii  <address@hidden>
 
        * mainmake.v2 (version): Update due to change in emacs.c.

=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp  2010-08-05 17:11:32 +0000
+++ b/msdos/sed1v2.inp  2010-08-20 20:26:12 +0000
@@ -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/