Several fixes to 'deriving' including Trac #2378

[ghc-hetmet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index cab4f19..f963e8f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -170,6 +170,15 @@ amd64-*-freebsd*|x86_64-*-freebsd*)
         HostVendor_CPP='unknown'
         HostOS_CPP='freebsd'
         ;;
+amd64-*-netbsd*|x86_64-*-netbsd*)
+        HostPlatform=x86_64-unknown-netbsd
+        TargetPlatform=x86_64-unknown-netbsd
+        BuildPlatform=x86_64-unknown-netbsd
+        HostPlatform_CPP='x86_64_unknown_netbsd'
+        HostArch_CPP='x86_64'
+        HostVendor_CPP='unknown'
+        HostOS_CPP='netbsd'
+        ;;
 arm*-linux*)
         HostPlatform=arm-unknown-linux # hack again
         TargetPlatform=arm-unknown-linux
@@ -656,12 +665,14 @@ if test "$WithGhc" != ""; then
   GhcCanonVersion="$GhcMajVersion$GhcMinVersion2"
   if test $GhcCanonVersion -ge 605; then ghc_ge_605=YES; else ghc_ge_605=NO; fi
   if test $GhcCanonVersion -ge 607; then ghc_ge_607=YES; else ghc_ge_607=NO; fi
+  if test $GhcCanonVersion -ge 609; then ghc_ge_609=YES; else ghc_ge_609=NO; fi
   AC_SUBST(ghc_ge_605)dnl
   AC_SUBST(ghc_ge_607)dnl
+  AC_SUBST(ghc_ge_609)dnl
 fi
 
-# Check whether this GHC has readline installed
-FP_GHC_HAS_READLINE
+# Check whether this GHC has editline installed
+FP_GHC_HAS_EDITLINE
 
 AC_PATH_PROGS(NHC,nhc nhc98)
 AC_PATH_PROG(HBC,hbc)
@@ -821,20 +832,20 @@ AC_SUBST(DotnetSupport)
 
 dnl ** Mac OS X: explicit deployment target
 dnl --------------------------------------------------------------
-AC_ARG_WITH([macos-deployment-target],
-[AC_HELP_STRING([--macos-deployment-target=VERSION],
-        [Build for Mac OS VERSION and higher  [default= version of build host]])],
-[MACOS_DEPLOYMENT_TARGET="$withval"
+AC_ARG_WITH([macosx-deployment-target],
+[AC_HELP_STRING([--with-macosx-deployment-target=VERSION],
+        [Build for Mac OS VERSION and higher  (default= version of build host)])],
+[FP_MACOSX_DEPLOYMENT_TARGET="$withval"
  if test "x$TargetOS_CPP-$TargetVendor_CPP" != "xdarwin-apple"; then
    # ignore everywhere, but on Mac OS
-   AC_MSG_WARN([--macos-deployment-target is only available on Mac OS X])
-   MACOS_DEPLOYMENT_TARGET=none
+   AC_MSG_WARN([--macosx-deployment-target is only available on Mac OS X])
+   FP_MACOSX_DEPLOYMENT_TARGET=none
  fi],
-[MACOS_DEPLOYMENT_TARGET=none]
+[FP_MACOSX_DEPLOYMENT_TARGET=none]
 )
-FP_MACOS_DEPLOYMENT_TARGET
-AC_SUBST(MACOS_DEPLOYMENT_VERSION)
-AC_SUBST(MACOS_DEPLOYMENT_SDK)
+FP_CHECK_MACOSX_DEPLOYMENT_TARGET
+AC_SUBST(MACOSX_DEPLOYMENT_VERSION)
+AC_SUBST(MACOSX_DEPLOYMENT_SDK)
 
 dnl --------------------------------------------------------------
 dnl End of configure script option section
@@ -1004,18 +1015,6 @@ AC_SYS_LARGEFILE
 dnl ** check for specific header (.h) files that we are interested in
 AC_CHECK_HEADERS([bfd.h ctype.h dirent.h dlfcn.h errno.h fcntl.h grp.h limits.h locale.h nlist.h pthread.h pwd.h signal.h sys/mman.h sys/resource.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/utsname.h sys/wait.h termios.h time.h utime.h windows.h winsock.h])
 
-AC_CHECK_HEADER([readline/readline.h], [HaveReadlineReadlineH=YES], [HaveReadlineReadlineH=NO])
-AC_CHECK_HEADER([readline/history.h], [HaveReadlineHistoryH=YES], [HaveReadlineHistoryH=NO])
-
-if test $HaveReadlineReadlineH = YES && test $HaveReadlineHistoryH = YES ; then
-  GhcLibsWithReadline=YES
-  AC_DEFINE([HAVE_READLINE_HEADERS], [1], [Define to 1 if readline/readline.h and readline/history.h exist.])
-else
-  GhcLibsWithReadline=NO
-  AC_DEFINE([HAVE_READLINE_HEADERS], [0], [Define to 1 if readline/readline.h and readline/history.h exist.])
-fi
-AC_SUBST(GhcLibsWithReadline)
-
 dnl ** check if it is safe to include both <time.h> and <sys/time.h>
 AC_HEADER_TIME