[Bug 659] Get the latest windows patches for libopts

bk: 44dabcd1dzymN950qUWYTxJPQNqECA

diff --git a/libopts/m4/libopts.m4 b/libopts/m4/libopts.m4
index fc1294869a80bb4960af61b05820168c2494a07e..65b876e371d7a5efd580191b966fb1589a7ef63d 100644 (file)
--- a/libopts/m4/libopts.m4
+++ b/libopts/m4/libopts.m4
@@ -24,7 +24,8 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
   # =================
   AC_CHECK_HEADERS(dlfcn.h errno.h fcntl.h libgen.h memory.h netinet/in.h \
     setjmp.h sys/mman.h sys/param.h sys/poll.h sys/procset.h sys/select.h \
-    sys/socket.h sys/stropts.h sys/time.h sys/un.h sys/wait.h unistd.h)
+    sys/socket.h sys/stropts.h sys/time.h sys/un.h sys/wait.h unistd.h    \
+    utime.h)
   
   # --------------------------------------------
   # Verify certain entries from AC_CHECK_HEADERS

diff --git a/sntp/libopts/compat/compat.h b/sntp/libopts/compat/compat.h
index 8375ac53d6cdef6d702c9c8971b5f09bccf5a5e8..8c7f19e6a3c1afb756e0e7cc08fc710f19f1df98 100644 (file)
--- a/sntp/libopts/compat/compat.h
+++ b/sntp/libopts/compat/compat.h
@@ -153,7 +153,7 @@
 
 #include <time.h>
 
-#ifndef __windows__
+#ifdef HAVE_UTIME_H
 #  include <utime.h>
 #endif
 

diff --git a/sntp/libopts/m4/libopts.m4 b/sntp/libopts/m4/libopts.m4
index d077e3fe943bf04a7d8283a62b564b62fde2bdb0..786802e5bf14a164029bba0789d48c5965acc007 100644 (file)
--- a/sntp/libopts/m4/libopts.m4
+++ b/sntp/libopts/m4/libopts.m4
@@ -24,7 +24,8 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
   # =================
   AC_CHECK_HEADERS(dlfcn.h errno.h fcntl.h libgen.h memory.h netinet/in.h \
     setjmp.h sys/mman.h sys/param.h sys/poll.h sys/procset.h sys/select.h \
-    sys/socket.h sys/stropts.h sys/time.h sys/un.h sys/wait.h unistd.h)
+    sys/socket.h sys/stropts.h sys/time.h sys/un.h sys/wait.h unistd.h    \
+    utime.h)
   
   # --------------------------------------------
   # Verify certain entries from AC_CHECK_HEADERS