From 92703d853cc9ac49e97c4da02df948387e61001f Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 26 Apr 2010 00:18:18 +0000 Subject: [PATCH] --- Magick++/bin/Magick++-config | 2 +- Makefile.in | 6 +- PerlMagick/Makefile.PL | 2 +- config/config.h.in | 18 +++ config/configure.xml | 4 +- configure | 303 ++++++++++++++++++++++++++++------- configure.ac | 4 +- libtool | 2 +- m4/ac_compile_warnings.m4 | 93 ----------- m4/ax_c___attribute__.m4 | 66 ++++++++ m4/ax_cflags_warn_all.m4 | 151 +++++++++++++++++ magick/Magick-config | 2 +- magick/magick-config.h | 24 +++ magick/studio.h | 22 +-- wand/Wand-config | 2 +- wand/studio.h | 22 +-- 16 files changed, 527 insertions(+), 196 deletions(-) delete mode 100644 m4/ac_compile_warnings.m4 create mode 100644 m4/ax_c___attribute__.m4 create mode 100644 m4/ax_cflags_warn_all.m4 diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config index ee67aabdf..8cfdf2eae 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 -pthread' ;; --cppflags) echo '-I/usr/local/include/ImageMagick' diff --git a/Makefile.in b/Makefile.in index c3dba0474..7110d4b52 100644 --- a/Makefile.in +++ b/Makefile.in @@ -275,8 +275,10 @@ DIST_COMMON = $(am__configure_deps) $(am__include_HEADERS_DIST) \ @CONVENIENCE_LTDL_TRUE@am__append_3 = ltdl/libltdlc.la subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ac_compile_warnings.m4 \ - $(top_srcdir)/m4/ac_func_fseeko.m4 $(top_srcdir)/m4/argz.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ac_func_fseeko.m4 \ + $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_c___attribute__.m4 \ + $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ $(top_srcdir)/m4/ax_compare_version.m4 \ $(top_srcdir)/m4/ax_cxx_bool.m4 \ $(top_srcdir)/m4/ax_cxx_namespace_std.m4 \ diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index f02873dc6..b13b03af4 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 -pthread"; my $LDFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'ldflags'} "; my $LDDLFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'lddlflags'} "; diff --git a/config/config.h.in b/config/config.h.in index a954f4619..59350409c 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -146,6 +146,10 @@ don't. */ #undef HAVE_DECL_STRLCPY +/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. + */ +#undef HAVE_DECL_TZNAME + /* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you don't. */ #undef HAVE_DECL_VSNPRINTF @@ -500,6 +504,9 @@ /* Define to 1 if you have the `strtoul' function. */ #undef HAVE_STRTOUL +/* Define to 1 if `tm_zone' is a member of `struct tm'. */ +#undef HAVE_STRUCT_TM_TM_ZONE + /* Define to 1 if you have the `symlink' function. */ #undef HAVE_SYMLINK @@ -586,6 +593,14 @@ /* Define to 1 if you have the `times' function. */ #undef HAVE_TIMES +/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use + `HAVE_STRUCT_TM_TM_ZONE' instead. */ +#undef HAVE_TM_ZONE + +/* Define to 1 if you don't have `tm_zone' but do have the external array + `tzname'. */ +#undef HAVE_TZNAME + /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H @@ -649,6 +664,9 @@ /* Define to 1 if you have the `_wstat' function. */ #undef HAVE__WSTAT +/* define if your compiler has __attribute__ */ +#undef HAVE___ATTRIBUTE__ + /* accurately represent the wide range of intensity levels in real scenes */ #undef HDRI_SUPPORT diff --git a/config/configure.xml b/config/configure.xml index 95ea68913..57e167f58 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -15,14 +15,14 @@ - + - + diff --git a/configure b/configure index 9b9b10e9a..13d40faa0 100755 --- a/configure +++ b/configure @@ -1189,7 +1189,6 @@ enable_option_checking enable_silent_rules enable_dependency_tracking with_gnu_ld -with_maximum_compile_warnings with_dmalloc enable_bounds_checking enable_osx_universal_binary @@ -1949,8 +1948,6 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --without-maximum-compile-warnings - Disable maximum warning verbosity --with-dmalloc use dmalloc, as in http://www.dmalloc.com/dmalloc.tar.gz --without-threads disable threads support @@ -2690,6 +2687,63 @@ $as_echo "$ac_res" >&6; } } # ac_fn_c_check_type +# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES +# ---------------------------------------------------- +# Tries to find if the field MEMBER exists in type AGGR, after including +# INCLUDES, setting cache variable VAR accordingly. +ac_fn_c_check_member () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +$as_echo_n "checking for $2.$3... " >&6; } +if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main () +{ +static $2 ac_aggr; +if (ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$4=yes" +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main () +{ +static $2 ac_aggr; +if (sizeof ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$4=yes" +else + eval "$4=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$4 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_member + # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES # -------------------------------------------- # Tries to find the compile-time value of EXPR in a program that includes @@ -7603,49 +7657,69 @@ if test "$am_t" != yes; then fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for maximum warnings" >&5 +$as_echo_n "checking CFLAGS for maximum warnings... " >&6; } +if test "${ac_cv_cflags_warn_all+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_cflags_warn_all="no, unknown" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking maximum warning verbosity option" >&5 -$as_echo_n "checking maximum warning verbosity option... " >&6; } - - + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_save_CFLAGS="$CFLAGS" +for ac_arg in "-pedantic % -Wall" "-xstrconst % -v" "-std1 % -verbose -w0 -warnprotos" "-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" "-ansi -ansiE % -fullwarn" "+ESlit % +w1" "-Xc % -pvctl,fullmsg" "-h conform % -h msglevel 2" # +do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# Check whether --with-maximum-compile-warnings was given. -if test "${with_maximum_compile_warnings+set}" = set; then : - withval=$with_maximum_compile_warnings; ac_compile_warnings_on="$withval" -else - ac_compile_warnings_on="" +int +main () +{ +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_cflags_warn_all=`echo $ac_arg | sed -e 's,.*% *,,'` ; break fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done + CFLAGS="$ac_save_CFLAGS" + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test x"$ac_compile_warnings_on" = xno - then - ac_compile_warnings_msg=no - else - if test -n "$CXX" - then - if test "$GXX" = "yes" - then - ac_compile_warnings_opt='-Wall -W' - fi - CXXFLAGS="$CXXFLAGS $ac_compile_warnings_opt" - ac_compile_warnings_msg="$ac_compile_warnings_opt for C++" - fi - - if test -n "$CC" - then - if test "$GCC" = "yes" - then - ac_compile_warnings_opt='-Wall -W' - fi - CFLAGS="$CFLAGS $ac_compile_warnings_opt" - ac_compile_warnings_msg="$ac_compile_warnings_msg $ac_compile_warnings_opt for C" - fi - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_compile_warnings_msg" >&5 -$as_echo "$ac_compile_warnings_msg" >&6; } - unset ac_compile_warnings_msg - unset ac_compile_warnings_opt +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_warn_all" >&5 +$as_echo "$ac_cv_cflags_warn_all" >&6; } +case ".$ac_cv_cflags_warn_all" in + .ok|.ok,*) ;; + .|.no|.no,*) + ;; + *) + if echo " $CFLAGS " | grep " $ac_cv_cflags_warn_all " 2>&1 >/dev/null + then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ac_cv_cflags_warn_all"; } >&5 + (: CFLAGS does contain $ac_cv_cflags_warn_all) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_warn_all\""; } >&5 + (: CFLAGS="$CFLAGS $ac_cv_cflags_warn_all") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + CFLAGS="$CFLAGS $ac_cv_cflags_warn_all" + fi + ;; +esac $ac_includes_default @@ -7831,6 +7905,46 @@ $as_echo "no" >&6; } fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__" >&5 +$as_echo_n "checking for __attribute__... " >&6; } +if test "${ax_cv___attribute__+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + static void foo(void) __attribute__ ((unused)); + static void + foo(void) { + exit(1); + } + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ax_cv___attribute__=yes +else + ax_cv___attribute__=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv___attribute__" >&5 +$as_echo "$ax_cv___attribute__" >&6; } + if test "$ax_cv___attribute__" = "yes"; then + +$as_echo "#define HAVE___ATTRIBUTE__ 1" >>confdefs.h + + fi + + # # Enable run-time checking. # @@ -9568,13 +9682,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:9571: $ac_compile\"" >&5) + (eval echo "\"\$as_me:9685: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:9574: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:9688: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:9577: output\"" >&5) + (eval echo "\"\$as_me:9691: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -10765,7 +10879,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 10768 "configure"' > conftest.$ac_ext + echo '#line 10882 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -12850,11 +12964,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:12853: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12967: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12857: \$? = $ac_status" >&5 + echo "$as_me:12971: \$? = $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. @@ -13189,11 +13303,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:13192: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13306: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13196: \$? = $ac_status" >&5 + echo "$as_me:13310: \$? = $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. @@ -13294,11 +13408,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:13297: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13411: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13301: \$? = $ac_status" >&5 + echo "$as_me:13415: \$? = $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 @@ -13349,11 +13463,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:13352: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13466: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13356: \$? = $ac_status" >&5 + echo "$as_me:13470: \$? = $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 @@ -15719,7 +15833,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 15722 "configure" +#line 15836 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15815,7 +15929,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 15818 "configure" +#line 15932 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17771,11 +17885,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:17774: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17888: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17778: \$? = $ac_status" >&5 + echo "$as_me:17892: \$? = $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. @@ -17870,11 +17984,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:17873: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17987: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17877: \$? = $ac_status" >&5 + echo "$as_me:17991: \$? = $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 @@ -17922,11 +18036,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:17925: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18039: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17929: \$? = $ac_status" >&5 + echo "$as_me:18043: \$? = $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 @@ -19334,7 +19448,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 19337 "configure" +#line 19451 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -21032,6 +21146,73 @@ $as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h fi +ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include +#include <$ac_cv_struct_tm> + +" +if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_TM_TM_ZONE 1 +_ACEOF + + +fi + +if test "$ac_cv_member_struct_tm_tm_zone" = yes; then + +$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h + +else + ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include +" +if test "x$ac_cv_have_decl_tzname" = x""yes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_TZNAME $ac_have_decl +_ACEOF + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5 +$as_echo_n "checking for tzname... " >&6; } +if test "${ac_cv_var_tzname+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#if !HAVE_DECL_TZNAME +extern char *tzname[]; +#endif + +int +main () +{ +return tzname[0][0]; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_var_tzname=yes +else + ac_cv_var_tzname=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5 +$as_echo "$ac_cv_var_tzname" >&6; } + if test $ac_cv_var_tzname = yes; then + +$as_echo "#define HAVE_TZNAME 1" >>confdefs.h + + fi +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether #! works in shell scripts" >&5 $as_echo_n "checking whether #! works in shell scripts... " >&6; } if test "${ac_cv_sys_interpreter+set}" = set; then : diff --git a/configure.ac b/configure.ac index c788ce3d4..f1c9025e3 100755 --- a/configure.ac +++ b/configure.ac @@ -245,13 +245,14 @@ AC_PROG_LD AC_SUBST(LD) AC_PROG_CC_C99 AM_PROG_CC_C_O -AC_COMPILE_WARNINGS +AX_CFLAGS_WARN_ALL AC_INCLUDES_DEFAULT AC_PROG_INSTALL AC_PROG_MAKE_SET AC_PROG_LN_S AM_WITH_DMALLOC PKG_PROG_PKG_CONFIG +AX_C___ATTRIBUTE__ # # Enable run-time checking. @@ -796,6 +797,7 @@ AC_C_STRINGIZE AC_HEADER_STAT AC_HEADER_TIME AC_STRUCT_TM +AC_STRUCT_TIMEZONE AC_SYS_INTERPRETER # If the C compiler supports the keyword inline, do nothing. Otherwise diff --git a/libtool b/libtool index dc35ac980..d3c76c5e3 100755 --- a/libtool +++ b/libtool @@ -138,7 +138,7 @@ old_postuninstall_cmds="" LTCC="gcc -std=gnu99 -std=gnu99" # LTCC compiler flags. -LTCFLAGS="-fopenmp -g -O2 -Wall -W -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'" diff --git a/m4/ac_compile_warnings.m4 b/m4/ac_compile_warnings.m4 deleted file mode 100644 index f1030d34d..000000000 --- a/m4/ac_compile_warnings.m4 +++ /dev/null @@ -1,93 +0,0 @@ -# =========================================================================== -# 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]) - AC_REQUIRE([AC_PROG_CXX]) - - AC_ARG_WITH([maximum-compile-warnings], - AS_HELP_STRING([--without-maximum-compile-warnings], - [Disable maximum warning verbosity]), - [ac_compile_warnings_on="$withval"], - [ac_compile_warnings_on=""]) - - if test x"$ac_compile_warnings_on" = xno - then - ac_compile_warnings_msg=no - else - if test -n "$CXX" - then - if test "$GXX" = "yes" - then - ac_compile_warnings_opt='-Wall -W' - fi - CXXFLAGS="$CXXFLAGS $ac_compile_warnings_opt" - ac_compile_warnings_msg="$ac_compile_warnings_opt for C++" - fi - - if test -n "$CC" - then - if test "$GCC" = "yes" - then - ac_compile_warnings_opt='-Wall -W' - fi - CFLAGS="$CFLAGS $ac_compile_warnings_opt" - ac_compile_warnings_msg="$ac_compile_warnings_msg $ac_compile_warnings_opt for C" - fi - fi - AC_MSG_RESULT([$ac_compile_warnings_msg]) - unset ac_compile_warnings_msg - unset ac_compile_warnings_opt -]) diff --git a/m4/ax_c___attribute__.m4 b/m4/ax_c___attribute__.m4 new file mode 100644 index 000000000..cf3d62bbd --- /dev/null +++ b/m4/ax_c___attribute__.m4 @@ -0,0 +1,66 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_c___attribute__.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_C___ATTRIBUTE__ +# +# DESCRIPTION +# +# Provides a test for the compiler support of __attribute__ extensions. +# Defines HAVE___ATTRIBUTE__ if it is found. +# +# LICENSE +# +# Copyright (c) 2008 Stepan Kasal +# Copyright (c) 2008 Christian Haggstrom +# Copyright (c) 2008 Ryan McCabe +# +# 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. + +#serial 8 + +AC_DEFUN([AX_C___ATTRIBUTE__], [ + AC_CACHE_CHECK([for __attribute__], [ax_cv___attribute__], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include + static void foo(void) __attribute__ ((unused)); + static void + foo(void) { + exit(1); + } + ]], [])], + [ax_cv___attribute__=yes], + [ax_cv___attribute__=no] + ) + ]) + if test "$ax_cv___attribute__" = "yes"; then + AC_DEFINE([HAVE___ATTRIBUTE__], 1, [define if your compiler has __attribute__]) + fi +]) diff --git a/m4/ax_cflags_warn_all.m4 b/m4/ax_cflags_warn_all.m4 new file mode 100644 index 000000000..64fb29769 --- /dev/null +++ b/m4/ax_cflags_warn_all.m4 @@ -0,0 +1,151 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_cflags_warn_all.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CFLAGS_WARN_ALL [(shellvar [,default, [A/NA]])] +# +# DESCRIPTION +# +# Try to find a compiler option that enables most reasonable warnings. +# +# For the GNU CC compiler it will be -Wall (and -ansi -pedantic) The +# result is added to the shellvar being CFLAGS by default. +# +# Currently this macro knows about GCC, Solaris C compiler, Digital Unix C +# compiler, C for AIX Compiler, HP-UX C compiler, IRIX C compiler, NEC +# SX-5 (Super-UX 10) C compiler, and Cray J90 (Unicos 10.0.0.8) C +# compiler. +# +# - $1 shell-variable-to-add-to : CFLAGS +# - $2 add-value-if-not-found : nothing +# - $3 action-if-found : add value to shellvariable +# - $4 action-if-not-found : nothing +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# 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. + +#serial 8 + +AC_DEFUN([AX_CFLAGS_WARN_ALL],[dnl +AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl +AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_warn_all])dnl +AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum warnings], +VAR,[VAR="no, unknown" + AC_LANG_SAVE + AC_LANG_C + ac_save_[]FLAGS="$[]FLAGS" +for ac_arg dnl +in "-pedantic % -Wall" dnl GCC + "-xstrconst % -v" dnl Solaris C + "-std1 % -verbose -w0 -warnprotos" dnl Digital Unix + "-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" dnl AIX + "-ansi -ansiE % -fullwarn" dnl IRIX + "+ESlit % +w1" dnl HP-UX C + "-Xc % -pvctl[,]fullmsg" dnl NEC SX-5 (Super-UX 10) + "-h conform % -h msglevel 2" dnl Cray C (Unicos) + # +do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` + AC_TRY_COMPILE([],[return 0;], + [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) +done + FLAGS="$ac_save_[]FLAGS" + AC_LANG_RESTORE +]) +case ".$VAR" in + .ok|.ok,*) m4_ifvaln($3,$3) ;; + .|.no|.no,*) m4_ifvaln($4,$4,[m4_ifval($2,[ + AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"]) + m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])]) ;; + *) m4_ifvaln($3,$3,[ + if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null + then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR]) + else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"]) + m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR" + fi ]) ;; +esac +AS_VAR_POPDEF([VAR])dnl +AS_VAR_POPDEF([FLAGS])dnl +]) + +dnl the only difference - the LANG selection... and the default FLAGS + +AC_DEFUN([AX_CXXFLAGS_WARN_ALL],[dnl +AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl +AS_VAR_PUSHDEF([VAR],[ax_cv_cxxflags_warn_all])dnl +AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum warnings], +VAR,[VAR="no, unknown" + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + ac_save_[]FLAGS="$[]FLAGS" +for ac_arg dnl +in "-pedantic % -Wall" dnl GCC + "-xstrconst % -v" dnl Solaris C + "-std1 % -verbose -w0 -warnprotos" dnl Digital Unix + "-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" dnl AIX + "-ansi -ansiE % -fullwarn" dnl IRIX + "+ESlit % +w1" dnl HP-UX C + "-Xc % -pvctl[,]fullmsg" dnl NEC SX-5 (Super-UX 10) + "-h conform % -h msglevel 2" dnl Cray C (Unicos) + # +do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` + AC_TRY_COMPILE([],[return 0;], + [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) +done + FLAGS="$ac_save_[]FLAGS" + AC_LANG_RESTORE +]) +case ".$VAR" in + .ok|.ok,*) m4_ifvaln($3,$3) ;; + .|.no|.no,*) m4_ifvaln($4,$4,[m4_ifval($2,[ + AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"]) + m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])]) ;; + *) m4_ifvaln($3,$3,[ + if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null + then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR]) + else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"]) + m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR" + fi ]) ;; +esac +AS_VAR_POPDEF([VAR])dnl +AS_VAR_POPDEF([FLAGS])dnl +]) + +dnl implementation tactics: +dnl the for-argument contains a list of options. The first part of +dnl these does only exist to detect the compiler - usually it is +dnl a global option to enable -ansi or -extrawarnings. All other +dnl compilers will fail about it. That was needed since a lot of +dnl compilers will give false positives for some option-syntax +dnl like -Woption or -Xoption as they think of it is a pass-through +dnl to later compile stages or something. The "%" is used as a +dnl delimimiter. A non-option comment can be given after "%%" marks +dnl which will be shown but not added to the respective C/CXXFLAGS. diff --git a/magick/Magick-config b/magick/Magick-config index 617b8958d..d183dc361 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 -pthread' ;; --cppflags) echo '-I/usr/local/include/ImageMagick' diff --git a/magick/magick-config.h b/magick/magick-config.h index f8b6e1ad1..fd74f795b 100644 --- a/magick/magick-config.h +++ b/magick/magick-config.h @@ -219,6 +219,10 @@ #define MAGICKCORE_HAVE_DECL_STRLCPY 0 #endif +/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. + */ +/* #undef HAVE_DECL_TZNAME */ + /* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you don't. */ #ifndef MAGICKCORE_HAVE_DECL_VSNPRINTF @@ -765,6 +769,11 @@ #define MAGICKCORE_HAVE_STRTOUL 1 #endif +/* Define to 1 if `tm_zone' is a member of `struct tm'. */ +#ifndef MAGICKCORE_HAVE_STRUCT_TM_TM_ZONE +#define MAGICKCORE_HAVE_STRUCT_TM_TM_ZONE 1 +#endif + /* Define to 1 if you have the `symlink' function. */ #ifndef MAGICKCORE_HAVE_SYMLINK #define MAGICKCORE_HAVE_SYMLINK 1 @@ -899,6 +908,16 @@ #define MAGICKCORE_HAVE_TIMES 1 #endif +/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use + `HAVE_STRUCT_TM_TM_ZONE' instead. */ +#ifndef MAGICKCORE_HAVE_TM_ZONE +#define MAGICKCORE_HAVE_TM_ZONE 1 +#endif + +/* Define to 1 if you don't have `tm_zone' but do have the external array + `tzname'. */ +/* #undef HAVE_TZNAME */ + /* Define to 1 if you have the header file. */ #ifndef MAGICKCORE_HAVE_UNISTD_H #define MAGICKCORE_HAVE_UNISTD_H 1 @@ -990,6 +1009,11 @@ /* Define to 1 if you have the `_wstat' function. */ /* #undef HAVE__WSTAT */ +/* define if your compiler has __attribute__ */ +#ifndef MAGICKCORE_HAVE___ATTRIBUTE__ +#define MAGICKCORE_HAVE___ATTRIBUTE__ 1 +#endif + /* accurately represent the wide range of intensity levels in real scenes */ /* #undef HDRI_SUPPORT */ diff --git a/magick/studio.h b/magick/studio.h index 03a1e3ee1..3e26233c4 100644 --- a/magick/studio.h +++ b/magick/studio.h @@ -224,22 +224,12 @@ extern size_t strlcpy(char *,const char *,size_t); extern int vsnprintf(char *,size_t,const char *,va_list); #endif -#if !defined(magick_attribute) -# if (defined(__GNUC__) && (__GNUC__ >= 3)) -# define magick_attribute __attribute__ -# else -# define magick_attribute(x) /* nothing */ -# endif -#endif - -#if !defined(magick_unused) -# if (defined(__GNUC__) && (__GNUC__ >= 3)) -# define magick_unused(x) magick_unused_ ## x __attribute__((unused)) -# elif defined(__LCLINT__) -# define magick_unused(x) /*@unused@*/ x -# else -# define magick_unused(x) x -# endif +#if defined(MAGICKCORE_HAVE___ATTRIBUTE__) +# define magick_attribute __attribute__ +# define magick_unused(x) magick_unused_ ## x __attribute__((unused)) +#else +# define magick_attribute(x) /* nothing */ +# define magick_unused(x) x #endif #if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(MAGICKCORE_POSIX_SUPPORT) diff --git a/wand/Wand-config b/wand/Wand-config index 61d7a3483..54db5ce94 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 -pthread' ;; --cppflags) echo '-I/usr/local/include/ImageMagick' diff --git a/wand/studio.h b/wand/studio.h index 6b8f750bc..835bf3c8a 100644 --- a/wand/studio.h +++ b/wand/studio.h @@ -234,22 +234,12 @@ extern size_t strlcpy(char *,const char *,size_t); extern int vsnprintf(char *,size_t,const char *,va_list); #endif -#if !defined(wand_attribute) -# if (defined(__GNUC__) && (__GNUC__ >= 3)) -# define wand_attribute __attribute__ -# else -# define wand_attribute(x) /* nothing */ -# endif -#endif - -#if !defined(wand_unused) -# if (defined(__GNUC__) && (__GNUC__ >= 3)) -# define wand_unused(x) wand_unused_ ## x __attribute__((unused)) -# elif defined(__LCLINT__) -# define wand_unused(x) /*@unused@*/ x -# else -# define wand_unused(x) x -# endif +#if defined(MAGICKCORE_HAVE___ATTRIBUTE__) +# define wand_attribute __attribute__ +# define wand_unused(x) wand_unused_ ## x __attribute__((unused)) +#else +# define wand_attribute(x) /* nothing */ +# define wand_unused(x) x #endif #if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(MAGICKCORE_POSIX_SUPPORT) -- 2.40.0