summaryrefslogtreecommitdiff
path: root/gphoto-m4
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2021-10-18 20:53:12 +0200
committerHans Ulrich Niedermann <hun@n-dimensional.de>2021-11-03 22:02:49 +0100
commit5a00d0480e2b8b5966ab8e9ceb6d1ad117327a01 (patch)
tree40c2c5ae1e0107839c01db11ee9f434fb4fb9cea /gphoto-m4
parent24b7cfad168017d561562b769ca164fc395b624c (diff)
downloadlibgphoto2-5a00d0480e2b8b5966ab8e9ceb6d1ad117327a01.tar.gz
Use m4_pattern_forbid to find unnoticed GP_ strings
Use m4_pattern_forbid to find unnoticed GP_ strings in the configure and config.status scripts.
Diffstat (limited to 'gphoto-m4')
-rw-r--r--gphoto-m4/gp-gettext-hack.m41
-rw-r--r--gphoto-m4/gp-set.m45
2 files changed, 4 insertions, 2 deletions
diff --git a/gphoto-m4/gp-gettext-hack.m4 b/gphoto-m4/gp-gettext-hack.m4
index 940e287de..01ca92742 100644
--- a/gphoto-m4/gp-gettext-hack.m4
+++ b/gphoto-m4/gp-gettext-hack.m4
@@ -33,6 +33,7 @@ m4_ifval([$4],[
if test -n "$PACKAGE_BUGREPORT"; then
sed_mb="${PACKAGE_BUGREPORT}"
else
+ m4_pattern_allow([GP_GETTEXT_HACK])dnl
AC_MSG_ERROR([
*** Your configure.{ac,in} is wrong.
*** Either define PACKAGE_BUGREPORT (by using the 4-parameter AC INIT syntax)
diff --git a/gphoto-m4/gp-set.m4 b/gphoto-m4/gp-set.m4
index 56be8bc57..444d71f76 100644
--- a/gphoto-m4/gp-set.m4
+++ b/gphoto-m4/gp-set.m4
@@ -338,17 +338,18 @@ cat>confset_res_23.txt<<EOF
x
EOF
AC_MSG_CHECKING([whether comm -23 works])
+m4_pattern_allow([GP_SET_xyz])dnl mentioned in message strings
AS_IF([${COMM} -23 confset_a.txt confset_b.txt > confset_diff_23.txt], [dnl
AS_IF([${CMP} confset_diff_23.txt confset_res_23.txt > /dev/null 2>&1], [dnl
AC_MSG_RESULT([yes])
rm -f confset_a.txt confset_b.txt confset_diff_23.txt confset_res_23.txt
], [dnl
AC_MSG_RESULT([no (wrong result)])
- AC_MSG_ERROR([comm -23 must work for GP_SET difference calculations])
+ AC_MSG_ERROR([comm -23 must work for GP_SET_xyz difference calculations])
])
], [dnl
AC_MSG_RESULT([no (does not run)])
- AC_MSG_ERROR([comm -23 must work for GP_SET difference calculations])
+ AC_MSG_ERROR([comm -23 must work for GP_SET_xyz difference calculations])
])
dnl This functions uses the shell builtin 'shift', so it needs to store
dnl the original $1 and $2 in local variables.