X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=configure.ac;h=29ed29f2868cf12fb4f3930f9170e018efb09c82;hp=0efe7239b727ae356e83f5be6f1dd97b4b4faca4;hb=cbc86d748d5f7b5ad5503c9e87c0b5c0402f27bc;hpb=0e89dd445e49365b9c87da57bbe9e165c292b7eb

diff --git a/configure.ac b/configure.ac
index 0efe723..29ed29f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,12 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([fptools build system], [1.0], [cvs-fptools@haskell.org], [fptools])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.5], [glasgow-haskell-bugs@haskell.org], [ghc])
+
+FP_SETUP_PROJECT_VERSION
+
+# Hmmm, we fix the RPM release number to 1 here... Is this convenient?
+AC_SUBST([release], [1])
 
 # First off, a distrib sanity check..
 AC_CONFIG_SRCDIR([mk/config.mk.in])
@@ -28,7 +33,7 @@ dnl
 dnl After the toplevel configuration is complete, the script will recurse into
 dnl these subdirectories if they exist. The use of a cache file makes repeated
 dnl checks cheap.
-AC_CONFIG_SUBDIRS([ghc libraries])
+AC_CONFIG_SUBDIRS([libraries])
 
 # -------------------------------------------------------------------------
 # Prepare to generate the following header files
@@ -125,6 +130,15 @@ amd64-*-openbsd*|x86_64-*-openbsd*)
         HostVendor_CPP='unknown'
         HostOS_CPP='openbsd'
         ;;
+amd64-*-freebsd*)
+	HostPlatform=x86_64-unknown-freebsd
+	TargetPlatform=x86_64-unknown-freebsd
+	BuildPlatform=x86_64-unknown-freebsd
+	HostPlatform_CPP='x86_64_unknown_freebsd'
+	HostArch_CPP='x86_64'
+	HostVendor_CPP='unknown'
+	HostOS_CPP='freebsd'
+	;;
 arm*-linux*)
         HostPlatform=arm-unknown-linux # hack again
         TargetPlatform=arm-unknown-linux
@@ -188,14 +202,14 @@ i[[3456]]86-*-linux*)
         HostVendor_CPP='unknown'
         HostOS_CPP='linux'
         ;;
-i[[3456]]86-*-gnu*)
-        HostPlatform=i386-unknown-gnu
-        TargetPlatform=i386-unknown-gnu
-        BuildPlatform=i386-unknown-gnu
-        HostPlatform_CPP=i386_unknown_gnu
-        HostArch_CPP=i386
-        HostVendor_CPP=unknown
-        HostOS_CPP=gnu
+i[[3456]]86-*-kfreebsd*-gnu)
+        HostPlatform=i386-unknown-kfreebsdgnu # hack again
+        TargetPlatform=i386-unknown-kfreebsdgnu
+        BuildPlatform=i386-unknown-kfreebsdgnu
+        HostPlatform_CPP='i386_unknown_kfreebsdgnu'
+        HostArch_CPP='i386'
+        HostVendor_CPP='unknown'
+        HostOS_CPP='kfreebsdgnu'
         ;;
 i[[3456]]86-*-freebsd[[3-9]]*) # FreeBSD 3.0+ uses ELF
 	HostPlatform=i386-unknown-freebsd # hack again
@@ -271,6 +285,15 @@ i[[3456]]86-apple-darwin*)
 	HostVendor_CPP='apple'
 	HostOS_CPP='darwin'
 	;;
+i[[3456]]86-*-gnu*)
+        HostPlatform=i386-unknown-gnu
+        TargetPlatform=i386-unknown-gnu
+        BuildPlatform=i386-unknown-gnu
+        HostPlatform_CPP=i386_unknown_gnu
+        HostArch_CPP=i386
+        HostVendor_CPP=unknown
+        HostOS_CPP=gnu
+        ;;
 ia64-*-linux*)
         HostPlatform=ia64-unknown-linux # hack again
         TargetPlatform=ia64-unknown-linux
@@ -631,6 +654,9 @@ if test "$WithGhc" != ""; then
   AC_SUBST(GhcPatchLevel)dnl
 fi
 
+# Check whether this GHC has readline installed
+FP_GHC_HAS_READLINE
+
 AC_PATH_PROGS(NHC,nhc nhc98)
 AC_PATH_PROG(HBC,hbc)
 
@@ -699,21 +725,6 @@ if test "$BootingFromHc" = "NO" -a "$WithGhc" = "" -a -d "$srcdir/ghc"; then
 AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.])
 fi;
 
-dnl ** --enable-threaded-rts (not used any more)
-dnl --------------------------------------------------------------
-AC_ARG_ENABLE(threaded-rts,
-[AC_HELP_STRING([--enable-threaded-rts],
-[DEPRECATED (backwards compatibility only). [default=no]])],
-[ if test x"$enableval" = x"yes"; then
-	ThreadedRts=YES
-  else
-	ThreadedRts=NO
-  fi
-],
-[ThreadedRts=NO]
-)
-AC_SUBST(ThreadedRts)
-
 dnl ** Enable the construction of Win32 DLLs?
 dnl --------------------------------------------------------------
 dnl
@@ -832,6 +843,8 @@ dnl     If gcc, make sure it's at least 2.1
 dnl
 FP_HAVE_GCC
 FP_MINGW_GCC
+FP_GCC_NEEDS_NO_OMIT_LFPTR
+FP_GCC_HAS_NO_UNIT_AT_A_TIME
 
 dnl ** figure out how to invoke cpp directly (gcc -E is no good)
 AC_PROG_CPP
@@ -1059,7 +1072,7 @@ fi
 
 dnl ** check for more functions
 dnl ** The following have been verified to be used in ghc/, but might be used somewhere else, too.
-AC_CHECK_FUNCS([getclock getrusage gettimeofday setitimer siginterrupt sysconf times])
+AC_CHECK_FUNCS([getclock getrusage gettimeofday setitimer siginterrupt sysconf times ctime_r])
 dnl ** For ghc/rts/gmp:
 AC_CHECK_FUNCS([getpagesize])
 
@@ -1072,17 +1085,19 @@ AC_SUBST(LibGmp)
 
 dnl ** (Mac OS X only: check for GMP.framework)
 HaveFrameworkGMP=NO
-if test $HostPlatform = "powerpc-apple-darwin"; then
- AC_MSG_CHECKING([for GMP.framework])
- save_libs="$LIBS"
- LIBS="-framework GMP"
- AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkGMP=YES,)
- if test $HaveFrameworkGMP = YES; then
-  AC_DEFINE([HAVE_FRAMEWORK_GMP], [1], [Define to 1 if GMP.framework is installed (Mac OS X only).])
- fi;
- LIBS="$save_libs"
- AC_MSG_RESULT([$HaveFrameworkGMP])
-fi;
+case $HostPlatform in
+*-apple-darwin)
+    AC_MSG_CHECKING([for GMP.framework])
+    save_libs="$LIBS"
+    LIBS="-framework GMP"
+    AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkGMP=YES,)
+    if test $HaveFrameworkGMP = YES; then
+      AC_DEFINE([HAVE_FRAMEWORK_GMP], [1], [Define to 1 if GMP.framework is installed (Mac OS X only).])
+    fi;
+    LIBS="$save_libs"
+    AC_MSG_RESULT([$HaveFrameworkGMP])
+    ;;
+esac
 AC_SUBST(HaveFrameworkGMP)
 
 dnl ** check for mingwex library
@@ -1198,6 +1213,10 @@ AC_TRY_COMPILE(,[__asm__ (".subsections_via_symbols");],
             [Define to 1 if Apple-style dead-stripping is supported.])
     ])
 
+dnl ** check for librt
+AC_CHECK_LIB(rt, clock_gettime)
+AC_CHECK_FUNCS(clock_gettime)
+
 dnl ** check for Apple's "interesting" long double compatibility scheme
 AC_MSG_CHECKING(for printf$LDBLStub)
 AC_TRY_LINK_FUNC(printf$LSBLStub,
@@ -1212,7 +1231,18 @@ AC_TRY_LINK_FUNC(printf$LSBLStub,
             [Define to 1 if we have printf$LDBLStub (Apple Mac OS >= 10.4, PPC).])
     ])
 
+# test for GTK+
+AC_PATH_PROGS([GTK_CONFIG], [pkg-config])
+if test -n "$GTK_CONFIG"; then
+  if $GTK_CONFIG gtk+-2.0 --atleast-version=2.0; then
+    GTK_CONFIG="$GTK_CONFIG gtk+-2.0"
+  else
+    AC_MSG_WARN([GTK+ not usable, need at least version 2.0])
+    GTK_CONFIG=
+  fi
+fi
+AC_SUBST([GTK_CONFIG])
 
-AC_CONFIG_FILES([mk/config.mk])
+AC_CONFIG_FILES([mk/config.mk ghc.spec docs/users_guide/ug-book.xml])
 AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
 AC_OUTPUT