projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2001-03-03 02:50:04 by chak]
[ghc-hetmet.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
7214401
..
5158551
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-355,15
+355,6
@@
if test "$GHC" = ""; then
AC_PATH_PROG(GHC,ghc)
fi
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
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_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
if test "$WithGhc" != ""; then
FPTOOLS_GHC_VERSION([GhcVersion], [GhcMajVersion], [GhcMinVersion], [GhcPatchLevel])dnl
AC_SUBST(GhcVersion)dnl
@@
-510,6
+510,11
@@
FPTOOLS_HAVE_GCC
dnl ** figure out how to invoke cpp directly (gcc -E is no good)
AC_PROG_CPP
dnl ** figure out how to invoke cpp directly (gcc -E is no good)
AC_PROG_CPP
+case $HostOS_CPP in
+mingw32)
+ CPP="$CPP -mno-cygwin"
+ ;;
+esac
dnl ** figure out how to do context diffs
FPTOOLS_PROG_DIFF
dnl ** figure out how to do context diffs
FPTOOLS_PROG_DIFF
@@
-842,12
+847,22
@@
else
fi
AC_SUBST(LibsReadline)
fi
AC_SUBST(LibsReadline)
+dnl ** check for math library
+FPTOOLS_CHECK_LIBM()
+AC_SUBST(LIBM)
+
dnl ################################################################
dnl Check for libraries
dnl ################################################################
dnl ################################################################
dnl Check for libraries
dnl ################################################################
-FPTOOLS_CHECK_LIB_NOWARN(dl, dlopen)
-FPTOOLS_CHECK_LIB_NOWARN(dld, shl_load)
+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)
dnl --------------------------------------------------
FPTOOLS_CHECK_LIB_NOWARN(m, atan)
dnl --------------------------------------------------
@@
-906,10
+921,3
@@
dnl ** code before data?
FPTOOLS_CODE_BEFORE_DATA
AC_OUTPUT(mk/config.mk, echo timestamp > mk/stamp-h )
FPTOOLS_CODE_BEFORE_DATA
AC_OUTPUT(mk/config.mk, echo timestamp > mk/stamp-h )
-
-echo ''
-echo '************************************************'
-echo '*** NOW DO: gmake boot followed by gmake all'
-echo '*** (where gmake == GNU make)'
-echo '************************************************'
-exit 0