diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 978a4cd..bd6180d 100644
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -1300,6 +1300,16 @@
#define MAGICKCORE_PACKAGE_VERSION "7.0.0-0"
#endif
+/* Define if you have PANGOFT2 library */
+#ifndef MAGICKCORE_PANGOFT2_DELEGATE
+#define MAGICKCORE_PANGOFT2_DELEGATE 1
+#endif
+
+/* Define if you have PANGO library */
+#ifndef MAGICKCORE_PANGO_DELEGATE
+#define MAGICKCORE_PANGO_DELEGATE 1
+#endif
+
/* Define if you have PNG library */
#ifndef MAGICKCORE_PNG_DELEGATE
#define MAGICKCORE_PNG_DELEGATE 1
diff --git a/Makefile.in b/Makefile.in
index acef84e..738c6fb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2504,6 +2504,8 @@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PACKAGE_VERSION_ADDENDUM = @PACKAGE_VERSION_ADDENDUM@
+PANGO_CFLAGS = @PANGO_CFLAGS@
+PANGO_LIBS = @PANGO_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCLCMYKDevice = @PCLCMYKDevice@
PCLColorDevice = @PCLColorDevice@
diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index 11b57e9..02eaa54 100644
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -156,7 +156,7 @@
}
# defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
-my $INC_magick = '-I../ -I.. -pthread -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/graphviz -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"';
+my $INC_magick = '-I../ -I.. -pthread -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -pthread -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/graphviz -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"';
my $LIBS_magick = '-L../MagickCore/.libs -lMagickCore -lperl -lm';
my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -g -O2 -Wall -pthread";
my $LDFLAGS_magick = "-L../MagickCore/.libs -lMagickCore $Config{'ldflags'} -L/usr/lib";
@@ -201,7 +201,7 @@
#'CC' => 'gcc -std=gnu99 -std=gnu99',
# C pre-processor flags (e.g. -I & -D options)
- # 'CPPFLAGS' => "$Config{'cppflags'} -pthread -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/graphviz -I/usr/include/freetype2 -I/usr/include/libxml2",
+ # 'CPPFLAGS' => "$Config{'cppflags'} -pthread -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -pthread -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/graphviz -I/usr/include/freetype2 -I/usr/include/libxml2",
# C compiler flags (e.g. -O -g)
'CCFLAGS' => $CCFLAGS_magick,
diff --git a/config/config.h.in b/config/config.h.in
index 922ed79..ea5cf28 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -857,6 +857,12 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Define if you have PANGOFT2 library */
+#undef PANGOFT2_DELEGATE
+
+/* Define if you have PANGO library */
+#undef PANGO_DELEGATE
+
/* Define if you have PNG library */
#undef PNG_DELEGATE
diff --git a/config/configure.xml b/config/configure.xml
index cd8c384..dd283f0 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -28,7 +28,7 @@
<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 -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl"/>
+ <configure name="LIBS" value="-lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng12 -ldjvulibre -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -pthread -lpango-1.0 -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"/>
diff --git a/configure b/configure
index 5167145..cd1bbaf 100755
--- a/configure
+++ b/configure
@@ -753,6 +753,12 @@
PNG_LIBS
PNG_DELEGATE_FALSE
PNG_DELEGATE_TRUE
+PANGOFT2_DELEGATE_FALSE
+PANGOFT2_DELEGATE_TRUE
+PANGO_DELEGATE_FALSE
+PANGO_DELEGATE_TRUE
+PANGO_LIBS
+PANGO_CFLAGS
OPENEXR_DELEGATE_FALSE
OPENEXR_DELEGATE_TRUE
OPENEXR_LIBS
@@ -1137,6 +1143,7 @@
with_lqr
with_lzma
with_openexr
+with_pango
with_png
with_rsvg
with_tiff
@@ -1170,6 +1177,8 @@
LQR_LIBS
OPENEXR_CFLAGS
OPENEXR_LIBS
+PANGO_CFLAGS
+PANGO_LIBS
RSVG_CFLAGS
RSVG_LIBS
CAIRO_SVG_CFLAGS
@@ -1889,6 +1898,7 @@
--without-lqr disable Liquid Rescale support
--without-lzma disable LZMA support
--without-openexr disable OpenEXR support
+ --without-pango disable PANGO support
--without-png disable PNG support
--without-rsvg disable RSVG support
--without-tiff disable TIFF support
@@ -1928,6 +1938,9 @@
C compiler flags for OPENEXR, overriding pkg-config
OPENEXR_LIBS
linker flags for OPENEXR, overriding pkg-config
+ PANGO_CFLAGS
+ C compiler flags for PANGO, overriding pkg-config
+ PANGO_LIBS linker flags for PANGO, overriding pkg-config
RSVG_CFLAGS C compiler flags for RSVG, overriding pkg-config
RSVG_LIBS linker flags for RSVG, overriding pkg-config
CAIRO_SVG_CFLAGS
@@ -30209,6 +30222,208 @@
#
+# Check for PANGO delegate library.
+#
+
+# Check whether --with-pango was given.
+if test "${with_pango+set}" = set; then :
+ withval=$with_pango; with_pango=$withval
+else
+ with_pango=$have_x
+fi
+
+
+if test "$with_pango" != 'yes'; then
+ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-pango=$with_pango "
+fi
+
+have_pango='no'
+have_pangoft2='no'
+PANGO_CFLAGS=""
+PANGO_LIBS=""
+PANGO_PKG=""
+if test "x$with_pango" = "xyes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5
+$as_echo "-------------------------------------------------------------" >&6; }
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO" >&5
+$as_echo_n "checking for PANGO... " >&6; }
+
+if test -n "$PANGO_CFLAGS"; then
+ pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "pango") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$PANGO_LIBS"; then
+ pkg_cv_PANGO_LIBS="$PANGO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "pango") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_PANGO_LIBS=`$PKG_CONFIG --libs "pango" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pango" 2>&1`
+ else
+ PANGO_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PANGO_PKG_ERRORS" >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ have_pango=no
+elif test $pkg_failed = untried; then
+ have_pango=no
+else
+ PANGO_CFLAGS=$pkg_cv_PANGO_CFLAGS
+ PANGO_LIBS=$pkg_cv_PANGO_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ have_pango=yes
+fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO" >&5
+$as_echo_n "checking for PANGO... " >&6; }
+
+if test -n "$PANGO_CFLAGS"; then
+ pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoft2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "pangoft2") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pangoft2" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$PANGO_LIBS"; then
+ pkg_cv_PANGO_LIBS="$PANGO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoft2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "pangoft2") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_PANGO_LIBS=`$PKG_CONFIG --libs "pangoft2" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pangoft2" 2>&1`
+ else
+ PANGO_PKG_ERRORS=`$PKG_CONFIG --print-errors "pangoft2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PANGO_PKG_ERRORS" >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ have_pangoft2=no
+elif test $pkg_failed = untried; then
+ have_pangoft2=no
+else
+ PANGO_CFLAGS=$pkg_cv_PANGO_CFLAGS
+ PANGO_LIBS=$pkg_cv_PANGO_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ have_pangoft2=yes
+fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+fi
+
+if test "$have_pango" = 'yes'; then
+
+$as_echo "#define PANGO_DELEGATE 1" >>confdefs.h
+
+ if test "$with_modules" = 'no'; then
+ CPPFLAGS="$PANGO_CFLAGS $CPPFLAGS"
+ fi
+fi
+
+if test "$have_pangoft2" = 'yes'; then
+
+$as_echo "#define PANGOFT2_DELEGATE 1" >>confdefs.h
+
+ if test "$with_modules" = 'no'; then
+ CPPFLAGS="$PANGOFT2_CFLAGS $CPPFLAGS"
+ fi
+fi
+
+ if test "$have_pango" = 'yes'; then
+ PANGO_DELEGATE_TRUE=
+ PANGO_DELEGATE_FALSE='#'
+else
+ PANGO_DELEGATE_TRUE='#'
+ PANGO_DELEGATE_FALSE=
+fi
+
+ if test "$have_pangoft2" = 'yes'; then
+ PANGOFT2_DELEGATE_TRUE=
+ PANGOFT2_DELEGATE_FALSE='#'
+else
+ PANGOFT2_DELEGATE_TRUE='#'
+ PANGOFT2_DELEGATE_FALSE=
+fi
+
+
+
+
+
+#
# Check for PNG delegate library.
#
@@ -34756,7 +34971,7 @@
if test "$with_modules" != 'no'; then
MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_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 $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_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 $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
+ 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 $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
fi
@@ -35099,6 +35314,14 @@
as_fn_error $? "conditional \"OPENEXR_DELEGATE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${PANGO_DELEGATE_TRUE}" && test -z "${PANGO_DELEGATE_FALSE}"; then
+ as_fn_error $? "conditional \"PANGO_DELEGATE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${PANGOFT2_DELEGATE_TRUE}" && test -z "${PANGOFT2_DELEGATE_FALSE}"; then
+ as_fn_error $? "conditional \"PANGOFT2_DELEGATE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${PNG_DELEGATE_TRUE}" && test -z "${PNG_DELEGATE_FALSE}"; then
as_fn_error $? "conditional \"PNG_DELEGATE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -37867,6 +38090,7 @@
LZMA --with-lzma=$with_lzma $have_lzma
Magick++ --with-magick-plus-plus=$with_magick_plus_plus $have_magick_plus_plus
OpenEXR --with-openexr=$with_openexr $have_openexr
+PANGO --with-pango=$with_pango $have_pango
PERL --with-perl=$with_perl $have_perl
PNG --with-png=$with_png $have_png
RSVG --with-rsvg=$with_rsvg $have_rsvg
@@ -37942,6 +38166,7 @@
LZMA --with-lzma=$with_lzma $have_lzma
Magick++ --with-magick-plus-plus=$with_magick_plus_plus $have_magick_plus_plus
OpenEXR --with-openexr=$with_openexr $have_openexr
+PANGO --with-pango=$with_pango $have_pango
PERL --with-perl=$with_perl $have_perl
PNG --with-png=$with_png $have_png
RSVG --with-rsvg=$with_rsvg $have_rsvg
diff --git a/configure.ac b/configure.ac
index 0384021..ffa8958 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2409,6 +2409,53 @@
dnl ===========================================================================
#
+# Check for PANGO delegate library.
+#
+AC_ARG_WITH([pango],
+ [AC_HELP_STRING([--without-pango],
+ [disable PANGO support])],
+ [with_pango=$withval],
+ [with_pango=$have_x])
+
+if test "$with_pango" != 'yes'; then
+ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-pango=$with_pango "
+fi
+
+have_pango='no'
+have_pangoft2='no'
+PANGO_CFLAGS=""
+PANGO_LIBS=""
+PANGO_PKG=""
+if test "x$with_pango" = "xyes"; then
+ AC_MSG_RESULT([-------------------------------------------------------------])
+ PKG_CHECK_MODULES(PANGO, pango, have_pango=yes, have_pango=no)
+ AC_MSG_RESULT([])
+ PKG_CHECK_MODULES(PANGO, pangoft2, have_pangoft2=yes, have_pangoft2=no)
+ AC_MSG_RESULT([])
+fi
+
+if test "$have_pango" = 'yes'; then
+ AC_DEFINE(PANGO_DELEGATE,1,Define if you have PANGO library)
+ if test "$with_modules" = 'no'; then
+ CPPFLAGS="$PANGO_CFLAGS $CPPFLAGS"
+ fi
+fi
+
+if test "$have_pangoft2" = 'yes'; then
+ AC_DEFINE(PANGOFT2_DELEGATE,1,Define if you have PANGOFT2 library)
+ if test "$with_modules" = 'no'; then
+ CPPFLAGS="$PANGOFT2_CFLAGS $CPPFLAGS"
+ fi
+fi
+
+AM_CONDITIONAL(PANGO_DELEGATE, test "$have_pango" = 'yes')
+AM_CONDITIONAL(PANGOFT2_DELEGATE, test "$have_pangoft2" = 'yes')
+AC_SUBST(PANGO_CFLAGS)
+AC_SUBST(PANGO_LIBS)
+
+dnl ===========================================================================
+
+#
# Check for PNG delegate library.
#
AC_ARG_WITH(png,
@@ -3581,7 +3628,7 @@
if test "$with_modules" != 'no'; then
MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_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 $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_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 $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
+ 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 $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
fi
AC_SUBST(MAGICK_DEP_LIBS)
@@ -3699,6 +3746,7 @@
LZMA --with-lzma=$with_lzma $have_lzma
Magick++ --with-magick-plus-plus=$with_magick_plus_plus $have_magick_plus_plus
OpenEXR --with-openexr=$with_openexr $have_openexr
+PANGO --with-pango=$with_pango $have_pango
PERL --with-perl=$with_perl $have_perl
PNG --with-png=$with_png $have_png
RSVG --with-rsvg=$with_rsvg $have_rsvg