diff options
| -rw-r--r-- | aclocal.m4 | 22 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | mk/config.mk.in | 3 | ||||
| -rw-r--r-- | rules/build-package-data.mk | 8 |
4 files changed, 34 insertions, 0 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index cb4aa83ec3..73b8890075 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1826,6 +1826,28 @@ AC_DEFUN([FP_GMP], AC_SUBST(GMP_LIB_DIRS) ])# FP_GMP +# FP_CURSES +# ------------- +AC_DEFUN([FP_CURSES], +[ + dnl-------------------------------------------------------------------- + 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])], + [CURSES_LIB_DIRS=$withval]) + + AC_SUBST(CURSES_INCLUDE_DIRS) + AC_SUBST(CURSES_LIB_DIRS) +])# FP_CURSES + # -------------------------------------------------------------- # Calculate absolute path to build tree # -------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 9740e1524b..f65d133aa7 100644 --- a/configure.ac +++ b/configure.ac @@ -357,6 +357,7 @@ fi FP_ICONV FP_GMP +FP_CURSES XCODE_VERSION() diff --git a/mk/config.mk.in b/mk/config.mk.in index dfe8c2b445..b32f227f08 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -805,3 +805,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@ diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 2e610014a2..494b89afc5 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -77,6 +77,14 @@ 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 + ifeq "$$(CrossCompiling)" "YES" $1_$2_CONFIGURE_OPTS += --configure-option=--host=$(TargetPlatformFull) endif |