Allow to use NULL tariff instead empty one

[stg.git] / projects / sgconf_xml / build

diff --git a/projects/sgconf_xml/build b/projects/sgconf_xml/build
index a4857105a2182de7d0f661732c2c5935740f7306..660899d753a1e48dfafd3882d179f971964622ac 100755 (executable)
--- a/projects/sgconf_xml/build
+++ b/projects/sgconf_xml/build
@@ -13,6 +13,7 @@ CONFFILE="../../Makefile.conf"
 PREFIX="/"
 BIN_MODE=0755
 DATA_MODE=0644
 PREFIX="/"
 BIN_MODE=0755
 DATA_MODE=0644

+DIR_MODE=0755

 OWNER=root
 
 if [ -z $1 ]
 OWNER=root
 
 if [ -z $1 ]


@@ -90,6 +91,25 @@ else
     SHELL="/usr/local/bin/bash"
 fi
 
     SHELL="/usr/local/bin/bash"
 fi
 

+echo -n "Checking gcc... "
+gcc --version > /dev/null 2> /dev/null
+if [ $? != 0 ]
+then
+    echo "FAIL!"
+    echo "gcc not found"
+    exit;
+fi
+echo "found"
+echo -n "Checking g++... "
+g++ --version > /dev/null 2> /dev/null
+if [ $? != 0 ]
+then
+    echo "FAIL!"
+    echo "g++ not found"
+    exit;
+fi
+echo "found"
+

 echo -n "Checking endianess... "
 echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c
 gcc $CXXFLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null
 echo -n "Checking endianess... "
 echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c
 gcc $CXXFLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null


@@ -115,7 +135,7 @@ rm -f fake
 
 echo -n "Checking for -lexpat... "
 echo "int main() { return 0; }" > build_check.c
 
 echo -n "Checking for -lexpat... "
 echo "int main() { return 0; }" > build_check.c

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

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


@@ -155,6 +175,7 @@ echo "LDFLAGS=$LDFLAGS" >> $CONFFILE
 echo "PREFIX=$PREFIX" >> $CONFFILE
 echo "BIN_MODE=$BIN_MODE" >> $CONFFILE
 echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
 echo "PREFIX=$PREFIX" >> $CONFFILE
 echo "BIN_MODE=$BIN_MODE" >> $CONFFILE
 echo "DATA_MODE=$DATA_MODE" >> $CONFFILE

+echo "DIR_MODE=$DIR_MODE" >> $CONFFILE

 echo "OWNER=$OWNER" >> $CONFFILE
 
 $MAKE $MAKEOPTS
 echo "OWNER=$OWNER" >> $CONFFILE
 
 $MAKE $MAKEOPTS