mirror
/
libx52
mirror of https://github.com/nirenjan/libx52.git
1
0
Fork 0
Code Releases Wiki Activity

Fix pkg-config check for inih and enable Ubuntu 18.04 builds

reverse-scroll
nirenjan 2021-07-19 11:09:41 -07:00
parent 3a68148472
commit 1b598c2d78
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -21,7 +21,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: ['ubuntu-20.04', 'macos-latest'] os: ['ubuntu-18.04', 'ubuntu-20.04', 'macos-latest']
cc: ['gcc', 'clang'] cc: ['gcc', 'clang']
steps: steps:

4
INSTALL.md
View File

@ -1,12 +1,12 @@
Installation instructions for x52pro-linux Installation instructions for x52pro-linux
========================================== ==========================================
[![Build Status](https://www.travis-ci.org/nirenjan/x52pro-linux.svg?branch=master)](https://www.travis-ci.org/nirenjan/x52pro-linux) ![Build Status](https://www.github.com/nirenjan/x52pro-linux/actions/workflows/build.yml/badge.svg)
Build has been tested on the following operating systems (x86-64 only): Build has been tested on the following operating systems (x86-64 only):
* Ubuntu 16.04 LTS
* Ubuntu 18.04 LTS * Ubuntu 18.04 LTS
* Ubuntu 20.04 LTS
* OS X 10.13.6 * OS X 10.13.6
# Prerequisites # Prerequisites

7
configure.ac
View File

@ -46,7 +46,12 @@ AC_SUBST([LIBUSB_LDFLAGS])
AC_SUBST([LIBUSB_LIBS]) AC_SUBST([LIBUSB_LIBS])
# Check for libinih # Check for libinih
PKG_CHECK_MODULES([INIH], [inih]) PKG_CHECK_MODULES([INIH], [inih], [],
[
# Older versions of Ubuntu don't provide a .pc file
AC_CHECK_HEADERS([ini.h])
AC_SEARCH_LIBS([ini_parse], [inih])
])
AC_SUBST([INIH_CFLAGS]) AC_SUBST([INIH_CFLAGS])
AC_SUBST([INIH_LDFLAGS]) AC_SUBST([INIH_LDFLAGS])
AC_SUBST([INIH_LIBS]) AC_SUBST([INIH_LIBS])