X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=2d8fbe13118195f88049f24a24782a1c3e22aeac;hb=0bde11509ca13d4d0914496ee652d7c2b43a0420;hp=db44d164b765a8558ac57c4cf218b1b5a1b29ef8;hpb=e50c1ea395c49b1480332f0ec08ffc20e72b6e80;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index db44d16..2d8fbe1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,17 @@ fi
 
 AC_SUBST([CONFIGURE_ARGS], [$ac_configure_args])
 
+dnl ----------------------------------------------------------
+dnl ** Find unixy sort and find commands, 
+dnl ** which are needed by FP_SETUP_PROJECT_VERSION
+
+dnl ** Find find command (for Win32's benefit)
+FP_PROG_FIND
+
+dnl ** Find sort command (for the benefit of Win32 environs)
+FP_PROG_SORT
+
+dnl ----------------------------------------------------------
 FP_SETUP_PROJECT_VERSION
 
 # Hmmm, we fix the RPM release number to 1 here... Is this convenient?
@@ -552,12 +563,6 @@ AC_SUBST(SRC_LD_OPTS)
 dnl ** figure out how to do context diffs
 FP_PROG_CONTEXT_DIFF
 
-dnl ** Find find command (for Win32's benefit)
-FP_PROG_FIND
-
-dnl ** Find sort command (for the benefit of Win32 environs)
-FP_PROG_SORT
-
 dnl Let's make sure install-sh is executable here.  If we got it from
 dnl a darcs repo, it might not be (see bug #978).
 chmod +x install-sh
@@ -888,6 +893,10 @@ fi
 AC_SUBST(BUILD_DOCBOOK_PS)
 AC_SUBST(BUILD_DOCBOOK_PDF)
 
+if grep '	' compiler/ghc.cabal.in 2>&1 >/dev/null; then
+   AC_MSG_ERROR([compiler/ghc.cabal.in contains tab characters; please remove them])
+fi
+
 AC_CONFIG_FILES([mk/config.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml distrib/ghc.iss])
 AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
 AC_OUTPUT