From a054b769a9fdc31ca176817226fb4b6b5b3de242 Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 26 Mar 2012 23:16:00 +0000 Subject: [PATCH] --- MagickCore/magick-config.h | 6 ++--- PerlMagick/Makefile.PL | 4 ++-- config/config.h.in | 4 ++-- config/configure.xml | 4 ++-- configure | 48 +++++++++++++++++++------------------- configure.ac | 12 +++++----- 6 files changed, 39 insertions(+), 39 deletions(-) diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index 6c325993c..8bab66c8a 100644 --- a/MagickCore/magick-config.h +++ b/MagickCore/magick-config.h @@ -1320,9 +1320,9 @@ #define MAGICKCORE_PACKAGE_VERSION "7.0.0-0" #endif -/* Define if you have PANGOFT2 library */ -#ifndef MAGICKCORE_PANGOFT2_DELEGATE -#define MAGICKCORE_PANGOFT2_DELEGATE 1 +/* Define if you have PANGOCAIRO library */ +#ifndef MAGICKCORE_PANGOCAIRO_DELEGATE +#define MAGICKCORE_PANGOCAIRO_DELEGATE 1 #endif /* Define if you have PANGO library */ diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index 66aa18ae2..6540afd6a 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -156,7 +156,7 @@ foreach my $delegate (@tested_delegates) { } # 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 -pthread -I/usr/include/pango-1.0 -I/usr/include/freetype2 -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 $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/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 $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 @@ WriteMakefile #'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 -pthread -I/usr/include/pango-1.0 -I/usr/include/freetype2 -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", + # '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/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", # C compiler flags (e.g. -O -g) 'CCFLAGS' => $CCFLAGS_magick, diff --git a/config/config.h.in b/config/config.h.in index 8e56fca1e..0b7a78dcc 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -869,8 +869,8 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define if you have PANGOFT2 library */ -#undef PANGOFT2_DELEGATE +/* Define if you have PANGOCAIRO library */ +#undef PANGOCAIRO_DELEGATE /* Define if you have PANGO library */ #undef PANGO_DELEGATE diff --git a/config/configure.xml b/config/configure.xml index d26152947..248cedb45 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -12,7 +12,7 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/configure b/configure index 614808046..4bc0bf2c7 100755 --- a/configure +++ b/configure @@ -756,8 +756,8 @@ RSVG_CFLAGS PNG_LIBS PNG_DELEGATE_FALSE PNG_DELEGATE_TRUE -PANGOFT2_DELEGATE_FALSE -PANGOFT2_DELEGATE_TRUE +PANGOCAIRO_DELEGATE_FALSE +PANGOCAIRO_DELEGATE_TRUE PANGO_DELEGATE_FALSE PANGO_DELEGATE_TRUE PANGO_LIBS @@ -30894,7 +30894,7 @@ if test "$with_pango" != 'yes'; then fi have_pango='no' -have_pangoft2='no' +have_pangocairo='no' PANGO_CFLAGS="" PANGO_LIBS="" PANGO_PKG="" @@ -30910,12 +30910,12 @@ 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 >= 1.28.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "pangoft2 >= 1.28.1") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangocairo >= 1.28.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "pangocairo >= 1.28.1") 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 >= 1.28.1" 2>/dev/null` + pkg_cv_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pangocairo >= 1.28.1" 2>/dev/null` else pkg_failed=yes fi @@ -30926,12 +30926,12 @@ 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 >= 1.28.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "pangoft2 >= 1.28.1") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangocairo >= 1.28.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "pangocairo >= 1.28.1") 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 >= 1.28.1" 2>/dev/null` + pkg_cv_PANGO_LIBS=`$PKG_CONFIG --libs "pangocairo >= 1.28.1" 2>/dev/null` else pkg_failed=yes fi @@ -30949,24 +30949,24 @@ 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 >= 1.28.1" 2>&1` + PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pangocairo >= 1.28.1" 2>&1` else - PANGO_PKG_ERRORS=`$PKG_CONFIG --print-errors "pangoft2 >= 1.28.1" 2>&1` + PANGO_PKG_ERRORS=`$PKG_CONFIG --print-errors "pangocairo >= 1.28.1" 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 + have_pangocairo=no elif test $pkg_failed = untried; then - have_pangoft2=no + have_pangocairo=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 + have_pangocairo=yes fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 $as_echo "" >&6; } @@ -31050,12 +31050,12 @@ $as_echo "#define PANGO_DELEGATE 1" >>confdefs.h fi fi -if test "$have_pangoft2" = 'yes'; then +if test "$have_pangocairo" = 'yes'; then -$as_echo "#define PANGOFT2_DELEGATE 1" >>confdefs.h +$as_echo "#define PANGOCAIRO_DELEGATE 1" >>confdefs.h if test "$with_modules" = 'no'; then - CPPFLAGS="$PANGOFT2_CFLAGS $CPPFLAGS" + CPPFLAGS="$PANGOCAIRO_CFLAGS $CPPFLAGS" fi fi @@ -31067,12 +31067,12 @@ else PANGO_DELEGATE_FALSE= fi - if test "$have_pangoft2" = 'yes'; then - PANGOFT2_DELEGATE_TRUE= - PANGOFT2_DELEGATE_FALSE='#' + if test "$have_pangocairo" = 'yes'; then + PANGOCAIRO_DELEGATE_TRUE= + PANGOCAIRO_DELEGATE_FALSE='#' else - PANGOFT2_DELEGATE_TRUE='#' - PANGOFT2_DELEGATE_FALSE= + PANGOCAIRO_DELEGATE_TRUE='#' + PANGOCAIRO_DELEGATE_FALSE= fi @@ -36035,8 +36035,8 @@ 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. +if test -z "${PANGOCAIRO_DELEGATE_TRUE}" && test -z "${PANGOCAIRO_DELEGATE_FALSE}"; then + as_fn_error $? "conditional \"PANGOCAIRO_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 diff --git a/configure.ac b/configure.ac index f374d87d0..3b0baa13f 100755 --- a/configure.ac +++ b/configure.ac @@ -2458,13 +2458,13 @@ if test "$with_pango" != 'yes'; then fi have_pango='no' -have_pangoft2='no' +have_pangocairo='no' PANGO_CFLAGS="" PANGO_LIBS="" PANGO_PKG="" if test "x$with_pango" = "xyes"; then AC_MSG_RESULT([-------------------------------------------------------------]) - PKG_CHECK_MODULES(PANGO, [pangoft2 >= 1.28.1], have_pangoft2=yes, have_pangoft2=no) + 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([]) @@ -2477,15 +2477,15 @@ if test "$have_pango" = 'yes'; then fi fi -if test "$have_pangoft2" = 'yes'; then - AC_DEFINE(PANGOFT2_DELEGATE,1,Define if you have PANGOFT2 library) +if test "$have_pangocairo" = 'yes'; then + AC_DEFINE(PANGOCAIRO_DELEGATE,1,Define if you have PANGOCAIRO library) if test "$with_modules" = 'no'; then - CPPFLAGS="$PANGOFT2_CFLAGS $CPPFLAGS" + CPPFLAGS="$PANGOCAIRO_CFLAGS $CPPFLAGS" fi fi AM_CONDITIONAL(PANGO_DELEGATE, test "$have_pango" = 'yes') -AM_CONDITIONAL(PANGOFT2_DELEGATE, test "$have_pangoft2" = 'yes') +AM_CONDITIONAL(PANGOCAIRO_DELEGATE, test "$have_pangocairo" = 'yes') AC_SUBST(PANGO_CFLAGS) AC_SUBST(PANGO_LIBS) -- 2.40.0