X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2FMakefile.linux;h=aea5fb9e9590f6c52344ed4bfc8b64efabb9b9cc;hp=04ef7e2f17397970cd3d4e31cd1d847772a9f069;hb=1b4bb33c1093a6e687fededdc8881520dc38ac14;hpb=07d7fbd6220956eed6b1dd278b05a4fcb099cff9

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 04ef7e2..aea5fb9 100644
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,6 +1,6 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.25 1998/04/01 02:06:41 paulus Exp $
+# $Id: Makefile.linux,v 1.46 2002/03/05 15:14:04 dfs Exp $
 #
 
 # Default installation locations
@@ -9,17 +9,17 @@ MANDIR = /usr/man
 
 PPPDSRCS = main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c md5.c ccp.c \
 	   ipxcp.c auth.c options.c sys-linux.c md4.c chap_ms.c cbcp.c \
-	   demand.c
+	   demand.c utils.c tty.c sha1.c
 HEADERS =  callout.h pathnames.h patchlevel.h chap.h md5.h chap_ms.h md4.h \
-	   ipxcp.h cbcp.h
+	   ipxcp.h cbcp.h tdb.h sha1.h
 MANPAGES = pppd.8
 PPPDOBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap.o md5.o ccp.o \
-	   auth.o options.o demand.o sys-linux.o ipxcp.o
+	   auth.o options.o demand.o utils.o sys-linux.o ipxcp.o tty.o sha1.o
 
 all: pppd
 
 #
-# include dependancies if present and backup if as a header file
+# include dependencies if present
 ifeq (.depend,$(wildcard .depend))
 include .depend
 endif
@@ -27,28 +27,45 @@ endif
 # CC = gcc
 #
 COPTS = -O2 -pipe -Wall -g
-VER = 2.3.4
 LIBS =
 
-ifneq ($(wildcard /usr/lib/libcrypt*),)
+ifneq ($(wildcard /usr/lib/libcrypt.*),)
 LIBS += -lcrypt
 endif
 
 # Uncomment the next 2 lines to include support for Microsoft's
-# MS-CHAP authentication protocol.
+# MS-CHAP authentication protocol.  Also, edit plugins/radius/Makefile.
 CHAPMS=y
 USE_CRYPT=y
-ifneq ($(wildcard /usr/lib/libcrypt*),)
+ifneq ($(wildcard /usr/lib/libcrypt.*),)
 HAVE_CRYPT_H=y
 endif
 
+# Uncomment the next line to include support for PPP packet filtering.
+# This requires that the libpcap library and headers be installed
+# and that the kernel driver support PPP packet filtering, which it
+# doesn't yet.
+#FILTER=y
+
+# Uncomment the next line to enable multilink PPP (enabled by default)
+# Linux distributions: Please leave multilink ENABLED in your builds
+# of pppd!
+HAVE_MULTILINK=y
+
+# Uncomment the next line to enable the TDB database (enabled by default.)
+# If you enable multilink, then TDB is automatically enabled also.
+# Linux distributions: Please leave TDB ENABLED in your builds.
+USE_TDB=y
 
 HAS_SHADOW=y
 #USE_PAM=y
+#HAVE_INET6=y
+
+PLUGIN=y
 
 INCLUDE_DIRS= -I../include
 
-COMPILE_FLAGS= -D_linux_=1 -DHAVE_PATHS_H -DIPX_CHANGE
+COMPILE_FLAGS= -D_linux_=1 -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP
 
 CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS)
 
@@ -79,19 +96,59 @@ CFLAGS   += -DUSE_PAM
 LIBS     := -lpam -ldl $(LIBS)
 endif
 
+# Multi-linnk
+ifdef HAVE_MULTILINK
+	# Multilink implies the use of TDB
+	USE_TDB=y
+
+	CFLAGS += -DHAVE_MULTILINK
+	PPPDSRCS += multilink.c
+	PPPDOBJS += multilink.o
+endif
+
+# TDB
+ifdef USE_TDB
+	CFLAGS += -DUSE_TDB=1
+	PPPDSRCS += tdb.c
+	PPPDOBJS += tdb.o
+endif
+
 # Lock library binary for Linux is included in 'linux' subdirectory.
 ifdef LOCKLIB
 LIBS     := -llock $(LIBS)
 CFLAGS   += -DLOCKLIB=1
 endif
 
+ifdef PLUGIN
+CFLAGS	+= -DPLUGIN
+LDFLAGS	+= -Wl,-E
+LIBS	+= -ldl
+endif
+
+ifdef FILTER
+LIBS    += -lpcap
+CFLAGS  += -DPPP_FILTER -I/usr/include/pcap
+endif
+
+ifdef HAVE_INET6
+     PPPDSRCS += ipv6cp.c eui64.c
+     HEADERS  += ipv6cp.h eui64.h
+     PPPDOBJS += ipv6cp.o eui64.o
+     CFLAGS   += -DINET6=1
+endif
+
+
+INSTALL= install -o root
+
 install: pppd
 	mkdir -p $(BINDIR) $(MANDIR)
-	install -s -c -m 4555 -o root pppd $(BINDIR)/pppd
-	install -c -m 444 -o root pppd.8 $(MANDIR)/man8
+	$(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
+	if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
+	  chmod o-rx,u+s $(BINDIR)/pppd; fi
+	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)/man8
 
 pppd: $(PPPDOBJS)
-	$(CC) $(CFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
 
 clean:
 	rm -f $(PPPDOBJS) pppd *~ #* core