diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 3db76f6..6c32599 100644
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -1520,9 +1520,7 @@
/* #undef WITH_DMALLOC */
/* Define if you have wmflite library */
-#ifndef MAGICKCORE_WMFLITE_DELEGATE
-#define MAGICKCORE_WMFLITE_DELEGATE 1
-#endif
+/* #undef WMFLITE_DELEGATE */
/* Define if you have wmf library */
/* #undef WMF_DELEGATE */
diff --git a/config/configure.xml b/config/configure.xml
index cc7a897..1b58b6b 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -29,16 +29,16 @@
<configure name="PCFLAGS" value="-fopenmp"/>
<configure name="DEFS" value="-DHAVE_CONFIG_H"/>
<configure name="LDFLAGS" value="-L/usr/local/lib -L/usr/lib"/>
- <configure name="LIBS" value="-lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng12 -ldjvulibre -lfftw3 -lfontconfig -lwmflite -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -pthread -lpangoft2-1.0 -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl"/>
+ <configure name="LIBS" value="-lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng12 -ldjvulibre -lfftw3 -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -pthread -lpangoft2-1.0 -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl"/>
<configure name="CXX" value="g++"/>
<configure name="CXXFLAGS" value="-g -O2 -pthread"/>
- <configure name="DISTCHECK_CONFIG_FLAGS" value="--disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-perl=no"/>
+ <configure name="DISTCHECK_CONFIG_FLAGS" value="--disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-wmf=no --with-perl=no"/>
<configure name="TARGET_CPU" value="x86_64"/>
<configure name="TARGET_VENDOR" value="unknown"/>
<configure name="TARGET_OS" value="linux-gnu"/>
<configure name="HOST" value="x86_64-unknown-linux-gnu"/>
<configure name="FEATURES" value="OpenMP "/>
- <configure name="DELEGATES" value="bzlib djvu fftw fontconfig freetype gvc jpeg jng jp2 lcms2 lzma png tiff x11 xml wmf zlib"/>
+ <configure name="DELEGATES" value="bzlib djvu fftw fontconfig freetype gvc jpeg jng jp2 lcms2 lzma png tiff x11 xml zlib"/>
<configure name="COPYRIGHT" value="Copyright (C) 1999-2012 ImageMagick Studio LLC"/>
<configure name="WEBSITE" value="http://www.imagemagick.org"/>
<configure name="QuantumDepth" value="16"/>
diff --git a/configure b/configure
index 859bb60..b08505d 100755
--- a/configure
+++ b/configure
@@ -1885,7 +1885,7 @@
--with-perl enable build/install of PerlMagick
--with-perl-options=OPTIONS
options to pass on command-line when generating
- PerlMagick's build file
+ PerlMagick build file
--with-umem enable umem memory allocation library support
--with-libstdc=DIR use libstdc++ in DIR (for GNU C++)
--without-bzlib disable BZLIB support
@@ -21443,18 +21443,19 @@
# Check whether --with-method-prefix was given.
if test "${with_method_prefix+set}" = set; then :
- withval=$with_method_prefix; with_method_prefix=$enableval
+ withval=$with_method_prefix; with_method_prefix=$withval
else
- with_method_prefix=''
+ with_method_prefix='no'
fi
-if test "$with_method_prefix" != ''; then
+if test "$with_method_prefix" != 'no'; then
cat >>confdefs.h <<_ACEOF
#define NAMESPACE_PREFIX $with_method_prefix
_ACEOF
+ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-method-prefix "
fi
# Number of bits in a Quantum
@@ -28819,7 +28820,7 @@
if test "${with_fontconfig+set}" = set; then :
withval=$with_fontconfig; with_fontconfig=$withval
else
- with_fontconfig=$have_x
+ with_fontconfig='yes'
fi
@@ -30450,7 +30451,7 @@
if test "${with_pango+set}" = set; then :
withval=$with_pango; with_pango=$withval
else
- with_pango=$have_x
+ with_pango='yes'
fi
@@ -31046,7 +31047,7 @@
if test "${with_rsvg+set}" = set; then :
withval=$with_rsvg; with_rsvg=$withval
else
- with_rsvg=$have_x
+ with_rsvg='yes'
fi
@@ -31687,7 +31688,7 @@
if test "${with_wmf+set}" = set; then :
withval=$with_wmf; with_wmf=$withval
else
- with_wmf='yes'
+ with_wmf='no'
fi
@@ -31860,7 +31861,7 @@
if test "${with_xml+set}" = set; then :
withval=$with_xml; with_xml=$withval
else
- with_xml=$have_x
+ with_xml='yes'
fi
diff --git a/configure.ac b/configure.ac
index 0e48258..b716bf4 100755
--- a/configure.ac
+++ b/configure.ac
@@ -680,11 +680,12 @@
AC_ARG_WITH([method-prefix],
[AC_HELP_STRING([--with-method-prefix=PREFIX],
[prefix MagickCore API methods])],
- [with_method_prefix=$enableval],
- [with_method_prefix=''])
+ [with_method_prefix=$withval],
+ [with_method_prefix='no'])
-if test "$with_method_prefix" != ''; then
+if test "$with_method_prefix" != 'no'; then
AC_DEFINE_UNQUOTED(NAMESPACE_PREFIX,$with_method_prefix,[Magick API method prefix])
+ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-method-prefix "
fi
# Number of bits in a Quantum
@@ -745,7 +746,7 @@
# Options to pass when configuring PerlMagick
AC_ARG_WITH([perl-options],
[AC_HELP_STRING([--with-perl-options=OPTIONS],
- [options to pass on command-line when generating PerlMagick's build file])],
+ [options to pass on command-line when generating PerlMagick build file])],
PERL_MAKE_OPTIONS=$withval)
AC_SUBST(PERL_MAKE_OPTIONS)
@@ -1814,7 +1815,7 @@
[AC_HELP_STRING([--without-fontconfig],
[disable fontconfig support])],
[with_fontconfig=$withval],
- [with_fontconfig=$have_x])
+ [with_fontconfig='yes'])
if test "$with_fontconfig" != 'yes'; then
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-fontconfig=$with_fontconfig "
@@ -2442,7 +2443,7 @@
[AC_HELP_STRING([--without-pango],
[disable PANGO support])],
[with_pango=$withval],
- [with_pango=$have_x])
+ [with_pango='yes'])
if test "$with_pango" != 'yes'; then
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-pango=$with_pango "
@@ -2606,7 +2607,7 @@
[AC_HELP_STRING([--without-rsvg],
[disable RSVG support])],
[with_rsvg=$withval],
- [with_rsvg=$have_x])
+ [with_rsvg='yes'])
if test "$with_rsvg" != 'yes'; then
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-rsvg=$with_rsvg "
@@ -2765,7 +2766,7 @@
[AC_HELP_STRING([--without-wmf],
[disable WMF support])],
[with_wmf=$withval],
- [with_wmf='yes'])
+ [with_wmf='no'])
if test "$with_wmf" != 'yes'; then
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-wmf=$with_wmf "
@@ -2834,7 +2835,7 @@
[AC_HELP_STRING([--without-xml],
[disable XML support])],
[with_xml=$withval],
- [with_xml=$have_x])
+ [with_xml='yes'])
if test "$with_xml" != 'yes' ; then
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-xml=$with_xml "