From 7ff01d4395b25b73c3c329432ae47aa64b3e3ecf Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Tue, 20 Sep 2011 14:57:49 +0300 Subject: [PATCH] libstgcommon.s needs iconv --- projects/convertor/Makefile | 2 +- projects/rlm_stg/Makefile | 3 ++- projects/rscriptd/Makefile | 4 ++++ projects/sgauth/Makefile | 6 +++--- projects/sgauthstress/Makefile | 3 ++- projects/stargazer/Makefile | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/projects/convertor/Makefile b/projects/convertor/Makefile index 7fd02880..86acb408 100644 --- a/projects/convertor/Makefile +++ b/projects/convertor/Makefile @@ -23,7 +23,7 @@ LIBS += $(LIB_THREAD) $(addprefix -lstg,$(STGLIBS)) ifeq ($(OS),linux) LIBS += -ldl else -LIBS += -lc +LIBS += -lc -liconv endif SEARCH_DIRS = -I ../../include diff --git a/projects/rlm_stg/Makefile b/projects/rlm_stg/Makefile index 0c9d8a64..635a572f 100644 --- a/projects/rlm_stg/Makefile +++ b/projects/rlm_stg/Makefile @@ -23,7 +23,8 @@ ifeq ($(OS),linux) LIBS += -ldl else LIBS += -lintl \ - -lc + -lc \ + -liconv endif SEARCH_DIRS = -I ../../include diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile index 2b7395a3..53029eb6 100644 --- a/projects/rscriptd/Makefile +++ b/projects/rscriptd/Makefile @@ -17,6 +17,10 @@ STGLIBS = logger \ scriptexecuter \ conffiles +ifneq ($(OS),linux) +LIBS += -liconv +endif + STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS))) STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS))) diff --git a/projects/sgauth/Makefile b/projects/sgauth/Makefile index 6e330c78..fe588238 100644 --- a/projects/sgauth/Makefile +++ b/projects/sgauth/Makefile @@ -20,10 +20,10 @@ STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS))) LIBS += $(LIB_THREAD) $(addprefix -lstg,$(STGLIBS)) -ifeq ($(OS),linux) -else +ifneq ($(OS),linux) LIBS += -lintl \ - -lc + -lc \ + -liconv endif SEARCH_DIRS = -I ../../include diff --git a/projects/sgauthstress/Makefile b/projects/sgauthstress/Makefile index 9d5e94cd..174c31a2 100644 --- a/projects/sgauthstress/Makefile +++ b/projects/sgauthstress/Makefile @@ -22,7 +22,8 @@ ifeq ($(OS),linux) LIBS += -ldl else LIBS += -lintl \ - -lc + -lc \ + -liconv endif SEARCH_DIRS = -I ../../include diff --git a/projects/stargazer/Makefile b/projects/stargazer/Makefile index 020e05b5..33027aaa 100644 --- a/projects/stargazer/Makefile +++ b/projects/stargazer/Makefile @@ -38,7 +38,7 @@ LIBS += -lexpat $(LIB_THREAD) $(addprefix -lstg,$(STGLIBS)) ifeq ($(OS),linux) LIBS += -ldl else -LIBS += -lc +LIBS += -lc -liconv endif SEARCH_DIRS = -I ../../include -- 2.44.2