(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index d168cce65a892f01697862d78c379d2a0f1b4fbd..276d3c62874f201c5e33f2d7186780056c53e4f0 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "7163"
+#define MagickSVNRevision  "7174"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0

diff --git a/config/configure.xml b/config/configure.xml
index 5c8b4293d5bbd5b0f85df0fc44f94669c486e7c2..70ae1c9dd90d9c42bdfedea2ee3509c6db5c93bc 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,7 +10,7 @@
   <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="7163" />
+  <configure name="SVN_REVISION" value="7174" />
   <configure name="RELEASE_DATE" value="2012-03-19"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/configure b/configure
index 1f11cedb49655038a8646c2d6e811f6acbd6121c..1c9778c83640ace04f37be7d3c69b688c4547ac8 100755 (executable)
--- a/configure
+++ b/configure
@@ -866,8 +866,6 @@ MODULE_EXTRA_CPPFLAGS
 LIBSTDCLDFLAGS
 PERL_MAKE_OPTIONS
 QUANTUM_DEPTH
-LEGACY_SUPPORT_FALSE
-LEGACY_SUPPORT_TRUE
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -1127,7 +1125,6 @@ enable_prof
 enable_gprof
 enable_gcov
 with_method_prefix
-enable_legacy_support
 with_quantum_depth
 with_cache
 with_frozenpaths
@@ -1860,7 +1857,6 @@ Optional Features:
   --enable-prof           enable 'prof' profiling support
   --enable-gprof          enable 'gprof' profiling support
   --enable-gcov           enable 'gcov' profiling support
-  --enable-legacy-support  install ImageMagick utility shortcuts (default disabled)
   --disable-assert        turn off assertions
 
 Optional Packages:
@@ -3620,7 +3616,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=7163
+MAGICK_SVN_REVISION=7174
 
 
 
@@ -21875,23 +21871,6 @@ _ACEOF
     DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-method-prefix "
 fi
 
-# Enable ImageMagick utilities legacy support (default no)
-# Check whether --enable-legacy-support was given.
-if test "${enable_legacy_support+set}" = set; then :
-  enableval=$enable_legacy_support; with_legacy_support=$enableval
-else
-  with_legacy_support='no'
-fi
-
- if test "$with_legacy_support" != 'no'; then
-  LEGACY_SUPPORT_TRUE=
-  LEGACY_SUPPORT_FALSE='#'
-else
-  LEGACY_SUPPORT_TRUE='#'
-  LEGACY_SUPPORT_FALSE=
-fi
-
-
 # Number of bits in a Quantum
 
 # Check whether --with-quantum-depth was given.
@@ -35938,10 +35917,6 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
   as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${LEGACY_SUPPORT_TRUE}" && test -z "${LEGACY_SUPPORT_FALSE}"; then
-  as_fn_error $? "conditional \"LEGACY_SUPPORT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.