From 66387d2b5d18e31609c476f1a88f7fc0389dc73a Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Mon, 2 Nov 2015 07:41:25 -0500
Subject: [PATCH] Update configure script to latest autoconf / automake

---
 MagickCore/animate.c |  2 +-
 MagickCore/studio.h  |  2 --
 MagickWand/import.c  |  2 +-
 MagickWand/studio.h  |  2 --
 configure            | 18 +++++++++++-------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/MagickCore/animate.c b/MagickCore/animate.c
index cf4788103..6cf46364b 100644
--- a/MagickCore/animate.c
+++ b/MagickCore/animate.c
@@ -2157,7 +2157,7 @@ MagickExport Image *XAnimateImages(Display *display,
                       break;
                     }
                 }
-              (void) sleep(1);
+              MagickDelay(1000);
             }
           continue;
         }
diff --git a/MagickCore/studio.h b/MagickCore/studio.h
index 8c8462b7a..d2f0fc278 100755
--- a/MagickCore/studio.h
+++ b/MagickCore/studio.h
@@ -299,8 +299,6 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #  define SetNotifyHandlers \
     SetErrorHandler(NTErrorHandler); \
     SetWarningHandler(NTWarningHandler)
-#  undef sleep
-#  define sleep(seconds)  Sleep(seconds*1000)
 #  if !defined(MAGICKCORE_HAVE_TIFFCONF_H)
 #    define HAVE_TIFFCONF_H
 #  endif
diff --git a/MagickWand/import.c b/MagickWand/import.c
index 9d51f25e3..b930bd5dd 100644
--- a/MagickWand/import.c
+++ b/MagickWand/import.c
@@ -453,7 +453,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
             MagickPathExtent);
         for (scene=0; scene < (size_t) MagickMax(snapshots,1); scene++)
         {
-          (void) sleep(resource_info.pause);
+          MagickDelay(1000*resource_info.pause);
           images=XImportImage(image_info,&ximage_info,exception);
           status&=(images != (Image *) NULL) &&
             (exception->severity < ErrorException);
diff --git a/MagickWand/studio.h b/MagickWand/studio.h
index 864dd9067..bf43f73b5 100644
--- a/MagickWand/studio.h
+++ b/MagickWand/studio.h
@@ -283,8 +283,6 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #  define SetNotifyHandlers \
     SetErrorHandler(NTErrorHandler); \
     SetWarningHandler(NTWarningHandler)
-#  undef sleep
-#  define sleep(seconds)  Sleep(seconds*1000)
 #  if !defined(MAGICKCORE_HAVE_TIFFCONF_H)
 #    define HAVE_TIFFCONF_H
 #  endif
diff --git a/configure b/configure
index c8ac326fd..d00adc46d 100755
--- a/configure
+++ b/configure
@@ -4379,7 +4379,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_GIT_REVISION=17086:5b747d9:20151017
+MAGICK_GIT_REVISION=17159:c6b7cef:20151102
 
 
 # Substitute library versioning
@@ -8744,11 +8744,12 @@ int
 main ()
 {
 
-     int op = 0, eax, ebx, ecx, edx;
+     int op = 0, level = 0, eax, ebx, ecx, edx;
      FILE *f;
-      __asm__("cpuid"
+      __asm__ __volatile__ ("cpuid"
         : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
-        : "a" (op));
+        : "a" (op), "2" (level));
+
      f = fopen("conftest_cpuid", "w"); if (!f) return 1;
      fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx);
      fclose(f);
@@ -8778,6 +8779,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -8799,11 +8801,12 @@ int
 main ()
 {
 
-     int op = 1, eax, ebx, ecx, edx;
+     int op = 1, level = 0, eax, ebx, ecx, edx;
      FILE *f;
-      __asm__("cpuid"
+      __asm__ __volatile__ ("cpuid"
         : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
-        : "a" (op));
+        : "a" (op), "2" (level));
+
      f = fopen("conftest_cpuid", "w"); if (!f) return 1;
      fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx);
      fclose(f);
@@ -8832,6 +8835,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+
      case $ax_cv_gcc_x86_cpuid_0 in
        *:756e6547:6c65746e:49656e69) # Intel
           case $ax_cv_gcc_x86_cpuid_1 in
-- 
2.40.0