(no commit message)

diff --git a/Makefile.in b/Makefile.in
index 7110d4b52ec8d0ee3c0541ffa08c3e3c634f381e..8d571283e8308a9dee4cdbd36d0f04d4c5df248b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2640,29 +2640,31 @@ EXTRA_LTLIBRARIES = ltdl/dlopen.la ltdl/dld_link.la ltdl/dyld.la \
 BUILT_SOURCES = ltdl/$(ARGZ_H)
 MOSTLYCLEANFILES = ltdl/argz.h ltdl/argz.h-t
 M4_EXTRA_DIST = \
-  ac_compile_warnings.m4 \
-  ac_func_fseeko.m4 \
-  ac_prog_perl_version.m4 \
-  acx_pthread.m4 \
-  argz.m4 \
-  ax_opencl.m4 \
-  ax_lang_compiler_ms.m4 \
-  ax_prefix_config_h.m4 \
-  cxx_have_bool.m4 \
-  cxx_have_lstring.m4 \
-  cxx_have_namespaces.m4 \
-  cxx_have_std_libs.m4 \
-  cxx_have_std_namespace.m4 \
-  framework.m4 \
-  libtool.m4 \
-  ltdl.m4 \
-  ltoptions.m4 \
-  ltsugar.m4 \
-  ltversion.m4 \
-  lt~obsolete.m4 \
-  magick_check_pthread_lib.m4 \
-  magick_func_mmap_fileio.m4 \
-  pkg.m4
+       ac_func_fseeko.m4  \
+       argz.m4  \
+       ax_c___attribute__.m4  \
+       ax_cflags_warn_all.m4  \
+       ax_compare_version.m4  \
+       ax_cxx_bool.m4  \
+       ax_cxx_namespaces.m4  \
+       ax_cxx_namespace_std.m4  \
+       ax_lang_compiler_ms.m4  \
+       ax_opencl.m4  \
+       ax_prefix_config_h.m4  \
+       ax_prog_perl_version.m4  \
+       ax_pthread.m4  \
+       cxx_have_lstring.m4  \
+       cxx_have_std_libs.m4  \
+       framework.m4  \
+       libtool.m4  \
+       ltdl.m4  \
+       lt~obsolete.m4  \
+       ltoptions.m4  \
+       ltsugar.m4  \
+       ltversion.m4  \
+       magick_check_pthread_lib.m4  \
+       magick_func_mmap_fileio.m4  \
+       pkg.m4  
 
 
 # Where architecture-independent configuration files get installed

diff --git a/configure b/configure
index 13d40faa018f36fbf32bf5d019e91ee3cc550b70..1578d9686c86b4d890c6f53ffd05f0a4d041f6d6 100755 (executable)
--- a/configure
+++ b/configure
@@ -7789,6 +7789,46 @@ 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 <stdlib.h>
+         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
+
+
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
        if test -n "$ac_tool_prefix"; then
@@ -7905,46 +7945,6 @@ $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 <stdlib.h>
-         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.
 #
@@ -7967,6 +7967,36 @@ fi
 #
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Microsoft C compiler" >&5
+$as_echo_n "checking whether we are using the Microsoft C compiler... " >&6; }
+if test "${ax_cv_c_compiler_ms+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef _MSC_VER
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_compiler_ms=yes
+else
+  ax_compiler_ms=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ax_cv_c_compiler_ms=$ax_compiler_ms
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_c_compiler_ms" >&5
+$as_echo "$ax_cv_c_compiler_ms" >&6; }
 
 GDI32_LIBS=''
 native_win32_build='no'
@@ -9682,13 +9712,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:9685: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:9715: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:9688: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:9718: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:9691: output\"" >&5)
+  (eval echo "\"\$as_me:9721: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -10879,7 +10909,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 10882 "configure"' > conftest.$ac_ext
+  echo '#line 10912 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -12964,11 +12994,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:12967: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12997: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12971: \$? = $ac_status" >&5
+   echo "$as_me:13001: \$? = $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.
@@ -13303,11 +13333,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:13306: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13336: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13310: \$? = $ac_status" >&5
+   echo "$as_me:13340: \$? = $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.
@@ -13408,11 +13438,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:13411: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13441: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13415: \$? = $ac_status" >&5
+   echo "$as_me:13445: \$? = $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
@@ -13463,11 +13493,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:13466: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13496: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13470: \$? = $ac_status" >&5
+   echo "$as_me:13500: \$? = $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
@@ -15833,7 +15863,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 15836 "configure"
+#line 15866 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15929,7 +15959,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 15932 "configure"
+#line 15962 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17885,11 +17915,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:17888: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17918: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17892: \$? = $ac_status" >&5
+   echo "$as_me:17922: \$? = $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.
@@ -17984,11 +18014,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:17987: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18017: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17991: \$? = $ac_status" >&5
+   echo "$as_me:18021: \$? = $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
@@ -18036,11 +18066,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:18039: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18069: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18043: \$? = $ac_status" >&5
+   echo "$as_me:18073: \$? = $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
@@ -19448,7 +19478,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 19451 "configure"
+#line 19481 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H

diff --git a/configure.ac b/configure.ac
index f1c9025e3cdd056223bd1e645321bb78b0e59a39..2be34783b38723487905164af18029331bf24cac 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -251,8 +251,8 @@ AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_LN_S
 AM_WITH_DMALLOC
-PKG_PROG_PKG_CONFIG
 AX_C___ATTRIBUTE__
+PKG_PROG_PKG_CONFIG
 
 #
 # Enable run-time checking.
@@ -273,6 +273,7 @@ fi
 #
 AC_EXEEXT
 AC_OBJEXT
+AX_LANG_COMPILER_MS
 
 GDI32_LIBS=''
 native_win32_build='no'

diff --git a/m4/Makefile.am b/m4/Makefile.am
index 4a366787414bb109911c2b2c9a1953ac536cef5b..d454e7de2b5538ae25b2fce45b24fb0e3e94be2d 100644 (file)
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -15,26 +15,28 @@
 #  Makefile for building ImageMagick m4 macros.
 
 M4_EXTRA_DIST =  \
-  ac_compile_warnings.m4 \
-  ac_func_fseeko.m4 \
-  ac_prog_perl_version.m4 \
-  acx_pthread.m4 \
-  argz.m4 \
-  ax_opencl.m4 \
-  ax_lang_compiler_ms.m4 \
-  ax_prefix_config_h.m4 \
-  cxx_have_bool.m4 \
-  cxx_have_lstring.m4 \
-  cxx_have_namespaces.m4 \
-  cxx_have_std_libs.m4 \
-  cxx_have_std_namespace.m4 \
-  framework.m4 \
-  libtool.m4 \
-  ltdl.m4 \
-  ltoptions.m4 \
-  ltsugar.m4 \
-  ltversion.m4 \
-  lt~obsolete.m4 \
-  magick_check_pthread_lib.m4 \
-  magick_func_mmap_fileio.m4 \
-  pkg.m4
+       ac_func_fseeko.m4  \
+       argz.m4  \
+       ax_c___attribute__.m4  \
+       ax_cflags_warn_all.m4  \
+       ax_compare_version.m4  \
+       ax_cxx_bool.m4  \
+       ax_cxx_namespaces.m4  \
+       ax_cxx_namespace_std.m4  \
+       ax_lang_compiler_ms.m4  \
+       ax_opencl.m4  \
+       ax_prefix_config_h.m4  \
+       ax_prog_perl_version.m4  \
+       ax_pthread.m4  \
+       cxx_have_lstring.m4  \
+       cxx_have_std_libs.m4  \
+       framework.m4  \
+       libtool.m4  \
+       ltdl.m4  \
+       lt~obsolete.m4  \
+       ltoptions.m4  \
+       ltsugar.m4  \
+       ltversion.m4  \
+       magick_check_pthread_lib.m4  \
+       magick_func_mmap_fileio.m4  \
+       pkg.m4