Merge pull request #673 from appneta/Bug_#669_auto_detect_netmap

Bug #669: LINUX installed netmap auto detection
appneta · Jun 19, 2021 · 13a9b59 · 13a9b59
2 parents dfc6353 + 45c7727
commit 13a9b59
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/configure.ac b/configure.ac
@@ -1266,7 +1266,7 @@ if test "$cross_compiling" = yes; then
         NETMAP_SEARCH_DIRS=$trynetmapdir
     fi
 else
-    NETMAP_SEARCH_DIRS="$trynetmapdir /opt/netmap /usr/src/netmap-release /usr/src/netmap /usr/local/src/netmap-release /usr/local/src/netmap /usr/include"
+    NETMAP_SEARCH_DIRS="$trynetmapdir /opt/netmap /usr/src/netmap-release /usr/src/netmap /usr/local/src/netmap-release /usr/local/src/netmap /usr/include /usr/local/include"
 fi
 
 for testdir in $NETMAP_SEARCH_DIRS; do

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
@@ -1,5 +1,6 @@
 06/19/2021 Version 4.3.5-beta1
     - gcc 9.3 compiler warnings #670
+    - installed netmap not automatically detected #669
     - heap-buffer-overflow with flow_decode() #665
 
 04/01/2021 Version 4.3.4