diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-02-23 23:27:51 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-02-23 23:27:51 +0000 |
| commit | 4d1698efa9bdc879da89e678d4f9bc17455d5237 (patch) | |
| tree | e29f3682d3eb3c2bb3a767ecc8cf90bdb13a1bdc | |
| parent | 8639908733753cabc143997d59f655324567f5ae (diff) | |
| download | ptxdist-4d1698efa9bdc879da89e678d4f9bc17455d5237.tar.gz ptxdist-4d1698efa9bdc879da89e678d4f9bc17455d5237.tar.xz | |
[ncurses] fix AUTOCONF variable handling
which was broken in b79fd71456bd899daa2ea89175a01be5a436e1ad
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9832 33e552b5-05e3-0310-8538-816dae2090ed
| -rw-r--r-- | rules/host-ncurses.make | 2 | ||||
| -rw-r--r-- | rules/ncurses.make | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/rules/host-ncurses.make b/rules/host-ncurses.make index cf6e2c303..b76f8c4af 100644 --- a/rules/host-ncurses.make +++ b/rules/host-ncurses.make @@ -55,7 +55,7 @@ $(STATEDIR)/host-ncurses.prepare: @$(call clean, $(HOST_NCURSES_DIR)/config.cache) cd $(HOST_NCURSES_DIR) && \ $(HOST_NCURSES_PATH) $(HOST_NCURSES_ENV) \ - ./configure $(HOST_NCURSES_AUTOCONF) $(NCURSES_AUTOCONF) + ./configure $(HOST_NCURSES_AUTOCONF) $(NCURSES_AUTOCONF_SHARED) @$(call touch) # ---------------------------------------------------------------------------- diff --git a/rules/ncurses.make b/rules/ncurses.make index 35ec77004..4fa7bafd7 100644 --- a/rules/ncurses.make +++ b/rules/ncurses.make @@ -39,8 +39,7 @@ $(NCURSES_SOURCE): NCURSES_PATH := PATH=$(CROSS_PATH) NCURSES_ENV := $(CROSS_ENV) -NCURSES_AUTOCONF := \ - $(CROSS_AUTOCONF_USR) \ +NCURSES_AUTOCONF_SHARED := \ --disable-echo \ --disable-nls \ --enable-const \ @@ -54,17 +53,21 @@ NCURSES_AUTOCONF := \ # enable wide char support on demand only ifdef PTXCONF_NCURSES_WIDE_CHAR -NCURSES_AUTOCONF += --enable-widec +NCURSES_AUTOCONF_SHARED += --enable-widec else -NCURSES_AUTOCONF += --disable-widec +NCURSES_AUTOCONF_SHARED += --disable-widec endif ifdef PTXCONF_NCURSES_BIG_CORE -NCURSES_AUTOCONF += --enable-big-core +NCURSES_AUTOCONF_SHARED += --enable-big-core else -NCURSES_AUTOCONF += --disable-big-core +NCURSES_AUTOCONF_SHARED += --disable-big-core endif +NCURSES_AUTOCONF := \ + $(CROSS_AUTOCONF_USR) \ + $(NCURSES_AUTOCONF_SHARED) + # ---------------------------------------------------------------------------- # Compile # ---------------------------------------------------------------------------- |