X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2FMakefile.linux;h=4e0fdf77d88c00ad219415a86d5ff0665303ff88;hb=8821c36a7798fd1c16d85ce63bcf519618975800;hp=36249a8e7b4faf8275a72e4aade013c15e6f3734;hpb=09032f7c09a5ead7d5cd14a61d17d1d495bf80f5;p=ppp.git

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 36249a8..4e0fdf7 100644
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,6 +1,6 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.22 1997/11/27 06:07:12 paulus Exp $
+# $Id: Makefile.linux,v 1.30 1999/04/12 06:24:44 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
 
@@ -26,19 +26,27 @@ endif
 
 # CC = gcc
 #
-COPTS = -O2 # -g
-VER = 2.3.2
+COPTS = -O2 -pipe -Wall -g
+VER = 2.3.7
 LIBS =
 
 ifneq ($(wildcard /usr/lib/libcrypt*),)
 LIBS += -lcrypt
 endif
 
-# The INCLUDE_DIRS must include the standard headers before the local
-# ones. If you just had -I.. then the order would be reversed. So, use
-# the default location for include files first before the .. location.
-#INCLUDE_DIRS= -I/usr/include -I..
-INCLUDE_DIRS=
+# Uncomment the next 2 lines to include support for Microsoft's
+# 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
+
+INCLUDE_DIRS= -I../include
 
 COMPILE_FLAGS= -D_linux_=1 -DHAVE_PATHS_H -DIPX_CHANGE
 
@@ -50,6 +58,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
@@ -59,7 +70,7 @@ endif
 
 ifdef HAS_SHADOW
 CFLAGS   += -DHAS_SHADOW
-LIBS     := -lshadow -lcrypt $(LIBS)
+#LIBS     := -lshadow $(LIBS)
 endif
 
 # For "Pluggable Authentication Modules", see ftp.redhat.com:/pub/pam/.
@@ -76,8 +87,10 @@ endif
 
 install: pppd
 	mkdir -p $(BINDIR) $(MANDIR)
-	install -s -c -m 4555 -o root pppd $(BINDIR)/pppd
-	install -c -m 555 -o root pppd.8 $(MANDIR)/man8
+	install -s -c -m 4550 -o root 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
 
 pppd: $(PPPDOBJS)
 	$(CC) $(CFLAGS) -o pppd $(PPPDOBJS) $(LIBS)