move way-related stuff into a separate file

[ghc-hetmet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8fa8829..5387c83 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -126,7 +126,12 @@ if test "$WithGhc" != ""; then
   GhcMinVersion2=`echo "$GhcMinVersion" | sed 's/^\\(.\\)$/0\\1/'`
   GhcCanonVersion="$GhcMajVersion$GhcMinVersion2"
   if test $GhcCanonVersion -ge 609; then ghc_ge_609=YES; else ghc_ge_609=NO; fi
+  FP_COMPARE_VERSIONS($GhcVersion,[-ge],[6.10.2],
+                      [ghc_ge_6102=YES], [ghc_ge_6102=NO])
+  if test $GhcCanonVersion -ge 611; then ghc_ge_611=YES; else ghc_ge_611=NO; fi
   AC_SUBST(ghc_ge_609)dnl
+  AC_SUBST(ghc_ge_6102)dnl
+  AC_SUBST(ghc_ge_611)dnl
 fi
 
 dnl ** Must have GHC to build GHC, unless --enable-hc-boot is on
@@ -255,15 +260,15 @@ i386-apple-darwin|powerpc-apple-darwin)
     soext='.dylib'
     CFLAGS="$CFLAGS -m32"
     LDFLAGS="$LDFLAGS -m32"
-    SRC_CC_OPTS="$SRC_CC_OPTS -m32"
-    SRC_LD_OPTS="$SRC_LD_OPTS -m32"
+    CONF_CC_OPTS="$CONF_CC_OPTS -m32"
+    CONF_LD_OPTS="$CONF_LD_OPTS -m32"
     ;;
 x86_64-apple-darwin)
     soext='.dylib'
     CFLAGS="$CFLAGS -m64"
     LDFLAGS="$LDFLAGS -m64"
-    SRC_CC_OPTS="$SRC_CC_OPTS -m64"
-    SRC_LD_OPTS="$SRC_LD_OPTS -m64"
+    CONF_CC_OPTS="$CONF_CC_OPTS -m64"
+    CONF_LD_OPTS="$CONF_LD_OPTS -m64"
     ;;
 esac
 
@@ -525,8 +530,8 @@ FP_GCC_EXTRA_FLAGS
 dnl ** figure out how to invoke cpp directly (gcc -E is no good)
 AC_PROG_CPP
 
-AC_SUBST(SRC_CC_OPTS)
-AC_SUBST(SRC_LD_OPTS)
+AC_SUBST(CONF_CC_OPTS)
+AC_SUBST(CONF_LD_OPTS)
 
 dnl ** figure out how to do context diffs
 FP_PROG_CONTEXT_DIFF