diff --git a/configure b/configure
index f20384d..441cfa4 100755
--- a/configure
+++ b/configure
@@ -892,7 +892,6 @@
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
MAGICK_HDRI
-DLLDFLAGS
WITH_LTDL_FALSE
WITH_LTDL_TRUE
WITH_MODULES_FALSE
@@ -3670,7 +3669,7 @@
MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
-MAGICK_SVN_REVISION=9592M
+MAGICK_SVN_REVISION=9602:9608M
@@ -21822,15 +21821,17 @@
if test "$libtool_build_shared_libs" = 'no'; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Modules may only be built if building shared libraries is enabled." >&5
$as_echo "$as_me: WARNING: Modules may only be built if building shared libraries is enabled." >&2;}
- with_modules='no'
- fi
+ build_modules='no'
+ else
+ build_modules='yes'
+ fi
fi
-if test "$with_modules" != 'no'; then
+if test "$build_modules" != 'no' ; then
$as_echo "#define BUILD_MODULES 1" >>confdefs.h
fi
- if test "$with_modules" != 'no'; then
+ if test "$build_modules" != 'no'; then
WITH_MODULES_TRUE=
WITH_MODULES_FALSE='#'
else
@@ -21839,10 +21840,9 @@
fi
-# Enable building/use of libltdl if we are building shared libraries regardless
-# of whether modules are built or not.
+# Only use/depend on libtdl if we are building modules.
with_ltdl='no'
-if test "$libtool_build_shared_libs" != 'no'; then
+if test "$build_modules" != 'no' ; then
with_ltdl='yes'
fi
@@ -21858,12 +21858,6 @@
$as_echo "#define LTDL_DELEGATE 1" >>confdefs.h
-
- # Set DLLDFLAGS
- if test X"$enable_shared" = Xyes; then
- DLLDFLAGS=-export-dynamic
-
- fi
fi
# Enable build using delegate libraries built in subdirectories rather than installed
@@ -22276,7 +22270,7 @@
MAGICK_CPPFLAGS="$MAGICK_CPPFLAGS -D_DLL"
MAGICK_PCFLAGS="$MAGICK_PCFLAGS -D_DLL"
LIBRARY_EXTRA_CPPFLAGS="$LIBRARY_EXTRA_CPPFLAGS -D_MAGICKLIB_"
- if test "$with_modules" = 'yes'; then
+ if test "$build_modules" = 'yes'; then
LIBRARY_EXTRA_CPPFLAGS="$LIBRARY_EXTRA_CPPFLAGS -D_MAGICKMOD_"
else
MODULE_EXTRA_CPPFLAGS="$MODULE_EXTRA_CPPFLAGS -D_MAGICKLIB_"
@@ -28864,7 +28858,7 @@
$as_echo "#define AUTOTRACE_DELEGATE 1" >>confdefs.h
- if test "$with_modules" = 'no'; then
+ if test "$build_modules" = 'no'; then
CPPFLAGS="$AUTOTRACE_CFLAGS $CPPFLAGS"
fi
fi
@@ -29556,7 +29550,7 @@
$as_echo "#define FONTCONFIG_DELEGATE 1" >>confdefs.h
- if test "$with_modules" = 'no'; then
+ if test "$build_modules" = 'no'; then
CPPFLAGS="$FONTCONFIG_CFLAGS $CPPFLAGS"
fi
fi
@@ -30073,7 +30067,7 @@
$as_echo "#define GVC_DELEGATE 1" >>confdefs.h
- if test "$with_modules" = 'no'; then
+ if test "$build_modules" = 'no'; then
CPPFLAGS="$GVC_CFLAGS $CPPFLAGS"
fi
fi
@@ -30957,7 +30951,7 @@
$as_echo "#define LZMA_DELEGATE 1" >>confdefs.h
- if test "$with_modules" = 'no'; then
+ if test "$build_modules" = 'no'; then
CPPFLAGS="$LZMA_CFLAGS $CPPFLAGS"
fi
fi
@@ -31072,7 +31066,7 @@
$as_echo "#define OPENEXR_DELEGATE 1" >>confdefs.h
- if test "$with_modules" = 'no'; then
+ if test "$build_modules" = 'no'; then
CFLAGS="$OPENEXR_CFLAGS $CFLAGS"
fi
fi
@@ -31257,7 +31251,7 @@
$as_echo "#define PANGO_DELEGATE 1" >>confdefs.h
- if test "$with_modules" = 'no'; then
+ if test "$build_modules" = 'no'; then
CPPFLAGS="$PANGO_CFLAGS $CPPFLAGS"
fi
fi
@@ -31266,7 +31260,7 @@
$as_echo "#define PANGOCAIRO_DELEGATE 1" >>confdefs.h
- if test "$with_modules" = 'no'; then
+ if test "$build_modules" = 'no'; then
CPPFLAGS="$PANGOCAIRO_CFLAGS $CPPFLAGS"
fi
fi
@@ -31853,7 +31847,7 @@
$as_echo "#define RSVG_DELEGATE 1" >>confdefs.h
- if test "$with_modules" = 'no'; then
+ if test "$build_modules" = 'no'; then
CPPFLAGS="$RSVG_CFLAGS $CPPFLAGS"
fi
fi
@@ -31862,7 +31856,7 @@
$as_echo "#define CAIRO_DELEGATE 1" >>confdefs.h
- if test "$with_modules" = 'no'; then
+ if test "$build_modules" = 'no'; then
CPPFLAGS="$CAIRO_SVG_CFLAGS $CPPFLAGS"
fi
fi
@@ -35843,18 +35837,15 @@
MAGICK_LIBLTDL='' # Libltdl for build
MAGICK_API_LIBLTDL='' # libltdl for dependent application (API) build
MAGICK_LTDLDEPS='' # extra libltdl dependencies
-if test "$with_ltdl" != 'no'
-then
- if test \( "$with_included_ltdl" = 'no' -o "$enable_ltdl_convenience" = 'no' \) -o "$enable_ltdl_install" = 'yes'; then
- MAGICK_API_LIBLTDL='-lltdl'
- fi
+if test "$with_ltdl" != 'no' ; then
+ MAGICK_API_LIBLTDL='-lltdl'
MAGICK_LIBLTDL=${LIBLTDL}
MAGICK_LTDLDEPS=${LTDLDEPS}
fi
-if test "$with_modules" != 'no'; then
+if test "$build_modules" != 'no'; then
MAGICK_DEP_LIBS="$LCMS_LIBS $FREETYPE_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS"
else
MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS"
@@ -35895,7 +35886,7 @@
MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/ */ /g'`
MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/ */ /g'`
MAGICK_LDFLAGS="-L$LIB_DIR $LDFLAGS"
-MAGICK_LIBS="-lMagickCore $MAGICK_DEP_LIBS $MAGICK_API_LIBLTDL"
+MAGICK_LIBS="-lMagickCore $MAGICK_DEP_LIBS"
@@ -38942,7 +38933,7 @@
-------------------------------------------------------------------------------
Shared libraries --enable-shared=$enable_shared $libtool_build_shared_libs
Static libraries --enable-static=$enable_static $libtool_build_static_libs
-Module support --with-modules=$with_modules $with_modules
+Module support --with-modules=$build_modules $build_modules
GNU ld --with-gnu-ld=$with_gnu_ld $lt_cv_prog_gnu_ld
Quantum depth --with-quantum-depth=$with_quantum_depth $with_quantum_depth
High Dynamic Range Imagery
@@ -39018,7 +39009,7 @@
-------------------------------------------------------------------------------
Shared libraries --enable-shared=$enable_shared $libtool_build_shared_libs
Static libraries --enable-static=$enable_static $libtool_build_static_libs
-Module support --with-modules=$with_modules $with_modules
+Module support --with-modules=$build_modules $build_modules
GNU ld --with-gnu-ld=$with_gnu_ld $lt_cv_prog_gnu_ld
Quantum depth --with-quantum-depth=$with_quantum_depth $with_quantum_depth
High Dynamic Range Imagery