From f6cfc59cb642de14f40d5cbe6b4e36ad593a7660 Mon Sep 17 00:00:00 2001
From: nirenjan <nirenjan@gmail.com>
Date: Tue, 3 Aug 2021 12:39:07 -0700
Subject: [PATCH] Fix libx52 pkgconfig file

---
 configure.ac        | 14 +++-----------
 libx52/libx52.pc.in |  6 +++---
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index fa78dad..6a048b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,11 +40,8 @@ AM_GNU_GETTEXT_VERSION(0.19)
 AM_CONDITIONAL([USE_NLS], [test "x${USE_NLS}" == "xyes"])
 
 # Check for libusb-1.0
-AX_PKG_CHECK_MODULES([LIBUSB], [libusb-1.0])
-
-AC_SUBST([LIBUSB_CFLAGS])
-AC_SUBST([LIBUSB_LDFLAGS])
-AC_SUBST([LIBUSB_LIBS])
+PKG_CHECK_MODULES([LIBUSB], [libusb-1.0])
+AC_SUBST([LIBUSB_PC], [libusb-1.0])
 
 # Check for libinih
 PKG_CHECK_MODULES([INIH], [inih], [],
@@ -53,9 +50,6 @@ PKG_CHECK_MODULES([INIH], [inih], [],
                     AC_CHECK_HEADERS([ini.h])
                     AC_SEARCH_LIBS([ini_parse], [inih])
                   ])
-AC_SUBST([INIH_CFLAGS])
-AC_SUBST([INIH_LDFLAGS])
-AC_SUBST([INIH_LIBS])
 
 # Pinelog configuration
 AC_SUBST([PINELOG_CFLAGS], ["-DPINELOG_SHOW_DATE=1 -DPINELOG_SHOW_LEVEL=1 -DPINELOG_SHOW_BACKTRACE=1"])
@@ -65,9 +59,7 @@ AC_SUBST([PINELOG_CFLAGS], ["-DPINELOG_SHOW_DATE=1 -DPINELOG_SHOW_LEVEL=1 -DPINE
 # hosts, so check accordingly
 AM_COND_IF([LINUX], [hidapi_backend=hidapi-hidraw], [hidapi_backend=hidapi])
 PKG_CHECK_MODULES([HIDAPI], [${hidapi_backend}])
-AC_SUBST([HIDAPI_CFLAGS])
-AC_SUBST([HIDAPI_LDFLAGS])
-AC_SUBST([HIDAPI_LIBS])
+AC_SUBST([HIDAPI_PC], [${hidapi_backend}])
 
 # Check for pthreads
 ACX_PTHREAD
diff --git a/libx52/libx52.pc.in b/libx52/libx52.pc.in
index c629a5c..f0f4fc9 100644
--- a/libx52/libx52.pc.in
+++ b/libx52/libx52.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: @PACKAGE_NAME@
+Name: libx52
 Description: Linux/Unix library to control Saitek X52/X52Pro joystick extended functionality.
-Version: @PACKAGE_VERSION@
+Version: 2.4.0
 Libs: -L${libdir} -lx52
 Cflags: -I${includedir}/x52pro
-Requires: @AX_PACKAGE_REQUIRES@
+Requires.private: @LIBUSB_PC@