Added necessary headers in netlink/nfq checks.

[stg.git] / projects / stargazer / build

diff --git a/projects/stargazer/build b/projects/stargazer/build
index 686d781fa6fde82a2012dafacb710f18881973ff..f8fb73633a1adbe75363327aad3754479e4ca5c9 100755 (executable)
--- a/projects/stargazer/build
+++ b/projects/stargazer/build
@@ -27,7 +27,8 @@ OWNER=root
 
 OS=unknown
 sys=`uname -s`
 
 OS=unknown
 sys=`uname -s`

-release=`uname -r | cut -b1`
+release=`uname -r`
+major=`printf "%s" "$release" | cut -d. -f1`

 BUILD_DIR=`pwd`
 CONFFILE="../../Makefile.conf"
 VAR_DIR="./inst/var/stargazer"
 BUILD_DIR=`pwd`
 CONFFILE="../../Makefile.conf"
 VAR_DIR="./inst/var/stargazer"


@@ -54,14 +55,13 @@ LDFLAGS="$LDFLAGS -L/usr/local/lib"
 if [ "$sys" = "Linux" ]
 then
     OS=linux
 if [ "$sys" = "Linux" ]
 then
     OS=linux

-    release=""

     ETC_DIR="./inst/linux/etc/stargazer"
     MAKE="make"
 fi
 
 if [ "$sys" = "FreeBSD" ]
 then
     ETC_DIR="./inst/linux/etc/stargazer"
     MAKE="make"
 fi
 
 if [ "$sys" = "FreeBSD" ]
 then

-    case $release in
+    case $major in

         4) OS=bsd;;
         5) OS=bsd5;;
         6) OS=bsd5;;
         4) OS=bsd;;
         5) OS=bsd5;;
         6) OS=bsd5;;


@@ -82,7 +82,7 @@ fi
 if [ "$OS" = "unknown" ]
 then
     printf "#############################################################################\n"
 if [ "$OS" = "unknown" ]
 then
     printf "#############################################################################\n"

-    printf "# Sorry, but stargazer currently supported by Linux, FreeBSD 4.x, 5.x, 6.x  #\n"
+    printf "# Sorry, but stargazer is currently supported by Linux, FreeBSD and Darwin. #\n"

     printf "#############################################################################\n"
     exit 1
 fi
     printf "#############################################################################\n"
     exit 1
 fi


@@ -92,7 +92,6 @@ printf "       Building STG 2.4 for $sys $release\n"
 printf "#############################################################################\n"
 
 STG_LIBS="logger.lib
 printf "#############################################################################\n"
 
 STG_LIBS="logger.lib

-          locker.lib

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


@@ -197,8 +196,8 @@ fi
 rm -f fake
 
 printf "Checking for -lexpat... "
 rm -f fake
 
 printf "Checking for -lexpat... "

-printf "int main() { return 0; }\n" > build_check.c
-$CC $CFLAGS $LDFLAGS build_check.c -lexpat -o fake > /dev/null 2> /dev/null
+printf "#include <expat.h>\nint main() { return 0; }\n" > build_check.c
+$CXX $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


@@ -210,7 +209,8 @@ fi
 rm -f fake
 
 printf "Checking for -lfbclient... "
 rm -f fake
 
 printf "Checking for -lfbclient... "

-$CC $CFLAGS $LDFLAGS build_check.c -lfbclient $LIB_THREAD -o fake > /dev/null 2> /dev/null
+printf "int main() { return 0; }\n" > build_check.c
+$CXX $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


@@ -222,12 +222,13 @@ fi
 rm -f fake
 
 printf "Checking for mysql_config... "
 rm -f fake
 
 printf "Checking for mysql_config... "

+printf "#include <mysql.h>\nint main() { return 0; }\n" > build_check.c

 MYSQL_VERSION=`mysql_config --version 2> /dev/null`
 if [ $? != 0 ]
 then
     printf "no\n";
     printf "Checking for -lmysqlclient... "
 MYSQL_VERSION=`mysql_config --version 2> /dev/null`
 if [ $? != 0 ]
 then
     printf "no\n";
     printf "Checking for -lmysqlclient... "

-    $CC $CFLAGS $LDFLAGS build_check.c -lmysqlclient_r $LIB_THREAD -o fake > /dev/null 2> /dev/null
+    $CXX $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


@@ -261,12 +262,13 @@ else
 fi
 
 printf "Checking for pg_config... "
 fi
 
 printf "Checking for pg_config... "

+printf "#include <libpq-fe.h>\nint main() { return 0; }\n" > build_check.c

 PG_VERSION=`pg_config --version 2> /dev/null`
 if [ $? != 0 ]
 then
     printf "no\n";
     printf "Checking for -lpq... "
 PG_VERSION=`pg_config --version 2> /dev/null`
 if [ $? != 0 ]
 then
     printf "no\n";
     printf "Checking for -lpq... "

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


@@ -300,12 +302,13 @@ else
 fi
 
 printf "Checking for xmlrpc-c-config... "
 fi
 
 printf "Checking for xmlrpc-c-config... "

+printf "#include <xmlrpc-c/base.hpp>\nint main() { return 0; }\n" > build_check.c

 XMLRPCC_VERSION=`xmlrpc-c-config $XMLRPC_FEATURES --version 2> /dev/null`
 if [ $? != 0 ]
 then
     printf "no\n";
     printf "Checking for -lxmlrpc... "
 XMLRPCC_VERSION=`xmlrpc-c-config $XMLRPC_FEATURES --version 2> /dev/null`
 if [ $? != 0 ]
 then
     printf "no\n";
     printf "Checking for -lxmlrpc... "

-    $CC $CFLAGS $LDFLAGS build_check.c -lxmlrpc $LIB_THREAD -o fake > /dev/null 2> /dev/null
+    $CXX $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


@@ -342,8 +345,9 @@ else
     fi
 fi
 
     fi
 fi
 

-printf "Checking for -lnfnetlink "
-$CC $CFLAGS $LDFLAGS build_check.c -lnfnetlink -o fake > /dev/null 2> /dev/null
+printf "Checking for -lnfnetlink... "
+printf "#include <stdint.h>\n#include <netinet/in.h>\n#include <linux/netfilter.h>\nint main() { return 0; }\n" > build_check.c
+$CXX $CXXFLAGS $LDFLAGS build_check.c -lnfnetlink -o fake > /dev/null 2> /dev/null

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


@@ -354,8 +358,9 @@ else
 fi
 rm -f fake
 
 fi
 rm -f fake
 

-printf "Checking for -lnetfilter_queue "
-$CC $CFLAGS $LDFLAGS build_check.c -lnetfilter_queue -o fake > /dev/null 2> /dev/null
+printf "Checking for -lnetfilter_queue... "
+printf "#include <stdint.h>\n#include <libnetfilter_queue/libnetfilter_queue.h>\nint main() { return 0; }\n" > build_check.c
+$CXX $CXXFLAGS $LDFLAGS build_check.c -lnetfilter_queue -o fake > /dev/null 2> /dev/null

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


@@ -372,7 +377,7 @@ then
     printf "#include <linux/types.h>\n" > build_check.c
     printf "#include <linux/netfilter_ipv4/ip_queue.h>\n" >> build_check.c
     printf "int main() { return 0; }\n" >> build_check.c
     printf "#include <linux/types.h>\n" > build_check.c
     printf "#include <linux/netfilter_ipv4/ip_queue.h>\n" >> build_check.c
     printf "int main() { return 0; }\n" >> build_check.c

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

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


@@ -391,7 +396,7 @@ rm -f build_check.c
 
 if [ "$CHECK_EXPAT" != "yes" ]
 then
 
 if [ "$CHECK_EXPAT" != "yes" ]
 then

-    printf "-lexpat not found!\n"
+    printf -- "-lexpat not found!\n"

     exit 1
 fi
 
     exit 1
 fi