From 2c6567799debe6017b1a1e1f5695fbe632545521 Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Tue, 4 Aug 2015 13:40:44 +0200
Subject: build-sys: add --disable-assert

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 libmount/src/mountP.h  | 9 ---------
 libmount/src/version.c | 4 ++--
 2 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'libmount')

diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h
index d28eb9cdd..660e0ad08 100644
--- a/libmount/src/mountP.h
+++ b/libmount/src/mountP.h
@@ -25,15 +25,6 @@
 #include "debug.h"
 #include "libmount.h"
 
-/* features */
-#define CONFIG_LIBMOUNT_ASSERT
-
-#ifdef CONFIG_LIBMOUNT_ASSERT
-# include <assert.h>
-#else
-# define assert(x)
-#endif
-
 /*
  * Debug
  */
diff --git a/libmount/src/version.c b/libmount/src/version.c
index 28f3a574b..d81d4323f 100644
--- a/libmount/src/version.c
+++ b/libmount/src/version.c
@@ -25,8 +25,8 @@ static const char *lib_features[] = {
 #ifdef HAVE_SMACK
 	"smack",
 #endif
-#ifdef CONFIG_LIBMOUNT_ASSERT
-	"assert",
+#if !defined(NDEBUG)
+	"assert",	/* libc assert.h stuff */
 #endif
 	"debug",	/* always enabled */
 	NULL
-- 
cgit v1.2.3-55-g7522