[project @ 2001-04-30 16:01:52 by sewardj]

Plumb LibsReadline into extra_libraries for -package util, rather than
extra_ld_opts, so that GHCi knows to load them too.

diff --git a/configure.in b/configure.in
index 3ed8baa..7e6bb90 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -840,7 +840,7 @@ fi
 
 if test $HaveLibTermcap = YES && test x"$HaveLibReadline" = xYES ; then
   AC_DEFINE(HAVE_READLINE_LIBS,1)
-  LibsReadline="-lreadline -l$LibTermcap"
+  LibsReadline="readline $LibTermcap"
 else
   AC_DEFINE(HAVE_READLINE_LIBS,0)
   LibsReadline=

diff --git a/ghc/driver/PackageSrc.hs b/ghc/driver/PackageSrc.hs
index cd488d1..d46d529 100644 (file)
--- a/ghc/driver/PackageSrc.hs
+++ b/ghc/driver/PackageSrc.hs
@@ -299,7 +299,7 @@ package_details installing
                              else [ cFPTOOLS_TOP_ABS ++ "/hslibs/util"
                                   , cFPTOOLS_TOP_ABS ++ "/hslibs/util/cbits" ],
          hs_libraries      = [ "HSutil" ],
-        extra_libraries   = [ "HSutil_cbits" ],
+        extra_libraries   = [ "HSutil_cbits" ] ++ words cLibsReadline,
          include_dirs   = if installing
                              then []
                              else [ cFPTOOLS_TOP_ABS ++ "/hslibs/util/cbits" ],
@@ -311,7 +311,7 @@ package_details installing
                          ],
          extra_ghc_opts = [],
          extra_cc_opts  = [],
-         extra_ld_opts  = words cLibsReadline
+         extra_ld_opts  = []
         },
 
         -- no cbits at the moment, we'll need to add one if this library