Plumb LibsReadline into extra_libraries for -package util, rather than
extra_ld_opts, so that GHCi knows to load them too.
if test $HaveLibTermcap = YES && test x"$HaveLibReadline" = xYES ; then
AC_DEFINE(HAVE_READLINE_LIBS,1)
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=
else
AC_DEFINE(HAVE_READLINE_LIBS,0)
LibsReadline=
else [ cFPTOOLS_TOP_ABS ++ "/hslibs/util"
, cFPTOOLS_TOP_ABS ++ "/hslibs/util/cbits" ],
hs_libraries = [ "HSutil" ],
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" ],
include_dirs = if installing
then []
else [ cFPTOOLS_TOP_ABS ++ "/hslibs/util/cbits" ],
],
extra_ghc_opts = [],
extra_cc_opts = [],
],
extra_ghc_opts = [],
extra_cc_opts = [],
- extra_ld_opts = words cLibsReadline
},
-- no cbits at the moment, we'll need to add one if this library
},
-- no cbits at the moment, we'll need to add one if this library