From: cristy Date: Mon, 22 Aug 2011 17:32:32 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~7162 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9243a2d254cb71851c41d5c14f3c6f1e824c3ee4;p=imagemagick --- diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index 60334d7b9..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 */ @@ -1161,15 +1157,16 @@ /* Define if you have umem memory allocation library */ /* #undef HasUMEM */ +/* Define if you have wmflite library */ +/* #undef HasWMFlite */ + /* ImageMagick is formally installed under prefix */ #ifndef MAGICKCORE_INSTALLED_SUPPORT #define MAGICKCORE_INSTALLED_SUPPORT 1 #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 @@ -1198,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 @@ -1212,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 */ @@ -1263,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 @@ -1320,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 @@ -1459,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 */ @@ -1469,10 +1458,8 @@ /* Define if using the dmalloc debugging malloc package */ /* #undef WITH_DMALLOC */ -/* Define if you have WMF library */ -#ifndef MAGICKCORE_WMF_DELEGATE -#define MAGICKCORE_WMF_DELEGATE 1 -#endif +/* Define if you have wmf library */ +/* #undef WMF_DELEGATE */ /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ diff --git a/MagickCore/version.h b/MagickCore/version.h index 5ee8f2358..a90a00e3b 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2011 ImageMagick Studio LLC" -#define MagickSVNRevision "exported" +#define MagickSVNRevision "5035" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 5,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 5 #define MagickLibMinInterface 5 -#define MagickReleaseDate "2011-08-21" +#define MagickReleaseDate "2011-08-22" #define MagickChangeDate "20110801" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/Makefile.in b/Makefile.in index b2127d7b1..7fa729e37 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1585,7 +1585,8 @@ coders_webp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @WEBP_DELEGATE_TRUE@@WITH_MODULES_TRUE@am_coders_webp_la_rpath = \ @WEBP_DELEGATE_TRUE@@WITH_MODULES_TRUE@ -rpath $(codersdir) coders_wmf_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_coders_wmf_la_OBJECTS = coders/coders_wmf_la-wmf.lo coders_wmf_la_OBJECTS = $(am_coders_wmf_la_OBJECTS) coders_wmf_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -2553,6 +2554,7 @@ VERSION = @VERSION@ WEBP_LIBS = @WEBP_LIBS@ WMFDecodeDelegate = @WMFDecodeDelegate@ WMF_LIBS = @WMF_LIBS@ +WMF_LIBS_DEPS = @WMF_LIBS_DEPS@ WWWDecodeDelegate = @WWWDecodeDelegate@ WinPathScript = @WinPathScript@ X11_LIBS = @X11_LIBS@ diff --git a/config/config.h.in b/config/config.h.in index 91ca1ce9f..7e631619e 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -760,6 +760,9 @@ /* Define if you have umem memory allocation library */ #undef HasUMEM +/* Define if you have wmflite library */ +#undef HasWMFlite + /* ImageMagick is formally installed under prefix */ #undef INSTALLED_SUPPORT @@ -970,7 +973,7 @@ /* Define if using the dmalloc debugging malloc package */ #undef WITH_DMALLOC -/* Define if you have WMF library */ +/* Define if you have wmf library */ #undef WMF_DELEGATE /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most diff --git a/config/configure.xml b/config/configure.xml index 6468c1e8e..66ea3cb69 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,8 +10,8 @@ - - + + diff --git a/configure b/configure index 026a30384..9ab875bf3 100755 --- a/configure +++ b/configure @@ -733,6 +733,7 @@ XML_LIBS XML_DELEGATE_FALSE XML_DELEGATE_TRUE xml2_config +WMF_LIBS_DEPS WMF_LIBS WMF_DELEGATE_FALSE WMF_DELEGATE_TRUE @@ -3583,7 +3584,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=4982 +MAGICK_SVN_REVISION=5035 @@ -30830,30 +30831,34 @@ fi have_wmf='no' WMF_LIBS='' +WMF_LIBS_DEPS='' +OLIBS="$LIBS" if test "$with_wmf" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 $as_echo "-------------------------------------------------------------" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WMF" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WMF" >&5 $as_echo_n "checking for WMF... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 $as_echo "" >&6; } - failed=0 - passed=0 - ac_fn_c_check_header_mongrel "$LINENO" "libwmf/eps.h" "ac_cv_header_libwmf_eps_h" "$ac_includes_default" -if test "x$ac_cv_header_libwmf_eps_h" = xyes; then : - passed=`expr $passed + 1` -else - failed=`expr $failed + 1` + have_libwmf='no' + have_libwmflite='no' + have_libwmf_ipa_h='no' + ac_fn_c_check_header_compile "$LINENO" "libwmf/ipa.h" "ac_cv_header_libwmf_ipa_h" "$FT2BUILD_H +" +if test "x$ac_cv_header_libwmf_ipa_h" = xyes; then : + have_libwmf_ipa_h='yes' fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wmf_eps_function in -lwmf" >&5 -$as_echo_n "checking for wmf_eps_function in -lwmf... " >&6; } -if ${ac_cv_lib_wmf_wmf_eps_function+:} false; then : + if test "$have_libwmf_ipa_h" = 'yes'; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wmf_lite_create in -lwmflite" >&5 +$as_echo_n "checking for wmf_lite_create in -lwmflite... " >&6; } +if ${ac_cv_lib_wmflite_wmf_lite_create+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lwmf "-lwmflite" $LIBS" +LIBS="-lwmflite $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30863,53 +30868,111 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char wmf_eps_function (); +char wmf_lite_create (); int main () { -return wmf_eps_function (); +return wmf_lite_create (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_wmf_wmf_eps_function=yes + ac_cv_lib_wmflite_wmf_lite_create=yes else - ac_cv_lib_wmf_wmf_eps_function=no + ac_cv_lib_wmflite_wmf_lite_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_wmf_wmf_eps_function" >&5 -$as_echo "$ac_cv_lib_wmf_wmf_eps_function" >&6; } -if test "x$ac_cv_lib_wmf_wmf_eps_function" = xyes; then : - passed=`expr $passed + 1` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wmflite_wmf_lite_create" >&5 +$as_echo "$ac_cv_lib_wmflite_wmf_lite_create" >&6; } +if test "x$ac_cv_lib_wmflite_wmf_lite_create" = xyes; then : + have_libwmflite='yes' +fi + + if test "$have_libwmflite" = 'yes'; then + +$as_echo "#define HasWMFlite 1" >>confdefs.h + + WMF_LIBS='-lwmflite' + LIBS="$WMF_LIBS $LIBS" + have_wmf='yes' + else + WMF_LIBS_DEPS='' + WMF_CONFIG_LIBS=`libwmf-config --libs` + for lib in xml2 expat freetype jpeg png z + do + testlib="-l${lib}" + echo "$WMF_CONFIG_LIBS" | grep -- "$testlib" > /dev/null && WMF_LIBS_DEPS="$WMF_LIBS_DEPS $testlib" + done + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wmf_api_create in -lwmf" >&5 +$as_echo_n "checking for wmf_api_create in -lwmf... " >&6; } +if ${ac_cv_lib_wmf_wmf_api_create+:} false; then : + $as_echo_n "(cached) " >&6 else - failed=`expr $failed + 1` + ac_check_lib_save_LIBS=$LIBS +LIBS="-lwmf $WMF_LIBS_DEPS $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 wmf_api_create (); +int +main () +{ +return wmf_api_create (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_wmf_wmf_api_create=yes +else + ac_cv_lib_wmf_wmf_api_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_wmf_wmf_api_create" >&5 +$as_echo "$ac_cv_lib_wmf_wmf_api_create" >&6; } +if test "x$ac_cv_lib_wmf_wmf_api_create" = xyes; then : + have_libwmf='yes' fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if WMF package is complete" >&5 -$as_echo_n "checking if WMF 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_wmf='no (failed tests)' - else - WMF_LIBS='-lwmf -lwmflite' - LIBS="$WMF_LIBS $LIBS" + if test "$have_libwmf" = 'yes'; then $as_echo "#define WMF_DELEGATE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + WMF_LIBS='-lwmf' + LIBS="$WMF_LIBS $LIBS" + have_wmf='yes' + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 +$as_echo "no -- some components failed test" >&6; } + have_wmf='no (failed tests)' + have_wmflite='no (failed tests)' + LIBS="$OLIBS" + WMF_LIBS='' + fi + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if WMF package is complete" >&5 +$as_echo_n "checking if WMF package is complete... " >&6; } +if test "$have_wmf" = 'yes'; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - have_wmf='yes' - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - fi fi if test "$have_wmf" = 'yes'; then WMF_DELEGATE_TRUE= @@ -30924,6 +30987,7 @@ fi + # # Check for XML delegate library. # diff --git a/configure.ac b/configure.ac index 0b14a2ea9..b70ef37a9 100755 --- a/configure.ac +++ b/configure.ac @@ -2616,32 +2616,57 @@ fi have_wmf='no' WMF_LIBS='' +WMF_LIBS_DEPS='' +OLIBS="$LIBS" if test "$with_wmf" != 'no'; then - AC_MSG_RESULT([-------------------------------------------------------------]) - AC_MSG_CHECKING([for WMF]) - AC_MSG_RESULT([]) - failed=0 - passed=0 - AC_CHECK_HEADER(libwmf/eps.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) - AC_CHECK_LIB(wmf,wmf_eps_function,passed=`expr $passed + 1`,failed=`expr $failed + 1`,"-lwmflite") - AC_MSG_CHECKING([if WMF package is complete]) - if test $passed -gt 0; then - if test $failed -gt 0; then - AC_MSG_RESULT([no -- some components failed test]) - have_wmf='no (failed tests)' - else - WMF_LIBS='-lwmf -lwmflite' - LIBS="$WMF_LIBS $LIBS" - AC_DEFINE(WMF_DELEGATE,1,Define if you have WMF library) - AC_MSG_RESULT([yes]) - have_wmf='yes' - fi + AC_MSG_RESULT([-------------------------------------------------------------]) + AC_MSG_CHECKING([for WMF]) + AC_MSG_RESULT([]) + have_libwmf='no' + have_libwmflite='no' + have_libwmf_ipa_h='no' + AC_CHECK_HEADER([libwmf/ipa.h],[have_libwmf_ipa_h='yes'],[],[$FT2BUILD_H]) + if test "$have_libwmf_ipa_h" = 'yes'; then + + AC_CHECK_LIB(wmflite,wmf_lite_create,have_libwmflite='yes',,) + if test "$have_libwmflite" = 'yes'; then + AC_DEFINE(HasWMFlite,1,Define if you have wmflite library) + WMF_LIBS='-lwmflite' + LIBS="$WMF_LIBS $LIBS" + have_wmf='yes' else - AC_MSG_RESULT([no]) + WMF_LIBS_DEPS='' + WMF_CONFIG_LIBS=`libwmf-config --libs` + for lib in xml2 expat freetype jpeg png z + do + testlib="-l${lib}" + echo "$WMF_CONFIG_LIBS" | grep -- "$testlib" > /dev/null && WMF_LIBS_DEPS="$WMF_LIBS_DEPS $testlib" + done + AC_CHECK_LIB(wmf,wmf_api_create,have_libwmf='yes',,$WMF_LIBS_DEPS) + if test "$have_libwmf" = 'yes'; then + AC_DEFINE(WMF_DELEGATE,1,Define if you have wmf library) + WMF_LIBS='-lwmf' + LIBS="$WMF_LIBS $LIBS" + have_wmf='yes' + else + AC_MSG_RESULT(no -- some components failed test) + have_wmf='no (failed tests)' + have_wmflite='no (failed tests)' + LIBS="$OLIBS" + WMF_LIBS='' + fi fi + fi +fi +AC_MSG_CHECKING(if WMF package is complete) +if test "$have_wmf" = 'yes'; then + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) fi -AM_CONDITIONAL(WMF_DELEGATE,test "$have_wmf" = 'yes') +AM_CONDITIONAL(WMF_DELEGATE, test "$have_wmf" = 'yes') AC_SUBST(WMF_LIBS) +AC_SUBST(WMF_LIBS_DEPS) dnl ===========================================================================