(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index f1851fe16aa3b62f4b6b13af5f06c387d0e7ec33..08ca7930bbdf9398f9e664aad57f881a66f3bf59 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision  "5802"
+#define MagickSVNRevision  "5819"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2011-10-29"
+#define MagickReleaseDate  "2011-10-30"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/config/configure.xml b/config/configure.xml
index bfd33a75e417ba564e45da620378443424f44ed1..fca8b55be6c3856a3f08ef6548b83761dc2a685c 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,8 +10,8 @@
   <configure name="VERSION" value="7.0.0"/>
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
-  <configure name="SVN_REVISION" value="5802" />
-  <configure name="RELEASE_DATE" value="2011-10-29"/>
+  <configure name="SVN_REVISION" value="5819" />
+  <configure name="RELEASE_DATE" value="2011-10-30"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/configure b/configure
index 4b567aebc548419e24ad091630f259580e9e8384..c99582d4ec9634c680c216a58e9a117e2f75be80 100755 (executable)
--- a/configure
+++ b/configure
@@ -3603,7 +3603,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=5802
+MAGICK_SVN_REVISION=5819
 
 
 
@@ -30281,6 +30281,8 @@ PANGO_PKG=""
 if test "x$with_pango" = "xyes"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5
 $as_echo "-------------------------------------------------------------" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO support " >&5
+$as_echo_n "checking for PANGO support ... " >&6; }
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO" >&5
@@ -30290,12 +30292,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\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "pangoft2") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoft2 >= 1.15.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "pangoft2 >= 1.15.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" 2>/dev/null`
+  pkg_cv_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pangoft2 >= 1.15.1" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -30306,12 +30308,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\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "pangoft2") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoft2 >= 1.15.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "pangoft2 >= 1.15.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" 2>/dev/null`
+  pkg_cv_PANGO_LIBS=`$PKG_CONFIG --libs "pangoft2 >= 1.15.1" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -30329,9 +30331,9 @@ 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`
+               PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pangoft2 >= 1.15.1" 2>&1`
         else
-               PANGO_PKG_ERRORS=`$PKG_CONFIG --print-errors "pangoft2" 2>&1`
+               PANGO_PKG_ERRORS=`$PKG_CONFIG --print-errors "pangoft2 >= 1.15.1" 2>&1`
         fi
        # Put the nasty error message in config.log where it belongs
        echo "$PANGO_PKG_ERRORS" >&5
@@ -30359,12 +30361,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 \"pango\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "pango") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= 1.15.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "pango >= 1.15.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 "pango" 2>/dev/null`
+  pkg_cv_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.15.1" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -30375,12 +30377,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 \"pango\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "pango") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= 1.15.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "pango >= 1.15.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 "pango" 2>/dev/null`
+  pkg_cv_PANGO_LIBS=`$PKG_CONFIG --libs "pango >= 1.15.1" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -30398,9 +30400,9 @@ 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`
+               PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pango >= 1.15.1" 2>&1`
         else
-               PANGO_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango" 2>&1`
+               PANGO_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango >= 1.15.1" 2>&1`
         fi
        # Put the nasty error message in config.log where it belongs
        echo "$PANGO_PKG_ERRORS" >&5
@@ -30419,22 +30421,6 @@ $as_echo "yes" >&6; }
 fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
 $as_echo "" >&6; }
-    ac_fn_c_check_header_mongrel "$LINENO" "pango.h" "ac_cv_header_pango_h" "$ac_includes_default"
-if test "x$ac_cv_header_pango_h" = xyes; then :
-  passed=`expr $passed + 1`
-else
-  failed=`expr $failed + 1`
-fi
-
-
-    ac_fn_c_check_header_mongrel "$LINENO" "pango-features.h" "ac_cv_header_pango_features_h" "$ac_includes_default"
-if test "x$ac_cv_header_pango_features_h" = xyes; then :
-  passed=`expr $passed + 1`
-else
-  failed=`expr $failed + 1`
-fi
-
-
 fi
 
 if test "$have_pango" = 'yes'; then

diff --git a/configure.ac b/configure.ac
index 2cb8c05ad55951c2b179684a5adad50948fd1432..c53930866c244aca0ef0878ba195a24bf002a78f 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -2451,12 +2451,11 @@ PANGO_LIBS=""
 PANGO_PKG=""
 if test "x$with_pango" = "xyes"; then
     AC_MSG_RESULT([-------------------------------------------------------------])
-    PKG_CHECK_MODULES(PANGO, pangoft2, have_pangoft2=yes, have_pangoft2=no)
+    AC_MSG_CHECKING(for PANGO support )
+    PKG_CHECK_MODULES(PANGO, [pangoft2 >= 1.15.1], have_pangoft2=yes, have_pangoft2=no)
     AC_MSG_RESULT([])
-    PKG_CHECK_MODULES(PANGO, pango, have_pango=yes, have_pango=no)
+    PKG_CHECK_MODULES(PANGO, [pango >= 1.15.1], have_pango=yes, have_pango=no)
     AC_MSG_RESULT([])
-    AC_CHECK_HEADER(pango.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
-    AC_CHECK_HEADER(pango-features.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
 fi
 
 if test "$have_pango" = 'yes'; then