From: Karel Zak <kzak@redhat.com>
Date: Wed, 26 Nov 2008 13:24:52 +0000 (+0100)
Subject: fdisk: rename ENABLE_CMDTAGQ macro
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76fe37dae132d50cbc2b42eb6aac23648339db0d;p=util-linux

fdisk: rename ENABLE_CMDTAGQ macro

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/fdisk/fdisksgilabel.h b/fdisk/fdisksgilabel.h
index d69616ab..a4704e4d 100644
--- a/fdisk/fdisksgilabel.h
+++ b/fdisk/fdisksgilabel.h
@@ -56,7 +56,7 @@ struct device_parameter { /* 48 bytes */
 #define	TRACK_MULTIVOL	0x08
 #define	IGNORE_ERRORS	0x10
 #define	RESEEK		0x20
-#define	ENABLE_CMDTAGQ	0x40
+#define	CMDTAGQ_ENABLE	0x40
 
 typedef struct {
 	unsigned int   magic;		 /* expect SGI_LABEL_MAGIC */
diff --git a/tools/checkconfig.sh b/tools/checkconfig.sh
index c5f30738..984e72be 100755
--- a/tools/checkconfig.sh
+++ b/tools/checkconfig.sh
@@ -30,8 +30,14 @@ while (( "$#" )); do
 
 	[ ! -f "$srcfile" ] && continue;
 
+	# Note that we use HAVE_ macros since util-linux-ng-2.14. The
+	# previous version also have used ENABLE_ too.
+	#
+	# ENABLE_ and HAVE_ macros shouldn't be used for any other pupose that
+	# for config/build options.
+	#
 	DEFINES=$(sed -n -e 's/.*[ \t(]\+\(HAVE_[[:alnum:]]\+[^ \t);]*\).*/\1/p' \
-                         -e 's/.*[ \t(]\+\(ENABLE_[[:alnum:]]\+[^ \t);]*\).*/\1/p' \
+			 -e 's/.*[ \t(]\+\(ENABLE_[[:alnum:]]\+[^ \t);]*\).*/\1/p' \
                          $srcfile | sort -u)
 	[ -z "$DEFINES" ] && continue