....I..... [ZBX-21064] renamed pcre(2) *dir_lib to *lib_dir

2 files changed, 20 insertions, 20 deletions

diff --git a/m4/pcre.m4 b/m4/pcre.m4
index 22bbb7f0d6d..27c633e5631 100644
--- a/m4/pcre.m4
+++ b/m4/pcre.m4
@@ -42,7 +42,7 @@ AC_DEFUN([LIBPCRE_CHECK_CONFIG],
 						withval="/usr"
 					fi
 				else
-					_libpcre_dir_lib="$withval/lib"
+					_libpcre_lib_dir="$withval/lib"
 				fi
 			fi
 			_libpcre_dir="$withval"
@@ -69,7 +69,7 @@ AC_DEFUN([LIBPCRE_CHECK_CONFIG],
 		),
 		[
 			_libpcre_dir="$withval"
-			_libpcre_dir_lib="$withval"
+			_libpcre_lib_dir="$withval"
 			LIBPCRE_LDFLAGS="-L$withval"
 			_libpcre_dir_set="yes"
 		]
@@ -81,7 +81,7 @@ AC_DEFUN([LIBPCRE_CHECK_CONFIG],
 		if test "x$enable_static_libs" = "xyes"; then
 			AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 			PKG_PROG_PKG_CONFIG()
-			test -z "$PKG_CONFIG" -a -z "$_libpcre_dir_lib" && AC_MSG_ERROR([Not found pkg-config library])
+			test -z "$PKG_CONFIG" -a -z "$_libpcre_lib_dir" && AC_MSG_ERROR([Not found pkg-config library])
 			m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
 		fi
 
@@ -90,25 +90,25 @@ AC_DEFUN([LIBPCRE_CHECK_CONFIG],
 		if test "x$enable_static" = "xyes"; then
 			LIBPCRE_LIBS=" $LIBPCRE_LIBS -lpthread"
 		elif test "x$enable_static_libs" = "xyes" -a -z "$PKG_CONFIG"; then
-			LIBPCRE_LIBS="$_libpcre_dir_lib/libpcre.a"
+			LIBPCRE_LIBS="$_libpcre_lib_dir/libpcre.a"
 		elif test "x$enable_static_libs" = "xyes"; then
 
-			test "x$static_linking_support" = "xno" -a -z "$_libpcre_dir_lib" && AC_MSG_ERROR(["Compiler not support statically linked libs from default folders"])
+			test "x$static_linking_support" = "xno" -a -z "$_libpcre_lib_dir" && AC_MSG_ERROR(["Compiler not support statically linked libs from default folders"])
 
-			if test -z "$_libpcre_dir_lib"; then
+			if test -z "$_libpcre_lib_dir"; then
 				PKG_CHECK_EXISTS(libpcre,[
 					LIBPCRE_LIBS=`$PKG_CONFIG --static --libs libpcre`
 				],[
 					AC_MSG_ERROR([Not found libpcre package])
 				])
 			else
-				AC_RUN_LOG([PKG_CONFIG_LIBDIR="$_libpcre_dir_lib/pkgconfig" $PKG_CONFIG --exists --print-errors libpcre]) || AC_MSG_ERROR(["Not found libpcre package in $_libpcre_dir/lib/pkgconfig"])
-				LIBPCRE_LIBS=`PKG_CONFIG_LIBDIR="$_libpcre_dir_lib/pkgconfig" $PKG_CONFIG --static --libs libpcre`
-				test -z "$LIBPCRE_LIBS" && LIBPCRE_LIBS=`PKG_CONFIG_LIBDIR="$_libpcre_dir_lib/pkgconfig" $PKG_CONFIG --libs libpcre`
+				AC_RUN_LOG([PKG_CONFIG_LIBDIR="$_libpcre_lib_dir/pkgconfig" $PKG_CONFIG --exists --print-errors libpcre]) || AC_MSG_ERROR(["Not found libpcre package in $_libpcre_dir/lib/pkgconfig"])
+				LIBPCRE_LIBS=`PKG_CONFIG_LIBDIR="$_libpcre_lib_dir/pkgconfig" $PKG_CONFIG --static --libs libpcre`
+				test -z "$LIBPCRE_LIBS" && LIBPCRE_LIBS=`PKG_CONFIG_LIBDIR="$_libpcre_lib_dir/pkgconfig" $PKG_CONFIG --libs libpcre`
 			fi
 
 			if test "x$static_linking_support" = "xno"; then
-				LIBPCRE_LIBS=`echo "$LIBPCRE_LIBS"|sed "s|-lpcre|$_libpcre_dir_lib/libpcre.a|g"`
+				LIBPCRE_LIBS=`echo "$LIBPCRE_LIBS"|sed "s|-lpcre|$_libpcre_lib_dir/libpcre.a|g"`
 			else
 				LIBPCRE_LIBS=`echo "$LIBPCRE_LIBS"|sed "s/-lpcre/${static_linking_support}static -lpcre ${static_linking_support}dynamic/g"`
 			fi
diff --git a/m4/pcre2.m4 b/m4/pcre2.m4
index c10bf52799a..c3908f071c5 100644
--- a/m4/pcre2.m4
+++ b/m4/pcre2.m4
@@ -45,7 +45,7 @@ AC_DEFUN([LIBPCRE2_CHECK_CONFIG],
 						withval="/usr"
 					fi
 				else
-					_libpcre2_dir_lib="$withval/lib"
+					_libpcre2_lib_dir="$withval/lib"
 				fi
 			fi
 			_libpcre2_dir="$withval"
@@ -72,7 +72,7 @@ AC_DEFUN([LIBPCRE2_CHECK_CONFIG],
 		),
 		[
 			_libpcre2_dir="$withval"
-			_libpcre2_dir_lib="$withval"
+			_libpcre2_lib_dir="$withval"
 			LIBPCRE2_LDFLAGS="-L$withval"
 			_libpcre2_dir_set="yes"
 		]
@@ -85,7 +85,7 @@ AC_DEFUN([LIBPCRE2_CHECK_CONFIG],
 		if test "x$enable_static_libs" = "xyes"; then
 			AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 			PKG_PROG_PKG_CONFIG()
-			test -z "$PKG_CONFIG" -a -z "$_libpcre2_dir_lib" && AC_MSG_ERROR([Not found pkg-config library])
+			test -z "$PKG_CONFIG" -a -z "$_libpcre2_lib_dir" && AC_MSG_ERROR([Not found pkg-config library])
 			m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
 		fi
 
@@ -94,25 +94,25 @@ AC_DEFUN([LIBPCRE2_CHECK_CONFIG],
 		if test "x$enable_static" = "xyes"; then
 			LIBPCRE2_LIBS=" $LIBPCRE2_LIBS -lpthread"
 		elif test "x$enable_static_libs" = "xyes" -a -z "$PKG_CONFIG"; then
-			LIBPCRE2_LIBS="$_libpcre2_dir_lib/libpcre2-8.a"
+			LIBPCRE2_LIBS="$_libpcre2_lib_dir/libpcre2-8.a"
 		elif test "x$enable_static_libs" = "xyes"; then
 
-			test "x$static_linking_support" = "xno" -a -z "$_libpcre2_dir_lib" && AC_MSG_ERROR(["Compiler not support statically linked libs from default folders"])
+			test "x$static_linking_support" = "xno" -a -z "$_libpcre2_lib_dir" && AC_MSG_ERROR(["Compiler not support statically linked libs from default folders"])
 
-			if test -z "$_libpcre2_dir_lib"; then
+			if test -z "$_libpcre2_lib_dir"; then
 				PKG_CHECK_EXISTS(libpcre2-8,[
 					LIBPCRE2_LIBS=`$PKG_CONFIG --static --libs libpcre2-8`
 				],[
 					AC_MSG_ERROR([Not found libpcre2 package])
 				])
 			else
-				AC_RUN_LOG([PKG_CONFIG_LIBDIR="$_libpcre2_dir_lib/pkgconfig" $PKG_CONFIG --exists --print-errors libpcre2-8]) || AC_MSG_ERROR(["Not found libpcre2 package in $_libpcre2_dir/lib/pkgconfig"])
-				LIBPCRE2_LIBS=`PKG_CONFIG_LIBDIR="$_libpcre2_dir_lib/pkgconfig" $PKG_CONFIG --static --libs libpcre2-8`
-				test -z "$LIBPCRE2_LIBS" && LIBPCRE2_LIBS=`PKG_CONFIG_LIBDIR="$_libpcre2_dir_lib/pkgconfig" $PKG_CONFIG --libs libpcre2-8`
+				AC_RUN_LOG([PKG_CONFIG_LIBDIR="$_libpcre2_lib_dir/pkgconfig" $PKG_CONFIG --exists --print-errors libpcre2-8]) || AC_MSG_ERROR(["Not found libpcre2 package in $_libpcre2_dir/lib/pkgconfig"])
+				LIBPCRE2_LIBS=`PKG_CONFIG_LIBDIR="$_libpcre2_lib_dir/pkgconfig" $PKG_CONFIG --static --libs libpcre2-8`
+				test -z "$LIBPCRE2_LIBS" && LIBPCRE2_LIBS=`PKG_CONFIG_LIBDIR="$_libpcre2_lib_dir/pkgconfig" $PKG_CONFIG --libs libpcre2-8`
 			fi
 
 			if test "x$static_linking_support" = "xno"; then
-				LIBPCRE2_LIBS=`echo "$LIBPCRE2_LIBS"|sed "s|-lpcre2-8|$_libpcre2_dir_lib/libpcre2-8.a|g"`
+				LIBPCRE2_LIBS=`echo "$LIBPCRE2_LIBS"|sed "s|-lpcre2-8|$_libpcre2_lib_dir/libpcre2-8.a|g"`
 			else
 				LIBPCRE2_LIBS=`echo "$LIBPCRE2_LIBS"|sed "s/-lpcre2-8/${static_linking_support}static -lpcre2-8 ${static_linking_support}dynamic/g"`
 			fi