projects
/
ghc-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
7a97ec4
)
Fix suseconds configure test on Windows
author
Ian Lynagh
<igloo@earth.li>
Sun, 12 Jun 2011 13:25:24 +0000
(14:25 +0100)
committer
Adam Megacz
<megacz@cs.berkeley.edu>
Mon, 20 Jun 2011 02:04:27 +0000
(19:04 -0700)
aclocal.m4
patch
|
blob
|
history
configure.ac
patch
|
blob
|
history
diff --git
a/aclocal.m4
b/aclocal.m4
index
a8f5412
..
6e9801f
100644
(file)
--- a/
aclocal.m4
+++ b/
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/configure.ac
b/configure.ac
index
787bf66
..
acfd48e
100644
(file)
--- a/
configure.ac
+++ b/
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])