Added missing dependency.

[stg.git] / projects / rscriptd / build

diff --git a/projects/rscriptd/build b/projects/rscriptd/build
index 38302ee34dcdb5a883dde007727bb76b47ab04b6..885eef76558f36c88353c0ff33300d20bfa54561 100755 (executable)
--- a/projects/rscriptd/build
+++ b/projects/rscriptd/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 ]


@@ -23,7 +24,7 @@ else
     then
         DEFS="-DDEBUG"
         MAKEOPTS="-j1"
     then
         DEFS="-DDEBUG"
         MAKEOPTS="-j1"

-        CXXFLAGS="$CXXFLAGS -g3 -W -Wall"
+        CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"

     else
         MAKEOPTS="-j1"
     fi
     else
         MAKEOPTS="-j1"
     fi


@@ -47,6 +48,7 @@ then
         6) OS=bsd5;;
         7) OS=bsd7;;
         8) OS=bsd7;;
         6) OS=bsd5;;
         7) OS=bsd7;;
         8) OS=bsd7;;

+        9) OS=bsd7;;

         *) OS=unknown;;
     esac
     MAKE="gmake"
         *) OS=unknown;;
     esac
     MAKE="gmake"


@@ -64,18 +66,17 @@ echo "##########################################################################
 echo "       Building rscriptd for $sys $release"
 echo "#############################################################################"
 
 echo "       Building rscriptd for $sys $release"
 echo "#############################################################################"
 

-STG_LIBS="stg_logger.lib 
-          stg_locker.lib
+STG_LIBS="logger.lib 
+          locker.lib

          crypto.lib 
          common.lib 
          crypto.lib 
          common.lib 

-         script_executer.lib 
+         scriptexecuter.lib 

          conffiles.lib"
 
 if [ "$OS" = "linux" ]
 then
     DEFS="$DEFS -DLINUX"
     LIB_THREAD=-lpthread
          conffiles.lib"
 
 if [ "$OS" = "linux" ]
 then
     DEFS="$DEFS -DLINUX"
     LIB_THREAD=-lpthread

-    SHELL="/bin/bash"

 else
     if [ "$OS" = "bsd" ]
     then
 else
     if [ "$OS" = "bsd" ]
     then


@@ -90,12 +91,40 @@ else
             LIB_THREAD=-lc_r
         fi
     fi
             LIB_THREAD=-lc_r
         fi
     fi

-    SHELL="/usr/local/bin/bash"

 fi
 
 fi
 

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

 echo -n "Checking endianess... "
 echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c
 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
+$CC $CFLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null

 if [ $? != 0 ]
 then
     echo "FAIL!"
 if [ $? != 0 ]
 then
     echo "FAIL!"


@@ -107,10 +136,12 @@ else
     then
         ARCH=le
         CXXFLAGS="$CXXFLAGS -DARCH_LE"
     then
         ARCH=le
         CXXFLAGS="$CXXFLAGS -DARCH_LE"

+        CFLAGS="$CFLAGS -DARCH_LE"

         echo "Little Endian"
     else
         ARCH=be
         CXXFLAGS="$CXXFLAGS -DARCH_BE"
         echo "Little Endian"
     else
         ARCH=be
         CXXFLAGS="$CXXFLAGS -DARCH_BE"

+        CFLAGS="$CFLAGS -DARCH_BE"

         echo "Big Endian"
     fi
 fi
         echo "Big Endian"
     fi
 fi


@@ -132,12 +163,13 @@ do
 done
 echo "" >> $CONFFILE
 echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE
 done
 echo "" >> $CONFFILE
 echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE

-echo "SHELL=$SHELL" >> $CONFFILE

 echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE
 echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE

+echo "CFLAGS=$CFLAGS" >> $CONFFILE

 echo "LDFLAGS=$LDFLAGS" >> $CONFFILE
 echo "PREFIX=$PREFIX" >> $CONFFILE
 echo "BIN_MODE=$BIN_MODE" >> $CONFFILE
 echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
 echo "LDFLAGS=$LDFLAGS" >> $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