]> git.stg.codes - stg.git/commitdiff
libstgcommon.s needs iconv
authorMaxim Mamontov <faust.madf@gmail.com>
Tue, 20 Sep 2011 11:57:49 +0000 (14:57 +0300)
committerMaxim Mamontov <faust.madf@gmail.com>
Tue, 20 Sep 2011 11:57:49 +0000 (14:57 +0300)
projects/convertor/Makefile
projects/rlm_stg/Makefile
projects/rscriptd/Makefile
projects/sgauth/Makefile
projects/sgauthstress/Makefile
projects/stargazer/Makefile

index 7fd028807ab210d16a010c884d442063b51224a8..86acb408a26000fb298cd7655ef8028050150e6d 100644 (file)
@@ -23,7 +23,7 @@ LIBS += $(LIB_THREAD) $(addprefix -lstg,$(STGLIBS))
 ifeq ($(OS),linux)
 LIBS += -ldl
 else
 ifeq ($(OS),linux)
 LIBS += -ldl
 else
-LIBS += -lc
+LIBS += -lc -liconv
 endif
 
 SEARCH_DIRS = -I ../../include
 endif
 
 SEARCH_DIRS = -I ../../include
index 0c9d8a6415f45e6631908b7e37e1cc729b650702..635a572f7abb88691dac735ec08bc66b415b1260 100644 (file)
@@ -23,7 +23,8 @@ ifeq ($(OS),linux)
 LIBS += -ldl
 else
 LIBS += -lintl \
 LIBS += -ldl
 else
 LIBS += -lintl \
-        -lc
+        -lc \
+       -liconv
 endif
 
 SEARCH_DIRS = -I ../../include
 endif
 
 SEARCH_DIRS = -I ../../include
index 2b7395a3d0e9d7615b48dda5c5b8c358f5fb9ed6..53029eb6f501a0b611a192b13bef3120e2a01292 100644 (file)
@@ -17,6 +17,10 @@ STGLIBS =  logger \
            scriptexecuter \
            conffiles
 
            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)))
 
 STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
 STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 
index 6e330c78f5725bc9b129aefef2be45ca3a5bea64..fe588238856ebd860a08ad5921c056943a8ebae4 100644 (file)
@@ -20,10 +20,10 @@ STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 
 LIBS += $(LIB_THREAD) $(addprefix -lstg,$(STGLIBS))
 
 
 LIBS += $(LIB_THREAD) $(addprefix -lstg,$(STGLIBS))
 
-ifeq ($(OS),linux)
-else
+ifneq ($(OS),linux)
 LIBS += -lintl \
 LIBS += -lintl \
-        -lc
+        -lc \
+       -liconv
 endif
 
 SEARCH_DIRS = -I ../../include
 endif
 
 SEARCH_DIRS = -I ../../include
index 9d5e94cde1618a8f87136b732b2b9c991b5500ab..174c31a2376bd318c12bb9a39725cee4faa9d8ec 100644 (file)
@@ -22,7 +22,8 @@ ifeq ($(OS),linux)
 LIBS += -ldl
 else
 LIBS += -lintl \
 LIBS += -ldl
 else
 LIBS += -lintl \
-        -lc
+        -lc \
+       -liconv
 endif
 
 SEARCH_DIRS = -I ../../include
 endif
 
 SEARCH_DIRS = -I ../../include
index 020e05b54f54d8181281ecd9759252c02413f9aa..33027aaa62ab74cc6e8b88e799153b10617801c6 100644 (file)
@@ -38,7 +38,7 @@ LIBS += -lexpat $(LIB_THREAD) $(addprefix -lstg,$(STGLIBS))
 ifeq ($(OS),linux)
 LIBS += -ldl
 else
 ifeq ($(OS),linux)
 LIBS += -ldl
 else
-LIBS += -lc
+LIBS += -lc -liconv
 endif
 
 SEARCH_DIRS = -I ../../include
 endif
 
 SEARCH_DIRS = -I ../../include