ticket 37. The newTariff, currentTariff objects added, if (newTariff)

[stg.git] / projects / sgconf_xml / build

diff --git a/projects/sgconf_xml/build b/projects/sgconf_xml/build
index 10de5f003478d554ab1078bd1ead6af06d61e212..a1084554f5ec8bf31be5eebc82791e61f3f6f575 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"
@@ -149,7 +150,7 @@ rm -f fake
 
 printf "Checking for -lexpat... "
 printf "int main() { return 0; }\n" > build_check.c
-$CC $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
@@ -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
+$CC $CFLAGS $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