Major patch to fix reporting of unused imports

[ghc-hetmet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a6cee70..2d8fbe1 100644 (file)
--- 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?
@@ -58,25 +69,6 @@ if test x"$srcdir" != 'x.' ; then
     exit 1
 fi
 
-dnl--------------------------------------------------------------------
-dnl * Deal with arguments telling us gmp is somewhere odd
-dnl--------------------------------------------------------------------
-
-FP_ARG_GMP
-
-GMP_INCLUDE_DIRS=
-GMP_LIB_DIRS=
-if test "x$gmp_libraries" != "xNONE"; then
-  LDFLAGS="-L$gmp_libraries $LDFLAGS"
-  GMP_LIB_DIRS=$gmp_libraries
-fi
-if test "x$gmp_includes" != "xNONE"; then
-  CPPFLAGS="-I$gmp_includes $CPPFLAGS"
-  GMP_INCLUDE_DIRS=$gmp_includes
-fi
-AC_SUBST(GMP_INCLUDE_DIRS)
-AC_SUBST(GMP_LIB_DIRS)
-
 dnl --------------------------------------------------------------
 dnl * Project specific configuration options
 dnl --------------------------------------------------------------
@@ -571,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
@@ -738,7 +724,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 ctime_r, sched_setaffinity])
+AC_CHECK_FUNCS([getclock getrusage gettimeofday setitimer siginterrupt sysconf times ctime_r sched_setaffinity setlocale])
 
 AC_TRY_RUN([
 #include <sys/types.h>
@@ -759,36 +745,6 @@ AC_CHECK_DECLS([ctime_r], , ,
 #define _POSIX_C_SOURCE 199506L
 #include <time.h>])
 
-dnl ** For ghc/rts/gmp:
-AC_CHECK_FUNCS([getpagesize])
-
-dnl ** check whether this machine has gmp3 installed
-AC_CHECK_LIB(gmp,  __gmpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp,
-  AC_CHECK_LIB(gmp3, __gmpz_fdiv_qr,  HaveLibGmp=YES; LibGmp=gmp3,
-    HaveLibGmp=NO; LibGmp=not-installed))
-  if test $HaveLibGmp = YES; then
-    AC_DEFINE([HAVE_LIB_GMP], [1], [Define to 1 if GMP library is installed.])
-  fi;
-AC_SUBST(HaveLibGmp)
-AC_SUBST(LibGmp)
-
-dnl ** (Mac OS X only: check for GMP.framework)
-HaveFrameworkGMP=NO
-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
 AC_CHECK_LIB(mingwex, closedir, HaveLibMingwEx=YES, HaveLibMingwEx=NO)
 AC_SUBST(HaveLibMingwEx)
@@ -797,12 +753,6 @@ if test $HaveLibMingwEx = YES ; then
   AC_DEFINE([HAVE_MINGWEX], [1], [Define to 1 if you have the mingwex library.])
 fi
 
-if test "$HaveLibGmp" = "NO"; then
-if test "$HostArch_CPP" = "ia64" -o "$HostArch_CPP" = "mipseb" ; then
-AC_MSG_ERROR([You need to install libgmp (the in-tree version does not work on IA64 or mips64).])
-fi;
-fi;
-
 dnl ** check whether this machine has BFD and liberty installed (used for debugging)
 dnl    the order of these tests matters: bfd needs liberty
 AC_CHECK_LIB(iberty, xmalloc)
@@ -914,6 +864,8 @@ AC_CHECK_HEADER([papi.h], [HavePapiHeader=YES], [HavePapiHeader=NO])
 AC_SUBST(HavePapiLib)
 AC_SUBST(HavePapiHeader)
 
+AC_CHECK_FUNCS(__mingw_vfprintf)
+
 if test "$HavePapiLib" = "YES" -a "$HavePapiHeader" = "YES"; then
    HavePapi=YES
 else
@@ -921,7 +873,7 @@ else
 fi
 AC_SUBST(HavePapi)
 
-if test "$HAVE_DOCBOOK_XSL" = "" ||
+if test "$HAVE_DOCBOOK_XSL" = "NO" ||
    test "$XsltprocCmd" = ""
 then
     BUILD_DOCBOOK_HTML=NO
@@ -941,7 +893,11 @@ fi
 AC_SUBST(BUILD_DOCBOOK_PS)
 AC_SUBST(BUILD_DOCBOOK_PDF)
 
-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])
+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