git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace some unsigned types with size_t
[stg.git]
/
projects
/
stargazer
/
build
diff --git
a/projects/stargazer/build
b/projects/stargazer/build
index 36f2f7339bd1ca61c08f7da48928ecab0ab3d856..041e51731664081bcf08195f0313107de6641b5b 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"
@@
-68,7
+68,7
@@
else
then
DEFS="$DEFS -DDEBUG"
MAKEOPTS="-j1"
then
DEFS="$DEFS -DDEBUG"
MAKEOPTS="-j1"
- CXXFLAGS="$CXXFLAGS -g3 -W -Wall"
+ CXXFLAGS="$CXXFLAGS -g
gdb
3 -W -Wall"
else
DEFS="$DEFS -DNDEBUG"
MAKEOPTS="-j1"
else
DEFS="$DEFS -DNDEBUG"
MAKEOPTS="-j1"
@@
-112,14
+112,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
pinger.lib
conffiles.lib
pinger.lib
- dotconfpp.lib"
+ dotconfpp.lib
+ smux.lib"
PLUGINS="authorization/ao
authorization/inetaccess
PLUGINS="authorization/ao
authorization/inetaccess
@@
-127,6
+128,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"
@@
-158,28
+160,38
@@
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 [ -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!"
if [ $? != 0 ]
then
echo "FAIL!"
- echo "
gcc
not found"
+ echo "
$CC
not found"
exit;
fi
echo "found"
exit;
fi
echo "found"
-echo -n "Checking
g++
... "
-
g++
--version > /dev/null 2> /dev/null
+echo -n "Checking
CXX
... "
+
$CXX
--version > /dev/null 2> /dev/null
if [ $? != 0 ]
then
echo "FAIL!"
if [ $? != 0 ]
then
echo "FAIL!"
- echo "
g++
not found"
+ echo "
$CXX
not found"
exit;
fi
echo "found"
echo -n "Checking endianess... "
echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c
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
+$CC $CXXFLAGS $LDFLAGS build_check.c -o fake
if [ $? != 0 ]
then
echo "FAIL!"
if [ $? != 0 ]
then
echo "FAIL!"
@@
-202,7
+214,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
@@
-214,7
+226,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
@@
-231,7
+243,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
@@
-272,7
+284,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
@@
-311,7
+323,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
@@
-411,6
+423,7
@@
done
echo "" >> $CONFFILE
echo "SHELL=$SHELL" >> $CONFFILE
echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE
echo "" >> $CONFFILE
echo "SHELL=$SHELL" >> $CONFFILE
echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE
+echo "CFLAGS=$CXXFLAGS" >> $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