Merge pull request #1016 in SNORT/snort3 from appid1 to master

Squashed commit of the following:

commit b158a2712ae7a41e8b2fac760358c209f6378a0d
Author: Steve Chew <stechew@cisco.com>
Date:   Fri Sep 15 18:06:20 2017 -0400

    Install the appid_api.h header to be used by FirewallInspector module.

diff --git a/src/network_inspectors/appid/CMakeLists.txt b/src/network_inspectors/appid/CMakeLists.txt
index 51cf51ff10f12ec8f4c1ae245bc8469dbe707614..bf9327df50c6fd4db27be8219e15c5ccec226088 100644 (file)
--- a/src/network_inspectors/appid/CMakeLists.txt
+++ b/src/network_inspectors/appid/CMakeLists.txt
@@ -1,6 +1,7 @@
 set( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -fno-strict-aliasing" )
 
 set (APPID_INCLUDES
+    appid_api.h
     application_ids.h
 )
 

diff --git a/src/network_inspectors/appid/Makefile.am b/src/network_inspectors/appid/Makefile.am
index a33c610b97e473a2ee3a2eda94440ed280856dad..438132708b65c34308360a3d9fe409f227474f9b 100644 (file)
--- a/src/network_inspectors/appid/Makefile.am
+++ b/src/network_inspectors/appid/Makefile.am
@@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS=foreign nostdinc subdir-objects
 x_includedir = $(pkgincludedir)/network_inspectors/appid
 
 x_include_HEADERS = \
+appid_api.h \
 application_ids.h
 
 AM_CPPFLAGS+=-I$(top_srcdir)/src/network_inspectors/appid -fno-strict-aliasing