1 diff -Nur wv-0.7.1.orig/GNUmakefile.am wv-0.7.1/GNUmakefile.am
2 --- wv-0.7.1.orig/GNUmakefile.am Tue Jan 15 10:58:17 2002
3 +++ wv-0.7.1/GNUmakefile.am Thu Feb 21 22:55:58 2002
10 +INCMAGICK = -I$(srcdir)
11 +LIBMAGICK = magick/libmagick.la
18 DIST_SUBDIRS = xml help wingdingfont patterns glib-wv libole2 oledecod magick expat exporter .
20 -SUBDIRS = xml help wingdingfont patterns $(DIRGLIB) libole2 oledecod magick $(DIREXPAT) $(DIREXPORTER) .
21 +SUBDIRS = xml help wingdingfont patterns $(DIRGLIB) libole2 oledecod $(DIRMAGICK) $(DIREXPAT) $(DIREXPORTER) .
23 DEFS = @DEFS@ -DVERSION=\"@VERSION@\" -DXMLCONFIG=\"$(pkgdatadir)/wvConfig.xml\" -DHTMLCONFIG=\"$(pkgdatadir)/wvHtml.xml\"
25 INCLUDES = -I. -I$(top_builddir) -I$(srcdir) \
26 - -I$(srcdir)/magick -I$(srcdir)/libole2 -I$(srcdir)/oledecod $(INCGLIB) $(INCEXPAT)
27 + $(INCMAGICK) -I$(srcdir)/libole2 -I$(srcdir)/oledecod $(INCGLIB) $(INCEXPAT)
29 CFLAGS = @CFLAGS@ @ANSI_CFLAGS@
31 -CPPFLAGS = @CPPFLAGS@ @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@
32 +CPPFLAGS = @CPPFLAGS@ @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@ @MAGICK_CFLAGS@
34 -WVLIBS = @WMF_LIBS@ @XML_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
35 +WVLIBS = @WMF_LIBS@ @XML_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @MAGICK_LIBS@ @LIBS@ -lm
37 include_HEADERS = wv.h
40 wvConvert_LDADD = libwv.la $(GETOPT)
41 wvVersion_LDADD = libwv.la $(GETOPT)
43 -libwv_la_LIBADD = magick/libmagick.la libole2/libole2.la oledecod/liboledecod.la $(LIBGLIB) $(LIBEXPAT) $(LIBEXPORTER) $(WVLIBS)
44 +libwv_la_LIBADD = $(LIBMAGICK) libole2/libole2.la oledecod/liboledecod.la $(LIBGLIB) $(LIBEXPAT) $(LIBEXPORTER) $(WVLIBS)
45 libwv_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic
48 diff -Nur wv-0.7.1.orig/bmptopng.c wv-0.7.1/bmptopng.c
49 --- wv-0.7.1.orig/bmptopng.c Tue Apr 10 18:36:48 2001
50 +++ wv-0.7.1/bmptopng.c Thu Feb 21 22:56:31 2002
52 -#include "magick/magick.h"
53 +#include <magick/magick.h>
58 GetImageInfo (&image_info);
59 sprintf (buffer, "%s.bmp", prefix);
60 strcpy (image_info.filename, buffer);
62 + image = ReadImage (&image_info, NULL);
64 image = ReadBMPImage (&image_info);
66 if (image == (Image *) NULL)
68 sprintf (buffer, "%s.png", prefix);
70 strcpy (image_info.filename, buffer);
72 + SetImageInfo (&image_info, 1, NULL);
74 SetImageInfo (&image_info, 1);
76 strcpy (image->filename, buffer);
78 + WriteImage (&image_info, image);
80 WritePNGImage (&image_info, image);
85 diff -Nur wv-0.7.1.orig/configure.ac wv-0.7.1/configure.ac
86 --- wv-0.7.1.orig/configure.ac Wed Jan 16 11:39:46 2002
87 +++ wv-0.7.1/configure.ac Thu Feb 21 23:02:39 2002
92 +dnl system Magick support
93 +dnl ========================================================
98 +AC_ARG_WITH(Magick,[ --with-Magick[=DIR] use Magick library in DIR],[
99 + if test "x$withval" = "xyes"; then
101 + elif test "x$withval" != "xno"; then
102 + MAGICK_DIR=$withval
103 + CPPFLAGS="$CPPFLAGS -I$withval/include"
104 + LDFLAGS="$LDFLAGS -L$withval/lib"
109 +AC_CHECK_HEADER(magick/magick.h,[
110 + AC_CHECK_LIB(Magick, ReadImage,[
111 + AC_DEFINE(HAVE_MAGICK,1,[define if you have libMagick])
113 + if test "x$MAGICK_DIR" != "x"; then
114 + MAGICK_CFLAGS="-I$MAGICK_DIR/include"
115 + MAGICK_LIBS="-L$MAGICK_DIR/lib -lMagick"
118 + MAGICK_LIBS="-lMagick"
129 +AC_SUBST(HAVE_MAGICK)
130 +AM_CONDITIONAL(BUILD_MAGICK,[ test "$HAVE_MAGICK" = "0" ])
132 +AC_SUBST(MAGICK_CFLAGS)
133 +AC_SUBST(MAGICK_LIBS)
138 dnl system XML support
139 dnl ========================================================