fix building w/out et headers and w/out debug

diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c
index f1adc8549da15f96159ef8f06861b011f66dbbef..db93ea0cec4ea3d9dba6172f3fc3c926effa494f 100644 (file)
--- a/e2fsprogs/e2fsck.c
+++ b/e2fsprogs/e2fsck.c
@@ -45,10 +45,8 @@ extern int optind;
 #endif
 
 #include "e2fsbb.h"
-#include "et/com_err.h"
 #include "e2fsck/e2fsck.h"
 #include "e2fsck/problem.h"
-//#include "../version.h"
 
 /* Command line options */
 static int swapfs;

diff --git a/e2fsprogs/e2fsck/badblocks.c b/e2fsprogs/e2fsck/badblocks.c
index 09ef3ab1bebf0cdf480bc8e9c08bca50b57bb1e8..1ab76a0911d19117daf4c3d68b98b6636f05d5e2 100644 (file)
--- a/e2fsprogs/e2fsck/badblocks.c
+++ b/e2fsprogs/e2fsck/badblocks.c
@@ -10,7 +10,6 @@
 #include <errno.h>
 #endif
 
-#include <et/com_err.h>
 #include "e2fsck.h"
 
 static int check_bb_inode_blocks(ext2_filsys fs, blk_t *block_nr, int blockcnt,

diff --git a/e2fsprogs/e2fsck/dict.c b/e2fsprogs/e2fsck/dict.c
index 48a1e74f76fbd3f531c4f1f1d8e70320eb2f45e2..b0809a76dd3669b9e18109214246770c48f07a07 100644 (file)
--- a/e2fsprogs/e2fsck/dict.c
+++ b/e2fsprogs/e2fsck/dict.c
@@ -30,7 +30,9 @@
 #define DICT_IMPLEMENTATION
 #include "dict.h"
 
-#define NDEBUG
+#ifndef NDEBUG
+# define NDEBUG
+#endif
 
 /*
  * These macros provide short convenient names for structure members,

diff --git a/e2fsprogs/e2fsck/swapfs.c b/e2fsprogs/e2fsck/swapfs.c
index 8d464043a2e3586da9732ed013b548fc5de0909d..a737b9624c85811bcbc619f0fe9fbb6ea9365039 100644 (file)
--- a/e2fsprogs/e2fsck/swapfs.c
+++ b/e2fsprogs/e2fsck/swapfs.c
@@ -13,7 +13,6 @@
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
-#include <et/com_err.h>
 #include "e2fsck.h"
 
 #ifdef ENABLE_SWAPFS