From c59f0e77d097dc12c17457d1ee199f366260e043 Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 27 Aug 2012 12:59:33 +0000 Subject: [PATCH] --- MagickCore/version.h | 4 ++-- config/ImageMagick.rdf | 4 ++-- config/configure.xml | 4 ++-- configure | 13 +++++++++---- configure.ac | 2 +- tests/common.shi | 2 ++ 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/MagickCore/version.h b/MagickCore/version.h index 59fbbd8cd..b1a91bb07 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC" -#define MagickSVNRevision "9067:9100M" +#define MagickSVNRevision "9117:9135M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 7,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 7 #define MagickLibMinInterface 7 -#define MagickReleaseDate "2012-08-24" +#define MagickReleaseDate "2012-08-27" #define MagickChangeDate "20120808" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf index ad08f3d85..8065c5fbe 100644 --- a/config/ImageMagick.rdf +++ b/config/ImageMagick.rdf @@ -5,7 +5,7 @@ ImageMagick ImageMagick: convert, edit, and compose images. - 2012-08-24 + 2012-08-27 ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves. @@ -57,7 +57,7 @@ Examples of ImageMagick Usage shows how to use ImageMagick from the command-line stable - 2012-08-24 + 2012-08-27 7.0.0 -0 diff --git a/config/configure.xml b/config/configure.xml index 17e9c07cf..723be7e6c 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,8 +10,8 @@ - - + + diff --git a/configure b/configure index 874b3a25e..0688a6ada 100755 --- a/configure +++ b/configure @@ -3666,7 +3666,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=9067:9100M +MAGICK_SVN_REVISION=9117:9135M @@ -33015,8 +33015,10 @@ $as_echo "no" >&6; } fi -# Extract the first word of ""$BrowseDelegateDefault" mozilla firefox netscape", so it can be a program name with args. -set dummy "$BrowseDelegateDefault" mozilla firefox netscape; ac_word=$2 +for ac_prog in "$BrowseDelegateDefault" google-chrome firefox konqueror mozilla lynx +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_BrowseDelegate+:} false; then : @@ -33042,7 +33044,6 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_BrowseDelegate" && ac_cv_path_BrowseDelegate=""$BrowseDelegateDefault"" ;; esac fi @@ -33056,6 +33057,10 @@ $as_echo "no" >&6; } fi + test -n "$BrowseDelegate" && break +done +test -n "$BrowseDelegate" || BrowseDelegate=""$BrowseDelegateDefault"" + # Extract the first word of ""$CGMDecodeDelegateDefault"", so it can be a program name with args. set dummy "$CGMDecodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 diff --git a/configure.ac b/configure.ac index 35f1b304a..2a8d175e5 100755 --- a/configure.ac +++ b/configure.ac @@ -3100,7 +3100,7 @@ ZipDelegateDefault='gzip' AC_PATH_PROG(AutotraceDecodeDelegate, "$AutotraceDecodeDelegateDefault", "$AutotraceDecodeDelegateDefault") AC_PATH_PROG(BlenderDecodeDelegate, "$BlenderDecodeDelegateDefault", "$BlenderDecodeDelegateDefault") AC_PATH_PROG(BZIPDelegate, "$BZIPDelegateDefault", "$BZIPDelegateDefault") -AC_PATH_PROG(BrowseDelegate, "$BrowseDelegateDefault" mozilla firefox netscape, "$BrowseDelegateDefault") +AC_PATH_PROGS(BrowseDelegate, "$BrowseDelegateDefault" google-chrome firefox konqueror mozilla lynx, "$BrowseDelegateDefault") AC_PATH_PROG(CGMDecodeDelegate, "$CGMDecodeDelegateDefault", "$CGMDecodeDelegateDefault") AC_PATH_PROG(CatDelegate, "$CatDelegateDefault", "$CatDelegateDefault") AC_PATH_PROG(DNGDecodeDelegate, "$DNGDecodeDelegateDefault", "$DNGDecodeDelegateDefault") diff --git a/tests/common.shi b/tests/common.shi index 64c66a183..620f6564e 100644 --- a/tests/common.shi +++ b/tests/common.shi @@ -12,6 +12,8 @@ IDENTIFY="/home/cristy/ImageMagick/ImageMagick/utilities/identify" MAGICK="/home/cristy/ImageMagick/ImageMagick/utilities/magick" MONTAGE="/home/cristy/ImageMagick/ImageMagick/utilities/montage" VALIDATE="/home/cristy/ImageMagick/ImageMagick/tests/validate" +DRAWTEST="/home/cristy/ImageMagick/ImageMagick/tests/drawtest" +WANDTEST="/home/cristy/ImageMagick/ImageMagick/tests/wandtest" REFERENCE_IMAGE="/home/cristy/ImageMagick/ImageMagick/images/rose.pnm" LD_LIBRARY_PATH="/home/cristy/ImageMagick/ImageMagick/magick/.libs:${LD_LIBRARY_PATH}" MAGICK_CODER_MODULE_PATH='/home/cristy/ImageMagick/ImageMagick/coders' -- 2.40.0