From: cristy Date: Wed, 24 Aug 2011 18:35:43 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~7150 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8be61c2e65cd93190cdfc2a7b47383ce50dac6dd;p=imagemagick --- diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index 5f0b18e41..d0dd86310 100644 --- a/MagickCore/magick-config.h +++ b/MagickCore/magick-config.h @@ -12,9 +12,7 @@ /* #undef AUTOTRACE_DELEGATE */ /* Define if coders and filters are to be built as modules. */ -#ifndef MAGICKCORE_BUILD_MODULES -#define MAGICKCORE_BUILD_MODULES 1 -#endif +/* #undef BUILD_MODULES */ /* Define if you have the bzip2 library */ #ifndef MAGICKCORE_BZLIB_DELEGATE @@ -80,9 +78,7 @@ #endif /* Define if you have FFTW library */ -#ifndef MAGICKCORE_FFTW_DELEGATE -#define MAGICKCORE_FFTW_DELEGATE 1 -#endif +/* #undef FFTW_DELEGATE */ /* Location of filter modules */ #ifndef MAGICKCORE_FILTER_PATH @@ -436,15 +432,15 @@ #endif /* Define if you have the header file. */ -/* #undef HAVE_LCMS2_H */ +#ifndef MAGICKCORE_HAVE_LCMS2_H +#define MAGICKCORE_HAVE_LCMS2_H 1 +#endif /* Define if you have the header file. */ /* #undef HAVE_LCMS2_LCMS2_H */ /* Define if you have the header file. */ -#ifndef MAGICKCORE_HAVE_LCMS_H -#define MAGICKCORE_HAVE_LCMS_H 1 -#endif +/* #undef HAVE_LCMS_H */ /* Define if you have the header file. */ /* #undef HAVE_LCMS_LCMS_H */ @@ -1162,9 +1158,7 @@ /* #undef HasUMEM */ /* Define if you have wmflite library */ -#ifndef MAGICKCORE_HasWMFlite -#define MAGICKCORE_HasWMFlite 1 -#endif +/* #undef HasWMFlite */ /* ImageMagick is formally installed under prefix */ #ifndef MAGICKCORE_INSTALLED_SUPPORT @@ -1172,9 +1166,7 @@ #endif /* Define if you have JBIG library */ -#ifndef MAGICKCORE_JBIG_DELEGATE -#define MAGICKCORE_JBIG_DELEGATE 1 -#endif +/* #undef JBIG_DELEGATE */ /* Define if you have JPEG version 2 "Jasper" library */ #ifndef MAGICKCORE_JP2_DELEGATE @@ -1203,9 +1195,7 @@ #endif /* Define if you have LQR library */ -#ifndef MAGICKCORE_LQR_DELEGATE -#define MAGICKCORE_LQR_DELEGATE 1 -#endif +/* #undef LQR_DELEGATE */ /* Define if using libltdl to support dynamically loadable modules */ #ifndef MAGICKCORE_LTDL_DELEGATE @@ -1217,7 +1207,7 @@ /* Define to the system default library search path. */ #ifndef MAGICKCORE_LT_DLSEARCH_PATH -#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/xulrunner-2" +#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib/llvm:/usr/lib64/llvm:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2" #endif /* The archive extension */ @@ -1268,9 +1258,7 @@ /* #undef NO_MINUS_C_MINUS_O */ /* Define if you have OPENEXR library */ -#ifndef MAGICKCORE_OPENEXR_DELEGATE -#define MAGICKCORE_OPENEXR_DELEGATE 1 -#endif +/* #undef OPENEXR_DELEGATE */ /* Define to the address where bug reports for this package should be sent. */ #ifndef MAGICKCORE_PACKAGE_BUGREPORT @@ -1325,9 +1313,7 @@ #endif /* Define if you have RSVG library */ -#ifndef MAGICKCORE_RSVG_DELEGATE -#define MAGICKCORE_RSVG_DELEGATE 1 -#endif +/* #undef RSVG_DELEGATE */ /* Define to the type of arg 1 for `select'. */ #ifndef MAGICKCORE_SELECT_TYPE_ARG1 @@ -1464,9 +1450,7 @@ /* Define if you have WEBP library */ -#ifndef MAGICKCORE_WEBP_DELEGATE -#define MAGICKCORE_WEBP_DELEGATE 1 -#endif +/* #undef WEBP_DELEGATE */ /* Define to use the Windows GDI32 library */ /* #undef WINGDI32_DELEGATE */ diff --git a/MagickCore/version.h b/MagickCore/version.h index e893ff71d..2f1dcc47f 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -34,7 +34,7 @@ extern "C" { #define MagickLibAddendum "-0" #define MagickLibInterface 5 #define MagickLibMinInterface 5 -#define MagickReleaseDate "2011-08-23" +#define MagickReleaseDate "2011-08-24" #define MagickChangeDate "20110801" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/config/configure.xml b/config/configure.xml index 5d1e58fa7..38bb1160f 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,8 +10,8 @@ - - + + diff --git a/configure.ac b/configure.ac index 2fe9c1e19..26f422b1b 100755 --- a/configure.ac +++ b/configure.ac @@ -2415,8 +2415,7 @@ fi have_png='no' PNG_LIBS='' -if test "$with_png" != 'no' -then +if test "$with_png" != 'no'; then AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING(for PNG support ) AC_MSG_RESULT() @@ -2469,8 +2468,7 @@ return 0; fi fi - if test $passed -gt 0 -a $failed -le 0 - then + if test $passed -gt 0 -a $failed -le 0; then if test "1${var}" = '15' ; then AC_CHECK_LIB(png15,png_get_io_ptr,passed=`expr $passed + 1`, failed=`expr $failed + 1`,) @@ -2495,14 +2493,14 @@ return 0; AC_MSG_CHECKING(if ${pnglib} package is complete) if test $passed -gt 0 ; then if test $failed -gt 0 ; then - AC_MSG_RESULT(no -- some components failed test) - have_png='no (failed tests)' + AC_MSG_RESULT(no -- some components failed test) + have_png='no (failed tests)' else - PNG_LIBS="-l${pnglib}" - LIBS="$PNG_LIBS $LIBS" - AC_DEFINE(PNG_DELEGATE,1,Define if you have PNG library) - AC_MSG_RESULT(yes) - have_png='yes' + PNG_LIBS="-l${pnglib}" + LIBS="$PNG_LIBS $LIBS" + AC_DEFINE(PNG_DELEGATE,1,Define if you have PNG library) + AC_MSG_RESULT(yes) + have_png='yes' fi fi fi