From: cristy Date: Mon, 17 Dec 2012 20:41:10 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4570 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e78d25308d069ddb4184a21e18fd8a2202f7a7ae;p=imagemagick --- diff --git a/configure.ac b/configure.ac index 0aebea52c..0428f2f0c 100755 --- a/configure.ac +++ b/configure.ac @@ -540,6 +540,7 @@ if test "$with_modules" != 'no' ; then fi if test "$build_modules" != 'no' ; then AC_DEFINE(BUILD_MODULES,1,Define if coders and filters are to be built as modules.) + MAGICK_FEATURES="$MAGICK_FEATURES Modules" fi AM_CONDITIONAL(WITH_MODULES, test "$build_modules" != 'no') @@ -1641,7 +1642,7 @@ if test "$have_autotrace" = 'yes'; then failed=0 AC_DEFINE(AUTOTRACE_DELEGATE,1,Define if you have AUTOTRACE library) if test "$build_modules" = 'no'; then - CPPFLAGS="$AUTOTRACE_CFLAGS $CPPFLAGS" + CPPFLAGS="$AUTOTRACE_CFLAGS $CPPFLAGS" fi fi @@ -3824,10 +3825,6 @@ 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'`