blob: ac6b8578f4916821025e8b67ac57f35f01719ea5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
diff -rN -u old-darcs-1.1.0pre1/aclocal.m4 new-darcs-1.1.0pre1/aclocal.m4
--- old-darcs-1.1.0pre1/aclocal.m4 2007-12-30 18:13:00.000000000 +0100
+++ new-darcs-1.1.0pre1/aclocal.m4 2007-12-30 18:13:01.000000000 +0100
@@ -447,6 +447,20 @@
openFd :: Int -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
openFd fd x y z a b = GHC.Handle.openFd fd x b y z a
]]),
+AC_MSG_RESULT([okay])
+IMPORT_WORKAROUND([
+import qualified GHC.Handle ( fdToHandle' )
+import System.IO ( Handle, IOMode )
+import System.Posix.Internals ( FDType )
+import qualified GHC.IOBase ( FD )
+])
+CODE_WORKAROUND([[
+ {-
+ Work around change in the GHC.Handle.fdToHandle' API.
+ -}
+openFd :: GHC.IOBase.FD -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
+openFd fd x y z a b = GHC.Handle.fdToHandle' fd x b y z a
+]]),
AC_MSG_RESULT([failed])
AC_MSG_ERROR([Couldnt figure out how to call GHC.Handle.openFd!])
)
diff -rN -u old-darcs-1.1.0pre1/configure.ac new-darcs-1.1.0pre1/configure.ac
--- old-darcs-1.1.0pre1/configure.ac 2007-12-30 18:13:00.000000000 +0100
+++ new-darcs-1.1.0pre1/configure.ac 2007-12-30 18:13:01.000000000 +0100
@@ -135,6 +135,10 @@
GHC_CHECK_MODULE(Text.Html, html, text "foo",,
AC_MSG_ERROR(Cannot find Text.Html; try installing package html?))
+dnl See if we need a package for containers...
+
+GHC_CHECK_MODULE(Data.Map, containers, empty)
+
dnl Deal with systems on which getCurrentDirectory uses '\\' rather than '/':
WORKAROUND_getCurrentDirectory
|
GitWeb
