m4: Remove workaround for old pkg-config

Fix was for 0.24 which is probably old enough (released in 2010;
problematic 0.23 was released 2008).

Signed-off-by: Petr Vorel <[email protected]>
Signed-off-by: Li Wang <[email protected]>
Reviewed-by: Cyril Hrubis <[email protected]>

Author: wangli5665

include/mk/config.mk.in

@@ -39,8 +39,8 @@ LEXLIB			:= @LEXLIB@
 NUMA_LIBS		:= @NUMA_LIBS@
 SELINUX_LIBS		:= @SELINUX_LIBS@
 HAVE_RPC		:= @HAVE_RPC@
-TIRPC_CFLAGS		:= @TIRPC_CFLAGS@
-TIRPC_LIBS		:= @TIRPC_LIBS@
+LIBTIRPC_CFLAGS		:= @LIBTIRPC_CFLAGS@
+LIBTIRPC_LIBS		:= @LIBTIRPC_LIBS@
 KEYUTILS_LIBS		:= @KEYUTILS_LIBS@
 HAVE_FTS_H		:= @HAVE_FTS_H@
 LIBMNL_LIBS		:= @LIBMNL_LIBS@

m4/ltp-tirpc.m4

@@ -6,8 +6,6 @@ AC_DEFUN([LTP_CHECK_TIRPC], [
 	dnl libtirpc library and headers
 	PKG_CHECK_MODULES([LIBTIRPC], [libtirpc >= 0.2.4], [
 		have_libtirpc=yes
-		TIRPC_CFLAGS=$LIBTIRPC_CFLAGS
-		TIRPC_LIBS=$LIBTIRPC_LIBS
 	], [have_libtirpc=no])
 
 	dnl TI-RPC headers (in glibc, since 2.26 installed only when configured
@@ -22,9 +20,4 @@ AC_DEFUN([LTP_CHECK_TIRPC], [
 	if test "x$have_libtirpc" = "xyes" -o "x$have_rpc_glibc" = "xyes"; then
 		AC_SUBST(HAVE_RPC, 1)
 	fi
-
-	dnl fix for old pkg-config (< 0.24)
-	dnl https://autotools.io/pkgconfig/pkg_check_modules.html
-	AC_SUBST(TIRPC_CFLAGS)
-	AC_SUBST(TIRPC_LIBS)
 ])

testcases/network/rpc/rpc-tirpc/tests_pack/Makefile

@@ -10,7 +10,7 @@ FILTER_OUT_DIRS		:= $(LIBDIR)
 LIB			:= $(LIBDIR)/librpc-tirpc.a
 
 # keep only rpc_*
-ifeq ($(TIRPC_LIBS),)
+ifeq ($(LIBTIRPC_LIBS),)
 FILTER_OUT_MAKE_TARGETS	+= tirpc_cleaner
 FILTER_OUT_DIRS	+= tirpc_svc_1 tirpc_svc_2 tirpc_svc_3 tirpc_svc_4 tirpc_svc_5 tirpc_svc_6 tirpc_svc_7 tirpc_svc_8 tirpc_svc_9 tirpc_svc_11
 endif

testcases/network/rpc/rpc-tirpc/tests_pack/Makefile.inc

@@ -15,5 +15,5 @@ $(LIBRPC-TIRPC): $(LIBDIR)
 MAKE_DEPS	+= $(LIBRPC-TIRPC)
 
 LDFLAGS		+= -L$(LIBDIR)
-LDLIBS		+= $(TIRPC_LIBS) -lrpc-tirpc
-CFLAGS		+= $(TIRPC_CFLAGS) -I$(LIBSRCDIR) -I$(LIBSRCDIR)/../include -pthread
+LDLIBS		+= $(LIBTIRPC_LIBS) -lrpc-tirpc
+CFLAGS		+= $(LIBTIRPC_CFLAGS) -I$(LIBSRCDIR) -I$(LIBSRCDIR)/../include -pthread

testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/Makefile

@@ -5,7 +5,7 @@ top_srcdir		?= ../../../../../..
 
 include	$(top_srcdir)/include/mk/env_pre.mk
 
-ifeq ($(TIRPC_LIBS),)
+ifeq ($(LIBTIRPC_LIBS),)
 FILTER_OUT_DIRS	+= tirpc
 endif
 

testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/Makefile

@@ -5,7 +5,7 @@ top_srcdir		?= ../../../../../../..
 
 include	$(top_srcdir)/include/mk/env_pre.mk
 
-ifeq ($(TIRPC_LIBS),)
+ifeq ($(LIBTIRPC_LIBS),)
 # glibc does not define registerrpc() in <rpc/rpc.h>
 # registerrpc() is deprecated in libtirpc, it should be replaced by rpc_reg()
 FILTER_OUT_DIRS	+= rpc_regunreg_registerrpc