Merge remote-tracking branch 'origin/stg-2.409' into ticket37

[stg.git] / projects / libs / build

diff --git a/projects/libs/build b/projects/libs/build
index 9ea852a077f4b458224b2e89f8df3d009e6eee93..4c1fce9bfd129b8fefe8a5b09bb8217e7a4f9b0c 100755 (executable)
--- a/projects/libs/build
+++ b/projects/libs/build
@@ -107,7 +107,6 @@ else
             if [ "$OS" == "darwin" ]
             then
                 DEFS="$DEFS -DDARWIN"
             if [ "$OS" == "darwin" ]
             then
                 DEFS="$DEFS -DDARWIN"

-                LIBICONV=""

             fi
         fi
     fi
             fi
         fi
     fi


@@ -169,7 +168,7 @@ rm -f fake
 
 printf "Checking for -lexpat... "
 printf "#include <expat.h>\nint main() { return 0; }\n" > build_check.c
 
 printf "Checking for -lexpat... "
 printf "#include <expat.h>\nint main() { return 0; }\n" > build_check.c

-$CXX $CXXFLAGS $LDFLAGS build_check.c -lexpat -o fake > /dev/null 2> /dev/null
+$CC $CFLAGS $LDFLAGS build_check.c -lexpat -o fake > /dev/null 2> /dev/null

 if [ $? != 0 ]
 then
     CHECK_EXPAT=no
 if [ $? != 0 ]
 then
     CHECK_EXPAT=no


@@ -182,7 +181,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
 
 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 $LIBICONV -o fake > /dev/null 2> /dev/null
+$CC $CFLAGS $LDFLAGS -Werror build_check.c $LIBICONV -o fake > /dev/null 2> /dev/null

 if [ $? != 0 ]
 then
     printf "non-const\n"
 if [ $? != 0 ]
 then
     printf "non-const\n"


@@ -199,7 +198,7 @@ then
     printf "no\n"
     printf "Checking for -lfbclient... "
     printf "int main() { return 0; }\n" > build_check.c
     printf "no\n"
     printf "Checking for -lfbclient... "
     printf "int main() { return 0; }\n" > build_check.c

-    $CXX $CXXFLAGS $LDFLAGS build_check.c -lfbclient $LIB_THREAD -o fake > /dev/null 2> /dev/null
+    $CC $CFLAGS $LDFLAGS build_check.c -lfbclient $LIB_THREAD -o fake > /dev/null 2> /dev/null

     if [ $? != 0 ]
     then
         CHECK_FBCLIENT=no
     if [ $? != 0 ]
     then
         CHECK_FBCLIENT=no