X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=Makefile;h=e40a77c7a14fe3bef7369fa567325d1f3fe60d42;hb=e65c7e57c71dd41061b322a950060990c3420b1e;hp=d2878d6493474352b902e62dc1d73171973f440d;hpb=8d8eda4eab3d2801251daf4eb31756c3595e2fc6;p=gnulib.git

diff --git a/Makefile b/Makefile
index d2878d649..e40a77c7a 100644
--- a/Makefile
+++ b/Makefile
@@ -13,12 +13,37 @@ info html dvi pdf:
 	cd doc && $(MAKE) $@ && $(MAKE) mostlyclean
 
 # Perform some platform independent checks on the gnulib code.
-check: sc_prefer_ac_check_funcs_once
+check: \
+  sc_prohibit_augmenting_PATH_via_TESTS_ENVIRONMENT			\
+  sc_pragma_columns							\
+  sc_prefer_ac_check_funcs_once
 
 sc_prefer_ac_check_funcs_once:
-	git grep -w -l AC_CHECK_FUNCS modules && \
-	  { echo use AC_CHECK_FUNCS_ONCE, not AC_CHECK_FUNCS in modules/ 1>&2; \
-	    exit 1; } || :
+	if test -d .git; then						\
+          git grep -w -l AC_CHECK_FUNCS modules				\
+            && { echo use AC_CHECK_FUNCS_ONCE, not AC_CHECK_FUNCS	\
+                   in modules/ 1>&2; exit 1; } || :			\
+	else :; fi
+
+sc_prohibit_augmenting_PATH_via_TESTS_ENVIRONMENT:
+	if test -d .git; then						\
+          url=http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/22874;	\
+	  git grep '^[	 ]*TESTS_ENVIRONMENT += PATH=' modules		\
+	    && { printf '%s\n' 'Do not augment PATH via TESTS_ENVIRONMENT;' \
+		 "  see <$$url>" 1>&2; exit 1; } || :			\
+	else :; fi
+
+sc_pragma_columns:
+	if test -d .git; then						\
+          git ls-files|grep '\.in\.h$$'					\
+              | xargs grep -l '^@PRAGMA_SYSTEM_HEADER@'			\
+              | xargs grep -L '^@PRAGMA_COLUMNS@'			\
+              | grep .							\
+	    && { printf '%s\n'						\
+                   'the files listed above use @PRAGMA_SYSTEM_HEADER@'	\
+                   'without also using @PRAGMA_COLUMNS@' 1>&2;		\
+		 exit 1; } || :;					\
+	else :; fi
 
 # Regenerate some files that are stored in the repository.
 regen: MODULES.html