X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=1b7dbdae4d0611aea8745204af148b5ccda7667b;hb=9ced2b5962e84d84694cde112e1befe52f970d7b;hp=75ab52c06a72f61fd14c72969300ed42ade936c9;hpb=5ad32b4208fdf32d67a27a285616dfa18840bb2f;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index 75ab52c..1b7dbda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -567,6 +567,14 @@ AC_SUBST(hardtop_plat)
 
 AC_MSG_RESULT(${hardtop})
 
+# We don't support building in directories with spaces.
+case "$hardtop" in
+  *' '*) AC_MSG_ERROR([
+   The build system does not support building in a directory containing
+   space characters.  Suggestion: move the build tree somewhere else.])
+ ;;
+esac
+
 dnl --------------------------------------------------------------
 dnl * Project specific configuration options
 dnl --------------------------------------------------------------
@@ -622,7 +630,9 @@ AC_ARG_WITH(gcc,
          withval=`cygpath -w ${withval} | sed -e 's@\\\\@/@g' `
        fi
  fi;
- CC="$withval"],
+ CC="$withval"
+ export CC
+ ],
 [WhatGccIsCalled="gcc"]
 )
 AC_SUBST(WhatGccIsCalled)
@@ -803,6 +813,7 @@ 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
+FP_MINGW_GCC
 
 dnl ** figure out how to invoke cpp directly (gcc -E is no good)
 AC_PROG_CPP
@@ -849,7 +860,7 @@ AC_PATH_PROGS(TarCmd,gtar tar,tar)
 
 dnl ** check for DocBook toolchain
 FP_CHECK_DOCBOOK_DTD
-FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl])
+FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl /usr/local/share/xsl/docbook])
 FP_PROG_FO_PROCESSOR
 
 dnl ** check for ghc-pkg command
@@ -948,11 +959,6 @@ AC_SUBST(GhcLibsWithReadline)
 dnl ** check if it is safe to include both <time.h> and <sys/time.h>
 AC_HEADER_TIME
 
-dnl ** check for POSIX regex
-HavePosixRegex=NO
-AC_CHECK_HEADERS([regex.h], [AC_CHECK_FUNCS(regcomp, [HavePosixRegex=YES])])
-AC_SUBST(HavePosixRegex)
-
 dnl ** how do we get a timezone name, and UTC offset ?
 AC_STRUCT_TIMEZONE
 
@@ -1238,22 +1244,25 @@ AC_C_BIGENDIAN
 dnl ** check for leading underscores in symbol names
 FP_LEADING_UNDERSCORE
 
-dnl ** check for ld, and whether ld has -x option
-AC_PATH_PROG(LdCmdRaw, ld)
-case $HostOS_CPP in
- mingw32) 
-        if test "${OSTYPE}" == "msys"
-	   then
-             LdCmd=${LdCmdRaw}
-	   else
-             LdCmd=`cygpath -w ${LdCmdRaw} | sed -e 's@\\\\@/@g' `
-	fi
- 	   ;;
- *) LdCmd=${LdCmdRaw}
-    ;;
-esac
-AC_SUBST(LdCmd)
-FPTOOLS_LD_X
+dnl ** check for ld, whether it has an -x option, and if it is GNU ld
+FP_PROG_LD_X
+FP_PROG_LD_IS_GNU
+
+dnl ** check for Apple-style dead-stripping support
+dnl    (.subsections-via-symbols assembler directive)
+
+
+AC_MSG_CHECKING(for .subsections_via_symbols)
+AC_TRY_COMPILE(,[__asm__ (".subsections_via_symbols");],
+    [
+        AC_MSG_RESULT(yes)
+        AC_DEFINE([HAVE_SUBSECTIONS_VIA_SYMBOLS],[1],
+            [Define to 1 if Apple-style dead-stripping is supported.])
+    ],
+    [
+        AC_DEFINE([HAVE_SUBSECTIONS_VIA_SYMBOLS],[0],
+            [Define to 1 if Apple-style dead-stripping is supported.])
+    ])
 
 AC_CONFIG_FILES([mk/config.mk])
 AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])