Ticket 37. TariffChangelsAllowed function name changed to

[stg.git] / projects / rscriptd / build

diff --git a/projects/rscriptd/build b/projects/rscriptd/build
index f01f50cb33b151accff29e1ac53a13f233962419..a2926ed005c65ecf197efa20f4ff2835273352e0 100755 (executable)
--- a/projects/rscriptd/build
+++ b/projects/rscriptd/build
@@ -81,6 +81,7 @@ then
     DEFS="$DEFS -DLINUX"
     LIB_THREAD=-lpthread
 else
     DEFS="$DEFS -DLINUX"
     LIB_THREAD=-lpthread
 else

+    LIBICONV="-liconv"

     if [ "$OS" = "bsd" ]
     then
         DEFS="$DEFS -DFREE_BSD"
     if [ "$OS" = "bsd" ]
     then
         DEFS="$DEFS -DFREE_BSD"


@@ -94,6 +95,7 @@ else
             then
                 DEFS="$DEFS -DDARWIN"
                 LIB_THREAD=-lpthread
             then
                 DEFS="$DEFS -DDARWIN"
                 LIB_THREAD=-lpthread

+                LIBICONV=""

             else
                 LIB_THREAD=-lc_r
             fi
             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
 
 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
+$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"


@@ -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 "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
 printf "PREFIX=$PREFIX\n" >> $CONFFILE
 printf "BIN_MODE=$BIN_MODE\n" >> $CONFFILE
 printf "DATA_MODE=$DATA_MODE\n" >> $CONFFILE