From 95f0d12a64b54168ef4f92e860256bee7c75e6c8 Mon Sep 17 00:00:00 2001
From: taotieren <admin@taotieren.com>
Date: Fri, 9 Dec 2022 18:48:27 +0800
Subject: [PATCH] Update usbfluxd

---
 README.md            |  5 +++--
 configure.ac         | 18 +++++++-----------
 usbfluxd/Makefile.am |  2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 68c24b4..6301e6a 100644
--- a/README.md
+++ b/README.md
@@ -77,8 +77,9 @@ make
 sudo make install
 ```
 
-Also available from the Arch User Repository for Linux hosts: [https://aur.archlinux.org/packages/usbfluxd/](https://aur.archlinux.org/packages/usbfluxd/)
-
+Also available from the Arch User Repository for Linux hosts:
+- [https://aur.archlinux.org/packages/usbfluxd/](https://aur.archlinux.org/packages/usbfluxd/)
+- [https://aur.archlinux.org/packages/usbfluxd-git/](https://aur.archlinux.org/packages/usbfluxd-git/)
 
 Linux Usage
 ===========
diff --git a/configure.ac b/configure.ac
index 337d427..499bfb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,17 +72,13 @@ AC_ARG_WITH([static-libplist],
             [AS_HELP_STRING(["--with-static-libplist[=/path/to/static/libplist"]],
             [link against a static libplist])],
             [with_static_libplist=$withval],
-            [with_static_libplist=yes])
-if test "x$with_static_libplist" != "xno"; then
-  if test "x$with_static_libplist" = "xyes"; then
-    STATIC_LIBPLIST="`pkg-config --libs-only-L libplist-2.0 |sed 's/^..//; s/[ ]*$/\/libplist-2.0.a/'`"
-  else
-    STATIC_LIBPLIST="$with_static_libplist"
-  fi
-  if ! test -f "$STATIC_LIBPLIST"; then
-    AC_MSG_ERROR([The file ${STATIC_LIBPLIST} passed to --with-static-libplist does not exist])
-  fi
-  AC_SUBST(libplist_LIBS, [$STATIC_LIBPLIST])
+            [with_static_libplist=no])
+if test "x$with_static_libplist" = xno; then
+  PKG_CHECK_MODULES(libplist, libplist-2.0 >= 2.2.0)
+else
+  # Use the static libplist from the specified path
+  AC_SUBST(libplist_CFLAGS, "-I${with_static_libplist}/include")
+  AC_SUBST(libplist_LIBS, "${with_static_libplist}/lib/libplist.a")
 fi
 
 AS_COMPILER_FLAGS(GLOBAL_CFLAGS, "-g -Wall -Wextra -Wmissing-declarations -Wredundant-decls -Wshadow -Wpointer-arith  -Wwrite-strings -Wswitch-default -Wno-unused-parameter")
diff --git a/usbfluxd/Makefile.am b/usbfluxd/Makefile.am
index 1730984..3fc8fff 100644
--- a/usbfluxd/Makefile.am
+++ b/usbfluxd/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)
 AM_CFLAGS = $(GLOBAL_CFLAGS) $(libplist_CFLAGS) $(avahi_client_CFLAGS)
 AM_LDFLAGS = $(libplist_LIBS) $(libpthread_LIBS) $(avahi_client_LIBS) $(AC_LDADD)
 
-sbin_PROGRAMS = usbfluxd
+bin_PROGRAMS = usbfluxd
 
 usbfluxd_CFLAGS = $(AM_CFLAGS)
 usbfluxd_LDFLAGS = $(AM_LDFLAGS) -no-undefined