diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | gphoto-m4/gp-gettext-hack.m4 | 1 | ||||
| -rw-r--r-- | gphoto-m4/gp-set.m4 | 5 | ||||
| -rw-r--r-- | libgphoto2_port/configure.ac | 5 | ||||
| -rw-r--r-- | libgphoto2_port/gphoto-m4/gp-gettext-hack.m4 | 1 |
5 files changed, 15 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index d235f9f0a..00fd9c9b0 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,11 @@ AM_INIT_AUTOMAKE([-Wall foreign 1.9 dist-bzip2 dist-xz check-news subdir-objects m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])]) AM_SILENT_RULES([no]) + +dnl Flag all GP_ strings in result as error unless specifically allowed. +m4_pattern_forbid([^_?GP_])dnl + + GP_CHECK_SHELL_ENVIRONMENT GP_CONFIG_MSG([Build]) GP_CONFIG_MSG([Source code location],[${srcdir}]) 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. diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac index 2d10a8e61..2fe797c1b 100644 --- a/libgphoto2_port/configure.ac +++ b/libgphoto2_port/configure.ac @@ -20,6 +20,11 @@ AC_LANG(C) m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])]) AM_SILENT_RULES([no]) + +dnl Flag all GP_ strings in result as error unless specifically allowed. +m4_pattern_forbid([^_?GP_])dnl + + dnl --------------------------------------------------------------------------- dnl Advanced information about versioning: dnl * "Writing shared libraries" by Mike Hearn diff --git a/libgphoto2_port/gphoto-m4/gp-gettext-hack.m4 b/libgphoto2_port/gphoto-m4/gp-gettext-hack.m4 index 940e287de..01ca92742 100644 --- a/libgphoto2_port/gphoto-m4/gp-gettext-hack.m4 +++ b/libgphoto2_port/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) |