Version 1.7.6.
[libguestfs.git] / cfg.mk
diff --git a/cfg.mk b/cfg.mk
index 0c19cc9..eb95dd3 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -100,16 +100,16 @@ sc_avoid_ctype_macros:
                1>&2; exit 1; } || :
 
 sc_prohibit_virBufferAdd_with_string_literal:
                1>&2; exit 1; } || :
 
 sc_prohibit_virBufferAdd_with_string_literal:
-       @re='\<virBufferAdd *\([^,]+, *"[^"]'                           \
-       msg='use virBufferAddLit, not virBufferAdd, with a string literal' \
-         $(_prohibit_regexp)
+       @prohibit='\<virBufferAdd *\([^,]+, *"[^"]'                     \
+       halt='use virBufferAddLit, not virBufferAdd, with a string literal' \
+         $(_sc_search_regexp)
 
 # Not only do they fail to deal well with ipv6, but the gethostby*
 # functions are also not thread-safe.
 sc_prohibit_gethostby:
 
 # Not only do they fail to deal well with ipv6, but the gethostby*
 # functions are also not thread-safe.
 sc_prohibit_gethostby:
-       @re='\<gethostby(addr|name2?) *\('                              \
-       msg='use getaddrinfo, not gethostby*'                           \
-         $(_prohibit_regexp)
+       @prohibit='\<gethostby(addr|name2?) *\('                        \
+       halt='use getaddrinfo, not gethostby*'                          \
+         $(_sc_search_regexp)
 
 # Disallow trailing blank lines.
 sc_prohibit_trailing_blank_lines:
 
 # Disallow trailing blank lines.
 sc_prohibit_trailing_blank_lines:
@@ -132,7 +132,9 @@ ifeq (0,$(MAKELEVEL))
   # submodule name.  Contrast these:
   # -b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib
   #  b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib (v0.0-2286-gb653eda)
   # submodule name.  Contrast these:
   # -b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib
   #  b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib (v0.0-2286-gb653eda)
-  _submodule_hash = sed 's/.//;s/ .*//'
+  # $ cat .git-module-status
+  # b653eda3ac4864de205419d9f41eec267cb89eeb
+  _submodule_hash = sed 's/^[ +-]//;s/ .*//'
   _update_required := $(shell                                          \
       actual=$$(git submodule status | $(_submodule_hash));            \
       stamp="$$($(_submodule_hash) $(_curr_status) 2>/dev/null)";      \
   _update_required := $(shell                                          \
       actual=$$(git submodule status | $(_submodule_hash));            \
       stamp="$$($(_submodule_hash) $(_curr_status) 2>/dev/null)";      \