From: Maxim Mamontov Date: Sun, 13 Nov 2016 02:17:00 +0000 (-0500) Subject: Merge branch 'stg-2.409' X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/cd4be4497c82b49b78567956755727408fe34c1e?ds=sidebyside;hp=-c Merge branch 'stg-2.409' --- cd4be4497c82b49b78567956755727408fe34c1e diff --combined projects/sgconv/build index 3c2f3f91,5fa0f23c..676bf74e --- a/projects/sgconv/build +++ b/projects/sgconv/build @@@ -72,6 -72,7 +72,6 @@@ printf " Building sgconv for $sy printf "#############################################################################\n" STG_LIBS="logger.lib - locker.lib crypto.lib common.lib conffiles.lib @@@ -99,7 -100,6 +99,6 @@@ els then DEFS="$DEFS -DDARWIN" LIB_THREAD=-lpthread - LIBICONV="" else LIB_THREAD=-lc_r fi diff --combined projects/stargazer/build index 638ed3ef,1fbb8a98..92935c05 --- a/projects/stargazer/build +++ b/projects/stargazer/build @@@ -132,7 -132,6 +132,6 @@@ els then DEFS="$DEFS -DDARWIN" LIB_THREAD=-lpthread - LIBICONV="" else LIB_THREAD=-lc_r fi @@@ -391,19 -390,6 +390,19 @@@ els fi fi +printf "Checking for -lpcap... " +printf "#include \nint main() { return 0; }\n" > build_check.c +$CC $CFLAGS $LDFLAGS build_check.c -lpcap -o fake > /dev/null 2> /dev/null +if [ $? != 0 ] +then + CHECK_PCAP=no + printf "no\n" +else + CHECK_PCAP=yes + printf "yes\n" +fi +rm -f fake + printf "Checking for -lnfnetlink... " printf "#include \n#include \n#include \nint main() { return 0; }\n" > build_check.c $CC $CFLAGS $LDFLAGS build_check.c -lnfnetlink -o fake > /dev/null 2> /dev/null @@@ -487,12 -473,6 +486,12 @@@ the configuration/rpcconfig" fi +if [ "$CHECK_PCAP" = "yes" ] +then + PLUGINS="$PLUGINS + capture/pcap" +fi + if [ "$CHECK_NFNETLINK" = "yes" -a "$CHECK_NFQ" = "yes" ] then PLUGINS="$PLUGINS @@@ -534,7 -514,6 +533,7 @@@ the printf "XMLRPC_CFLAGS=$XMLRPC_CFLAGS\n" >> $CONFFILE printf "XMLRPC_LDFLAGS=$XMLRPC_LDFLAGS\n" >> $CONFFILE fi +printf "CHECK_PCAP=$CHECK_PCAP\n" >> $CONFFILE printf "CHECK_NFNETLINK=$CHECK_NFNETLINK\n" >> $CONFFILE if [ "$CHECK_NFNETLINK" = "yes" ] then