Ticket 37. Int2TS() method changed to formatTime() function, TS2Int() method

[stg.git] / projects / sgauthstress / build

diff --git a/projects/sgauthstress/build b/projects/sgauthstress/build
index 1593af28b623170057d67524474e8432e09a7d3f..dae35b74bcec7d9d2a0fc49e8e628e1b20a37fb7 100755 (executable)
--- a/projects/sgauthstress/build
+++ b/projects/sgauthstress/build
@@ -86,6 +86,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"


@@ -154,6 +155,19 @@ else
     fi
 fi
 rm -f fake
     fi
 fi
 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
+$CC $CFLAGS $LDFLAGS -Werror build_check.c $LIBICONV -o fake > /dev/null 2> /dev/null
+if [ $? != 0 ]
+then
+    printf "non-const\n"
+else
+    DEFS="$DEFS -DCONST_ICONV"
+    printf "const\n"
+fi
+rm -f fake
+

 rm -f build_check.c
 
 printf "Checking for fb_config... "
 rm -f build_check.c
 
 printf "Checking for fb_config... "


@@ -163,7 +177,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


@@ -244,7 +258,7 @@ if [ $? != 0 ]
 then
     printf "no\n";
     printf "Checking for -lpq... "
 then
     printf "no\n";
     printf "Checking for -lpq... "

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

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


@@ -346,6 +360,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