diff --git a/.github/scripts/install-dependencies-macos.sh b/.github/scripts/install-dependencies-macos.sh index 3f13107..d3784af 100755 --- a/.github/scripts/install-dependencies-macos.sh +++ b/.github/scripts/install-dependencies-macos.sh @@ -9,6 +9,7 @@ brew install \ gettext \ libusb \ hidapi \ + inih \ doxygen \ rsync \ cmocka diff --git a/.github/scripts/install-dependencies-ubuntu.sh b/.github/scripts/install-dependencies-ubuntu.sh index c0f6c08..487d56d 100755 --- a/.github/scripts/install-dependencies-ubuntu.sh +++ b/.github/scripts/install-dependencies-ubuntu.sh @@ -11,6 +11,7 @@ sudo apt-get install -y \ autopoint \ libusb-1.0-0-dev \ libhidapi-dev \ + libinih-dev \ libevdev-dev \ doxygen \ rsync \ diff --git a/INSTALL.md b/INSTALL.md index cafa640..4ade22c 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -18,6 +18,7 @@ Build has been tested on the following operating systems (x86-64 only): * autopoint * gettext * hidapi +* inih * libtool * libusb-1.0 + headers * pkg-config @@ -27,9 +28,9 @@ Build has been tested on the following operating systems (x86-64 only): | Platform | Install instructions | | -------- | -------------------- | -| Ubuntu | `sudo apt-get install automake autoconf gettext autopoint libhidapi-dev libtool libusb-1.0-0-dev pkg-config python3` | -| MacOS + Homebrew | `brew install automake autoconf gettext hidapi libtool libusb pkg-config python3` | -| Arch Linux | `pacman -S base-devel libusb hidapi python` | +| Ubuntu | `sudo apt-get install automake autoconf gettext autopoint libhidapi-dev libinih-dev libtool libusb-1.0-0-dev pkg-config python3` | +| MacOS + Homebrew | `brew install automake autoconf gettext hidapi inih libtool libusb pkg-config python3` | +| Arch Linux | `pacman -S base-devel libusb hidapi inih python` | ## Optional Packages diff --git a/configure.ac b/configure.ac index 2586e0b..eaa309b 100644 --- a/configure.ac +++ b/configure.ac @@ -43,10 +43,15 @@ AC_SUBST([LIBUSB_CFLAGS]) AC_SUBST([LIBUSB_LDFLAGS]) AC_SUBST([LIBUSB_LIBS]) -# Pinelog configuration -AC_SUBST([PINELOG_CFLAGS], [-DPINELOG_SHOW_DATE=1 -DPINELOG_SHOW_LEVEL=1 -DPINELOG_SHOW_BACKTRACE=1]) +# Check for libinih +AX_PKG_CHECK_MODULES([INIH], [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"]) -AC_SUBST([X52_PKG_VERSION], [0.1]) AC_SUBST([X52_INCLUDE], ["-I \$(top_srcdir)/lib/libx52"]) # Check for hidapi. This uses a different pkg-config file on Linux vs other