diff options
| author | Ben Gamari <bgamari.foss@gmail.com> | 2017-07-03 19:08:43 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-07-03 19:08:50 -0400 |
| commit | ef63ff27251a20ff11e58c9303677fa31e609a88 (patch) | |
| tree | ea6d99aa87f8db384924b939184f4a1e33d5a42e | |
| parent | af403b2eb50abde6a7992470032d7df5faea043e (diff) | |
| download | haskell-ef63ff27251a20ff11e58c9303677fa31e609a88.tar.gz | |
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
| -rw-r--r-- | aclocal.m4 | 5 | ||||
| -rw-r--r-- | mk/config.mk.in | 1 | ||||
| -rw-r--r-- | rules/build-package-data.mk | 4 |
3 files changed, 0 insertions, 10 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 677c0e77bc..001f813dfc 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 189439ec7c..2c62e90956 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 a20afbca3f..04364b781e 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 |