Link against smux library instead of plain object files

[stg.git] / projects / stargazer / build

diff --git a/projects/stargazer/build b/projects/stargazer/build
index 637dc739f1c039b6217e48b26809885a081415d0..0b8f30a1e9cff1876bfa5d4abc247cae31c290c0 100755 (executable)
--- a/projects/stargazer/build
+++ b/projects/stargazer/build
@@ -59,7 +59,7 @@ MIN_XMLRPCC_VERSION="1.06.27"
 XMLRPC_FEATURES="c++2 abyss-server"
 
 
 XMLRPC_FEATURES="c++2 abyss-server"
 
 

-if [ -z $1 ]
+if [ -z "$1" ]

 then
     DEFS="$DEFS -DNDEBUG"
     MAKEOPTS="-j1"
 then
     DEFS="$DEFS -DNDEBUG"
     MAKEOPTS="-j1"


@@ -112,13 +112,12 @@ echo "##########################################################################
 echo "       Building STG 2.4 for $sys $release"
 echo "#############################################################################"
 
 echo "       Building STG 2.4 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
          conffiles.lib

-          hostallow.lib 

          pinger.lib 
          dotconfpp.lib"
 
          pinger.lib 
          dotconfpp.lib"
 


@@ -128,6 +127,7 @@ PLUGINS="authorization/ao
          other/ping
          other/rscript
          other/radius
          other/ping
          other/rscript
          other/radius

+         other/smux

          store/files
          capture/cap_nf"
 
          store/files
          capture/cap_nf"
 


@@ -159,9 +159,38 @@ else
     SHELL="/usr/local/bin/bash"
 fi
 
     SHELL="/usr/local/bin/bash"
 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 $CXXFLAGS $LDFLAGS build_check.c -o fake

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


@@ -184,7 +213,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 $CXXFLAGS $LDFLAGS build_check.c -lexpat -o fake > /dev/null 2> /dev/null
+$CC $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


@@ -196,7 +225,7 @@ fi
 rm -f fake
 
 echo -n "Checking for -lfbclient... "
 rm -f fake
 
 echo -n "Checking for -lfbclient... "

-gcc $CXXFLAGS $LDFLAGS build_check.c -lfbclient $LIB_THREAD -o fake > /dev/null 2> /dev/null
+$CC $CXXFLAGS $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


@@ -213,7 +242,7 @@ if [ $? != 0 ]
 then
     echo "no";
     echo -n "Checking for -lmysqlclient... "
 then
     echo "no";
     echo -n "Checking for -lmysqlclient... "

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

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


@@ -254,7 +283,7 @@ if [ $? != 0 ]
 then
     echo "no";
     echo -n "Checking for -lpq... "
 then
     echo "no";
     echo -n "Checking for -lpq... "

-    gcc $CXXFLAGS $LDFLAGS build_check.c -lpq $LIB_THREAD -o fake > /dev/null 2> /dev/null
+    $CC $CXXFLAGS $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


@@ -293,7 +322,7 @@ if [ $? != 0 ]
 then
     echo "no";
     echo -n "Checking for -lxmlrpc... "
 then
     echo "no";
     echo -n "Checking for -lxmlrpc... "

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

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