From: Josh Boyer <jwboyer@gmail.com>
Date: Mon, 23 Jul 2007 14:15:29 +0000 (-0500)
Subject: Use lzo2 libraries
X-Git-Tag: v1.1.0~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9845d92440bd87739c89edd000fd6e0c47fab185;p=mtd-utils.git

Use lzo2 libraries

Switch to using the more common lzo2 libraries for LZO compression.  They
should still work with the lzo1x interfaces.

Signed-off-by: Josh Boyer <jwboyer@gmail.com>
---

diff --git a/Makefile b/Makefile
index d3d9c15..88b666a 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ $(BUILDDIR)/mkfs.jffs2: $(BUILDDIR)/crc32.o \
 			$(BUILDDIR)/compr_zlib.o \
 			$(BUILDDIR)/compr_lzo.o \
 			$(BUILDDIR)/compr.o
-	$(CC) $(LDFLAGS) -o $@ $^ -lz -llzo
+	$(CC) $(LDFLAGS) -o $@ $^ -lz -llzo2
 
 $(BUILDDIR)/flash_eraseall: $(BUILDDIR)/crc32.o $(BUILDDIR)/flash_eraseall.o
 	$(CC) $(LDFLAGS) -o $@ $^
diff --git a/compr_lzo.c b/compr_lzo.c
index ef3b413..c15fd32 100644
--- a/compr_lzo.c
+++ b/compr_lzo.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <asm/types.h>
 #include <linux/jffs2.h>
-#include <lzo1x.h>
+#include <lzo/lzo1x.h>
 #include "compr.h"
 
 extern int page_size;