From e63291850fd0795c5700e25e67e5dee89ba54c5f Mon Sep 17 00:00:00 2001
From: Ashlee Young <ashlee@wildernessvoice.com>
Date: Tue, 1 Dec 2015 05:49:27 -0800
Subject: onos commit hash c2999f30c69e50df905a9d175ef80b3f23a98514

Change-Id: I2bb8562c4942b6d6a6d60b663db2e17540477b81
Signed-off-by: Ashlee Young <ashlee@wildernessvoice.com>
---
 build.sh | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index fc234b5e..42c6940a 100755
--- a/build.sh
+++ b/build.sh
@@ -20,7 +20,7 @@
 ##### Settings #####
 VERSION=1.0.7
 AUTHOR="Ashlee Young"
-MODIFIED="November 23, 2015"
+MODIFIED="November 30, 2015"
 GERRITURL="git clone ssh://im2bz2pee@gerrit.opnfv.org:29418/onosfw"
 ONOSURL="https://github.com/opennetworkinglab/onos"
 SURICATAURL="https://github.com/inliniac/suricata"
@@ -29,6 +29,7 @@ JAVA_VERSION=1.8
 ANT_VERSION=1.9.6
 MAVEN_VERSION=3.3.3
 KARAF_VERSION=4.0.2
+LIBCAP-NG_VERSION=0.7.7
 MODE=$1
 ##### End Settings #####
 
@@ -447,6 +448,32 @@ checkforlibpcap() # Checks whether RPMBUILD is installed
 }
 ##### End Check for libpcap #####
 
+##### Check for libhtp #####
+checkforlibhtp() # Checks whether RPMBUILD is installed
+{
+    if [ ! -f "$SURICATAROOT/libhtp" ]; then
+        cd $SURICATAROOT
+        git clone https://github.com/ironbee/libhtp
+    fi    
+}
+##### End Check for libhtp #####
+
+##### Check for libcap-ng #####
+checkforlibcap-ng() # Checks whether RPMBUILD is installed
+{
+    if [ ! -f "$SURICATAROOT/libcap-ng-$LIBCAP-NG_VERSION" ]; then
+        cd $SURICATAROOT
+        wget http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-$LIBCAP-NG_VERSION.tar.gz
+        tar xzvf libcap-ng-$LIBCAP-NG_VERSION.tar.gz
+        rm libcap-ng-$LIBCAP-NG_VERSION.tar.gz
+        cd libcap-ng-$LIBCAP-NG_VERSION
+        ./autogen.sh
+        ./configure --without-python3
+        make
+    fi    
+}
+##### End Check for libcap-ng #####
+
 ##### Build Suricata #####
 buildSuricata()
 {
@@ -477,6 +504,7 @@ buildSuricata()
                     fi
                 fi
                 cd $SURICATAROOT
+                checkforlibhtp
                 ./autogen.sh
                 ./configure
                 make
@@ -501,6 +529,7 @@ buildSuricata()
                     fi
                 fi
                 cd $SURICATAROOT
+                checkforlibhtp
                 ./autogen.sh
                 ./configure
                 make
-- 
cgit 1.2.3-korg