X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=787bf66d695f36b997bba4c26dc5ad3f83276727;hb=00e51b0132c947f6b6eb548d968bf377384151ca;hp=b19e8008ff5c922f8689758f17bd118ac4e82f76;hpb=4d4e09c3de951466d81e9ade6273a5973079f4f1;p=ghc-base.git

diff --git a/configure.ac b/configure.ac
index b19e800..787bf66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,6 +10,13 @@ AC_ARG_WITH([cc],
             [CC=$withval])
 AC_PROG_CC()
 
+case `uname -s` in
+    MINGW*|CYGWIN*)
+        WINDOWS=YES;;
+    *)
+        WINDOWS=NO;;
+esac
+
 # do we have long longs?
 AC_CHECK_TYPES([long long])
 
@@ -90,7 +97,15 @@ FPTOOLS_CHECK_HTYPE(sig_atomic_t)
 FPTOOLS_CHECK_HTYPE(clock_t)
 FPTOOLS_CHECK_HTYPE(time_t)
 FPTOOLS_CHECK_HTYPE(useconds_t)
-FPTOOLS_CHECK_HTYPE(suseconds_t)
+FPTOOLS_CHECK_HTYPE_ELSE(suseconds_t,
+                         [if test "$WINDOWS" = "YES"
+                          then
+                              AC_CV_NAME=Int32
+                              AC_CV_NAME_supported=yes
+                              AC_MSG_RESULT([not found...on Windows, so using Int32])
+                          else
+                              AC_MSG_ERROR([type not found])
+                          fi])
 FPTOOLS_CHECK_HTYPE(dev_t)
 FPTOOLS_CHECK_HTYPE(ino_t)
 FPTOOLS_CHECK_HTYPE(mode_t)
@@ -138,11 +153,10 @@ FP_SEARCH_LIBS_PROTO(iconv,
                       iconv_close(cd);],
                      iconv,
                      [EXTRA_LIBS="$EXTRA_LIBS $ac_lib"],
-                     [case `uname -s` in
-                        MINGW*|CYGWIN*) ;;
-                        *)
-                             AC_MSG_ERROR([iconv is required on non-Windows platforms]);;
-                      esac])
+                     [if test "$WINDOWS" = "NO"
+                      then
+                          AC_MSG_ERROR([iconv is required on non-Windows platforms])
+                      fi])
 
 # If possible, we use libcharset instead of nl_langinfo(CODESET) to
 # determine the current locale's character encoding.