[pkgsrc/trunk]: pkgsrc/mk/check The package x11/gdm embeds ${exec_prefix} int...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ddfc52ac7843
branches:  trunk
changeset: 537920:ddfc52ac7843
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Jan 21 06:11:09 2008 +0000

description:
The package x11/gdm embeds ${exec_prefix} into a macro containing a
PATH, in which it is not directly preceded by a quote character:

        #define GDM_USER_PATH "/usr/bin:/bin:${exec_prefix}"

Catch this by complaining about "${" also when it appears after a colon.

Since this check is still disabled by default, it will not surprise anyone.

diffstat:

 mk/check/check-headers.sh |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r feb0652e756c -r ddfc52ac7843 mk/check/check-headers.sh
--- a/mk/check/check-headers.sh Mon Jan 21 03:04:30 2008 +0000
+++ b/mk/check/check-headers.sh Mon Jan 21 06:11:09 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: check-headers.sh,v 1.9 2007/01/02 17:58:11 rillig Exp $
+# $NetBSD: check-headers.sh,v 1.10 2008/01/21 06:11:09 rillig Exp $
 #
 # This program checks the header files for possible problems.
 #
@@ -22,7 +22,7 @@
 
                # Check for "${" in macro definitions.
                case "$line" in
-               "#"*define*\"\$\{[A-Za-z]*\}/*\"*)
+               "#"*define*[\":]\$\{[A-Za-z]*\}/*\"*)
                        found_unresolved_variable=yes
                        cs_error_heading "Found unresolved variable in macro:"
                        cs_error_msg "$fname: $line"
@@ -55,6 +55,7 @@
 configure.in file, there is some code like
 
     FOO_DIR="\${bindir}"
+    # ...
     AC_DEFINE_UNQUOTED(FOO_DIR, "\$FOO_DIR", [Directory where foo files go])
 
 You can fix this by telling the original package author not to use