From c98cc28f128dffc456488c74b600640057da6994 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Thu, 31 Dec 2020 05:37:38 +0100 Subject: [PATCH] pppdump: support building with the system zlib (#189) Signed-off-by: Samuel Thibault Co-authored-by: Marco d'Itri --- pppdump/Makefile.linux | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/pppdump/Makefile.linux b/pppdump/Makefile.linux index 0457561..b61bc9d 100644 --- a/pppdump/Makefile.linux +++ b/pppdump/Makefile.linux @@ -2,15 +2,39 @@ DESTDIR = $(INSTROOT)@DESTDIR@ BINDIR = $(DESTDIR)/sbin MANDIR = $(DESTDIR)/share/man/man8 +DO_DEFLATE=y +DO_BSD_COMPRESS=y +HAVE_ZLIB=n + CFLAGS= -O -I../include/net -OBJS = pppdump.o bsd-comp.o deflate.o zlib.o +OBJS = pppdump.o +LIBS = + +ifdef DO_DEFLATE +CFLAGS += -DDO_DEFLATE=1 +OBJS += deflate.o +ifdef HAVE_ZLIB +LIBS += -lz +else +OBJS += zlib.o +endif +else +CFLAGS += -DDO_DEFLATE=0 +endif + +ifdef DO_BSD_COMPRESS +CFLAGS += -DDO_BSD_COMPRESS=1 +OBJS += bsd-comp.o +else +CFLAGS += -DDO_BSD_COMPRESS=0 +endif INSTALL= install all: pppdump pppdump: $(OBJS) - $(CC) $(LDFLAGS) -o pppdump $(OBJS) + $(CC) $(LDFLAGS) -o pppdump $(OBJS) $(LIBS) clean: rm -f pppdump $(OBJS) *~ -- 2.39.2