diff options
| -rw-r--r-- | aclocal.m4 | 12 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | ghc.spec.in | 1 | ||||
| -rw-r--r-- | mk/config.mk.in | 2 | ||||
| -rw-r--r-- | utils/Makefile | 2 |
5 files changed, 1 insertions, 18 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 7433873279..c7aba3e6a3 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1031,18 +1031,6 @@ AC_SUBST([FopCmd]) ])# FP_PROG_FOP -# FP_PROG_HSTAGS -# ---------------- -# Sets the output variable HstagsCmd to the full Haskell tags program path. -# HstagsCmd is empty if no such program could be found. -AC_DEFUN([FP_PROG_HSTAGS], -[AC_PATH_PROG([HstagsCmd], [hasktags]) -if test -z "$HstagsCmd"; then - AC_MSG_WARN([cannot find hasktags in your PATH, you will not be able to build the tags]) -fi -])# FP_PROG_HSTAGS - - # FP_PROG_GHC_PKG # ---------------- # Try to find a ghc-pkg matching the ghc mentioned in the environment variable diff --git a/configure.ac b/configure.ac index 4e9b54874f..67d6b57f0f 100644 --- a/configure.ac +++ b/configure.ac @@ -632,8 +632,6 @@ FP_CHECK_DOCBOOK_DTD FP_DOCBOOK_XSL FP_PROG_DBLATEX -FP_PROG_HSTAGS - dnl ** check for ghc-pkg command FP_PROG_GHC_PKG diff --git a/ghc.spec.in b/ghc.spec.in index c8eab264c2..2a70043eea 100644 --- a/ghc.spec.in +++ b/ghc.spec.in @@ -177,7 +177,6 @@ fi %{_prefix}/bin/ghci %{_prefix}/bin/ghci-%{version} %{_prefix}/bin/ghcprof -%{_prefix}/bin/hasktags %{_prefix}/bin/hp2ps %{_prefix}/bin/hpc %{_prefix}/bin/hsc2hs-ghc diff --git a/mk/config.mk.in b/mk/config.mk.in index 8796ad4674..3749bce6b6 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -774,8 +774,6 @@ ALEX_VERSION = @AlexVersion@ # SRC_ALEX_OPTS = -g -HSTAGS = @HstagsCmd@ - # Should we build haddock docs? HADDOCK_DOCS = YES # And HsColour the sources? diff --git a/utils/Makefile b/utils/Makefile index 881d7d50b9..e522c32ba8 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -60,7 +60,7 @@ endif WITH_BOOTSTRAPPING_COMPILER = installPackage ghc-pkg hsc2hs hpc -WITH_STAGE2 = installPackage ghc-pkg hasktags runghc hpc pwd haddock +WITH_STAGE2 = installPackage ghc-pkg runghc hpc pwd haddock ifneq "$(NO_INSTALL_HSC2HS)" "YES" WITH_STAGE2 += hsc2hs endif |