X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2FMakefile.linux;h=705f549fabfdf34a644571a19444c228d17180b2;hb=33c08b5f78f41aab4d1172e66db7c1afe21b5f1c;hp=9a96c9a1c13e2e138fbf6c4e3ab48cfbe50c46f3;hpb=6f099903b36ddcca0a85753549dad910e47a9734;p=ppp.git

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 9a96c9a..705f549 100644
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,6 +1,6 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.24 1998/03/25 01:27:01 paulus Exp $
+# $Id: Makefile.linux,v 1.34 1999/09/11 12:08:56 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,7 +27,6 @@ endif
 # CC = gcc
 #
 COPTS = -O2 -pipe -Wall -g
-VER = 2.3.4
 LIBS =
 
 ifneq ($(wildcard /usr/lib/libcrypt*),)
@@ -38,9 +37,16 @@ endif
 # MS-CHAP authentication protocol.
 CHAPMS=y
 USE_CRYPT=y
+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
 
@@ -54,6 +60,9 @@ ifndef USE_CRYPT
 LIBS     := -ldes $(LIBS)
 else
 CFLAGS   += -DUSE_CRYPT=1
+ifneq ($(wildcard /usr/include/crypt.h),)
+CFLAGS   += -DHAVE_CRYPT_H=1
+endif
 endif
 PPPDOBJS += md4.o chap_ms.o
 ifdef MSLANMAN
@@ -78,13 +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 4555 -o root pppd $(BINDIR)/pppd
-	install -c -m 444 -o root pppd.8 $(MANDIR)/man8
+	$(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 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