From c975144ebbe7690ac907828b6f0e02a58942789e Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 29 Sep 2010 21:34:35 +0000 Subject: [PATCH] --- Magick++/bin/Magick++-config | 4 +- PerlMagick/Makefile.PL | 8 ++-- config/configure.xml | 8 ++-- config/type-dejavu.xml | 84 ++++++++++++++++++------------------ config/type-ghostscript.xml | 68 ++++++++++++++--------------- config/type.xml | 2 +- libtool | 62 +++++++++++++------------- magick/Magick-config | 4 +- magick/magick-config.h | 54 ++++++++--------------- wand/Wand-config | 4 +- 10 files changed, 140 insertions(+), 158 deletions(-) diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config index 358177aa5..6ca2a2ee3 100755 --- a/Magick++/bin/Magick++-config +++ b/Magick++/bin/Magick++-config @@ -46,7 +46,7 @@ while test $# -gt 0; do echo "-I${includedir} -fopenmp" ;; --cxxflags) - echo '-g -O2 -pthread' + echo '-pthread' ;; --cppflags) echo '-I/usr/local/include/ImageMagick' @@ -55,7 +55,7 @@ while test $# -gt 0; do echo '-L/usr/local/lib ' ;; --libs) - echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lIlmImf -lz -lImath -lHalf -lIex -lIlmThread -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl" + echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl" ;; *) echo "${usage}" 1>&2 diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index af934ea3e..8178f18c2 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -125,7 +125,7 @@ EOF # Compute test specification my $delegate_tests='t/*.t'; my $delegate; -foreach $delegate (qw/bzlib djvu freetype gvc jpeg jng jp2 lcms openexr png tiff x11 xml wmf zlib/) { +foreach $delegate (qw/bzlib fontconfig freetype jpeg jng jp2 png tiff x11 xml zlib/) { if ( -d "t/$delegate" ) { if ( defined($ENV{'DISPLAY'}) && ($^O ne 'MSWin32') ) { if ( defined $ENV{'DISPLAY'} ) { @@ -138,9 +138,9 @@ foreach $delegate (qw/bzlib djvu freetype gvc jpeg jng jp2 lcms openexr png tiff } # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile -my $INC_magick = '-I../ -I.. -I/usr/include/graphviz -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"'; +my $INC_magick = '-I../ -I.. -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"'; my $LIBS_magick = '-L../magick/.libs -lMagickCore -lperl -lm'; -my $CCFLAGS_magick = "$Config{'ccflags'} -pthread -I/usr/include/OpenEXR -fopenmp -g -O2 -Wall -pthread"; +my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -g -O2 -Wall -pthread"; my $LDFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'ldflags'} "; my $LDDLFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'lddlflags'} "; @@ -183,7 +183,7 @@ WriteMakefile #'CC' => 'gcc -std=gnu99 -std=gnu99', # C pre-processor flags (e.g. -I & -D options) - # 'CPPFLAGS' => "$Config{'cppflags'} -I/usr/include/graphviz -I/usr/include/freetype2 -I/usr/include/libxml2", + # 'CPPFLAGS' => "$Config{'cppflags'} -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/freetype2 -I/usr/include/libxml2", # C compiler flags (e.g. -O -g) 'CCFLAGS' => $CCFLAGS_magick, diff --git a/config/configure.xml b/config/configure.xml index 9593f59fb..9ae5b28d9 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -15,18 +15,18 @@ - + - + - + - + diff --git a/config/type-dejavu.xml b/config/type-dejavu.xml index 0db1fc8e9..88c0d7224 100644 --- a/config/type-dejavu.xml +++ b/config/type-dejavu.xml @@ -17,46 +17,46 @@ ]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/type-ghostscript.xml b/config/type-ghostscript.xml index d8d554b97..0f5beb90f 100644 --- a/config/type-ghostscript.xml +++ b/config/type-ghostscript.xml @@ -17,38 +17,38 @@ ]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/type.xml b/config/type.xml index ccf5d65dc..96866bf8f 100644 --- a/config/type.xml +++ b/config/type.xml @@ -17,5 +17,5 @@ ]> - + diff --git a/libtool b/libtool index 8f754d088..bf8c1ec95 100755 --- a/libtool +++ b/libtool @@ -1,8 +1,8 @@ -#! /bin/bash +#! /bin/sh # libtool - Provide generalized library-building support services. # Generated automatically by config.status (ImageMagick) 6.6.4-8 -# Libtool was configured on host nicolas-laptop: +# Libtool was configured on host magick.imagemagick.org: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -95,7 +95,7 @@ NM="/usr/bin/nm -B" LN_S="ln -s" # What is the maximum length of a command? -max_cmd_len=1572864 +max_cmd_len=1966080 # Object file suffix (normally "o"). objext=o @@ -138,7 +138,7 @@ old_postuninstall_cmds="" LTCC="gcc -std=gnu99 -std=gnu99" # LTCC compiler flags. -LTCFLAGS="-pthread -I/usr/include/OpenEXR -fopenmp -g -O2 -Wall -pthread" +LTCFLAGS="-fopenmp -g -O2 -Wall -pthread" # Take the output of nm and produce a listing of raw symbols and C names. global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" @@ -156,7 +156,7 @@ global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\ objdir=.libs # Shell to use when invoking shell scripts. -SHELL="/bin/bash" +SHELL="/bin/sh" # An echo program that does not interpret backslashes. ECHO="echo" @@ -240,10 +240,10 @@ finish_eval="" hardcode_into_libs=yes # Compile-time system search path for libraries. -sys_lib_search_path_spec="/usr/lib/gcc/x86_64-linux-gnu/4.4.3 /usr/lib /lib /usr/lib/x86_64-linux-gnu" +sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.4.4 /usr/lib64 /lib64" # Run-time system search path for libraries. -sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib/mesa /usr/lib32/mesa /usr/lib/alsa-lib /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu " +sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /usr/lib64/mysql /usr/lib64/qt-3.3/lib /usr/lib/wine/ /usr/lib64/wine/ /usr/lib64/xulrunner-1.9.2 " # Whether dlopen is supported. dlopen_support=yes @@ -252,7 +252,7 @@ dlopen_support=yes dlopen_self=yes # Whether dlopen of statically linked programs is supported. -dlopen_self_static=no +dlopen_self_static=yes # Commands to strip libraries. old_striplib="strip --strip-debug" @@ -281,7 +281,7 @@ wl="-Wl," pic_flag=" -fPIC -DPIC" # Compiler flag to prevent dynamic linking. -link_static_flag="-static" +link_static_flag="" # Does compiler simultaneously support -c and -o options? compiler_c_o="yes" @@ -8915,31 +8915,31 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` # ### BEGIN LIBTOOL TAG CONFIG: CXX # The linker used to build libraries. -LD="/usr/bin/ld -m elf_x86_64" +LD="" # Commands used to build an old-style archive. old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib" # A language specific compiler. -CC="g++" +CC="" # Is the compiler the GNU compiler? -with_gcc=yes +with_gcc= # Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin" +no_builtin_flag="" # How to pass a linker flag through the compiler. -wl="-Wl," +wl="" # Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" +pic_flag="" # Compiler flag to prevent dynamic linking. -link_static_flag="-static" +link_static_flag="" # Does compiler simultaneously support -c and -o options? -compiler_c_o="yes" +compiler_c_o="" # Whether or not to add -lc for building shared libraries. build_libtool_need_lc=no @@ -8948,10 +8948,10 @@ build_libtool_need_lc=no allow_libtool_libs_with_static_runtimes=no # Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="\${wl}--export-dynamic" +export_dynamic_flag_spec="" # Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive" +whole_archive_flag_spec="" # Whether the compiler copes with passing no objects directly. compiler_needs_object="no" @@ -8963,8 +8963,8 @@ old_archive_from_new_cmds="" old_archive_from_expsyms_cmds="" # Commands used to build a shared archive. -archive_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib" -archive_expsym_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-retain-symbols-file \$wl\$export_symbols -o \$lib" +archive_cmds="" +archive_expsym_cmds="" # Commands used to build a loadable module if different from building # a shared archive. @@ -8972,7 +8972,7 @@ module_cmds="" module_expsym_cmds="" # Whether we are building with GNU ld or not. -with_gnu_ld="yes" +with_gnu_ld="" # Flag that allows shared libraries with undefined symbols to be built. allow_undefined_flag="" @@ -8982,7 +8982,7 @@ no_undefined_flag="" # Flag to hardcode $libdir into a binary during linking. # This must work even if $libdir does not exist -hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir" +hardcode_libdir_flag_spec="" # If ld is used when linking, flag to hardcode $libdir into a binary # during linking. This must work even if $libdir does not exist. @@ -9028,10 +9028,10 @@ fix_srcfile_path="" always_export_symbols=no # The commands to list exported symbols. -export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols" +export_symbols_cmds="" # Symbols that should not be listed in the preloaded symbols. -exclude_expsyms="_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*" +exclude_expsyms="" # Symbols that must always be exported. include_expsyms="" @@ -9043,20 +9043,20 @@ prelink_cmds="" file_list_spec="" # How to hardcode a shared library path into an executable. -hardcode_action=immediate +hardcode_action= # The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs="/usr/lib/gcc/x86_64-linux-gnu/4.4.3 /usr/lib/gcc/x86_64-linux-gnu/4.4.3 /usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../../../lib /lib/../lib /usr/lib/../lib /usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../.. /usr/lib/x86_64-linux-gnu" +compiler_lib_search_dirs="" # Dependencies to place before and after the objects being linked to # create a shared library. -predep_objects="/usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../../../lib/crti.o /usr/lib/gcc/x86_64-linux-gnu/4.4.3/crtbeginS.o" -postdep_objects="/usr/lib/gcc/x86_64-linux-gnu/4.4.3/crtendS.o /usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../../../lib/crtn.o" +predep_objects="" +postdep_objects="" predeps="" -postdeps="-lstdc++ -lm -lgomp -lgcc_s -lpthread -lc -lgcc_s" +postdeps="" # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path="-L/usr/lib/gcc/x86_64-linux-gnu/4.4.3 -L/usr/lib/gcc/x86_64-linux-gnu/4.4.3 -L/usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../.. -L/usr/lib/x86_64-linux-gnu" +compiler_lib_search_path="" # ### END LIBTOOL TAG CONFIG: CXX diff --git a/magick/Magick-config b/magick/Magick-config index 467f513f6..b64039c35 100755 --- a/magick/Magick-config +++ b/magick/Magick-config @@ -43,7 +43,7 @@ while test $# -gt 0; do echo "-I${includedir} -fopenmp" ;; --cxxflags) - echo '-g -O2 -pthread' + echo '-pthread' ;; --cppflags) echo '-I/usr/local/include/ImageMagick' @@ -52,7 +52,7 @@ while test $# -gt 0; do echo '-L/usr/local/lib ' ;; --libs) - echo "-L${libdir} -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lIlmImf -lz -lImath -lHalf -lIex -lIlmThread -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl" + echo "-L${libdir} -lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl" ;; *) echo "${usage}" 1>&2 diff --git a/magick/magick-config.h b/magick/magick-config.h index 9fe2d4c5b..8aa230006 100644 --- a/magick/magick-config.h +++ b/magick/magick-config.h @@ -20,7 +20,9 @@ #endif /* Define if you have CAIRO library */ -/* #undef CAIRO_DELEGATE */ +#ifndef MAGICKCORE_CAIRO_DELEGATE +#define MAGICKCORE_CAIRO_DELEGATE 1 +#endif /* permit enciphering and deciphering image pixels */ #ifndef MAGICKCORE_CIPHER_SUPPORT @@ -52,9 +54,7 @@ #endif /* Define if you have DJVU library */ -#ifndef MAGICKCORE_DJVU_DELEGATE -#define MAGICKCORE_DJVU_DELEGATE 1 -#endif +/* #undef DJVU_DELEGATE */ /* Directory where ImageMagick documents live. */ #ifndef MAGICKCORE_DOCUMENTATION_PATH @@ -89,7 +89,9 @@ #endif /* Define if you have FONTCONFIG library */ -/* #undef FONTCONFIG_DELEGATE */ +#ifndef MAGICKCORE_FONTCONFIG_DELEGATE +#define MAGICKCORE_FONTCONFIG_DELEGATE 1 +#endif /* Define if you have FlashPIX library */ /* #undef FPX_DELEGATE */ @@ -103,9 +105,7 @@ /* #undef GS_DELEGATE */ /* Define if you have GVC library */ -#ifndef MAGICKCORE_GVC_DELEGATE -#define MAGICKCORE_GVC_DELEGATE 1 -#endif +/* #undef GVC_DELEGATE */ /* Define to 1 if you have the `argz_add' function. */ #ifndef MAGICKCORE_HAVE_ARGZ_ADD @@ -161,9 +161,7 @@ #endif /* define if bool is a built-in type */ -#ifndef MAGICKCORE_HAVE_BOOL -#define MAGICKCORE_HAVE_BOOL /**/ -#endif +/* #undef HAVE_BOOL */ /* Define to 1 if you have the `cimag' function. */ #ifndef MAGICKCORE_HAVE_CIMAG @@ -394,9 +392,7 @@ /* #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 */ @@ -449,9 +445,7 @@ #endif /* define if the compiler implements L"widestring" */ -#ifndef MAGICKCORE_HAVE_LSTRING -#define MAGICKCORE_HAVE_LSTRING /**/ -#endif +/* #undef HAVE_LSTRING */ /* Define this if a modern libltdl is already installed */ #ifndef MAGICKCORE_HAVE_LTDL @@ -500,14 +494,10 @@ #endif /* define if the compiler implements namespaces */ -#ifndef MAGICKCORE_HAVE_NAMESPACES -#define MAGICKCORE_HAVE_NAMESPACES /**/ -#endif +/* #undef HAVE_NAMESPACES */ /* Define if g++ supports namespace std. */ -#ifndef MAGICKCORE_HAVE_NAMESPACE_STD -#define MAGICKCORE_HAVE_NAMESPACE_STD /**/ -#endif +/* #undef HAVE_NAMESPACE_STD */ /* Define to 1 if you have the `nanosleep' function. */ #ifndef MAGICKCORE_HAVE_NANOSLEEP @@ -708,9 +698,7 @@ #endif /* define if the compiler supports ISO C++ standard library */ -#ifndef MAGICKCORE_HAVE_STD_LIBS -#define MAGICKCORE_HAVE_STD_LIBS /**/ -#endif +/* #undef HAVE_STD_LIBS */ /* Define to 1 if you have the `strcasecmp' function. */ #ifndef MAGICKCORE_HAVE_STRCASECMP @@ -1071,9 +1059,7 @@ #endif /* Define if you have LCMS (v1.11 or later) library */ -#ifndef MAGICKCORE_LCMS_DELEGATE -#define MAGICKCORE_LCMS_DELEGATE 1 -#endif +/* #undef LCMS_DELEGATE */ /* Directory where architecture-dependent files live. */ #ifndef MAGICKCORE_LIBRARY_PATH @@ -1099,7 +1085,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/lib/mesa:/usr/lib32/mesa:/usr/lib/alsa-lib:/usr/local/lib:/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu" +#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-1.9.2" #endif /* The archive extension */ @@ -1140,9 +1126,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 @@ -1345,9 +1329,7 @@ /* #undef WITH_DMALLOC */ /* Define if you have WMF library */ -#ifndef MAGICKCORE_WMF_DELEGATE -#define MAGICKCORE_WMF_DELEGATE 1 -#endif +/* #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/wand/Wand-config b/wand/Wand-config index cf9b4cee8..dd7d2fa43 100755 --- a/wand/Wand-config +++ b/wand/Wand-config @@ -43,7 +43,7 @@ while test $# -gt 0; do echo "-I${includedir} -fopenmp" ;; --cxxflags) - echo '-g -O2 -pthread' + echo '-pthread' ;; --cppflags) echo '-I/usr/local/include/ImageMagick' @@ -52,7 +52,7 @@ while test $# -gt 0; do echo '-L/usr/local/lib ' ;; --libs) - echo "-L${libdir} -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lIlmImf -lz -lImath -lHalf -lIex -lIlmThread -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl" + echo "-L${libdir} -lMagickWand -lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl" ;; *) echo "${usage}" 1>&2 -- 2.40.0