diff options
author | Benoit Foucher <benoit@zeroc.com> | 2013-07-04 16:02:09 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2013-07-04 16:02:09 +0200 |
commit | 7d0bc9a1eb4078d43a81efa83ef24ccf564a54e0 (patch) | |
tree | 100d4e2cb1dd407f308f17e6984b5b530af8ce76 /cpp | |
parent | ICE-5340 - Fix updates (diff) | |
download | ice-7d0bc9a1eb4078d43a81efa83ef24ccf564a54e0.tar.bz2 ice-7d0bc9a1eb4078d43a81efa83ef24ccf564a54e0.tar.xz ice-7d0bc9a1eb4078d43a81efa83ef24ccf564a54e0.zip |
Fixed ICE-5355 - no longer link with ncurses
Diffstat (limited to 'cpp')
-rw-r--r-- | cpp/config/Make.rules | 2 | ||||
-rw-r--r-- | cpp/config/Make.rules.Darwin | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index 089dec06238..f5acdc18117 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -253,7 +253,7 @@ MCPP_RPATH_LINK = $(if $(MCPP_HOME),$(call rpathlink,$(MCPP_HOME)/$(libsu ifeq ($(PLATFORM_HAS_READLINE),yes) ifeq ($(USE_READLINE),yes) READLINE_FLAGS = -DHAVE_READLINE $(if $(READLINE_HOME),-I$(READLINE_HOME)/include) - READLINE_LIBS = $(if $(READLINE_HOME),-L$(READLINE_HOME)/$(libsubdir)) -lreadline -lncurses + READLINE_LIBS = $(if $(READLINE_HOME),-L$(READLINE_HOME)/$(libsubdir)) -lreadline endif endif diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin index f4dc935bb5b..3d69c4f8d73 100644 --- a/cpp/config/Make.rules.Darwin +++ b/cpp/config/Make.rules.Darwin @@ -78,7 +78,7 @@ ICONV_LIB = -liconv ICEUTIL_OS_LIBS = -lpthread ICE_OS_LIBS = -ldl -PLATFORM_HAS_READLINE := no +PLATFORM_HAS_READLINE := yes # # QT is used only for the deprecated IceGrid and IceStorm SQL plugins |