From: jason taylor <jtfas90@gmail.com>
Date: Wed, 3 Apr 2019 17:26:24 +0000 (-0400)
Subject: ci: updated travis and appveyor for nss/nspr
X-Git-Tag: suricata-5.0.0-beta1~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4ec133a888a465418eb30bb839b76dfa85bea4d;p=thirdparty%2Fsuricata.git

ci: updated travis and appveyor for nss/nspr

* added nss and nspr requirements for appveyor build
* added nss and nspr requirements for travis builds
* added travis build without nss and nspr

Signed-off-by: jason taylor <jtfas90@gmail.com>
---

diff --git a/.travis.yml b/.travis.yml
index 37710deb57..ae1523f53c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,38 @@ language: c
 
 addons:
   apt:
+    # Define the required packages without nss/nspr so we can do a
+    # build without nss/nspr
+    packages-without-nssnspr: &packages-without-nssnspr
+      - libpcre3
+      - libpcre3-dbg
+      - libpcre3-dev
+      - build-essential
+      - autoconf
+      - automake
+      - libtool
+      - libpcap-dev
+      - libnet1-dev
+      - libyaml-0-2
+      - libyaml-dev
+      - zlib1g
+      - zlib1g-dev
+      - libcap-ng-dev
+      - libcap-ng0
+      - make
+      - libmagic-dev
+      - libnetfilter-queue-dev
+      - libnetfilter-queue1
+      - libnfnetlink-dev
+      - libnfnetlink0
+      - libhiredis-dev
+      - libjansson-dev
+      - libevent-dev
+      - libevent-pthreads-2.0-5
     # Define the required packages without libjansson so we can do a
     # build without libjansson.
     packages-without-jansson: &packages-without-jansson
+      - libnss3-dev
       - libpcre3
       - libpcre3-dbg
       - libpcre3-dev
@@ -174,6 +203,17 @@ matrix:
       env:
         - NAME="osx,gcc"
         - *default-cflags
+    # Linux, gcc, no nss/nspr.
+    - os: linux
+      compiler: gcc
+      env:
+        - NAME="linux,gcc,no-nssnspr"
+        - *default-cflags
+        - ARGS="--disable-nss --disable-nspr"
+      addons:
+        apt:
+          packages:
+            - *packages-without-nssnspr
 
 script:
   - |
diff --git a/appveyor.yml b/appveyor.yml
index c12404f22e..f3d96e06cc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -46,6 +46,8 @@ before_build:
   - c:\msys64\usr\bin\pacman -Su --noconfirm mingw-w64-"%MINGW_ARCH%"-pcre
   - c:\msys64\usr\bin\pacman -Su --noconfirm mingw-w64-"%MINGW_ARCH%"-rust
   - c:\msys64\usr\bin\pacman -Su --noconfirm mingw-w64-"%MINGW_ARCH%"-jansson
+  - c:\msys64\usr\bin\pacman -Su --noconfirm mingw-w64-"%MINGW_ARCH%"-nss
+  - c:\msys64\usr\bin\pacman -Su --noconfirm mingw-w64-"%MINGW_ARCH%"-nspr
 
 install:
   - choco install winpcap # winpcap userspace
diff --git a/configure.ac b/configure.ac
index 2cd0a1e72e..a6669ec479 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1873,7 +1873,6 @@
             echo "   Fedora: dnf install nspr-devel"
             echo "   CentOS/RHEL: yum install nspr-devel"
             echo
-            exit 1
         fi
     fi
 
@@ -1926,7 +1925,6 @@
             echo "   Fedora: dnf install nss-devel"
             echo "   CentOS/RHEL: yum install nss-devel"
             echo
-            exit 1
         fi
     fi