Minor ChangeLog fix

[stg.git] / projects / stargazer / build

diff --git a/projects/stargazer/build b/projects/stargazer/build
index 637dc739f1c039b6217e48b26809885a081415d0..60c8e1ff035e4c07008c3cec1c62146fbf9f084a 100755 (executable)
--- a/projects/stargazer/build
+++ b/projects/stargazer/build
@@ -25,30 +25,6 @@ DIR_MODE=0755
 
 OWNER=root
 
 
 OWNER=root
 

-# Name of the firebird's group
-# Need for chown directory with firebird db
-
-FIREBIRD_GROUP=firebird
-
-# Database address
-# Firebird must have priviledges to read/write for specified path
-
-DB_ADDRESS="localhost:/var/stargazer/stargazer.fdb"
-
-# Database user
-# This user must have priviledges to create database
-
-DB_USER="stg"
-
-# Database password
-
-DB_PASSWORD="123456"
-
-# Full path to isql utility
-# Note: Debian users have to specify path to isql-fb utility
-
-FIREBIRD_ISQL="/opt/firebird/bin/isql"
-

 OS=unknown
 sys=`uname -s`
 release=`uname -r | cut -b1`
 OS=unknown
 sys=`uname -s`
 release=`uname -r | cut -b1`


@@ -59,7 +35,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"


@@ -68,7 +44,7 @@ else
     then
         DEFS="$DEFS -DDEBUG"
         MAKEOPTS="-j1"
     then
         DEFS="$DEFS -DDEBUG"
         MAKEOPTS="-j1"

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

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


@@ -94,6 +70,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
     ETC_DIR="./inst/freebsd/etc/stargazer"
         *) OS=unknown;;
     esac
     ETC_DIR="./inst/freebsd/etc/stargazer"


@@ -112,15 +89,15 @@ 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 
          pinger.lib 

-         dotconfpp.lib"
+         dotconfpp.lib
+          smux.lib"

 
 PLUGINS="authorization/ao
          authorization/inetaccess
 
 PLUGINS="authorization/ao
          authorization/inetaccess


@@ -128,6 +105,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"
 


@@ -137,7 +115,6 @@ then
     PLUGINS="$PLUGINS
              capture/ether_linux
              capture/ipq_linux"
     PLUGINS="$PLUGINS
              capture/ether_linux
              capture/ipq_linux"

-    SHELL="/bin/bash"

     LIB_THREAD=-lpthread
 else
     if [ "$OS" = "bsd" ]
     LIB_THREAD=-lpthread
 else
     if [ "$OS" = "bsd" ]


@@ -156,12 +133,40 @@ else
     PLUGINS="$PLUGINS
              capture/ether_freebsd
              capture/divert_freebsd"
     PLUGINS="$PLUGINS
              capture/ether_freebsd
              capture/divert_freebsd"

-    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

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


@@ -173,10 +178,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


@@ -184,7 +191,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 $CFLAGS $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 +203,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 $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


@@ -213,7 +220,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 $CFLAGS $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


@@ -232,7 +239,6 @@ else
         CHECK_MYSQLCLIENT=no
         echo "no"
     else
         CHECK_MYSQLCLIENT=no
         echo "no"
     else

-        #CXXFLAGS="$CXXFLAGS $MYSQL_CFLAGS"

         echo "[$MYSQL_CFLAGS]"
         echo -n "Checking for mysql_config --libs_r... "
         MYSQL_LDFLAGS=`mysql_config --libs_r 2> /dev/null`
         echo "[$MYSQL_CFLAGS]"
         echo -n "Checking for mysql_config --libs_r... "
         MYSQL_LDFLAGS=`mysql_config --libs_r 2> /dev/null`


@@ -242,7 +248,6 @@ else
             echo "no"
         else
             CHECK_MYSQLCLIENT=yes
             echo "no"
         else
             CHECK_MYSQLCLIENT=yes

-            #LDFLAGS="$LDFLAGS $MYSQL_LDFLAGS"

             echo "[$MYSQL_LDFLAGS]"
         fi
     fi
             echo "[$MYSQL_LDFLAGS]"
         fi
     fi


@@ -254,7 +259,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 $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


@@ -293,7 +298,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 $CFLAGS $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


@@ -391,8 +396,8 @@ do
     echo -n "$plugin " >> $CONFFILE
 done
 echo "" >> $CONFFILE
     echo -n "$plugin " >> $CONFFILE
 done
 echo "" >> $CONFFILE

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

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

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

 echo "LDFLAGS=$LDFLAGS" >> $CONFFILE
 echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE
 echo "PREFIX=$PREFIX" >> $CONFFILE
 echo "LDFLAGS=$LDFLAGS" >> $CONFFILE
 echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE
 echo "PREFIX=$PREFIX" >> $CONFFILE


@@ -402,11 +407,6 @@ echo "DIR_MODE=$DIR_MODE" >> $CONFFILE
 echo "OWNER=$OWNER" >> $CONFFILE
 echo "VAR_DIR=$VAR_DIR" >> $CONFFILE
 echo "ETC_DIR=$ETC_DIR" >> $CONFFILE
 echo "OWNER=$OWNER" >> $CONFFILE
 echo "VAR_DIR=$VAR_DIR" >> $CONFFILE
 echo "ETC_DIR=$ETC_DIR" >> $CONFFILE

-echo "DB_ADDRESS=$DB_ADDRESS" >> $CONFFILE
-echo "DB_USER=$DB_USER" >> $CONFFILE
-echo "DB_PASSWORD=$DB_PASSWORD" >> $CONFFILE
-echo "FIREBIRD_ISQL=$FIREBIRD_ISQL" >> $CONFFILE
-echo "FIREBIRD_GROUP=$FIREBIRD_GROUP" >> $CONFFILE

 
 mkdir -p modules
 
 
 mkdir -p modules