From d92eea29329bd44e5020eafeb5e6f34837836f64 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 16 Oct 2011 00:28:23 +0000 Subject: [PATCH] --- MagickCore/magick-config.h | 6 +++--- MagickCore/version.h | 2 +- config/configure.xml | 2 +- configure | 22 +++++++++++----------- configure.ac | 3 ++- libtool | 2 +- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index 36722eaa0..c964c40fd 100644 --- a/MagickCore/magick-config.h +++ b/MagickCore/magick-config.h @@ -1277,7 +1277,7 @@ /* Define to the full name and version of this package. */ #ifndef MAGICKCORE_PACKAGE_STRING -#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.0.0" +#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.0.0.0" #endif /* Define to the one symbol short name of this package. */ @@ -1292,7 +1292,7 @@ /* Define to the version of this package. */ #ifndef MAGICKCORE_PACKAGE_VERSION -#define MAGICKCORE_PACKAGE_VERSION "7.0.0" +#define MAGICKCORE_PACKAGE_VERSION "7.0.0.0" #endif /* Define if you have PNG library */ @@ -1461,7 +1461,7 @@ /* Version number of package */ #ifndef MAGICKCORE_VERSION -#define MAGICKCORE_VERSION "7.0.0" +#define MAGICKCORE_VERSION "7.0.0.0" #endif /* Define if you have WEBP library */ diff --git a/MagickCore/version.h b/MagickCore/version.h index 856a129ea..6e1d28104 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2011 ImageMagick Studio LLC" -#define MagickSVNRevision "5652" +#define MagickSVNRevision "5659" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 7,0,0 diff --git a/config/configure.xml b/config/configure.xml index bdb5b6058..11fc4d799 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,7 +10,7 @@ - + diff --git a/configure b/configure index b79cadc66..62112e3b6 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for ImageMagick 7.0.0. +# Generated by GNU Autoconf 2.68 for ImageMagick 7.0.0.0. # # Report bugs to . # @@ -574,8 +574,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ImageMagick' PACKAGE_TARNAME='ImageMagick' -PACKAGE_VERSION='7.0.0' -PACKAGE_STRING='ImageMagick 7.0.0' +PACKAGE_VERSION='7.0.0.0' +PACKAGE_STRING='ImageMagick 7.0.0.0' PACKAGE_BUGREPORT='http://www.imagemagick.org' PACKAGE_URL='' @@ -1716,7 +1716,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ImageMagick 7.0.0 to adapt to many kinds of systems. +\`configure' configures ImageMagick 7.0.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1791,7 +1791,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ImageMagick 7.0.0:";; + short | recursive ) echo "Configuration of ImageMagick 7.0.0.0:";; esac cat <<\_ACEOF @@ -2001,7 +2001,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ImageMagick configure 7.0.0 +ImageMagick configure 7.0.0.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -3044,7 +3044,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ImageMagick $as_me 7.0.0, which was +It was created by ImageMagick $as_me 7.0.0.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3583,7 +3583,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=5652 +MAGICK_SVN_REVISION=5659 @@ -4040,7 +4040,7 @@ fi # Define the identity of the package. PACKAGE='ImageMagick' - VERSION='7.0.0' + VERSION='7.0.0.0' cat >>confdefs.h <<_ACEOF @@ -35492,7 +35492,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ImageMagick $as_me 7.0.0, which was +This file was extended by ImageMagick $as_me 7.0.0.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -35558,7 +35558,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ImageMagick config.status 7.0.0 +ImageMagick config.status 7.0.0.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 99379b89e..c62776d39 100755 --- a/configure.ac +++ b/configure.ac @@ -19,8 +19,9 @@ AC_PREREQ(2.67) m4_define([magick_major_version], [7]) m4_define([magick_minor_version], [0]) m4_define([magick_micro_version], [0]) +m4_define([magick_patchlevel_version], [0]) m4_define([magick_version], - [magick_major_version.magick_minor_version.magick_micro_version]) + [magick_major_version.magick_minor_version.magick_micro_version.magick_patchlevel_version]) m4_define([magick_svn_revision], esyscmd([sh -c "svnversion | sed -r 's/([0-9]+).*/\1/'"])) AC_INIT([ImageMagick],[magick_version],[http://www.imagemagick.org],[ImageMagick]) diff --git a/libtool b/libtool index 75e50016e..6070fc305 100755 --- a/libtool +++ b/libtool @@ -1,7 +1,7 @@ #! /bin/sh # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (ImageMagick) 7.0.0 +# Generated automatically by config.status (ImageMagick) 7.0.0.0 # Libtool was configured on host magick.imagemagick.org: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # -- 2.40.0