X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=ccc625fdccbc2125597de8178a9e29b7b82c3175;hb=bed9246114cff5b4d22acc0ff7ecfdd4fc52a5c2;hp=f2773672896f209c4af41e8cc45e66eb8d0861c8;hpb=13346da217137e4efb6cf14657960c75a23251ad;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index f277367..ccc625f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -319,12 +319,6 @@ x86_64-apple-darwin)
     ;;
 esac
 
-FPTOOLS_SET_C_LD_FLAGS([target],[CFLAGS],[LDFLAGS])
-FPTOOLS_SET_C_LD_FLAGS([build],[CONF_CC_OPTS_STAGE0],[CONF_LD_OPTS_STAGE0])
-FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE1],[CONF_LD_OPTS_STAGE1])
-# Stage 3 won't be supported by cross-compilation
-FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE2],[CONF_LD_OPTS_STAGE2])
-
 checkArch() {
     case $1 in
     alpha|arm|hppa|hppa1_1|i386|ia64|m68k|mips|mipseb|mipsel|powerpc|powerpc64|rs6000|s390|sparc|sparc64|vax|x86_64)
@@ -432,12 +426,11 @@ then
     NM="$hardtop/inplace/mingw/bin/nm.exe"
     fp_prog_ar_raw="$hardtop/inplace/mingw/bin/ar.exe"
     if ! test -d inplace/mingw ||
-         test inplace/mingw -ot ghc-tarballs/mingw/binutils*.tar.gz ||
-         test inplace/mingw -ot ghc-tarballs/mingw/gcc-core*.tar.gz ||
-         test inplace/mingw -ot ghc-tarballs/mingw/gcc-g++*.tar.gz ||
-         test inplace/mingw -ot ghc-tarballs/mingw/libcrypt*.tar.bz2 ||
-         test inplace/mingw -ot ghc-tarballs/mingw/mingw-runtime*.tar.gz ||
-         test inplace/mingw -ot ghc-tarballs/mingw/w32api*.tar.gz
+         test inplace/mingw -ot ghc-tarballs/mingw/binutils*.tar.lzma ||
+         test inplace/mingw -ot ghc-tarballs/mingw/gcc-core*.tar.lzma ||
+         test inplace/mingw -ot ghc-tarballs/mingw/gcc-c++*.tar.lzma  ||
+         test inplace/mingw -ot ghc-tarballs/mingw/mingwrt*.tar.gz    ||
+         test inplace/mingw -ot ghc-tarballs/mingw/w32api*.tar.lzma
     then
         AC_MSG_NOTICE([Making in-tree mingw tree])
         rm -rf inplace/mingw
@@ -445,12 +438,11 @@ then
         mkdir inplace/mingw
         (
             cd inplace/mingw &&
-            tar -zxf ../../ghc-tarballs/mingw/binutils*.tar.gz &&
-            tar -zxf ../../ghc-tarballs/mingw/gcc-core*.tar.gz &&
-            tar -zxf ../../ghc-tarballs/mingw/gcc-g++*.tar.gz &&
-            tar -jxf ../../ghc-tarballs/mingw/libcrypt*.tar.bz2 &&
-            tar -zxf ../../ghc-tarballs/mingw/mingw-runtime*.tar.gz &&
-            tar -zxf ../../ghc-tarballs/mingw/w32api*.tar.gz &&
+            tar --lzma -xf ../../ghc-tarballs/mingw/binutils*.tar.lzma &&
+            tar --lzma -xf ../../ghc-tarballs/mingw/gcc-core*.tar.lzma &&
+            tar --lzma -xf ../../ghc-tarballs/mingw/gcc-c++*.tar.lzma  &&
+            tar -z     -xf ../../ghc-tarballs/mingw/mingwrt*.tar.gz    &&
+            tar --lzma -xf ../../ghc-tarballs/mingw/w32api*.tar.lzma   &&
             mv bin/gcc.exe bin/realgcc.exe
         )
         inplace/mingw/bin/realgcc.exe driver/gcc/gcc.c driver/utils/cwrapper.c driver/utils/getLocation.c -Idriver/utils -o inplace/mingw/bin/gcc.exe
@@ -562,6 +554,13 @@ dnl     Figure out which C compiler to use.  Gcc is preferred.
 dnl     If gcc, make sure it's at least 2.1
 dnl
 FP_HAVE_GCC
+
+FPTOOLS_SET_C_LD_FLAGS([target],[CFLAGS],[LDFLAGS])
+FPTOOLS_SET_C_LD_FLAGS([build],[CONF_CC_OPTS_STAGE0],[CONF_LD_OPTS_STAGE0])
+FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE1],[CONF_LD_OPTS_STAGE1])
+# Stage 3 won't be supported by cross-compilation
+FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE2],[CONF_LD_OPTS_STAGE2])
+
 FP_GCC_EXTRA_FLAGS
 
 dnl ** figure out how to invoke cpp directly (gcc -E is no good)
@@ -780,8 +779,11 @@ dnl    Keep that check as early as possible.
 dnl    as we need to know whether we need libm
 dnl    for math functions or not
 dnl    (see http://hackage.haskell.org/trac/ghc/ticket/3730)
-AC_SEARCH_LIBS(atan, m, 
-  [AC_DEFINE([HAVE_LIBM], [1], [Define to 1 if you need to link with libm])])
+AC_CHECK_LIB(m, atan, HaveLibM=YES, HaveLibM=NO)
+if test $HaveLibM = YES
+then
+  AC_DEFINE([HAVE_LIBM], [1], [Define to 1 if you need to link with libm])
+fi
 
 dnl ** check whether this machine has BFD and liberty installed (used for debugging)
 dnl    the order of these tests matters: bfd needs liberty
@@ -875,6 +877,10 @@ AC_TRY_LINK_FUNC(printf\$LDBLStub,
             [Define to 1 if we have printf$LDBLStub (Apple Mac OS >= 10.4, PPC).])
     ])
 
+dnl ** check for eventfd which is needed by the I/O manager
+AC_CHECK_HEADERS([sys/eventfd.h])
+AC_CHECK_FUNCS([eventfd])
+
 # test for GTK+
 AC_PATH_PROGS([GTK_CONFIG], [pkg-config])
 if test -n "$GTK_CONFIG"; then