From: cristy Date: Thu, 21 Aug 2014 18:50:43 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~2084 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=853d9904b754937baa65c9654f4bce50b0576b6b;p=imagemagick --- diff --git a/MagickCore/version.h b/MagickCore/version.h index 0d46f55f6..36ec8c717 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2014 ImageMagick Studio LLC" -#define MagickSVNRevision "16331" +#define MagickSVNRevision "16339:16340M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 1,0,0 @@ -48,7 +48,7 @@ extern "C" { #define MagickppLibAddendum "-0" #define MagickppLibInterface 1 #define MagickppLibMinInterface 1 -#define MagickReleaseDate "2014-08-16" +#define MagickReleaseDate "2014-08-21" #define MagickChangeDate "20120427" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickFeatures "DPC HDRI OpenMP" diff --git a/configure b/configure index 2dffa0ed0..7e3c9324e 100755 --- a/configure +++ b/configure @@ -831,15 +831,15 @@ FONTCONFIG_DELEGATE_FALSE FONTCONFIG_DELEGATE_TRUE FONTCONFIG_LIBS FONTCONFIG_CFLAGS +DJVU_LIBS +DJVU_DELEGATE_FALSE +DJVU_DELEGATE_TRUE FPX_LIBS FPX_DELEGATE_FALSE FPX_DELEGATE_TRUE FFTW_LIBS FFTW_DELEGATE_FALSE FFTW_DELEGATE_TRUE -DJVU_LIBS -DJVU_DELEGATE_FALSE -DJVU_DELEGATE_TRUE DPS_LIBS DPS_DELEGATE_FALSE DPS_DELEGATE_TRUE @@ -1169,10 +1169,10 @@ with_x with_zlib with_autotrace with_dps -with_djvu with_dejavu_font_dir with_fftw with_fpx +with_djvu with_fontconfig with_freetype with_gslib @@ -1940,11 +1940,11 @@ Optional Packages: --without-zlib disable ZLIB support --with-autotrace enable autotrace support --without-dps disable Display Postscript support - --without-djvu disable DjVu support --with-dejavu-font-dir=DIR DejaVu font directory --without-fftw disable FFTW support --without-fpx disable FlashPIX support + --without-djvu disable DjVu support --without-fontconfig disable fontconfig support --without-freetype disable Freetype support --with-gslib enable Ghostscript library support @@ -3698,7 +3698,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_SVN_REVISION=16331 +MAGICK_SVN_REVISION=16339:16340M # Substitute library versioning @@ -28713,116 +28713,6 @@ fi -# -# Check for DJVU delegate library. -# - -# Check whether --with-djvu was given. -if test "${with_djvu+set}" = set; then : - withval=$with_djvu; with_djvu=$withval -else - with_djvu='yes' -fi - - -if test "$with_djvu" != 'yes'; then - DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-djvu=$with_djvu " -fi - -have_djvu='no' -DJVU_LIBS='' -if test "$with_djvu" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 -$as_echo "-------------------------------------------------------------" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DJVU" >&5 -$as_echo_n "checking for DJVU... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } - failed=0 - passed=0 - ac_fn_c_check_header_mongrel "$LINENO" "libdjvu/ddjvuapi.h" "ac_cv_header_libdjvu_ddjvuapi_h" "$ac_includes_default" -if test "x$ac_cv_header_libdjvu_ddjvuapi_h" = xyes; then : - passed=`expr $passed + 1` -else - failed=`expr $failed + 1` -fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ddjvu_context_create in -ldjvulibre" >&5 -$as_echo_n "checking for ddjvu_context_create in -ldjvulibre... " >&6; } -if ${ac_cv_lib_djvulibre_ddjvu_context_create+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldjvulibre $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ddjvu_context_create (); -int -main () -{ -return ddjvu_context_create (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_djvulibre_ddjvu_context_create=yes -else - ac_cv_lib_djvulibre_ddjvu_context_create=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_djvulibre_ddjvu_context_create" >&5 -$as_echo "$ac_cv_lib_djvulibre_ddjvu_context_create" >&6; } -if test "x$ac_cv_lib_djvulibre_ddjvu_context_create" = xyes; then : - passed=`expr $passed + 1` -else - failed=`expr $failed + 1` -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if DJVU package is complete" >&5 -$as_echo_n "checking if DJVU package is complete... " >&6; } - if test $passed -gt 0; then - if test $failed -gt 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 -$as_echo "no -- some components failed test" >&6; } - have_djvu='no (failed tests)' - else - DJVU_LIBS='-ldjvulibre' - LIBS="$DJVU_LIBS $LIBS" - -$as_echo "#define DJVU_DELEGATE 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - have_djvu='yes' - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi -fi - if test "$have_djvu" = 'yes'; then - DJVU_DELEGATE_TRUE= - DJVU_DELEGATE_FALSE='#' -else - DJVU_DELEGATE_TRUE='#' - DJVU_DELEGATE_FALSE= -fi - - - - # # Set DejaVu font directory. # @@ -28968,8 +28858,6 @@ fi have_fpx='no' FPX_LIBS='' -SAVED_LIBS=${LIBS} -LIBS=${LIBS/-ldjvulibre/} if test "$with_fpx" != 'no'; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 $as_echo "-------------------------------------------------------------" >&6; } @@ -29073,7 +28961,116 @@ else fi -LIBS=${SAVED_LIBS} + + +# +# Check for DJVU delegate library. +# + +# Check whether --with-djvu was given. +if test "${with_djvu+set}" = set; then : + withval=$with_djvu; with_djvu=$withval +else + with_djvu='yes' +fi + + +if test "$with_djvu" != 'yes'; then + DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-djvu=$with_djvu " +fi + +have_djvu='no' +DJVU_LIBS='' +if test "$with_djvu" != 'no'; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 +$as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DJVU" >&5 +$as_echo_n "checking for DJVU... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + failed=0 + passed=0 + ac_fn_c_check_header_mongrel "$LINENO" "libdjvu/ddjvuapi.h" "ac_cv_header_libdjvu_ddjvuapi_h" "$ac_includes_default" +if test "x$ac_cv_header_libdjvu_ddjvuapi_h" = xyes; then : + passed=`expr $passed + 1` +else + failed=`expr $failed + 1` +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ddjvu_context_create in -ldjvulibre" >&5 +$as_echo_n "checking for ddjvu_context_create in -ldjvulibre... " >&6; } +if ${ac_cv_lib_djvulibre_ddjvu_context_create+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldjvulibre $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ddjvu_context_create (); +int +main () +{ +return ddjvu_context_create (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_djvulibre_ddjvu_context_create=yes +else + ac_cv_lib_djvulibre_ddjvu_context_create=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_djvulibre_ddjvu_context_create" >&5 +$as_echo "$ac_cv_lib_djvulibre_ddjvu_context_create" >&6; } +if test "x$ac_cv_lib_djvulibre_ddjvu_context_create" = xyes; then : + passed=`expr $passed + 1` +else + failed=`expr $failed + 1` +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if DJVU package is complete" >&5 +$as_echo_n "checking if DJVU package is complete... " >&6; } + if test $passed -gt 0; then + if test $failed -gt 0; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 +$as_echo "no -- some components failed test" >&6; } + have_djvu='no (failed tests)' + else + DJVU_LIBS='-ldjvulibre' + LIBS="$DJVU_LIBS $LIBS" + +$as_echo "#define DJVU_DELEGATE 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_djvu='yes' + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi +fi + if test "$have_djvu" = 'yes'; then + DJVU_DELEGATE_TRUE= + DJVU_DELEGATE_FALSE='#' +else + DJVU_DELEGATE_TRUE='#' + DJVU_DELEGATE_FALSE= +fi + + # @@ -36207,10 +36204,6 @@ if test -z "${DPS_DELEGATE_TRUE}" && test -z "${DPS_DELEGATE_FALSE}"; then as_fn_error $? "conditional \"DPS_DELEGATE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${DJVU_DELEGATE_TRUE}" && test -z "${DJVU_DELEGATE_FALSE}"; then - as_fn_error $? "conditional \"DJVU_DELEGATE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${FFTW_DELEGATE_TRUE}" && test -z "${FFTW_DELEGATE_FALSE}"; then as_fn_error $? "conditional \"FFTW_DELEGATE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -36219,6 +36212,10 @@ if test -z "${FPX_DELEGATE_TRUE}" && test -z "${FPX_DELEGATE_FALSE}"; then as_fn_error $? "conditional \"FPX_DELEGATE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${DJVU_DELEGATE_TRUE}" && test -z "${DJVU_DELEGATE_FALSE}"; then + as_fn_error $? "conditional \"DJVU_DELEGATE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${FONTCONFIG_DELEGATE_TRUE}" && test -z "${FONTCONFIG_DELEGATE_FALSE}"; then as_fn_error $? "conditional \"FONTCONFIG_DELEGATE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/configure.ac b/configure.ac index ede967412..60573bbd7 100755 --- a/configure.ac +++ b/configure.ac @@ -1806,50 +1806,6 @@ AC_SUBST(DPS_LIBS) dnl =========================================================================== -# -# Check for DJVU delegate library. -# -AC_ARG_WITH([djvu], - [AC_HELP_STRING([--without-djvu], - [disable DjVu support])], - [with_djvu=$withval], - [with_djvu='yes']) - -if test "$with_djvu" != 'yes'; then - DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-djvu=$with_djvu " -fi - -have_djvu='no' -DJVU_LIBS='' -if test "$with_djvu" != 'no'; then - AC_MSG_RESULT([-------------------------------------------------------------]) - AC_MSG_CHECKING([for DJVU]) - AC_MSG_RESULT([]) - failed=0 - passed=0 - AC_CHECK_HEADER(libdjvu/ddjvuapi.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) - AC_CHECK_LIB(djvulibre,ddjvu_context_create,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) - AC_MSG_CHECKING([if DJVU package is complete]) - if test $passed -gt 0; then - if test $failed -gt 0; then - AC_MSG_RESULT([no -- some components failed test]) - have_djvu='no (failed tests)' - else - DJVU_LIBS='-ldjvulibre' - LIBS="$DJVU_LIBS $LIBS" - AC_DEFINE(DJVU_DELEGATE,1,Define if you have DJVU library) - AC_MSG_RESULT([yes]) - have_djvu='yes' - fi - else - AC_MSG_RESULT([no]) - fi -fi -AM_CONDITIONAL(DJVU_DELEGATE, test "$have_djvu" = 'yes') -AC_SUBST(DJVU_LIBS) - -dnl =========================================================================== - # # Set DejaVu font directory. # @@ -1924,8 +1880,6 @@ fi have_fpx='no' FPX_LIBS='' -SAVED_LIBS=${LIBS} -LIBS=${LIBS/-ldjvulibre/} if test "$with_fpx" != 'no'; then AC_MSG_RESULT([-------------------------------------------------------------]) AC_MSG_CHECKING([for FlashPIX]) @@ -1954,7 +1908,50 @@ if test "$with_fpx" != 'no'; then fi AM_CONDITIONAL(FPX_DELEGATE, test "$have_fpx" = 'yes') AC_SUBST(FPX_LIBS) -LIBS=${SAVED_LIBS} + +dnl =========================================================================== + +# +# Check for DJVU delegate library. +# +AC_ARG_WITH([djvu], + [AC_HELP_STRING([--without-djvu], + [disable DjVu support])], + [with_djvu=$withval], + [with_djvu='yes']) + +if test "$with_djvu" != 'yes'; then + DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-djvu=$with_djvu " +fi + +have_djvu='no' +DJVU_LIBS='' +if test "$with_djvu" != 'no'; then + AC_MSG_RESULT([-------------------------------------------------------------]) + AC_MSG_CHECKING([for DJVU]) + AC_MSG_RESULT([]) + failed=0 + passed=0 + AC_CHECK_HEADER(libdjvu/ddjvuapi.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) + AC_CHECK_LIB(djvulibre,ddjvu_context_create,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) + AC_MSG_CHECKING([if DJVU package is complete]) + if test $passed -gt 0; then + if test $failed -gt 0; then + AC_MSG_RESULT([no -- some components failed test]) + have_djvu='no (failed tests)' + else + DJVU_LIBS='-ldjvulibre' + LIBS="$DJVU_LIBS $LIBS" + AC_DEFINE(DJVU_DELEGATE,1,Define if you have DJVU library) + AC_MSG_RESULT([yes]) + have_djvu='yes' + fi + else + AC_MSG_RESULT([no]) + fi +fi +AM_CONDITIONAL(DJVU_DELEGATE, test "$have_djvu" = 'yes') +AC_SUBST(DJVU_LIBS) dnl ===========================================================================