From: cristy Date: Sun, 5 Oct 2014 19:26:36 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~1921 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a0697786caa9bd8cd7b7f133f5e10d2bc7ab5e0;p=imagemagick --- diff --git a/MagickCore/version.h b/MagickCore/version.h index dfb4f3a1e..22b7531fb 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2014 ImageMagick Studio LLC" -#define MagickSVNRevision "16591:16618M" +#define MagickSVNRevision "16629:16633M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 1,0,0 diff --git a/configure b/configure index ed87ab7fe..2e616018b 100755 --- a/configure +++ b/configure @@ -3698,7 +3698,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_SVN_REVISION=16591:16618M +MAGICK_SVN_REVISION=16629:16633M # Substitute library versioning @@ -32278,7 +32278,7 @@ fi # Debian installs libxml headers under /usr/include/libxml2/libxml with # the shared library installed under /usr/lib, whereas the package # installs itself under $prefix/libxml and $prefix/lib. - xml2_prefix=`xml2-config --prefix` + xml2_prefix=`${xml2_config} --prefix` if test -d "${xml2_prefix}/include/libxml2"; then CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2" fi diff --git a/configure.ac b/configure.ac index 7f4a8597f..cf3f98b57 100755 --- a/configure.ac +++ b/configure.ac @@ -2953,7 +2953,7 @@ if test "$with_xml" != 'no'; then # Debian installs libxml headers under /usr/include/libxml2/libxml with # the shared library installed under /usr/lib, whereas the package # installs itself under $prefix/libxml and $prefix/lib. - xml2_prefix=`xml2-config --prefix` + xml2_prefix=`${xml2_config} --prefix` if test -d "${xml2_prefix}/include/libxml2"; then CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2" fi