changes to linux interface for new kernel driver,

[ppp.git] / pppd / Makefile.linux

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 8c0ac11531d0156a94d2b259fca75bf986b3c4e1..f36d841686276b3fb9c4589d4403c3df23e84f50 100644 (file)
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,6 +1,6 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.28 1999/03/30 06:01:42 paulus Exp $
+# $Id: Makefile.linux,v 1.36 2000/03/27 06:02:59 paulus Exp $
 #
 
 # Default installation locations
@@ -9,12 +9,12 @@ 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
 HEADERS =  callout.h pathnames.h patchlevel.h chap.h md5.h chap_ms.h md4.h \
           ipxcp.h cbcp.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
 
 all: pppd
 
@@ -27,10 +27,9 @@ endif
 # CC = gcc
 #
 COPTS = -O2 -pipe -Wall -g
-VER = 2.3.6
 LIBS =
 
-ifneq ($(wildcard /usr/lib/libcrypt*),)
+ifneq ($(wildcard /usr/lib/libcrypt.*),)
 LIBS += -lcrypt
 endif
 
@@ -38,17 +37,20 @@ endif
 # MS-CHAP authentication protocol.
 CHAPMS=y
 USE_CRYPT=y
-ifneq ($(wildcard /usr/lib/libcrypt*),)
+ifneq ($(wildcard /usr/lib/libcrypt.*),)
 HAVE_CRYPT_H=y
 endif
 
 
 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_MULTILINK
 
 CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS)
 
@@ -85,15 +87,31 @@ LIBS     := -llock $(LIBS)
 CFLAGS   += -DLOCKLIB=1
 endif
 
+ifdef PLUGIN
+CFLAGS += -DPLUGIN
+LDFLAGS        += -Wl,-E
+LIBS   += -ldl
+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 4550 -o root pppd $(BINDIR)/pppd
+       $(INSTALL) -s -c -m 4550 pppd $(BINDIR)/pppd
        if ! chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
          chmod o+rx $(BINDIR)/pppd; fi
-       install -c -m 444 -o root pppd.8 $(MANDIR)/man8
+       $(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