aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2010-08-20 23:26:12 +0300
committerEli Zaretskii2010-08-20 23:26:12 +0300
commit6f505bc82d1d4a9d6ebb3665db8fc7ce8128bd66 (patch)
tree7fb5bc18703724f32c7c4f87152a7a630d84b6e5
parente8a6cc19a3127188a95d407cb74d4442b04bc1db (diff)
downloademacs-6f505bc82d1d4a9d6ebb3665db8fc7ce8128bd66.tar.gz
emacs-6f505bc82d1d4a9d6ebb3665db8fc7ce8128bd66.zip
Fix the MSDOS build broken by the ImageMagick support.
sed1v2.inp (IMAGEMAGICK_LIBS, IMAGEMAGICK_CFLAGS): Edit to empty.
-rw-r--r--msdos/ChangeLog4
-rw-r--r--msdos/sed1v2.inp2
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 @@
12010-08-20 Eli Zaretskii <eliz@gnu.org>
2
3 * sed1v2.inp (IMAGEMAGICK_LIBS, IMAGEMAGICK_CFLAGS): Edit to empty.
4
12010-08-15 Eli Zaretskii <eliz@gnu.org> 52010-08-15 Eli Zaretskii <eliz@gnu.org>
2 6
3 * mainmake.v2 (version): Update due to change in emacs.c. 7 * 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/
88/^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@// 88/^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@//
89/^RSVG_LIBS *=/s/@RSVG_LIBS@// 89/^RSVG_LIBS *=/s/@RSVG_LIBS@//
90/^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@// 90/^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@//
91/^IMAGEMAGICK_LIBS *=/s/@IMAGEMAGICK_LIBS@//
92/^IMAGEMAGICK_CFLAGS *=/s/@IMAGEMAGICK_CFLAGS@//
91/^WIDGET_OBJ *=/s/@WIDGET_OBJ@// 93/^WIDGET_OBJ *=/s/@WIDGET_OBJ@//
92/^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@// 94/^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@//
93/^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o w16select.o/ 95/^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o w16select.o/