From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 10 Aug 2006 04:57:53 +0000 (-0400)
Subject: [Bug 659] Get the latest windows patches for libopts
X-Git-Tag: NTP_4_2_3P29~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abd3b65eaa1d1b662817d84a228238e96e5d837e;p=thirdparty%2Fntp.git

[Bug 659] Get the latest windows patches for libopts

bk: 44dabcd1dzymN950qUWYTxJPQNqECA
---

diff --git a/libopts/m4/libopts.m4 b/libopts/m4/libopts.m4
index fc1294869..65b876e37 100644
--- 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 8375ac53d..8c7f19e6a 100644
--- 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 d077e3fe9..786802e5b 100644
--- 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