Skip to content

Commit

Permalink
Removed checks for PANGO_DELEGATE since we only use pangocairo.
Browse files Browse the repository at this point in the history
  • Loading branch information
dlemstra committed Mar 5, 2023
1 parent 1010008 commit 8f7e7aa
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 15 deletions.
3 changes: 0 additions & 3 deletions config/config.h.in
Expand Up @@ -833,9 +833,6 @@
/* Define if you have PANGOCAIRO library */
#undef PANGOCAIRO_DELEGATE

/* Define if you have PANGO library */
#undef PANGO_DELEGATE

/* enable pipes (|) in filenames */
#undef PIPES_SUPPORT

Expand Down
15 changes: 3 additions & 12 deletions configure.ac
Expand Up @@ -2570,7 +2570,6 @@ if test "$with_pango" != 'yes'; then
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-pango=$with_pango "
fi

have_pango='no'
have_pangocairo='no'
PANGO_CFLAGS=""
PANGO_LIBS=""
Expand All @@ -2579,21 +2578,13 @@ if test "x$with_pango" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
PKG_CHECK_MODULES([PANGO],[pangocairo >= 1.28.1],[have_pangocairo=yes],[have_pangocairo=no])
AC_MSG_RESULT([])
PKG_CHECK_MODULES([PANGO],[pango >= 1.28.1],[have_pango=yes],[have_pango=no])
AC_MSG_RESULT([])
fi

if test "$have_pango" = 'yes'; then
AC_DEFINE([PANGO_DELEGATE],[1],[Define if you have PANGO library])
CFLAGS="$PANGO_CFLAGS $CFLAGS"
fi

if test "$have_pangocairo" = 'yes'; then
AC_DEFINE([PANGOCAIRO_DELEGATE],[1],[Define if you have PANGOCAIRO library])
CFLAGS="$PANGOCAIRO_CFLAGS $CFLAGS"
fi

AM_CONDITIONAL([PANGO_DELEGATE],[test "$have_pango" = 'yes'])
AM_CONDITIONAL([PANGOCAIRO_DELEGATE],[test "$have_pangocairo" = 'yes'])
AC_SUBST([PANGO_CFLAGS])
AC_SUBST([PANGO_LIBS])
Expand Down Expand Up @@ -3762,8 +3753,8 @@ fi
if test "$have_openexr" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES openexr"
fi
if test "$have_pango" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES pango"
if test "$have_pangocairo" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES pangocairo"
fi
if test "$have_png" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES png"
Expand Down Expand Up @@ -4037,7 +4028,7 @@ Delegate library configuration:
Magick++ --with-magick-plus-plus=$with_magick_plus_plus $have_magick_plus_plus
OpenEXR --with-openexr=$with_openexr $have_openexr
OpenJP2 --with-openjp2=$with_openjp2 $have_openjp2
PANGO --with-pango=$with_pango $have_pango
PANGO --with-pango=$with_pango $have_pangocairo
PERL --with-perl=$with_perl $have_perl
PNG --with-png=$with_png $have_png
RAQM --with-raqm=$with_raqm $have_raqm
Expand Down

0 comments on commit 8f7e7aa

Please sign in to comment.