diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2021-10-19 05:48:21 +0200 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2021-10-25 00:18:23 +0200 |
| commit | b6e9e97fe8a12fde1aa3486be563c3362005de8e (patch) | |
| tree | 199f4e44d97d3c33a657f30a3e56f20523259ddc /gphoto-m4 | |
| parent | b75bca666a9a4c4ad51c3b119c044c7f62462d85 (diff) | |
| download | libgphoto2-b6e9e97fe8a12fde1aa3486be563c3362005de8e.tar.gz | |
sync gp-check-library.m4 between gphoto-m4 dirs
The gphoto-m4 gp-check-library.m4 has been using PKG_PROG_PKG_CONFIG
since commit c1ab67b7288359066b4884d3058e712f6170da35 (2017-08-29),
so this makes the libgphoto2_port/gphoto-m4 use the same code.
As PKG_PROG_PKG_CONFIG provided by pkg-config's pkg.po, this means
we now require that to be present - and we should better check at
autoreconf time that the PKG_PROG_PKG_CONFIG macro is actually
defined.
Diffstat (limited to 'gphoto-m4')
| -rw-r--r-- | gphoto-m4/gp-check-library.m4 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/gphoto-m4/gp-check-library.m4 b/gphoto-m4/gp-check-library.m4 index 2737d8d20..ee9ef004b 100644 --- a/gphoto-m4/gp-check-library.m4 +++ b/gphoto-m4/gp-check-library.m4 @@ -95,6 +95,12 @@ else fi ])dnl dnl +dnl +m4_ifndef([PKG_PROG_PKG_CONFIG], [dnl + m4_fatal([PKG_PROG_PKG_CONFIG not found, do you have pkg-config installed with pkg.m4?]) +]) +dnl +dnl AC_DEFUN([_GP_CHECK_LIBRARY],[ # ---------------------------------------------------------------------- # [GP_CHECK_LIBRARY]([$1],[$2],[$3], @@ -105,6 +111,7 @@ m4_ifval([$9],[dnl ])dnl # ---------------------------------------------------------------------- dnl +dnl AC_REQUIRE([GP_CONFIG_MSG])dnl AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_REQUIRE([_GP_CHECK_LIBRARY_SOEXT])dnl |