diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-06-12 14:25:24 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-06-12 14:39:29 +0100 |
| commit | 3fb44a582c7796d24661d87b084b1f8d201cc5e9 (patch) | |
| tree | 731ab20e9bbf1c59868a034b685fa63512e35a48 | |
| parent | fe144853b4c39bf97efc0e81cc034c77c256ec0e (diff) | |
| download | haskell-3fb44a582c7796d24661d87b084b1f8d201cc5e9.tar.gz | |
Fix suseconds configure test on Windows
| -rw-r--r-- | libraries/base/aclocal.m4 | 9 | ||||
| -rw-r--r-- | libraries/base/configure.ac | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/libraries/base/aclocal.m4 b/libraries/base/aclocal.m4 index a8f54124ea..6e9801fbc8 100644 --- a/libraries/base/aclocal.m4 +++ b/libraries/base/aclocal.m4 @@ -169,12 +169,17 @@ AC_DEFUN([FPTOOLS_CHECK_HTYPE_ELSE],[ fi fi ]) + if test "$AC_CV_NAME_supported" = no + then + $2 + fi + + dnl Note: evaluating dollar-2 can change the value of + dnl $AC_CV_NAME_supported, so we might now get a different answer if test "$AC_CV_NAME_supported" = yes; then AC_MSG_RESULT($AC_CV_NAME) AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [Define to Haskell type for $1]) - else - $2 fi undefine([AC_TYPE_NAME])dnl undefine([AC_CV_NAME])dnl diff --git a/libraries/base/configure.ac b/libraries/base/configure.ac index 787bf66d69..acfd48e5ca 100644 --- a/libraries/base/configure.ac +++ b/libraries/base/configure.ac @@ -102,7 +102,6 @@ FPTOOLS_CHECK_HTYPE_ELSE(suseconds_t, 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]) |