Revert "pppdump: support building with the system zlib (#189)"

This reverts commit c98cc28f128dffc456488c74b600640057da6994
because of compile errors in pppdump:

cc  -o pppdump pppdump.o deflate.o bsd-comp.o  -lz
/usr/bin/ld: deflate.o: in function `z_incomp':
deflate.c:(.text+0x99): undefined reference to `inflateIncomp'
/usr/bin/ld: deflate.o: in function `z_decomp_alloc':
deflate.c:(.text+0x355): undefined reference to `inflateInit2'
collect2: error: ld returned 1 exit status
make[1]: *** [Makefile:38: pppdump] Error 1

The copy of zlib here is not the same as the standard upstream zlib;
this version has some extra functions added.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

diff --git a/pppdump/Makefile.linux b/pppdump/Makefile.linux
index b61bc9dda31896508ccd217e2b5c3a09212cfd18..0457561f1034add1ea19e60cc3f7f3d70ea04b0e 100644 (file)
--- a/pppdump/Makefile.linux
+++ b/pppdump/Makefile.linux
@@ -2,39 +2,15 @@ DESTDIR = $(INSTROOT)@DESTDIR@
 BINDIR = $(DESTDIR)/sbin
 MANDIR = $(DESTDIR)/share/man/man8
 
 BINDIR = $(DESTDIR)/sbin
 MANDIR = $(DESTDIR)/share/man/man8
 

-DO_DEFLATE=y
-DO_BSD_COMPRESS=y
-HAVE_ZLIB=n
-

 CFLAGS= -O -I../include/net
 CFLAGS= -O -I../include/net

-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
+OBJS = pppdump.o bsd-comp.o deflate.o zlib.o

 
 INSTALL= install
 
 all:   pppdump
 
 pppdump: $(OBJS)
 
 INSTALL= install
 
 all:   pppdump
 
 pppdump: $(OBJS)

-       $(CC) $(LDFLAGS) -o pppdump $(OBJS) $(LIBS)
+       $(CC) $(LDFLAGS) -o pppdump $(OBJS)

 
 clean:
        rm -f pppdump $(OBJS) *~
 
 clean:
        rm -f pppdump $(OBJS) *~