m4/nut_check_lib*.m4: use AC_REQUIRE([NUT_CHECK_PKGCONFIG]) etc, not …

…plain macro calls

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

m4/nut_check_libavahi.m4

@@ -7,7 +7,7 @@ AC_DEFUN([NUT_CHECK_LIBAVAHI],
 [
 if test -z "${nut_have_avahi_seen}"; then
 	nut_have_avahi_seen=yes
-	NUT_CHECK_PKGCONFIG
+	AC_REQUIRE([NUT_CHECK_PKGCONFIG])
 
 	dnl save CFLAGS and LIBS
 	CFLAGS_ORIG="${CFLAGS}"

m4/nut_check_libfreeipmi.m4

@@ -8,7 +8,7 @@ AC_DEFUN([NUT_CHECK_LIBFREEIPMI],
 [
 if test -z "${nut_have_libfreeipmi_seen}"; then
 	nut_have_libfreeipmi_seen=yes
-	NUT_CHECK_PKGCONFIG
+	AC_REQUIRE([NUT_CHECK_PKGCONFIG])
 
 	dnl save CFLAGS and LIBS
 	CFLAGS_ORIG="${CFLAGS}"

m4/nut_check_libgd.m4

@@ -7,7 +7,7 @@ AC_DEFUN([NUT_CHECK_LIBGD],
 [
 if test -z "${nut_have_libgd_seen}"; then
 	nut_have_libgd_seen=yes
-	NUT_CHECK_PKGCONFIG
+	AC_REQUIRE([NUT_CHECK_PKGCONFIG])
 
 	CFLAGS_ORIG="${CFLAGS}"
 	LDFLAGS_ORIG="${LDFLAGS}"

m4/nut_check_libgpiod.m4

@@ -7,7 +7,7 @@ AC_DEFUN([NUT_CHECK_LIBGPIO],
 [
 if test -z "${nut_have_gpio_seen}"; then
 	nut_have_gpio_seen=yes
-	NUT_CHECK_PKGCONFIG
+	AC_REQUIRE([NUT_CHECK_PKGCONFIG])
 
 	dnl save CFLAGS and LIBS
 	CFLAGS_ORIG="${CFLAGS}"

m4/nut_check_libmodbus.m4

@@ -7,7 +7,7 @@ AC_DEFUN([NUT_CHECK_LIBMODBUS],
 [
 if test -z "${nut_have_libmodbus_seen}"; then
 	nut_have_libmodbus_seen=yes
-	NUT_CHECK_PKGCONFIG
+	AC_REQUIRE([NUT_CHECK_PKGCONFIG])
 
 	dnl save CFLAGS and LIBS
 	CFLAGS_ORIG="${CFLAGS}"
@@ -85,7 +85,7 @@ if test -z "${nut_have_libmodbus_seen}"; then
 			dnl know we are not opposed to pulling it in.
 			dnl Static libmodbus builds do not refer to
 			dnl (shared) libusb for example.
-			NUT_CHECK_LIBUSB
+			AC_REQUIRE([NUT_CHECK_LIBUSB])
 			AC_MSG_NOTICE([Retry detection of libmodbus USB support])
 			CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
 			LIBS="$LIBS $LIBUSB_LIBS"

m4/nut_check_libneon.m4

@@ -7,7 +7,7 @@ AC_DEFUN([NUT_CHECK_LIBNEON],
 [
 if test -z "${nut_have_neon_seen}"; then
 	nut_have_neon_seen=yes
-	NUT_CHECK_PKGCONFIG
+	AC_REQUIRE([NUT_CHECK_PKGCONFIG])
 
 	dnl save CFLAGS and LIBS
 	CFLAGS_ORIG="${CFLAGS}"

m4/nut_check_libnetsnmp.m4

@@ -8,7 +8,7 @@ AC_DEFUN([NUT_CHECK_LIBNETSNMP],
 [
 if test -z "${nut_have_libnetsnmp_seen}"; then
 	nut_have_libnetsnmp_seen=yes
-	NUT_CHECK_PKGCONFIG
+	AC_REQUIRE([NUT_CHECK_PKGCONFIG])
 	AC_LANG_PUSH([C])
 
 	dnl save CFLAGS and LIBS

m4/nut_check_libnss.m4

@@ -7,7 +7,7 @@ AC_DEFUN([NUT_CHECK_LIBNSS],
 [
 if test -z "${nut_have_libnss_seen}"; then
 	nut_have_libnss_seen=yes
-	NUT_CHECK_PKGCONFIG
+	AC_REQUIRE([NUT_CHECK_PKGCONFIG])
 
 	dnl save CFLAGS and LIBS
 	CFLAGS_ORIG="${CFLAGS}"

m4/nut_check_libopenssl.m4

@@ -8,7 +8,7 @@ AC_DEFUN([NUT_CHECK_LIBOPENSSL],
 [
 if test -z "${nut_have_libopenssl_seen}"; then
 	nut_have_libopenssl_seen=yes
-	NUT_CHECK_PKGCONFIG
+	AC_REQUIRE([NUT_CHECK_PKGCONFIG])
 
 	dnl save CFLAGS and LIBS
 	CFLAGS_ORIG="${CFLAGS}"

m4/nut_check_libpowerman.m4

@@ -7,7 +7,7 @@ AC_DEFUN([NUT_CHECK_LIBPOWERMAN],
 [
 if test -z "${nut_have_libpowerman_seen}"; then
 	nut_have_libpowerman_seen=yes
-	NUT_CHECK_PKGCONFIG
+	AC_REQUIRE([NUT_CHECK_PKGCONFIG])
 
 	dnl save CFLAGS and LIBS
 	CFLAGS_ORIG="${CFLAGS}"

m4/nut_check_libregex.m4

@@ -8,7 +8,7 @@ AC_DEFUN([NUT_CHECK_LIBREGEX],
 [
 if test -z "${nut_have_libregex_seen}"; then
 	nut_have_libregex_seen=yes
-	NUT_CHECK_PKGCONFIG
+	AC_REQUIRE([NUT_CHECK_PKGCONFIG])
 
 	dnl save CFLAGS and LIBS
 	CFLAGS_ORIG="${CFLAGS}"

m4/nut_check_libsystemd.m4

@@ -7,7 +7,7 @@ AC_DEFUN([NUT_CHECK_LIBSYSTEMD],
 [
 if test -z "${nut_have_libsystemd_seen}"; then
 	nut_have_libsystemd_seen=yes
-	NUT_CHECK_PKGCONFIG
+	AC_REQUIRE([NUT_CHECK_PKGCONFIG])
 
 	dnl save CFLAGS and LIBS
 	CFLAGS_ORIG="${CFLAGS}"

m4/nut_check_libusb.m4

@@ -12,10 +12,10 @@ AC_DEFUN([NUT_CHECK_LIBUSB],
 [
 if test -z "${nut_have_libusb_seen}"; then
 	nut_have_libusb_seen=yes
-	NUT_CHECK_PKGCONFIG
+	AC_REQUIRE([NUT_CHECK_PKGCONFIG])
 
 	dnl Our USB matching relies on regex abilities
-	NUT_CHECK_LIBREGEX
+	AC_REQUIRE([NUT_CHECK_LIBREGEX])
 
 	dnl save CFLAGS and LIBS
 	CFLAGS_ORIG="${CFLAGS}"