From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 19 Dec 2012 15:45:28 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4554
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa161189a669037b40a963d1d9ea39cd4eaa4145;p=imagemagick

---

diff --git a/configure b/configure
index 35777eef8..9f62894f7 100755
--- a/configure
+++ b/configure
@@ -644,6 +644,7 @@ MAGICK_CXXFLAGS
 MAGICK_CFLAGS
 MAGICK_DEP_LIBS
 OSX_GCOV_LDFLAG
+MAGICK_FEATURES
 DELEGATES
 MAGICKCORE_PATH
 PERL_SUPPORTS_DESTDIR
@@ -3648,7 +3649,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=10255:10277M
+MAGICK_SVN_REVISION=10302:10324M
 
 
 
@@ -20691,6 +20692,7 @@ if test "$build_modules" != 'no' ; then
 
 $as_echo "#define BUILD_MODULES 1" >>confdefs.h
 
+    MAGICK_FEATURES="$MAGICK_FEATURES Modules"
 fi
  if test "$build_modules" != 'no'; then
   WITH_MODULES_TRUE=
@@ -27944,7 +27946,7 @@ if test "$have_autotrace" = 'yes'; then
 $as_echo "#define AUTOTRACE_DELEGATE 1" >>confdefs.h
 
     if test "$build_modules" = 'no'; then
-    CPPFLAGS="$AUTOTRACE_CFLAGS $CPPFLAGS"
+      CPPFLAGS="$AUTOTRACE_CFLAGS $CPPFLAGS"
     fi
 fi
 
@@ -34912,15 +34914,12 @@ if test "$have_zlib"   = 'yes' ; then
    DELEGATES="$DELEGATES zlib"
    MAGICK_FEATURES="$MAGICK_FEATURES ZLIB"
 fi
-if test "$build_modules" != 'no' || \
-   test "${native_win32_build}" = 'yes' ; then
-   MAGICK_FEATURES="$MAGICK_FEATURES MODULES"
-fi
 # Remove extraneous spaces from output variables (asthetic)
 DELEGATES=`echo $DELEGATES | sed -e 's/  */ /g'`
 MAGICK_FEATURES=`echo $MAGICK_FEATURES | sed -e 's/  */ /g'`
 
 
+
 #
 # Handle special compiler flags
 #
diff --git a/configure.ac b/configure.ac
index 0428f2f0c..abcf0466c 100755
--- a/configure.ac
+++ b/configure.ac
@@ -3829,6 +3829,7 @@ fi
 DELEGATES=`echo $DELEGATES | sed -e 's/  */ /g'`
 MAGICK_FEATURES=`echo $MAGICK_FEATURES | sed -e 's/  */ /g'`
 AC_SUBST(DELEGATES)
+AC_SUBST(MAGICK_FEATURES)
 
 #
 # Handle special compiler flags