Removed artefact from previous patch.

[stg.git] / projects / stargazer / build

diff --git a/projects/stargazer/build b/projects/stargazer/build
index ff2269e125396821a7a0dbe247607e63c44ee253..a323148b9ed3c9787c58fd029a9d5a9e49060c68 100755 (executable)
--- a/projects/stargazer/build
+++ b/projects/stargazer/build
@@ -35,20 +35,15 @@ MIN_XMLRPCC_VERSION="1.06.27"
 XMLRPC_FEATURES="c++2 abyss-server"
 
 
 XMLRPC_FEATURES="c++2 abyss-server"
 
 

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

 then
 then

-    DEFS="$DEFS -DNDEBUG"
-    MAKEOPTS="-j1"
+    DEFS="$DEFS -DDEBUG"
+    MAKEOPTS="$MAKEOPTS -j1"
+    CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
+    DEBUG="yes"

 else
 else

-    if [ "$1" = "debug" ]
-    then
-        DEFS="$DEFS -DDEBUG"
-        MAKEOPTS="-j1"
-        CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
-    else
-        DEFS="$DEFS -DNDEBUG"
-        MAKEOPTS="-j1"
-    fi
+    DEFS="$DEFS -DNDEBUG"
+    DEBUG="no"

 fi
 
 CXXFLAGS="$CXXFLAGS -I/usr/local/include"
 fi
 
 CXXFLAGS="$CXXFLAGS -I/usr/local/include"


@@ -113,8 +108,7 @@ if [ "$OS" = "linux" ]
 then
     DEFS="$DEFS -DLINUX"
     PLUGINS="$PLUGINS
 then
     DEFS="$DEFS -DLINUX"
     PLUGINS="$PLUGINS

-             capture/ether_linux
-             capture/ipq_linux"
+             capture/ether_linux"

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


@@ -335,21 +329,26 @@ else
     fi
 fi
 
     fi
 fi
 

-echo -n "Checking for linux/netfilter_ipv4/ip_queue.h... "
-echo "#include <linux/types.h>" > build_check.c
-echo "#include <linux/netfilter_ipv4/ip_queue.h>" >> build_check.c
-echo "int main() { return 0; }" >> build_check.c
-$CC $CFLAGS $LDFLAGS build_check.c -lexpat -o fake > /dev/null 2> /dev/null
-if [ $? != 0 ]
+if [ "$OS" = "linux" ]

 then
 then

-    CHECK_IP_QUEUE_H=no
-    echo "no"
-else
-    CHECK_IP_QUEUE_H=yes
-    DEFS="$DEFS HAS_IP_QUEUE_H"
-    echo "yes"
+    echo -n "Checking for linux/netfilter_ipv4/ip_queue.h... "
+    echo "#include <linux/types.h>" > build_check.c
+    echo "#include <linux/netfilter_ipv4/ip_queue.h>" >> build_check.c
+    echo "int main() { return 0; }" >> build_check.c
+    $CC $CFLAGS $LDFLAGS build_check.c -lexpat -o fake > /dev/null 2> /dev/null
+    if [ $? != 0 ]
+    then
+        CHECK_IP_QUEUE_H=no
+        echo "no"
+    else
+        CHECK_IP_QUEUE_H=yes
+        DEFS="$DEFS -DHAS_IP_QUEUE_H"
+        PLUGINS="$PLUGINS
+                 capture/ipq_linux"
+        echo "yes"
+    fi
+    rm -f fake

 fi
 fi

-rm -f fake

 
 rm -f build_check.c
 
 
 rm -f build_check.c
 


@@ -387,6 +386,7 @@ fi
 
 echo "OS=$OS" > $CONFFILE
 echo "STG_TIME=yes" >> $CONFFILE
 
 echo "OS=$OS" > $CONFFILE
 echo "STG_TIME=yes" >> $CONFFILE

+echo "DEBUG=$DEBUG" >> $CONFFILE

 echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
 echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
 echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
 echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
 echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
 echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE