X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=2551da6bd8f0854ba75ddf3e0ca9e88dece06a5e;hb=9064bb63718f6d3a18bfaedda2697bf9d0b0e422;hp=436a4d0d81dd545a09061039b0fcd1018ceae3f8;hpb=ce93b8c5acec8674d5b1a96f19ad5196366e7454;p=ghc-hetmet.git diff --git a/configure.in b/configure.in index 436a4d0..2551da6 100644 --- a/configure.in +++ b/configure.in @@ -322,7 +322,17 @@ dnl AC_SUBST(TargetVendor_CPP) AC_SUBST(exeext) -AC_PATH_PROG(GHC,ghc) +if test "$GHC" = ""; then + AC_PATH_PROG(GHC,ghc) +fi +if test "$GHC" != ""; then + FPTOOLS_GHC_VERSION([GhcVersion], [GhcMajVersion], [GhcMinVersion], [GhcPatchLevel])dnl + AC_SUBST(GhcVersion)dnl + AC_SUBST(GhcMajVersion)dnl + AC_SUBST(GhcMinVersion)dnl + AC_SUBST(GhcPatchLevel)dnl +fi + AC_PATH_PROGS(NHC,nhc nhc98) AC_PATH_PROG(HBC,hbc) @@ -491,7 +501,7 @@ AC_PATH_PROGS(CompressCmd,gzip compress,gzip) dnl ** check for jade/openjade & determine a working catalog AC_PATH_PROGS(JadeCmd,openjade jade,jade) FPTOOLS_DOCBOOK_CATALOG(Catalog, $JadeCmd, docs/fptools-both.dsl, - /usr/share/sgml/CATALOG.docbkdsl $hardtop/glafp-utils/docbook/CATALOG*) + /etc/sgml.catalog /usr/share/sgml/CATALOG.docbkdsl $hardtop/glafp-utils/docbook/CATALOG*) if test -z "$Catalog"; then AC_MSG_RESULT([Warning: You will not be able to build the documentation.]) fi @@ -612,6 +622,30 @@ fi FPTOOLS_CHECK_ALIGNMENT(unsigned short) FPTOOLS_CHECK_ALIGNMENT(void *) +dnl ** map standard C types and ISO types to Haskell types +FPTOOLS_CHECK_HTYPE(char) +FPTOOLS_CHECK_HTYPE(signed char) +FPTOOLS_CHECK_HTYPE(unsigned char) +FPTOOLS_CHECK_HTYPE(short) +FPTOOLS_CHECK_HTYPE(unsigned short) +FPTOOLS_CHECK_HTYPE(int) +FPTOOLS_CHECK_HTYPE(unsigned int) +FPTOOLS_CHECK_HTYPE(long) +FPTOOLS_CHECK_HTYPE(unsigned long) +if test "$fptools_cv_have_long_long" = yes; then +FPTOOLS_CHECK_HTYPE(long long) +FPTOOLS_CHECK_HTYPE(unsigned long long) +fi +FPTOOLS_CHECK_HTYPE(float) +FPTOOLS_CHECK_HTYPE(double) +FPTOOLS_CHECK_HTYPE(ptrdiff_t) +FPTOOLS_CHECK_HTYPE(size_t) +FPTOOLS_CHECK_HTYPE(wchar_t) +dnl Int32 is a HACK for non-ISO C compilers +FPTOOLS_CHECK_HTYPE(sig_atomic_t, Int32) +FPTOOLS_CHECK_HTYPE(clock_t) +FPTOOLS_CHECK_HTYPE(time_t) + dnl ** can we open files in binary mode? FPTOOLS_O_BINARY @@ -697,6 +731,9 @@ AC_CHECK_LIB(gmp, mpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp, AC_SUBST(HaveLibGmp) AC_SUBST(LibGmp) +dnl ** check whether this machine has GNU regex in libc. +FPTOOLS_REGEX_IN_LIBC + dnl ** check whether this machine has BFD and liberty installed (used for debugging) dnl the order of these tests matters: bfd needs liberty AC_CHECK_LIB(iberty, xmalloc)