Fixed iconv linkage.

diff --git a/projects/libs/build b/projects/libs/build
index 9b23d546dab94a19ac80cd186d9c6b288e0f21e0..9ea852a077f4b458224b2e89f8df3d009e6eee93 100755 (executable)
--- a/projects/libs/build
+++ b/projects/libs/build
@@ -95,6 +95,7 @@ if [ "$OS" = "linux" ]
 then
     DEFS="$DEFS -DLINUX"
 else
+    LIBICONV="-liconv"
     if [ "$OS" = "bsd" ]
     then
         DEFS="$DEFS -DFREE_BSD"
@@ -106,6 +107,7 @@ else
             if [ "$OS" == "darwin" ]
             then
                 DEFS="$DEFS -DDARWIN"
+                LIBICONV=""
             fi
         fi
     fi
@@ -180,7 +182,7 @@ rm -f fake
 
 printf "Checking for iconv 2nd argument... "
 printf "#include <iconv.h>\nint main(){ const char** src = 0; iconv(0, src, 0, 0, 0); }\n" > build_check.c
-$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c -o fake > /dev/null 2> /dev/null
+$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c $LIBICONV -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
     printf "non-const\n"
@@ -273,6 +275,7 @@ printf "CXX=$CXX\n" >> $CONFFILE
 printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE
 printf "CFLAGS=$CFLAGS\n" >> $CONFFILE
 printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE
+printf "LIBICONV=$LIBICONV\n" >> $CONFFILE
 printf "PREFIX=$PREFIX\n" >> $CONFFILE
 printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE
 printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE

diff --git a/projects/rlm_stg/Makefile b/projects/rlm_stg/Makefile
index efc1bcaa9f38ad657030b4c7aa74103c9d45395c..05c43d95135b559866886ac904108ce3fc074cfc 100644 (file)
--- a/projects/rlm_stg/Makefile
+++ b/projects/rlm_stg/Makefile
@@ -18,14 +18,13 @@ STGLIBS = crypto \
 STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
 STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 
-LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
+LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD) $(LIBICONV)
 
 ifeq ($(OS),linux)
 LIBS += -ldl
 else
 LIBS += -lintl \
-        -lc \
-        -liconv
+        -lc
 endif
 
 SEARCH_DIRS = -I ../../include

diff --git a/projects/rlm_stg/build b/projects/rlm_stg/build
index f78a9e1fbeefeb8dae6b344ccdf5400cdacbe291..ded3a070ed31963722fcd6be356d5bcdc7f3058e 100755 (executable)
--- a/projects/rlm_stg/build
+++ b/projects/rlm_stg/build
@@ -68,6 +68,7 @@ then
     DEFS="$DEFS -DLINUX"
     LIB_THREAD=-lpthread
 else
+    LIBICONV="-liconv"
     if [ "$OS" = "bsd" ]
     then
         DEFS="$DEFS -DFREE_BSD"
@@ -139,7 +140,7 @@ rm -f fake
 
 printf "Checking for iconv 2nd argument... "
 printf "#include <iconv.h>\nint main(){ const char** src = 0; iconv(0, src, 0, 0, 0); }\n" > build_check.c
-$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c -o fake > /dev/null 2> /dev/null
+$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c $LIBICONV -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
     printf "non-const\n"
@@ -168,6 +169,7 @@ printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE
 printf "CFLAGS=$CFLAGS\n" >> $CONFFILE
 printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE
 printf "LIB_THREAD=$LIB_THREAD\n" >> $CONFFILE
+printf "LIBICONV=$LIBICONV\n" >> $CONFFILE
 printf "PREFIX=$PREFIX\n" >> $CONFFILE
 printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE
 printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE

diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile
index 516894b6459c407b5c5db0171dcac000a496a899..98b2f5e471a9841a05519264228ad90a61177dff 100644 (file)
--- a/projects/rscriptd/Makefile
+++ b/projects/rscriptd/Makefile
@@ -19,12 +19,7 @@ STGLIBS = scriptexecuter \
 STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
 STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 
-LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
-
-ifeq ($(OS),linux)
-else
-LIBS += -liconv
-endif
+LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD) $(LIBICONV)
 
 SEARCH_DIRS = -I ../../include
 

diff --git a/projects/rscriptd/build b/projects/rscriptd/build
index f01f50cb33b151accff29e1ac53a13f233962419..65f634bdb25f824e0fb16a4d8e6c012d4d7fbc08 100755 (executable)
--- a/projects/rscriptd/build
+++ b/projects/rscriptd/build
@@ -81,6 +81,7 @@ then
     DEFS="$DEFS -DLINUX"
     LIB_THREAD=-lpthread
 else
+    LIBICONV="-liconv"
     if [ "$OS" = "bsd" ]
     then
         DEFS="$DEFS -DFREE_BSD"
@@ -94,6 +95,7 @@ else
             then
                 DEFS="$DEFS -DDARWIN"
                 LIB_THREAD=-lpthread
+                LIBICONV=""
             else
                 LIB_THREAD=-lc_r
             fi
@@ -157,7 +159,7 @@ rm -f fake
 
 printf "Checking for iconv 2nd argument... "
 printf "#include <iconv.h>\nint main(){ const char** src = 0; iconv(0, src, 0, 0, 0); }\n" > build_check.c
-$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c -o fake > /dev/null 2> /dev/null
+$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c $LIBICONV -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
     printf "non-const\n"
@@ -190,6 +192,7 @@ printf "CXX=$CXX\n" >> $CONFFILE
 printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE
 printf "CFLAGS=$CFLAGS\n" >> $CONFFILE
 printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE
+printf "LIBICONV=$LIBICONV\n" >> $CONFFILE
 printf "PREFIX=$PREFIX\n" >> $CONFFILE
 printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE
 printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE

diff --git a/projects/sgauth/Makefile b/projects/sgauth/Makefile
index c6c733f01b5bb24a6e960289ee16f044602b8fc2..d6c844e0d9e55b3d4410fa4ac0218a1a8aff3f18 100644 (file)
--- a/projects/sgauth/Makefile
+++ b/projects/sgauth/Makefile
@@ -18,13 +18,12 @@ STGLIBS =  conffiles \
 STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
 STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 
-LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
+LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD) $(LIBICONV)
 
 ifeq ($(OS),linux)
 else
 LIBS += -lintl \
-        -lc \
-        -liconv
+        -lc
 endif
 
 SEARCH_DIRS = -I ../../include

diff --git a/projects/sgauth/build b/projects/sgauth/build
index 4f8048cccdfd976047514f7c5fb929fde5a94352..81edf8d4d4221ab65904736bc0aa616d0493c2e6 100755 (executable)
--- a/projects/sgauth/build
+++ b/projects/sgauth/build
@@ -83,6 +83,7 @@ then
     DEFS="$DEFS -DLINUX"
     LIB_THREAD=-lpthread
 else
+    LIBICONV="-liconv"
     if [ "$OS" = "bsd" ]
     then
         DEFS="$DEFS -DFREE_BSD"
@@ -96,6 +97,7 @@ else
             then
                 DEFS="$DEFS -DDARWIN"
                 LIB_THREAD=-lpthread
+                LIBICONV=""
             else
                 LIB_THREAD=-lc_r
             fi
@@ -159,7 +161,7 @@ rm -f fake
 
 printf "Checking for iconv 2nd argument... "
 printf "#include <iconv.h>\nint main(){ const char** src = 0; iconv(0, src, 0, 0, 0); }\n" > build_check.c
-$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c -o fake > /dev/null 2> /dev/null
+$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c $LIBICONV -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
     printf "non-const\n"
@@ -192,6 +194,7 @@ printf "CXX=$CXX\n" >> $CONFFILE
 printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE
 printf "CFLAGS=$CFLAGS\n" >> $CONFFILE
 printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE
+printf "LIBICONV=$LIBICONV\n" >> $CONFFILE
 printf "PREFIX=$PREFIX\n" >> $CONFFILE
 printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE
 printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE

diff --git a/projects/sgauthstress/Makefile b/projects/sgauthstress/Makefile
index 4884b21367b5fb9da727ce2c3a93cedc84ab67ce..74c09b62a08b711bde41f022edb24e9f13582fd8 100644 (file)
--- a/projects/sgauthstress/Makefile
+++ b/projects/sgauthstress/Makefile
@@ -15,14 +15,13 @@ STGLIBS = dotconfpp \
 STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
 STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 
-LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
+LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD) $(LIBICONV)
 
 ifeq ($(OS),linux)
 LIBS += -ldl
 else
 LIBS += -lintl \
-        -lc \
-        -liconv
+        -lc
 endif
 
 SEARCH_DIRS = -I ../../include

diff --git a/projects/sgauthstress/build b/projects/sgauthstress/build
index 92be70d91283ba1404ee03a0fd294f192798e871..4ea506e8ec85944bebb4a06c4bcfdb2cd421ae8b 100755 (executable)
--- a/projects/sgauthstress/build
+++ b/projects/sgauthstress/build
@@ -86,6 +86,7 @@ then
     DEFS="$DEFS -DLINUX"
     LIB_THREAD=-lpthread
 else
+    LIBICONV="-liconv"
     if [ "$OS" = "bsd" ]
     then
         DEFS="$DEFS -DFREE_BSD"
@@ -157,7 +158,7 @@ rm -f fake
 
 printf "Checking for iconv 2nd argument... "
 printf "#include <iconv.h>\nint main(){ const char** src = 0; iconv(0, src, 0, 0, 0); }\n" > build_check.c
-$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c -o fake > /dev/null 2> /dev/null
+$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c $LIBICONV -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
     printf "non-const\n"
@@ -359,6 +360,7 @@ printf "CXX=$CXX\n" >> $CONFFILE
 printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE
 printf "CFLAGS=$CFLAGS\n" >> $CONFFILE
 printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE
+printf "LIBICONV=$LIBICONV\n" >> $CONFFILE
 printf "PREFIX=$PREFIX\n" >> $CONFFILE
 printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE
 printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE

diff --git a/projects/sgconf/Makefile b/projects/sgconf/Makefile
index 3541a0588f609fecf4aa9d48fd39997de2d4172d..795c25222d481bfd0de5d88bf1a50c0de693605a 100644 (file)
--- a/projects/sgconf/Makefile
+++ b/projects/sgconf/Makefile
@@ -17,12 +17,11 @@ STGLIBS = conffiles \
 STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
 STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 
-LIBS += $(addprefix -lstg,$(STGLIBS)) -lexpat $(LIB_THREAD)
+LIBS += $(addprefix -lstg,$(STGLIBS)) -lexpat $(LIB_THREAD) $(LIBICONV)
 
 ifeq ($(OS),linux)
 else
-LIBS += -lc \
-        -liconv
+LIBS += -lc
 endif
 
 SEARCH_DIRS = -I ../../include

diff --git a/projects/sgconf/build b/projects/sgconf/build
index 2d6fc859f5ca4f9c9cde0adda4be1f2bb1346862..441306988911534ccc3e9817d61263bf816dedb7 100755 (executable)
--- a/projects/sgconf/build
+++ b/projects/sgconf/build
@@ -80,6 +80,7 @@ then
     DEFS="$DEFS -DLINUX"
     LIB_THREAD=-lpthread
 else
+    LIBICONV="-liconv"
     if [ "$OS" = "bsd" ]
     then
         DEFS="$DEFS -DFREE_BSD"
@@ -93,6 +94,7 @@ else
             then
                 DEFS="$DEFS -DDARWIN"
                 LIB_THREAD=-lpthread
+                LIBICONV=""
             else
                 LIB_THREAD=-lc_r
             fi
@@ -169,7 +171,7 @@ rm -f fake
 
 printf "Checking for iconv 2nd argument... "
 printf "#include <iconv.h>\nint main(){ const char** src = 0; iconv(0, src, 0, 0, 0); }\n" > build_check.c
-$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c -o fake > /dev/null 2> /dev/null
+$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c $LIBICONV -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
     printf "non-const\n"
@@ -209,6 +211,7 @@ printf "CXX=$CXX\n" >> $CONFFILE
 printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE
 printf "CFLAGS=$CFLAGS\n" >> $CONFFILE
 printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE
+printf "LIBICONV=$LIBICONV\n" >> $CONFFILE
 printf "PREFIX=$PREFIX\n" >> $CONFFILE
 printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE
 printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE

diff --git a/projects/sgconf_xml/Makefile b/projects/sgconf_xml/Makefile
index bfb7b21414d3a3eb3aefe4298ac5041b6abfa304..a7058b896cc497242c200a27375c000dee07bf6f 100644 (file)
--- a/projects/sgconf_xml/Makefile
+++ b/projects/sgconf_xml/Makefile
@@ -17,12 +17,11 @@ STGLIBS = conffiles \
 STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
 STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 
-LIBS += $(addprefix -lstg,$(STGLIBS)) -lexpat $(LIB_THREAD)
+LIBS += $(addprefix -lstg,$(STGLIBS)) -lexpat $(LIB_THREAD) $(LIBICONV)
 
 ifeq ($(OS),linux)
 else
-LIBS += -lc \
-        -liconv
+LIBS += -lc
 endif
 
 SEARCH_DIRS = -I ../../include

diff --git a/projects/sgconf_xml/build b/projects/sgconf_xml/build
index 10de5f003478d554ab1078bd1ead6af06d61e212..fc2067405827e6f0b503392031bf603f9325647d 100755 (executable)
--- a/projects/sgconf_xml/build
+++ b/projects/sgconf_xml/build
@@ -79,6 +79,7 @@ then
     DEFS="$DEFS -DLINUX"
     LIB_THREAD=-lpthread
 else
+    LIBICONV="-liconv"
     if [ "$OS" = "bsd" ]
     then
         DEFS="$DEFS -DFREE_BSD"
@@ -162,12 +163,12 @@ rm -f fake
 
 printf "Checking for iconv 2nd argument... "
 printf "#include <iconv.h>\nint main(){ const char** src = 0; iconv(0, src, 0, 0, 0); }\n" > build_check.c
-$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c -o fake > /dev/null 2> /dev/null
+$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c $LIBICONV -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
-    DEFS="$DEFS -DCONST_ICONV"
     printf "non-const\n"
 else
+    DEFS="$DEFS -DCONST_ICONV"
     printf "const\n"
 fi
 rm -f fake
@@ -202,6 +203,7 @@ printf "CXX=$CXX\n" >> $CONFFILE
 printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE
 printf "CFLAGS=$CFLAGS\n" >> $CONFFILE
 printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE
+printf "LIBICONV=$LIBICONV\n" >> $CONFFILE
 printf "PREFIX=$PREFIX\n" >> $CONFFILE
 printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE
 printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE

diff --git a/projects/sgconv/Makefile b/projects/sgconv/Makefile
index ff6308eddc5414f298b5e681a45cbba2ad8f2d02..b463f1750cc876c2fcfc0c83db85f0d7cc80a8ee 100644 (file)
--- a/projects/sgconv/Makefile
+++ b/projects/sgconv/Makefile
@@ -18,12 +18,12 @@ STGLIBS = dotconfpp \
 STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
 STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 
-LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
+LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD) $(LIBICONV)
 
 ifeq ($(OS),linux)
 LIBS += -ldl
 else
-LIBS += -lc -liconv
+LIBS += -lc
 endif
 
 SEARCH_DIRS = -I ../../include

diff --git a/projects/sgconv/build b/projects/sgconv/build
index 2d6ce471ef5a88ff779ea5aa1f171e604a1bba31..da83a527e9d98faa470d5279da835890b1e5bb25 100755 (executable)
--- a/projects/sgconv/build
+++ b/projects/sgconv/build
@@ -85,6 +85,7 @@ then
     DEFS="$DEFS -DLINUX"
     LIB_THREAD=-lpthread
 else
+    LIBICONV="-liconv"
     if [ "$OS" = "bsd" ]
     then
         DEFS="$DEFS -DFREE_BSD"
@@ -99,6 +100,7 @@ else
             then
                 DEFS="$DEFS -DDARWIN"
                 LIB_THREAD=-lpthread
+                LIBICONV=""
             else
                 LIB_THREAD=-lc_r
             fi
@@ -162,7 +164,7 @@ rm -f fake
 
 printf "Checking for iconv 2nd argument... "
 printf "#include <iconv.h>\nint main(){ const char** src = 0; iconv(0, src, 0, 0, 0); }\n" > build_check.c
-$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c -o fake > /dev/null 2> /dev/null
+$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c $LIBICONV -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
     printf "non-const\n"
@@ -363,6 +365,7 @@ printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE
 printf "CFLAGS=$CFLAGS\n" >> $CONFFILE
 printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE
 printf "LIB_THREAD=$LIB_THREAD\n" >> $CONFFILE
+printf "LIBICONV=$LIBICONV\n" >> $CONFFILE
 printf "PREFIX=$PREFIX\n" >> $CONFFILE
 printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE
 printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE

diff --git a/projects/stargazer/Makefile b/projects/stargazer/Makefile
index 0fbccd32ec74fb29eb64bc5e1367a18a92595944..e127d4f8a4eb27e9f07b6e7ab24b9485c1475942 100644 (file)
--- a/projects/stargazer/Makefile
+++ b/projects/stargazer/Makefile
@@ -33,12 +33,12 @@ STGLIBS = scriptexecuter \
 STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
 STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
 
-LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD)
+LIBS += $(addprefix -lstg,$(STGLIBS)) $(LIB_THREAD) $(LIBICONV)
 
 ifeq ($(OS),linux)
 LIBS += -ldl
 else
-LIBS += -lc -liconv
+LIBS += -lc
 endif
 
 SEARCH_DIRS = -I ../../include

diff --git a/projects/stargazer/build b/projects/stargazer/build
index 4bf38506e58f8f2e943ea7454672a28b08275818..a77c2e094cc8d529e568a8c8ff14eecf2245a2d3 100755 (executable)
--- a/projects/stargazer/build
+++ b/projects/stargazer/build
@@ -117,6 +117,7 @@ then
              capture/ether_linux"
     LIB_THREAD=-lpthread
 else
+    LIBICONV="-liconv"
     if [ "$OS" = "bsd" ]
     then
         DEFS="$DEFS -DFREE_BSD"
@@ -131,6 +132,7 @@ else
             then
                 DEFS="$DEFS -DDARWIN"
                 LIB_THREAD=-lpthread
+                LIBICONV=""
             else
                 LIB_THREAD=-lc_r
             fi
@@ -210,7 +212,7 @@ rm -f fake
 
 printf "Checking for iconv 2nd argument... "
 printf "#include <iconv.h>\nint main(){ const char** src = 0; iconv(0, src, 0, 0, 0); }\n" > build_check.c
-$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c -o fake > /dev/null 2> /dev/null
+$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c $LIBICONV -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
     printf "non-const\n"
@@ -542,6 +544,7 @@ printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE
 printf "CFLAGS=$CFLAGS\n" >> $CONFFILE
 printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE
 printf "LIB_THREAD=$LIB_THREAD\n" >> $CONFFILE
+printf "LIBICONV=$LIBICONV\n" >> $CONFFILE
 printf "PREFIX=$PREFIX\n" >> $CONFFILE
 printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE
 printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/Makefile b/projects/stargazer/plugins/configuration/rpcconfig/Makefile
index 732b0e11396e6c6c249b3725383696695a7b9370..c647f7524d918e1f2772e0ab289c76a876aaf00c 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/Makefile
+++ b/projects/stargazer/plugins/configuration/rpcconfig/Makefile
@@ -16,11 +16,8 @@ SRCS = ./rpcconfig.cpp \
        ./messages_methods.cpp
 
 LIBS += $(XMLRPC_LDFLAGS) \
-       $(LIB_THREAD)
-
-ifneq ($(OS),linux)
-LIBS += -liconv
-endif
+       $(LIB_THREAD) \
+       $(LIBICONV)
 
 STGLIBS = common \
          logger \

diff --git a/stglibs/common.lib/Makefile b/stglibs/common.lib/Makefile
index 0ef14dea0a8af4f700317e1a2d0dad97b69972a8..1f662c25c3357985ec83d49a11fbb5129b7a4539 100644 (file)
--- a/stglibs/common.lib/Makefile
+++ b/stglibs/common.lib/Makefile
@@ -11,8 +11,6 @@ SRCS = common.cpp \
 
 INCS = common.h
 
-ifneq ($(OS),linux)
-LIBS += -liconv
-endif
+LIBS += $(LIBICONV)
 
 include ../Makefile.in