m4/nut_check_lib*.m4: call AX_REALPATH_LIB to discover SOPATH*/SOFILE…

…* for nut-scanner third-party libs [networkupstools#2431] libavahi, libfreeipmi, libneon, libnetsnmp, libusb0/1 NOTE: The libnutclient is separate, we build it - so can not detect the final name in advance right here Signed-off-by: Jim Klimov <[email protected]>
jimklimov · Jul 2, 2024 · c31b800 · c31b800
1 parent c4880b0
commit c31b800
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 2 deletions.
diff --git a/m4/nut_check_libavahi.m4 b/m4/nut_check_libavahi.m4
@@ -83,6 +83,22 @@ if test -z "${nut_have_avahi_seen}"; then
 			LIBAVAHI_CFLAGS="${CFLAGS}"
 			LIBAVAHI_LIBS="${LIBS}"
 		fi
+
+		dnl Help ltdl if we can (nut-scanner etc.)
+		for TOKEN in $LIBS ; do
+			AS_CASE(["${TOKEN}"],
+				[-l*avahi*], [
+					AX_REALPATH_LIB([${TOKEN}], [SOPATH_LIBAVAHI], [])
+					AS_IF([test -n "${SOPATH_LIBAVAHI}" && test -s "${SOPATH_LIBAVAHI}"], [
+						AC_DEFINE_UNQUOTED([SOPATH_LIBAVAHI],["${SOPATH_LIBAVAHI}"],[Path to dynamic library on build system])
+						SOFILE_LIBAVAHI="`basename "$SOPATH_LIBAVAHI"`"
+						AC_DEFINE_UNQUOTED([SOFILE_LIBAVAHI],["${SOFILE_LIBAVAHI}"],[Base file name of dynamic library on build system])
+						break
+					])
+				]
+			)
+		done
+		unset TOKEN
 	fi
 
 	dnl restore original CFLAGS and LIBS

diff --git a/m4/nut_check_libfreeipmi.m4 b/m4/nut_check_libfreeipmi.m4
@@ -92,6 +92,22 @@ if test -z "${nut_have_libfreeipmi_seen}"; then
 		AC_DEFINE(HAVE_FREEIPMI, 1, [Define if FreeIPMI support is available])
 		LIBIPMI_CFLAGS="${CFLAGS}"
 		LIBIPMI_LIBS="${LIBS}"
+
+		dnl Help ltdl if we can (nut-scanner etc.)
+		for TOKEN in $LIBS ; do
+			AS_CASE(["${TOKEN}"],
+				[-l*ipmi*], [
+					AX_REALPATH_LIB([${TOKEN}], [SOPATH_LIBFREEIPMI], [])
+					AS_IF([test -n "${SOPATH_LIBFREEIPMI}" && test -s "${SOPATH_LIBFREEIPMI}"], [
+						AC_DEFINE_UNQUOTED([SOPATH_LIBFREEIPMI],["${SOPATH_LIBFREEIPMI}"],[Path to dynamic library on build system])
+						SOFILE_LIBFREEIPMI="`basename "$SOPATH_LIBFREEIPMI"`"
+						AC_DEFINE_UNQUOTED([SOFILE_LIBFREEIPMI],["${SOFILE_LIBFREEIPMI}"],[Base file name of dynamic library on build system])
+						break
+					])
+				]
+			)
+		done
+		unset TOKEN
 	fi
 
 	if test "${nut_have_freeipmi_11x_12x}" = "yes"; then

diff --git a/m4/nut_check_libneon.m4 b/m4/nut_check_libneon.m4
@@ -78,6 +78,22 @@ if test -z "${nut_have_neon_seen}"; then
 		AC_CHECK_FUNCS(ne_set_connect_timeout ne_sock_connect_timeout)
 		LIBNEON_CFLAGS="${CFLAGS}"
 		LIBNEON_LIBS="${LIBS}"
+
+		dnl Help ltdl if we can (nut-scanner etc.)
+		for TOKEN in $LIBS ; do
+			AS_CASE(["${TOKEN}"],
+				[-l*neon*], [
+					AX_REALPATH_LIB([${TOKEN}], [SOPATH_LIBNEON], [])
+					AS_IF([test -n "${SOPATH_LIBNEON}" && test -s "${SOPATH_LIBNEON}"], [
+						AC_DEFINE_UNQUOTED([SOPATH_LIBNEON],["${SOPATH_LIBNEON}"],[Path to dynamic library on build system])
+						SOFILE_LIBNEON="`basename "$SOPATH_LIBNEON"`"
+						AC_DEFINE_UNQUOTED([SOFILE_LIBNEON],["${SOFILE_LIBNEON}"],[Base file name of dynamic library on build system])
+						break
+					])
+				]
+			)
+		done
+		unset TOKEN
 	fi
 
 	dnl restore original CFLAGS and LIBS

diff --git a/m4/nut_check_libnetsnmp.m4 b/m4/nut_check_libnetsnmp.m4
@@ -347,7 +347,23 @@ int num = NETSNMP_DRAFT_BLUMENTHAL_AES_04 + 1; /* if defined, NETSNMP_DRAFT_BLUM
 			 AC_DEFINE_UNQUOTED(NUT_HAVE_LIBNETSNMP_DRAFT_BLUMENTHAL_AES_04, 0, [Variable or macro by this name is not resolvable])
 			])
 
+		dnl Help ltdl if we can (nut-scanner etc.)
+		for TOKEN in $LIBS ; do
+			AS_CASE(["${TOKEN}"],
+				[-l*snmp*], [
+					AX_REALPATH_LIB([${TOKEN}], [SOPATH_LIBNETSNMP], [])
+					AS_IF([test -n "${SOPATH_LIBNETSNMP}" && test -s "${SOPATH_LIBNETSNMP}"], [
+						AC_DEFINE_UNQUOTED([SOPATH_LIBNETSNMP],["${SOPATH_LIBNETSNMP}"],[Path to dynamic library on build system])
+						SOFILE_LIBNETSNMP="`basename "$SOPATH_LIBNETSNMP"`"
+						AC_DEFINE_UNQUOTED([SOFILE_LIBNETSNMP],["${SOFILE_LIBNETSNMP}"],[Base file name of dynamic library on build system])
+						break
+					])
+				]
+			)
+		done
+		unset TOKEN
 	])
+
 	AC_LANG_POP([C])
 
 	dnl restore original CFLAGS and LIBS

diff --git a/m4/nut_check_libusb.m4 b/m4/nut_check_libusb.m4
@@ -371,14 +371,48 @@ if test -z "${nut_have_libusb_seen}"; then
 	dnl with some value.
 	AS_IF([test "${nut_with_usb}" = "yes" && test "${nut_usb_lib}" = "(libusb-1.0)"],
 		[AC_DEFINE([WITH_LIBUSB_1_0], [1],
-			[Define to 1 for version 1.0 of the libusb (via pkg-config).])],
+			[Define to 1 for version 1.0 of the libusb (via pkg-config).])
+
+		 dnl Help ltdl if we can (nut-scanner etc.)
+		 for TOKEN in $LIBS ; do
+			AS_CASE(["${TOKEN}"],
+				[-l*usb*], [
+					AX_REALPATH_LIB([${TOKEN}], [SOPATH_LIBUSB1], [])
+					AS_IF([test -n "${SOPATH_LIBUSB1}" && test -s "${SOPATH_LIBUSB1}"], [
+						AC_DEFINE_UNQUOTED([SOPATH_LIBUSB1],["${SOPATH_LIBUSB1}"],[Path to dynamic library on build system])
+						SOFILE_LIBUSB1="`basename "$SOPATH_LIBUSB1"`"
+						AC_DEFINE_UNQUOTED([SOFILE_LIBUSB1],["${SOFILE_LIBUSB1}"],[Base file name of dynamic library on build system])
+						break
+					])
+				]
+			)
+		 done
+		 unset TOKEN
+                ],
 		[AC_DEFINE([WITH_LIBUSB_1_0], [0],
 			[Define to 1 for version 1.0 of the libusb (via pkg-config).])]
 	)
 
 	AS_IF([test "${nut_with_usb}" = "yes" && test "${nut_usb_lib}" = "(libusb-0.1)" -o "${nut_usb_lib}" = "(libusb-0.1-config)"],
 		[AC_DEFINE([WITH_LIBUSB_0_1], [1],
-			[Define to 1 for version 0.1 of the libusb (via pkg-config or libusb-config).])],
+			[Define to 1 for version 0.1 of the libusb (via pkg-config or libusb-config).])
+
+		 dnl Help ltdl if we can (nut-scanner etc.)
+		 for TOKEN in $LIBS ; do
+			AS_CASE(["${TOKEN}"],
+				[-l*usb*], [
+					AX_REALPATH_LIB([${TOKEN}], [SOPATH_LIBUSB0], [])
+					AS_IF([test -n "${SOPATH_LIBUSB0}" && test -s "${SOPATH_LIBUSB0}"], [
+						AC_DEFINE_UNQUOTED([SOPATH_LIBUSB0],["${SOPATH_LIBUSB0}"],[Path to dynamic library on build system])
+						SOFILE_LIBUSB0="`basename "$SOPATH_LIBUSB0"`"
+						AC_DEFINE_UNQUOTED([SOFILE_LIBUSB0],["${SOFILE_LIBUSB0}"],[Base file name of dynamic library on build system])
+						break
+					])
+				]
+			)
+		 done
+		 unset TOKEN
+                ],
 		[AC_DEFINE([WITH_LIBUSB_0_1], [0],
 			[Define to 1 for version 0.1 of the libusb (via pkg-config or libusb-config).])]
 	)