[commit: ghc] master: configure: Remove --with-curses-includes flag (ef63ff2)

git at git.haskell.org git at git.haskell.org
Mon Jul 3 23:42:57 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ef63ff27251a20ff11e58c9303677fa31e609a88/ghc

>---------------------------------------------------------------

commit ef63ff27251a20ff11e58c9303677fa31e609a88
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Mon Jul 3 19:08:43 2017 -0400

    configure: Remove --with-curses-includes flag
    
    terminfo no longer needs to be able to find the ncurses headers.
    See https://github.com/judah/terminfo/pull/22.
    
    Reviewers: austin, hvr
    
    Subscribers: rwbarton, thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D3688


>---------------------------------------------------------------

ef63ff27251a20ff11e58c9303677fa31e609a88
 aclocal.m4                  | 5 -----
 mk/config.mk.in             | 1 -
 rules/build-package-data.mk | 4 ----
 3 files changed, 10 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 677c0e7..001f813 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1740,11 +1740,6 @@ AC_DEFUN([FP_CURSES],
   dnl * Deal with arguments telling us curses is somewhere odd
   dnl--------------------------------------------------------------------
 
-  AC_ARG_WITH([curses-includes],
-    [AC_HELP_STRING([--with-curses-includes],
-      [directory containing curses headers])],
-      [CURSES_INCLUDE_DIRS=$withval])
-
   AC_ARG_WITH([curses-libraries],
     [AC_HELP_STRING([--with-curses-libraries],
       [directory containing curses libraries])],
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 189439e..2c62e90 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -890,7 +890,6 @@ ICONV_LIB_DIRS = @ICONV_LIB_DIRS@
 GMP_INCLUDE_DIRS = @GMP_INCLUDE_DIRS@
 GMP_LIB_DIRS = @GMP_LIB_DIRS@
 
-CURSES_INCLUDE_DIRS = @CURSES_INCLUDE_DIRS@
 CURSES_LIB_DIRS = @CURSES_LIB_DIRS@
 
 # See Note [Disable -O2 in unregisterised mode]
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index a20afbc..04364b7 100644
--- a/rules/build-package-data.mk
+++ b/rules/build-package-data.mk
@@ -90,10 +90,6 @@ ifneq "$$(GMP_LIB_DIRS)" ""
 $1_$2_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="$$(GMP_LIB_DIRS)"
 endif
 
-ifneq "$$(CURSES_INCLUDE_DIRS)" ""
-$1_$2_CONFIGURE_OPTS += --configure-option=--with-curses-includes="$$(CURSES_INCLUDE_DIRS)"
-endif
-
 ifneq "$$(CURSES_LIB_DIRS)" ""
 $1_$2_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="$$(CURSES_LIB_DIRS)"
 endif



More information about the ghc-commits mailing list