1 --- wv-0.7.0/Makefile.in.orig Thu Nov 8 06:52:57 2001
2 +++ wv-0.7.0/Makefile.in Thu Nov 8 06:57:11 2001
4 DEFS = @DEFS@ -DVERSION=\"@VERSION@\" -DXMLCONFIG=\"$(datadir)/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(datadir)/wv/wvHtml.xml\"
5 CPPFLAGS = @ICONV_CFLAGS@ @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@ @CPPFLAGS@
6 CFLAGS = @CFLAGS@ -ansi -pedantic
7 -INCLUDES = -I. -I./ -I$(srcdir)/ -I$(srcdir)/magick/ -I$(srcdir)/libole2/ -I$(srcdir)/oledecod/
8 +INCLUDES = -I. -I./ -I$(srcdir)/ @MAGICK_CFLAGS@ -I$(srcdir)/libole2/ -I$(srcdir)/oledecod/
10 ifeq ($(INCLUDED_EXPAT),1)
11 INCLUDES += "-I$(srcdir)/expat/xmlparse/"
12 diff -Nur wv-0.6.5.orig/bmptopng.c wv-0.6.5/bmptopng.c
13 --- wv-0.6.5.orig/bmptopng.c Tue Apr 10 18:51:24 2001
14 +++ wv-0.6.5/bmptopng.c Tue May 22 16:02:59 2001
16 -#include "magick/magick.h"
17 +#include <magick/magick.h>
22 GetImageInfo (&image_info);
23 sprintf (buffer, "%s.bmp", prefix);
24 strcpy (image_info.filename, buffer);
25 - image = ReadBMPImage (&image_info);
26 + image = ReadImage (&image_info);
27 if (image == (Image *) NULL)
29 sprintf (buffer, "%s.png", prefix);
31 strcpy (image_info.filename, buffer);
32 SetImageInfo (&image_info, 1);
33 strcpy (image->filename, buffer);
34 - WritePNGImage (&image_info, image);
35 + WriteImage (&image_info, image);
39 --- wv-0.6.7/configure.in.orig Sat Sep 1 11:05:44 2001
40 +++ wv-0.6.7/configure.in Sat Sep 1 11:15:31 2001
42 AC_CHECK_HEADER(magick/magick.h,
43 AC_CHECK_LIB(Magick, GetImageInfo,[
44 MAGICK_CFLAGS=$m_cppflags
45 - MAGICK_LIBS=$m_ldflags
47 - MAGICKOBJS="\$(RMAGICKOBJS)"]))
48 + MAGICK_LIBS="$m_ldflags -lMagick"
53 if test -z "$MAGICK"; then