From: Dongyang Li <dongyangli@ddn.com>
Date: Wed, 6 Mar 2019 22:59:55 +0000 (+0000)
Subject: Fix autoheader warnings
X-Git-Tag: v1.45.1-rc1~40^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f72ea2deb0d8c455044eb5ab773829e5deb96f41;p=thirdparty%2Fe2fsprogs.git

Fix autoheader warnings

autoheader complains after 1.44.6 release:
autoheader: warning: missing template: HAVE_BLKID_PROBE_ENABLE_PARTITIONS
autoheader: Use AC_DEFINE([HAVE_BLKID_PROBE_ENABLE_PARTITIONS], [], [Description])
autoheader: warning: missing template: HAVE_BLKID_PROBE_GET_TOPOLOGY

This could fail automatic rpm builds.
Fixes: 7154d97 ("Check for the newer blkid functions without adding blkid to @LIBS@")

Signed-off-by: Li Dongyang <dongyangli@ddn.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/configure.ac b/configure.ac
index 0de90573b..04e199445 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1118,9 +1118,11 @@ dnl the functions added after migrating that library to util-linux
 dnl
 if test -n "$BLKID_CMT"; then
   AC_CHECK_LIB(blkid, blkid_probe_get_topology,
-		      AC_DEFINE(HAVE_BLKID_PROBE_GET_TOPOLOGY, 1))
+		      AC_DEFINE(HAVE_BLKID_PROBE_GET_TOPOLOGY, 1,
+				[Define to 1 if blkid has blkid_probe_get_topology]))
   AC_CHECK_LIB(blkid, blkid_probe_enable_partitions,
-		      AC_DEFINE(HAVE_BLKID_PROBE_ENABLE_PARTITIONS, 1))
+		      AC_DEFINE(HAVE_BLKID_PROBE_ENABLE_PARTITIONS, 1,
+				[Define to 1 if blkid has blkid_probe_enable_partitions]))
 fi
 dnl
 if test -n "$DLOPEN_LIB" ; then
diff --git a/lib/config.h.in b/lib/config.h.in
index 67a05481c..5165c904a 100644
--- a/lib/config.h.in
+++ b/lib/config.h.in
@@ -73,10 +73,10 @@
 /* Define to 1 if you have the `backtrace' function. */
 #undef HAVE_BACKTRACE
 
-/* Define to 1 if you have the `blkid_probe_enable_partitions' function. */
+/* Define to 1 if blkid has blkid_probe_enable_partitions */
 #undef HAVE_BLKID_PROBE_ENABLE_PARTITIONS
 
-/* Define to 1 if you have the `blkid_probe_get_topology' function. */
+/* Define to 1 if blkid has blkid_probe_get_topology */
 #undef HAVE_BLKID_PROBE_GET_TOPOLOGY
 
 /* Define to 1 if the compiler understands __builtin_expect. */