summaryrefslogtreecommitdiff
path: root/libgphoto2_port
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2022-03-30 15:10:49 +0200
committerHans Ulrich Niedermann <hun@n-dimensional.de>2022-05-19 22:48:38 +0200
commit4230f166705570b672009e7c75b0f7d00fa3c460 (patch)
tree8cdf0eaf8a4d1167f0f3f25387e63477e306b17d /libgphoto2_port
parentf5455ef081ecaa894e137bc288ecddab27b32fd4 (diff)
downloadlibgphoto2-4230f166705570b672009e7c75b0f7d00fa3c460.tar.gz
Use m4_pattern_ignore for some PKG_* macros
It makes more sense to use the provided m4_pattern_ignore() macro than writing our own error messages. Yes, our own error message could be more helpful to the uninitiated user by mentioning the package and the m4 file name to install which provide the required macro. However, those file names and package names can and do change with time or by operating system.
Diffstat (limited to 'libgphoto2_port')
-rw-r--r--libgphoto2_port/gphoto-m4/gp-check-library.m410
1 files changed, 4 insertions, 6 deletions
diff --git a/libgphoto2_port/gphoto-m4/gp-check-library.m4 b/libgphoto2_port/gphoto-m4/gp-check-library.m4
index 209e1ce89..9232bc482 100644
--- a/libgphoto2_port/gphoto-m4/gp-check-library.m4
+++ b/libgphoto2_port/gphoto-m4/gp-check-library.m4
@@ -1,5 +1,5 @@
# gp-check-library.m4 - generic library check -*- Autoconf -*-
-# serial 13
+# serial 14
dnl | Increment the above serial number every time you edit this file.
dnl | When it finds multiple m4 files with the same name,
dnl | aclocal will use the one with the highest serial.
@@ -76,6 +76,9 @@ dnl This will change the calling conventions, so be aware of that.
dnl * Give names of a header file and function name and to a test
dnl compilation.
dnl
+m4_pattern_forbid([PKG_PROG_PKG_CONFIG])dnl
+m4_pattern_forbid([PKG_CHECK_MODULES])dnl
+dnl
AC_DEFUN([_GP_CHECK_LIBRARY_SOEXT],[dnl
AC_MSG_CHECKING([for dynamic library extension])
soext=""
@@ -102,11 +105,6 @@ 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],