diff -ru darcs-1.0.9/work/darcs-1.0.9/aclocal.m4 darcs-1.0.9.new/work/darcs-1.0.9/aclocal.m4
--- darcs-1.0.9/work/darcs-1.0.9/aclocal.m4	2007-06-04 07:39:21.000000000 -0400
+++ darcs-1.0.9.new/work/darcs-1.0.9/aclocal.m4	2007-11-24 15:05:55.000000000 -0500
@@ -447,9 +447,29 @@
 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([NOT 'new' API])
+       AC_MSG_CHECKING([GHC.Handle.fdToHandle' API])
+       TRY_RUN_GHC([
+import GHC.Handle ( fdToHandle' )
+import IO ( IOMode(..) )
+
+main = fdToHandle' 1 Nothing False "stdout" WriteMode True
+       ],
+       AC_MSG_RESULT([okay])
+       IMPORT_WORKAROUND([import qualified GHC.Handle ( fdToHandle' )
+import System.IO ( Handle, IOMode )
+import System.Posix.Internals ( FDType )
+])
+       CODE_WORKAROUND([[
+{-
+Work around renaming of GHC.Handle.openFd and change in its API.
+-}
+openFd :: Int -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
+openFd fd x y z a b = GHC.Handle.fdToHandle' (fromIntegral fd) x b y z a
+        ]]),
        AC_MSG_RESULT([failed])
        AC_MSG_ERROR([Couldnt figure out how to call GHC.Handle.openFd!])
     )
   )
-])
+)])
 
diff -ru darcs-1.0.9/work/darcs-1.0.9/configure.ac darcs-1.0.9.new/work/darcs-1.0.9/configure.ac
--- darcs-1.0.9/work/darcs-1.0.9/configure.ac	2007-06-04 07:39:21.000000000 -0400
+++ darcs-1.0.9.new/work/darcs-1.0.9/configure.ac	2007-11-24 15:05:36.000000000 -0500
@@ -134,6 +134,16 @@
 GHC_CHECK_MODULE(Text.Html, html, text "foo",,
                  AC_MSG_ERROR(Cannot find Text.Html; try installing package html?))
 
+dnl Check if we need package containers
+
+GHC_CHECK_MODULE(Data.Map, containers, empty,,
+                 AC_MSG_ERROR(Cannot find Data.Map))
+
+dnl Check if we need package pretty (just for the utilities)
+
+GHC_CHECK_MODULE(Text.PrettyPrint, pretty, empty,,
+                 AC_MSG_ERROR(Cannot find Text.PrettyPrint))
+
 dnl Deal with systems on which getCurrentDirectory uses '\\' rather than '/':
 
 WORKAROUND_getCurrentDirectory