diff --git a/build/libgeoip.m4 b/build/libgeoip.m4
index c382d241df..b8aa158cd4 100644
--- a/build/libgeoip.m4
+++ b/build/libgeoip.m4
@@ -129,31 +129,31 @@ AC_DEFUN([CHECK_FOR_GEOIP_AT], [
     for y in ${GEOIP_POSSIBLE_EXTENSIONS}; do
         for z in ${GEOIP_POSSIBLE_LIB_NAMES}; do
            if test -e "${path}/${z}.${y}"; then
-               geoip_lib_path="${path}/"
+               geoip_lib_path="${path}"
                geoip_lib_name="${z}"
                geoip_lib_file="${geoip_lib_path}/${z}.${y}"
                break
            fi
            if test -e "${path}/lib${z}.${y}"; then
-               geoip_lib_path="${path}/"
+               geoip_lib_path="${path}"
                geoip_lib_name="${z}"
                geoip_lib_file="${geoip_lib_path}/lib${z}.${y}"
                break
            fi
            if test -e "${path}/lib/lib${z}.${y}"; then
-               geoip_lib_path="${path}/lib/"
+               geoip_lib_path="${path}/lib"
                geoip_lib_name="${z}"
                geoip_lib_file="${geoip_lib_path}/lib${z}.${y}"
                break
            fi
            if test -e "${path}/lib64/lib${z}.${y}"; then
-               geoip_lib_path="${path}/lib64/"
+               geoip_lib_path="${path}/lib64"
                geoip_lib_name="${z}"
                geoip_lib_file="${geoip_lib_path}/lib${z}.${y}"
                break
            fi
            if test -e "${path}/lib/x86_64-linux-gnu/lib${z}.${y}"; then
-               geoip_lib_path="${path}/lib/x86_64-linux-gnu/"
+               geoip_lib_path="${path}/lib/x86_64-linux-gnu"
                geoip_lib_name="${z}"
                geoip_lib_file="${geoip_lib_path}/lib${z}.${y}"
                break
diff --git a/build/libmaxmind.m4 b/build/libmaxmind.m4
index 7eafc4d58d..b9b5cffe1e 100644
--- a/build/libmaxmind.m4
+++ b/build/libmaxmind.m4
@@ -130,31 +130,31 @@ AC_DEFUN([CHECK_FOR_MAXMIND_AT], [
     for y in ${MAXMIND_POSSIBLE_EXTENSIONS}; do
         for z in ${MAXMIND_POSSIBLE_LIB_NAMES}; do
            if test -e "${path}/${z}.${y}"; then
-               maxmind_lib_path="${path}/"
+               maxmind_lib_path="${path}"
                maxmind_lib_name="${z}"
                maxmind_lib_file="${maxmind_lib_path}/${z}.${y}"
                break
            fi
            if test -e "${path}/lib${z}.${y}"; then
-               maxmind_lib_path="${path}/"
+               maxmind_lib_path="${path}"
                maxmind_lib_name="${z}"
                maxmind_lib_file="${maxmind_lib_path}/lib${z}.${y}"
                break
            fi
            if test -e "${path}/lib/lib${z}.${y}"; then
-               maxmind_lib_path="${path}/lib/"
+               maxmind_lib_path="${path}/lib"
                maxmind_lib_name="${z}"
                maxmind_lib_file="${maxmind_lib_path}/lib${z}.${y}"
                break
            fi
            if test -e "${path}/lib64/lib${z}.${y}"; then
-               maxmind_lib_path="${path}/lib64/"
+               maxmind_lib_path="${path}/lib64"
                maxmind_lib_name="${z}"
                maxmind_lib_file="${maxmind_lib_path}/lib${z}.${y}"
                break
            fi
            if test -e "${path}/lib/x86_64-linux-gnu/lib${z}.${y}"; then
-               maxmind_lib_path="${path}/lib/x86_64-linux-gnu/"
+               maxmind_lib_path="${path}/lib/x86_64-linux-gnu"
                maxmind_lib_name="${z}"
                maxmind_lib_file="${maxmind_lib_path}/lib${z}.${y}"
                break
diff --git a/build/lmdb.m4 b/build/lmdb.m4
index 1488617e3f..2be10a7ea5 100644
--- a/build/lmdb.m4
+++ b/build/lmdb.m4
@@ -120,31 +120,37 @@ AC_DEFUN([CHECK_FOR_LMDB_AT], [
     for y in ${LMDB_POSSIBLE_EXTENSIONS}; do
         for z in ${LMDB_POSSIBLE_LIB_NAMES}; do
            if test -e "${path}/${z}.${y}"; then
-               lmdb_lib_path="${path}/"
+               lmdb_lib_path="${path}"
                lmdb_lib_name="${z}"
                lmdb_lib_file="${lmdb_lib_path}/${z}.${y}"
                break
            fi
            if test -e "${path}/lib${z}.${y}"; then
-               lmdb_lib_path="${path}/"
+               lmdb_lib_path="${path}"
                lmdb_lib_name="${z}"
                lmdb_lib_file="${lmdb_lib_path}/lib${z}.${y}"
                break
            fi
            if test -e "${path}/lib/lib${z}.${y}"; then
-               lmdb_lib_path="${path}/lib/"
+               lmdb_lib_path="${path}/lib"
+               lmdb_lib_name="${z}"
+               lmdb_lib_file="${lmdb_lib_path}/lib${z}.${y}"
+               break
+           fi
+           if test -e "${path}/lib64/lib${z}.${y}"; then
+               lmdb_lib_path="${path}/lib64"
                lmdb_lib_name="${z}"
                lmdb_lib_file="${lmdb_lib_path}/lib${z}.${y}"
                break
            fi
            if test -e "${path}/lib/x86_64-linux-gnu/lib${z}.${y}"; then
-               lmdb_lib_path="${path}/lib/x86_64-linux-gnu/"
+               lmdb_lib_path="${path}/lib/x86_64-linux-gnu"
                lmdb_lib_name="${z}"
                lmdb_lib_file="${lmdb_lib_path}/lib${z}.${y}"
                break
            fi
            if test -e "${path}/lib/i386-linux-gnu/lib${z}.${y}"; then
-               lmdb_lib_path="${path}/lib/i386-linux-gnu/"
+               lmdb_lib_path="${path}/lib/i386-linux-gnu"
                lmdb_lib_name="${z}"
                lmdb_lib_file="${lmdb_lib_path}/lib${z}.${y}"
                break
diff --git a/build/lua.m4 b/build/lua.m4
index c644ff8af3..b32f187f96 100644
--- a/build/lua.m4
+++ b/build/lua.m4
@@ -121,31 +121,37 @@ AC_DEFUN([CHECK_FOR_LUA_AT], [
     for y in ${LUA_POSSIBLE_EXTENSIONS}; do
         for z in ${LUA_POSSIBLE_LIB_NAMES}; do
            if test -e "${path}/${z}.${y}"; then
-               lua_lib_path="${path}/"
+               lua_lib_path="${path}"
                lua_lib_name="${z}"
                lua_lib_file="${lua_lib_path}/${z}.${y}"
                break
            fi
            if test -e "${path}/lib${z}.${y}"; then
-               lua_lib_path="${path}/"
+               lua_lib_path="${path}"
                lua_lib_name="${z}"
                lua_lib_file="${lua_lib_path}/lib${z}.${y}"
                break
            fi
            if test -e "${path}/lib/lib${z}.${y}"; then
-               lua_lib_path="${path}/lib/"
+               lua_lib_path="${path}/lib"
+               lua_lib_name="${z}"
+               lua_lib_file="${lua_lib_path}/lib${z}.${y}"
+               break
+           fi
+           if test -e "${path}/lib64/lib${z}.${y}"; then
+               lua_lib_path="${path}/lib64"
                lua_lib_name="${z}"
                lua_lib_file="${lua_lib_path}/lib${z}.${y}"
                break
            fi
            if test -e "${path}/lib/x86_64-linux-gnu/lib${z}.${y}"; then
-               lua_lib_path="${path}/lib/x86_64-linux-gnu/"
+               lua_lib_path="${path}/lib/x86_64-linux-gnu"
                lua_lib_name="${z}"
                lua_lib_file="${lua_lib_path}/lib${z}.${y}"
                break
            fi
            if test -e "${path}/lib/i386-linux-gnu/lib${z}.${y}"; then
-               lua_lib_path="${path}/lib/i386-linux-gnu/"
+               lua_lib_path="${path}/lib/i386-linux-gnu"
                lua_lib_name="${z}"
                lua_lib_file="${lua_lib_path}/lib${z}.${y}"
                break
diff --git a/build/pcre2.m4 b/build/pcre2.m4
index aaa4f8a1d2..6fe412e601 100644
--- a/build/pcre2.m4
+++ b/build/pcre2.m4
@@ -127,31 +127,37 @@ AC_DEFUN([CHECK_FOR_PCRE2_AT], [
     for y in ${PCRE2_POSSIBLE_EXTENSIONS}; do
         for z in ${PCRE2_POSSIBLE_LIB_NAMES}; do
            if test -e "${path}/${z}.${y}"; then
-               pcre2_lib_path="${path}/"
+               pcre2_lib_path="${path}"
                pcre2_lib_name="${z}"
                pcre2_lib_file="${pcre2_lib_path}/${z}.${y}"
                break
            fi
            if test -e "${path}/lib${z}.${y}"; then
-               pcre2_lib_path="${path}/"
+               pcre2_lib_path="${path}"
                pcre2_lib_name="${z}"
                pcre2_lib_file="${pcre2_lib_path}/lib${z}.${y}"
                break
            fi
            if test -e "${path}/lib/lib${z}.${y}"; then
-               pcre2_lib_path="${path}/lib/"
+               pcre2_lib_path="${path}/lib"
+               pcre2_lib_name="${z}"
+               pcre2_lib_file="${pcre2_lib_path}/lib${z}.${y}"
+               break
+           fi
+           if test -e "${path}/lib64/lib${z}.${y}"; then
+               pcre2_lib_path="${path}/lib64"
                pcre2_lib_name="${z}"
                pcre2_lib_file="${pcre2_lib_path}/lib${z}.${y}"
                break
            fi
            if test -e "${path}/lib/x86_64-linux-gnu/lib${z}.${y}"; then
-               pcre2_lib_path="${path}/lib/x86_64-linux-gnu/"
+               pcre2_lib_path="${path}/lib/x86_64-linux-gnu"
                pcre2_lib_name="${z}"
                pcre2_lib_file="${pcre2_lib_path}/lib${z}.${y}"
                break
            fi
            if test -e "${path}/lib/i386-linux-gnu/lib${z}.${y}"; then
-               pcre2_lib_path="${path}/lib/i386-linux-gnu/"
+               pcre2_lib_path="${path}/lib/i386-linux-gnu"
                pcre2_lib_name="${z}"
                pcre2_lib_file="${pcre2_lib_path}/lib${z}.${y}"
                break
diff --git a/build/ssdeep.m4 b/build/ssdeep.m4
index 44e7832718..31a9fe3505 100644
--- a/build/ssdeep.m4
+++ b/build/ssdeep.m4
@@ -81,31 +81,37 @@ AC_DEFUN([CHECK_FOR_SSDEEP_AT], [
     for y in ${SSDEEP_POSSIBLE_EXTENSIONS}; do
         for z in ${SSDEEP_POSSIBLE_LIB_NAMES}; do
            if test -e "${path}/${z}.${y}"; then
-               ssdeep_lib_path="${path}/"
+               ssdeep_lib_path="${path}"
                ssdeep_lib_name="${z}"
                ssdeep_lib_file="${ssdeep_lib_path}/${z}.${y}"
                break
            fi
            if test -e "${path}/lib${z}.${y}"; then
-               ssdeep_lib_path="${path}/"
+               ssdeep_lib_path="${path}"
                ssdeep_lib_name="${z}"
                ssdeep_lib_file="${ssdeep_lib_path}/lib${z}.${y}"
                break
            fi
            if test -e "${path}/lib/lib${z}.${y}"; then
-               ssdeep_lib_path="${path}/lib/"
+               ssdeep_lib_path="${path}/lib"
+               ssdeep_lib_name="${z}"
+               ssdeep_lib_file="${ssdeep_lib_path}/lib${z}.${y}"
+               break
+           fi
+           if test -e "${path}/lib64/lib${z}.${y}"; then
+               ssdeep_lib_path="${path}/lib64"
                ssdeep_lib_name="${z}"
                ssdeep_lib_file="${ssdeep_lib_path}/lib${z}.${y}"
                break
            fi
            if test -e "${path}/lib/x86_64-linux-gnu/lib${z}.${y}"; then
-               ssdeep_lib_path="${path}/lib/x86_64-linux-gnu/"
+               ssdeep_lib_path="${path}/lib/x86_64-linux-gnu"
                ssdeep_lib_name="${z}"
                ssdeep_lib_file="${ssdeep_lib_path}/lib${z}.${y}"
                break
            fi
            if test -e "${path}/lib/i386-linux-gnu/lib${z}.${y}"; then
-               ssdeep_lib_path="${path}/lib/i386-linux-gnu/"
+               ssdeep_lib_path="${path}/lib/i386-linux-gnu"
                ssdeep_lib_name="${z}"
                ssdeep_lib_file="${ssdeep_lib_path}/lib${z}.${y}"
                break
diff --git a/build/yajl.m4 b/build/yajl.m4
index 10d4e78a4c..8bb102a8c6 100644
--- a/build/yajl.m4
+++ b/build/yajl.m4
@@ -138,25 +138,31 @@ AC_DEFUN([CHECK_FOR_YAJL_AT], [
     for y in ${YAJL_POSSIBLE_EXTENSIONS}; do
         for z in ${YAJL_POSSIBLE_LIB_NAMES}; do
            if test -e "${path}/${z}.${y}"; then
-               yajl_lib_path="${path}/"
+               yajl_lib_path="${path}"
                yajl_lib_name="${z}"
                yajl_lib_file="${yajl_lib_path}/${z}.${y}"
                break
            fi
            if test -e "${path}/lib${z}.${y}"; then
-               yajl_lib_path="${path}/"
+               yajl_lib_path="${path}"
                yajl_lib_name="${z}"
                yajl_lib_file="${yajl_lib_path}/lib${z}.${y}"
                break
            fi
            if test -e "${path}/lib/lib${z}.${y}"; then
-               yajl_lib_path="${path}/lib/"
+               yajl_lib_path="${path}/lib"
+               yajl_lib_name="${z}"
+               yajl_lib_file="${yajl_lib_path}/lib${z}.${y}"
+               break
+           fi
+           if test -e "${path}/lib64/lib${z}.${y}"; then
+               yajl_lib_path="${path}/lib64"
                yajl_lib_name="${z}"
                yajl_lib_file="${yajl_lib_path}/lib${z}.${y}"
                break
            fi
            if test -e "${path}/lib/x86_64-linux-gnu/lib${z}.${y}"; then
-               yajl_lib_path="${path}/lib/x86_64-linux-gnu/"
+               yajl_lib_path="${path}/lib/x86_64-linux-gnu"
                yajl_lib_name="${z}"
                yajl_lib_file="${yajl_lib_path}/lib${z}.${y}"
                break