From 3f73bfb3e09c407425245aa5f62477fd572328c9 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 18 Feb 2024 13:52:42 +0100 Subject: Make it possible to compile jffsX-utils without zlib The jffsX-utils already have a CONFIG_JFFS2_ZLIB define, but it is statically defined in a header and not used consistently. This patch first replaces it with a "WITH_ZLIB" define, provided via automake, to bring it in line with the already existing "WITH_LZO". Then, the missing checks and typedefs are added in jffs2reader.c. Signed-off-by: David Oberhollenzer --- jffsX-utils/compr.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'jffsX-utils/compr.h') diff --git a/jffsX-utils/compr.h b/jffsX-utils/compr.h index 0806f4d..f1f5975 100644 --- a/jffsX-utils/compr.h +++ b/jffsX-utils/compr.h @@ -16,7 +16,6 @@ #include #include "linux/jffs2.h" -#define CONFIG_JFFS2_ZLIB #define CONFIG_JFFS2_RTIME #define JFFS2_RUBINMIPS_PRIORITY 10 @@ -102,7 +101,7 @@ char *jffs2_stats(void); /* Compressor modules */ /* These functions will be called by jffs2_compressors_init/exit */ -#ifdef CONFIG_JFFS2_ZLIB +#ifdef WITH_ZLIB int jffs2_zlib_init(void); void jffs2_zlib_exit(void); #endif -- cgit v1.2.3