fdisk: rename ENABLE_CMDTAGQ macro

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

diff --git a/fdisk/fdisksgilabel.h b/fdisk/fdisksgilabel.h
index d69616ab8ffae382557503b080f49c584d52eda0..a4704e4dae848347c1c0f54ec892ddc4e79a8a56 100644 (file)
--- 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 c5f307387ad4a47ee43414892eff6d7ecd506747..984e72bea2d55e17cb65f8eca05b1229806a2bbf 100755 (executable)
--- 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