# 
# 
# patch "ChangeLog"
#  from [475065e0075fea72070c1b9e3df9d6156a2d23d2]
#    to [531cd0bee428682b34f604210d5c05be910b758b]
# 
# patch "Makefile.am"
#  from [73bbbf9fadf07f9f85d194f011de6671b8dbbbda]
#    to [1086b6f0ea35d96bdd46455c7d97c5934fb77e5a]
# 
# patch "configure.ac"
#  from [4d670586a1339428e4249c10655f5b52b9558761]
#    to [3db7a41acaf0a99ca96e19c12c2f96e5eaea45b1]
# 
============================================================
--- ChangeLog	475065e0075fea72070c1b9e3df9d6156a2d23d2
+++ ChangeLog	531cd0bee428682b34f604210d5c05be910b758b
@@ -1,3 +1,10 @@
+2006-01-21  Matthew Gregan  <address@hidden>
+
+	* configure.ac: Fix up Windows and IPv6 tests after the change
+	from AC_TRY_RUN to AC_TRY_COMPILE.  Also a couple of other minor
+	cleanups.
+	* Makefile.am: Remove win32/wcwidth.c from WIN32_PLATFORM_SOURCES.
+
 2006-01-20  Richard Levitte  <address@hidden>
 
 	* po/sv.po: Added a \n at the end of a msgstr that was missing
============================================================
--- Makefile.am	73bbbf9fadf07f9f85d194f011de6671b8dbbbda
+++ Makefile.am	1086b6f0ea35d96bdd46455c7d97c5934fb77e5a
@@ -216,7 +216,7 @@
 
 WIN32_PLATFORM_SOURCES = \
 	win32/read_password.cc win32/get_system_flavour.cc win32/process.cc win32/terminal.cc \
-	win32/inodeprint.cc win32/fs.cc win32/wcwidth.c
+	win32/inodeprint.cc win32/fs.cc
 
 # primaries
 
============================================================
--- configure.ac	4d670586a1339428e4249c10655f5b52b9558761
+++ configure.ac	3db7a41acaf0a99ca96e19c12c2f96e5eaea45b1
@@ -277,20 +277,11 @@
 
 AC_CACHE_CHECK([if this is Windows],
        ac_win32, [
-       AC_TRY_COMPILE([
-#ifdef WIN32
-#include <windows.h>
-int main(void)
-{
-  return 0;
-}
-#else
-__wont_compile_
-#endif
-],
-        ac_win32=yes,
-        ac_win32=no,
-        ac_win32=no)])
+       AC_TRY_COMPILE([#include <windows.h>],
+                      [HANDLE h; DWORD d;],
+                      ac_win32=yes,
+                      ac_win32=no)
+])
 if test "$ac_win32" = "yes"; then
    AM_CONDITIONAL(WIN32_PLATFORM, true)
 else
@@ -309,21 +300,16 @@
       ac_inet6=no
       if test x"${enable_ipv6}" = x"auto" || test x"${enable_ipv6}" = x"yes"
       then
-         AC_TRY_COMPILE([
-#if defined(WIN32)
-# include <winsock2.h>
-#else
-# include <sys/types.h>
-# include <sys/socket.h>
-# include <netinet/in.h>
-# include <arpa/inet.h>
-#endif
-int main(void)
-{
-  sockaddr_in6 sa_in6;
-}
-],
-            ac_inet6=yes
+         AC_TRY_COMPILE([#ifdef WIN32
+                         #include <winsock2.h>
+                         #else
+                         #include <sys/types.h>
+                         #include <sys/socket.h>
+                         #include <netinet/in.h>
+                         #include <arpa/inet.h>
+                         #endif],
+                        [sockaddr_in6 sa_in6;],
+                        ac_inet6=yes
          )
 
          if test x"${enable_ipv6}" = x"yes" && test x"${ac_inet6}" = x"no"
@@ -419,7 +405,7 @@
   AC_TRY_COMPILE(
   [#include <sys/types.h>
    #include <sys/socket.h>],
-  [socklen_t len = 42; return 0;],
+  [socklen_t len = 42;],
   ac_cv_type_socklen_t=yes,
   ac_cv_type_socklen_t=no)
 ])
@@ -434,7 +420,7 @@
 [
   AC_TRY_COMPILE(
   [#include <sys/types.h>],
-  [pid_t pid = 42; return 0;],
+  [pid_t pid = 42; ],
   ac_cv_type_pid_t=yes,
   ac_cv_type_pid_t=no)
 ])