From: cristy Date: Thu, 21 Jan 2010 20:44:04 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~10088 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=430a731007e0a4f30a5193abd43dfbb586669b2e;p=imagemagick --- diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config index 840c0d1d8..9db032e72 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 -Wall -W -pthread' + echo '-g -O2 -Wall -W -ansi -pedantic -pthread' ;; --cppflags) echo '-I/usr/local/include/ImageMagick' diff --git a/Makefile.in b/Makefile.in index 861404bba..2a3f4b1e7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -242,6 +242,7 @@ DIST_COMMON = $(am__configure_deps) $(am__include_HEADERS_DIST) \ $(top_srcdir)/config/config.h.in \ $(top_srcdir)/config/configure.xml.in \ $(top_srcdir)/config/delegates.xml.in \ + $(top_srcdir)/config/type-dejavu.xml.in \ $(top_srcdir)/config/type-ghostscript.xml.in \ $(top_srcdir)/config/type-windows.xml.in \ $(top_srcdir)/config/type.xml.in $(top_srcdir)/configure \ @@ -301,13 +302,13 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config/config.h CONFIG_CLEAN_FILES = config/configure.xml config/delegates.xml \ config/ImageMagick.rdf config/MagickCore.dox \ - config/MagickWand.dox config/type-ghostscript.xml \ - config/type-windows.xml config/type.xml ImageMagick.spec \ - Magick++/bin/Magick++-config magick/ImageMagick.pc \ - Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc \ - magick/Magick-config magick/MagickCore-config \ - magick/MagickCore.pc magick/version.h magick.sh \ - PerlMagick/Magick.pm PerlMagick/Makefile.PL \ + config/MagickWand.dox config/type-dejavu.xml \ + config/type-ghostscript.xml config/type-windows.xml \ + config/type.xml ImageMagick.spec Magick++/bin/Magick++-config \ + magick/ImageMagick.pc Magick++/lib/ImageMagick++.pc \ + Magick++/lib/Magick++.pc magick/Magick-config \ + magick/MagickCore-config magick/MagickCore.pc magick/version.h \ + magick.sh PerlMagick/Magick.pm PerlMagick/Makefile.PL \ PerlMagick/check.sh utilities/animate.1 utilities/compare.1 \ utilities/composite.1 utilities/conjure.1 utilities/convert.1 \ utilities/display.1 utilities/identify.1 \ @@ -2473,6 +2474,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ +dejavu_font_dir = @dejavu_font_dir@ # Architecture independent data files installed in the package's data directory docdir = $(SHARE_PATH) @@ -2664,6 +2666,7 @@ configlib_DATA = \ config/locale.xml \ config/policy.xml \ config/type.xml \ + config/type-dejavu.xml \ config/type-ghostscript.xml \ config/type-windows.xml @@ -2683,6 +2686,7 @@ CONFIG_EXTRA_DIST = \ config/policy.xml \ config/sRGB.icm \ config/thresholds.xml \ + config/type-dejavu.xml.in \ config/type-ghostscript.xml.in \ config/type-windows.xml.in \ config/type.xml.in @@ -4649,6 +4653,8 @@ config/MagickCore.dox: $(top_builddir)/config.status $(top_srcdir)/config/Magick cd $(top_builddir) && $(SHELL) ./config.status $@ config/MagickWand.dox: $(top_builddir)/config.status $(top_srcdir)/config/MagickWand.dox.in cd $(top_builddir) && $(SHELL) ./config.status $@ +config/type-dejavu.xml: $(top_builddir)/config.status $(top_srcdir)/config/type-dejavu.xml.in + cd $(top_builddir) && $(SHELL) ./config.status $@ config/type-ghostscript.xml: $(top_builddir)/config.status $(top_srcdir)/config/type-ghostscript.xml.in cd $(top_builddir) && $(SHELL) ./config.status $@ config/type-windows.xml: $(top_builddir)/config.status $(top_srcdir)/config/type-windows.xml.in diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index 1a5cc571f..42c15d988 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -140,7 +140,7 @@ foreach $delegate (qw/bzlib djvu fftw fontconfig freetype jpeg jng jp2 lcms mpeg # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile my $INC_magick = '-I../ -I.. -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -pthread -I/usr/include/librsvg-2 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/gtk-2.0 -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'} -fopenmp -g -O2 -Wall -W -pthread"; +my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -g -O2 -Wall -W -ansi -pedantic -pthread"; my $LDFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'ldflags'} "; my $LDDLFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'lddlflags'} "; diff --git a/config/Makefile.am b/config/Makefile.am index b93dfeb02..bc88eabd0 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -37,6 +37,7 @@ configlib_DATA = \ config/locale.xml \ config/policy.xml \ config/type.xml \ + config/type-dejavu.xml \ config/type-ghostscript.xml \ config/type-windows.xml @@ -56,6 +57,7 @@ CONFIG_EXTRA_DIST = \ config/policy.xml \ config/sRGB.icm \ config/thresholds.xml \ + config/type-dejavu.xml.in \ config/type-ghostscript.xml.in \ config/type-windows.xml.in \ config/type.xml.in diff --git a/config/configure.xml b/config/configure.xml index 719666f78..dbeaca0f3 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,19 +10,19 @@ - + - + - + diff --git a/config/type-dejavu.xml b/config/type-dejavu.xml new file mode 100644 index 000000000..88c0d7224 --- /dev/null +++ b/config/type-dejavu.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/type-dejavu.xml.in b/config/type-dejavu.xml.in new file mode 100644 index 000000000..8d81a765d --- /dev/null +++ b/config/type-dejavu.xml.in @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/configure b/configure index 273c6ff6b..4089342a2 100755 --- a/configure +++ b/configure @@ -804,6 +804,7 @@ ShowImageDelegate type_include_files ghostscript_font_dir windows_font_dir +dejavu_font_dir PrintDelegate ZipDelegate XPSDelegate @@ -1228,6 +1229,7 @@ with_zlib with_autotrace with_dps with_djvu +with_dejavu_font_dir with_fftw with_fpx with_fontconfig @@ -1972,6 +1974,8 @@ Optional Packages: --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-fontconfig disable fontconfig support @@ -3333,7 +3337,7 @@ ac_config_headers="$ac_config_headers config/config.h" ac_config_commands="$ac_config_commands magick/magick-config.h" -ac_config_files="$ac_config_files config/configure.xml config/delegates.xml config/ImageMagick.rdf config/MagickCore.dox config/MagickWand.dox config/type-ghostscript.xml config/type-windows.xml config/type.xml ImageMagick.spec Magick++/bin/Magick++-config magick/ImageMagick.pc Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc magick/Magick-config magick/MagickCore-config magick/MagickCore.pc magick/version.h Makefile magick.sh PerlMagick/Magick.pm PerlMagick/Makefile.PL PerlMagick/check.sh utilities/animate.1 utilities/compare.1 utilities/composite.1 utilities/conjure.1 utilities/convert.1 utilities/display.1 utilities/identify.1 utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 utilities/montage.1 utilities/stream.1 wand/MagickWand-config wand/MagickWand.pc wand/Wand-config wand/Wand.pc" +ac_config_files="$ac_config_files config/configure.xml config/delegates.xml config/ImageMagick.rdf config/MagickCore.dox config/MagickWand.dox config/type-dejavu.xml config/type-ghostscript.xml config/type-windows.xml config/type.xml ImageMagick.spec Magick++/bin/Magick++-config magick/ImageMagick.pc Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc magick/Magick-config magick/MagickCore-config magick/MagickCore.pc magick/version.h Makefile magick.sh PerlMagick/Magick.pm PerlMagick/Makefile.PL PerlMagick/check.sh utilities/animate.1 utilities/compare.1 utilities/composite.1 utilities/conjure.1 utilities/convert.1 utilities/display.1 utilities/identify.1 utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 utilities/montage.1 utilities/stream.1 wand/MagickWand-config wand/MagickWand.pc wand/Wand-config wand/Wand.pc" # @@ -6451,7 +6455,7 @@ fi then if test "$GXX" = "yes" then - ac_compile_warnings_opt='-Wall -W' + ac_compile_warnings_opt='-Wall -W -ansi -pedantic' fi CXXFLAGS="$CXXFLAGS $ac_compile_warnings_opt" ac_compile_warnings_msg="$ac_compile_warnings_opt for C++" @@ -6461,7 +6465,7 @@ fi then if test "$GCC" = "yes" then - ac_compile_warnings_opt='-Wall -W' + ac_compile_warnings_opt='-Wall -W -ansi -pedantic' fi CFLAGS="$CFLAGS $ac_compile_warnings_opt" ac_compile_warnings_msg="$ac_compile_warnings_msg $ac_compile_warnings_opt for C" @@ -8193,13 +8197,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:8196: $ac_compile\"" >&5) + (eval echo "\"\$as_me:8200: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:8199: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:8203: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:8202: output\"" >&5) + (eval echo "\"\$as_me:8206: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -9390,7 +9394,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 9393 "configure"' > conftest.$ac_ext + echo '#line 9397 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -11475,11 +11479,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11478: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11482: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11482: \$? = $ac_status" >&5 + echo "$as_me:11486: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11814,11 +11818,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11817: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11821: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11821: \$? = $ac_status" >&5 + echo "$as_me:11825: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11919,11 +11923,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11922: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11926: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11926: \$? = $ac_status" >&5 + echo "$as_me:11930: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11974,11 +11978,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11977: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11981: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11981: \$? = $ac_status" >&5 + echo "$as_me:11985: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14344,7 +14348,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 14347 "configure" +#line 14351 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14440,7 +14444,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 14443 "configure" +#line 14447 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16396,11 +16400,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16399: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16403: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16403: \$? = $ac_status" >&5 + echo "$as_me:16407: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16495,11 +16499,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16498: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16502: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16502: \$? = $ac_status" >&5 + echo "$as_me:16506: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16547,11 +16551,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16550: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16554: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16554: \$? = $ac_status" >&5 + echo "$as_me:16558: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17959,7 +17963,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 17962 "configure" +#line 17966 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -25212,6 +25216,23 @@ fi +# +# Set DejaVu font directory. +# + +# Check whether --with-dejavu-font-dir was given. +if test "${with_dejavu_font_dir+set}" = set; then : + withval=$with_dejavu_font_dir; with_dejavu_font_dir=$withval +else + with_dejavu_font_dir='default' +fi + + +if test "$with_dejavu_font_dir" != 'default'; then + DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-dejavu-font-dir=$with_dejavu_font_dir " +fi + + # # Check for FFTW delegate library. # @@ -29830,12 +29851,36 @@ have_xps='no' ; if test "$XPSDelegate" != "$XPSDelegateDefault"; then hav # type_include_files='' +# Dejavu fonts. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Dejavu fonts directory" >&5 +$as_echo_n "checking for Dejavu fonts directory... " >&6; } +dejavu_font_dir='' +if test "${with_dejavu_font_dir}" != 'default'; then + dejavu_font_dir="${with_dejavu_font_dir}/" +else + for font_dir in "${prefix}/share/dejavu/fonts/" '/usr/share/fonts/dejavu/'; do + if test -f "${font_dir}DejaVuSerif.ttf"; then + dejavu_font_dir="${font_dir}" + break 1 + fi + done +fi +if test "${dejavu_font_dir}x" != 'x'; then + type_include_files="${type_include_files} "'' + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dejavu_font_dir" >&5 +$as_echo "$dejavu_font_dir" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found!" >&5 +$as_echo "not found!" >&6; }; +fi + + # Windows windows_font_dir='' if test "$with_windows_font_dir" != "no" && test -n "$with_windows_font_dir"; then windows_font_dir="${with_windows_font_dir}/" fi -if test -n "$windows_font_dir"; then +if test "${windows_font_dir}x" != 'x'; then if test -f '/usr/X11R6/lib/X11/fonts/truetype/arial.ttf'; then windows_font_dir='/usr/X11R6/lib/X11/fonts/truetype/' fi @@ -29846,7 +29891,7 @@ if test -n "$windows_font_dir"; then windows_font_dir='/usr/share/fonts/msttcore/truetype/' fi fi -if test -n "$windows_font_dir"; then +if test "${windows_font_dir}x" != 'x'; then type_include_files="$type_include_files "'' fi @@ -32193,6 +32238,7 @@ do "config/ImageMagick.rdf") CONFIG_FILES="$CONFIG_FILES config/ImageMagick.rdf" ;; "config/MagickCore.dox") CONFIG_FILES="$CONFIG_FILES config/MagickCore.dox" ;; "config/MagickWand.dox") CONFIG_FILES="$CONFIG_FILES config/MagickWand.dox" ;; + "config/type-dejavu.xml") CONFIG_FILES="$CONFIG_FILES config/type-dejavu.xml" ;; "config/type-ghostscript.xml") CONFIG_FILES="$CONFIG_FILES config/type-ghostscript.xml" ;; "config/type-windows.xml") CONFIG_FILES="$CONFIG_FILES config/type-windows.xml" ;; "config/type.xml") CONFIG_FILES="$CONFIG_FILES config/type.xml" ;; @@ -33859,6 +33905,11 @@ fi rm -f magick-version +result_dejavu_font_dir='none' +if test "${dejavu_font_dir}x" != 'x'; then + result_dejavu_font_dir=$dejavu_font_dir +fi + result_ghostscript_font_dir='none' if test "${ghostscript_font_dir}x" != 'x'; then result_ghostscript_font_dir=$ghostscript_font_dir @@ -33889,6 +33940,7 @@ High Dynamic Range Imagery Delegate Configuration: BZLIB --with-bzlib=$with_bzlib $have_bzlib Autotrace --with-autotrace=$with_autotrace $have_autotrace +Dejavu fonts --with-dejavu-font-dir=$with_dejavu_font_dir $result_dejavu_font_dir DJVU --with-djvu=$with_djvu $have_djvu DPS --with-dps=$with_dps $have_dps FFTW --with-fftw=$with_fftw $have_fftw @@ -33959,6 +34011,7 @@ High Dynamic Range Imagery Delegate Configuration: BZLIB --with-bzlib=$with_bzlib $have_bzlib Autotrace --with-autotrace=$with_autotrace $have_autotrace +Dejavu fonts --with-dejavu-font-dir=$with_dejavu_font_dir $result_dejavu_font_dir DJVU --with-djvu=$with_djvu $have_djvu DPS --with-dps=$with_dps $have_dps FFTW --with-fftw=$with_fftw $have_fftw diff --git a/configure.ac b/configure.ac index ab8c7bf3f..a7cfcf60b 100755 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,7 @@ AC_CONFIG_FILES([\ config/ImageMagick.rdf \ config/MagickCore.dox \ config/MagickWand.dox \ + config/type-dejavu.xml \ config/type-ghostscript.xml \ config/type-windows.xml \ config/type.xml \ @@ -1584,6 +1585,21 @@ AC_SUBST(DJVU_LIBS) dnl =========================================================================== +# +# Set DejaVu font directory. +# +AC_ARG_WITH([dejavu-font-dir], + [AC_HELP_STRING([--with-dejavu-font-dir=DIR], + [DejaVu font directory])], + [with_dejavu_font_dir=$withval], + [with_dejavu_font_dir='default']) + +if test "$with_dejavu_font_dir" != 'default'; then + DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-dejavu-font-dir=$with_dejavu_font_dir " +fi + +dnl =========================================================================== + # # Check for FFTW delegate library. # @@ -2729,12 +2745,33 @@ have_xps='no' ; if test "$XPSDelegate" != "$XPSDelegateDefault"; then hav # type_include_files='' +# Dejavu fonts. +AC_MSG_CHECKING(for Dejavu fonts directory) +dejavu_font_dir='' +if test "${with_dejavu_font_dir}" != 'default'; then + dejavu_font_dir="${with_dejavu_font_dir}/" +else + for font_dir in "${prefix}/share/dejavu/fonts/" '/usr/share/fonts/dejavu/'; do + if test -f "${font_dir}DejaVuSerif.ttf"; then + dejavu_font_dir="${font_dir}" + break 1 + fi + done +fi +if test "${dejavu_font_dir}x" != 'x'; then + type_include_files="${type_include_files} "'' + AC_MSG_RESULT([$dejavu_font_dir]) +else + AC_MSG_RESULT([not found!]); +fi +AC_SUBST(dejavu_font_dir) + # Windows windows_font_dir='' if test "$with_windows_font_dir" != "no" && test -n "$with_windows_font_dir"; then windows_font_dir="${with_windows_font_dir}/" fi -if test -n "$windows_font_dir"; then +if test "${windows_font_dir}x" != 'x'; then if test -f '/usr/X11R6/lib/X11/fonts/truetype/arial.ttf'; then windows_font_dir='/usr/X11R6/lib/X11/fonts/truetype/' fi @@ -2745,7 +2782,7 @@ if test -n "$windows_font_dir"; then windows_font_dir='/usr/share/fonts/msttcore/truetype/' fi fi -if test -n "$windows_font_dir"; then +if test "${windows_font_dir}x" != 'x'; then type_include_files="$type_include_files "'' fi AC_SUBST(windows_font_dir) @@ -3320,6 +3357,11 @@ AC_OUTPUT rm -f magick-version +result_dejavu_font_dir='none' +if test "${dejavu_font_dir}x" != 'x'; then + result_dejavu_font_dir=$dejavu_font_dir +fi + result_ghostscript_font_dir='none' if test "${ghostscript_font_dir}x" != 'x'; then result_ghostscript_font_dir=$ghostscript_font_dir @@ -3350,6 +3392,7 @@ High Dynamic Range Imagery Delegate Configuration: BZLIB --with-bzlib=$with_bzlib $have_bzlib Autotrace --with-autotrace=$with_autotrace $have_autotrace +Dejavu fonts --with-dejavu-font-dir=$with_dejavu_font_dir $result_dejavu_font_dir DJVU --with-djvu=$with_djvu $have_djvu DPS --with-dps=$with_dps $have_dps FFTW --with-fftw=$with_fftw $have_fftw diff --git a/libtool b/libtool index a0c5ef25d..f634a7d93 100755 --- a/libtool +++ b/libtool @@ -138,7 +138,7 @@ old_postuninstall_cmds="" LTCC="gcc -std=gnu99" # LTCC compiler flags. -LTCFLAGS="-fopenmp -g -O2 -Wall -W -pthread" +LTCFLAGS="-fopenmp -g -O2 -Wall -W -ansi -pedantic -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'" diff --git a/m4/ac_compile_warnings.m4 b/m4/ac_compile_warnings.m4 index b2136bde9..f52cc9ab5 100644 --- a/m4/ac_compile_warnings.m4 +++ b/m4/ac_compile_warnings.m4 @@ -1,6 +1,57 @@ -dnl Available from the GNU Autoconf Macro Archive at: -dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_compile_warnings.html -dnl +# =========================================================================== +# http://www.nongnu.org/autoconf-archive/ac_compile_warnings.html +# =========================================================================== +# +# OBSOLETE MACRO +# +# Deprecated in favor of AX_CFLAGS_WARN_ALL. +# +# SYNOPSIS +# +# AC_COMPILE_WARNINGS +# +# DESCRIPTION +# +# Set the maximum warning verbosity according to C and C++ compiler used. +# Currently supports g++ and gcc. +# +# The compiler options are always added CFLAGS and CXXFLAGS even if these +# are overidden at configure time. Removing the maximum warning flags can +# be removed with --without-maximum-compile-warnings. For example: +# +# ./configure --without-maximum-compile-warnings CFLAGS= CXXFLAGS= +# +# LICENSE +# +# Copyright (c) 2008 Loic Dachary +# Copyright (c) 2008 William Fulton +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + AC_DEFUN([AC_COMPILE_WARNINGS], [ AC_MSG_CHECKING([maximum warning verbosity option]) AC_REQUIRE([AC_PROG_CC]) @@ -20,7 +71,7 @@ AC_MSG_CHECKING([maximum warning verbosity option]) then if test "$GXX" = "yes" then - ac_compile_warnings_opt='-Wall -W' + ac_compile_warnings_opt='-Wall -W -ansi -pedantic' fi CXXFLAGS="$CXXFLAGS $ac_compile_warnings_opt" ac_compile_warnings_msg="$ac_compile_warnings_opt for C++" @@ -30,7 +81,7 @@ AC_MSG_CHECKING([maximum warning verbosity option]) then if test "$GCC" = "yes" then - ac_compile_warnings_opt='-Wall -W' + ac_compile_warnings_opt='-Wall -W -ansi -pedantic' fi CFLAGS="$CFLAGS $ac_compile_warnings_opt" ac_compile_warnings_msg="$ac_compile_warnings_msg $ac_compile_warnings_opt for C" diff --git a/m4/acx_pthread.m4 b/m4/acx_pthread.m4 index eb09f5acc..798d6d1c6 100644 --- a/m4/acx_pthread.m4 +++ b/m4/acx_pthread.m4 @@ -1,5 +1,5 @@ # =========================================================================== -# http://autoconf-archive.cryp.to/acx_pthread.html +# http://www.nongnu.org/autoconf-archive/acx_pthread.html # =========================================================================== # # SYNOPSIS @@ -45,11 +45,7 @@ # Alejandro Forero Cuervo to the autoconf macro repository. We are also # grateful for the helpful feedback of numerous users. # -# LAST MODIFICATION -# -# 2008-04-12 -# -# COPYLEFT +# LICENSE # # Copyright (c) 2008 Steven G. Johnson # @@ -75,9 +71,9 @@ # all other use of the material that constitutes the Autoconf Macro. # # This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Macro Archive. When you make and -# distribute a modified version of the Autoconf Macro, you may extend this -# special exception to the GPL to apply to your modified version as well. +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. AC_DEFUN([ACX_PTHREAD], [ AC_REQUIRE([AC_CANONICAL_HOST]) diff --git a/m4/ax_prefix_config_h.m4 b/m4/ax_prefix_config_h.m4 index 79481646c..be0ba48bf 100644 --- a/m4/ax_prefix_config_h.m4 +++ b/m4/ax_prefix_config_h.m4 @@ -1,4 +1,6 @@ -##### http://autoconf-archive.cryp.to/ax_prefix_config_h.html +# =========================================================================== +# http://www.nongnu.org/autoconf-archive/ax_prefix_config_h.html +# =========================================================================== # # SYNOPSIS # @@ -8,16 +10,16 @@ # # This is a new variant from ac_prefix_config_ this one will use a # lowercase-prefix if the config-define was starting with a -# lowercase-char, e.g. "#define const", "#define restrict", or -# "#define off_t", (and this one can live in another directory, e.g. -# testpkg/config.h therefore I decided to move the output-header to -# be the first arg) +# lowercase-char, e.g. "#define const", "#define restrict", or "#define +# off_t", (and this one can live in another directory, e.g. +# testpkg/config.h therefore I decided to move the output-header to be the +# first arg) # -# takes the usual config.h generated header file; looks for each of -# the generated "#define SOMEDEF" lines, and prefixes the defined -# name (ie. makes it "#define PREFIX_SOMEDEF". The result is written -# to the output config.header file. The PREFIX is converted to -# uppercase for the conversions. +# takes the usual config.h generated header file; looks for each of the +# generated "#define SOMEDEF" lines, and prefixes the defined name (ie. +# makes it "#define PREFIX_SOMEDEF". The result is written to the output +# config.header file. The PREFIX is converted to uppercase for the +# conversions. # # Defaults: # @@ -25,10 +27,9 @@ # PREFIX = $PACKAGE # ORIG-HEADER, from AM_CONFIG_HEADER(config.h) # -# Your configure.ac script should contain both macros in this order, -# and unlike the earlier variations of this prefix-macro it is okay -# to place the AX_PREFIX_CONFIG_H call before the AC_OUTPUT -# invokation. +# Your configure.ac script should contain both macros in this order, and +# unlike the earlier variations of this prefix-macro it is okay to place +# the AX_PREFIX_CONFIG_H call before the AC_OUTPUT invokation. # # Example: # @@ -41,10 +42,9 @@ # AC_OUTPUT(Makefile) # creates the "config.h" now # # and also mylib/_config.h # -# if the argument to AX_PREFIX_CONFIG_H would have been omitted then -# the default outputfile would have been called simply -# "testpkg-config.h", but even under the name "mylib/_config.h" it -# contains prefix-defines like +# if the argument to AX_PREFIX_CONFIG_H would have been omitted then the +# default outputfile would have been called simply "testpkg-config.h", but +# even under the name "mylib/_config.h" it contains prefix-defines like # # #ifndef TESTPKG_VERSION # #define TESTPKG_VERSION "0.1.1" @@ -57,26 +57,26 @@ # #endif # # and this "mylib/_config.h" can be installed along with other -# header-files, which is most convenient when creating a shared -# library (that has some headers) where some functionality is -# dependent on the OS-features detected at compile-time. No need to -# invent some "mylib-confdefs.h.in" manually. :-) +# header-files, which is most convenient when creating a shared library +# (that has some headers) where some functionality is dependent on the +# OS-features detected at compile-time. No need to invent some +# "mylib-confdefs.h.in" manually. :-) # -# Note that some AC_DEFINEs that end up in the config.h file are -# actually self-referential - e.g. AC_C_INLINE, AC_C_CONST, and the -# AC_TYPE_OFF_T say that they "will define inline|const|off_t if the -# system does not do it by itself". You might want to clean up about -# these - consider an extra mylib/conf.h that reads something like: +# Note that some AC_DEFINEs that end up in the config.h file are actually +# self-referential - e.g. AC_C_INLINE, AC_C_CONST, and the AC_TYPE_OFF_T +# say that they "will define inline|const|off_t if the system does not do +# it by itself". You might want to clean up about these - consider an +# extra mylib/conf.h that reads something like: # # #include # #ifndef _testpkg_const # #define _testpkg_const const # #endif # -# and then start using _testpkg_const in the header files. That is -# also a good thing to differentiate whether some library-user has -# starting to take up with a different compiler, so perhaps it could -# read something like this: +# and then start using _testpkg_const in the header files. That is also a +# good thing to differentiate whether some library-user has starting to +# take up with a different compiler, so perhaps it could read something +# like this: # # #ifdef _MSC_VER # #include @@ -87,45 +87,37 @@ # #define _testpkg_const const # #endif # -# LAST MODIFICATION +# LICENSE # -# 2007-01-17 +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2008 Marten Svantesson +# Copyright (c) 2008 Gerald Point # -# COPYLEFT -# -# Copyright (c) 2007 Guido U. Draheim -# Copyright (c) 2007 Marten Svantesson -# Copyright (c) 2007 Gerald Point -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. -# -# As a special exception, the respective Autoconf Macro's copyright -# owner gives unlimited permission to copy, distribute and modify the -# configure scripts that are the output of Autoconf when processing -# the Macro. You need not follow the terms of the GNU General Public -# License when using or distributing such scripts, even though -# portions of the text of the Macro appear in them. The GNU General -# Public License (GPL) does govern all other use of the material that -# constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the -# Autoconf Macro released by the Autoconf Macro Archive. When you -# make and distribute a modified version of the Autoconf Macro, you -# may extend this special exception to the GPL to apply to your -# modified version as well. +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. AC_DEFUN([AX_PREFIX_CONFIG_H],[dnl AC_BEFORE([AC_CONFIG_HEADERS],[$0])dnl diff --git a/magick/Magick-config b/magick/Magick-config index b1cfbcf12..4d556cffc 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 -Wall -W -pthread' + echo '-g -O2 -Wall -W -ansi -pedantic -pthread' ;; --cppflags) echo '-I/usr/local/include/ImageMagick' diff --git a/magick/magick-config.h b/magick/magick-config.h index 76c0f7513..8c5ad8300 100644 --- a/magick/magick-config.h +++ b/magick/magick-config.h @@ -1337,7 +1337,9 @@ /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #ifndef __cplusplus -/* #undef inline */ +#ifndef _magickcore_inline +#define _magickcore_inline __inline__ +#endif #endif /* Define to `int' if does not define. */ diff --git a/wand/Wand-config b/wand/Wand-config index 00ce38130..2974c8af6 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 -Wall -W -pthread' + echo '-g -O2 -Wall -W -ansi -pedantic -pthread' ;; --cppflags) echo '-I/usr/local/include/ImageMagick'