[project @ 2001-02-15 17:33:53 by simonmar]

[ghc-hetmet.git] / configure.in

diff --git a/configure.in b/configure.in
index bfb4068..dbfe119 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -355,15 +355,6 @@ if test "$GHC" = ""; then
   AC_PATH_PROG(GHC,ghc)
 fi
 
-AC_ARG_WITH(hc,
-[  --with-hc=<haskell compiler>
-        Use a command different from 'ghc' to compile generic Haskell code.
-],
-[WithHc="$withval"],
-[WithHc=$GHC]
-)
-AC_SUBST(WithHc)
-
 AC_ARG_WITH(ghc,
 [  --with-ghc=<haskell compiler>
         Use a command different from 'ghc' to compile GHC-specific Haskell code
@@ -374,6 +365,15 @@ AC_ARG_WITH(ghc,
 )
 AC_SUBST(WithGhc)
 
+AC_ARG_WITH(hc,
+[  --with-hc=<haskell compiler>
+        Use a command different from 'ghc' to compile generic Haskell code.
+],
+[WithHc="$withval"],
+[WithHc=$WithGhc]
+)
+AC_SUBST(WithHc)
+
 if test "$WithGhc" != ""; then
   FPTOOLS_GHC_VERSION([GhcVersion], [GhcMajVersion], [GhcMinVersion], [GhcPatchLevel])dnl
   AC_SUBST(GhcVersion)dnl
@@ -846,14 +846,12 @@ dnl ################################################################
 dnl Check for libraries
 dnl ################################################################
 
-AC_CHECK_LIB(dl, dlopen, [
-       HaveLibDL=YES
-       AC_DEFINE(HAVE_LIBDL)], [HaveLibDL=NO])
-if test x$HaveLibDL = xYES; then
-   AC_DEFINE(HAVE_DLOPEN)
-else
-   AC_CHECK_FUNCS(dlopen)
-fi
+AC_CHECK_LIB(dl, dlopen, 
+       [HaveLibDL=YES
+        AC_DEFINE(HAVE_LIBDL)
+        LIBS="$LIBS -ldl"], 
+       [HaveLibDL=NO])
+AC_CHECK_FUNCS(dlopen)
 AC_SUBST(HaveLibDL)
 
 FPTOOLS_CHECK_LIB_NOWARN(m, atan)