update the version number

[ppp.git] / pppd / Makefile.linux

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 13d9a1b3f3de7fa7440c89bb8ff0fde5bcedd22e..8d320837efa4e9dcbe4c29f11f2a8623b0d5fec4 100644 (file)
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,13 +1,17 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.13 1996/07/01 01:05:27 paulus Exp $
+# $Id: Makefile.linux,v 1.27 1999/03/02 05:33:45 paulus Exp $
 #
 
+# Default installation locations
+BINDIR = /usr/sbin
+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 \
+          ipxcp.c auth.c options.c sys-linux.c md4.c chap_ms.c cbcp.c \
           demand.c
 HEADERS =  callout.h pathnames.h patchlevel.h chap.h md5.h chap_ms.h md4.h \
-          ipxcp.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
@@ -21,50 +25,73 @@ include .depend
 endif
 
 # CC = gcc
-# DEBUG_FLAGS = -DDEBUGALL
 #
-COPTS = -O2 # -g
-VER = 2.3.0
-LIBS = -lbsd
-YACC = bison -y
-LEX = flex
-
-# 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=
-
-COMPILE_FLAGS= -D_linux_=1 -DHAVE_PATHS_H
-  
-CFLAGS= $(COPTS) $(DEBUG_FLAGS) $(COMPILE_FLAGS) $(INCLUDE_DIRS)
-
-ifdef USE_MS_DNS
-CFLAGS   += -DUSE_MS_DNS=1
+COPTS = -O2 -pipe -Wall -g
+VER = 2.3.6
+LIBS =
+
+ifneq ($(wildcard /usr/lib/libcrypt*),)
+LIBS += -lcrypt
+endif
+
+# 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
 
-ifdef IPX_CHANGE
-CFLAGS   += -DIPX_CHANGE=1
-PPPDOBJS += ipxcp.o
+
+HAS_SHADOW=y
+#USE_PAM=y
+
+INCLUDE_DIRS= -I../include
+
+COMPILE_FLAGS= -D_linux_=1 -DHAVE_PATHS_H -DIPX_CHANGE
+
+CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS)
+
+ifdef CHAPMS
+CFLAGS   += -DCHAPMS=1
+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
+CFLAGS   += -DMSLANMAN=1
+endif
 endif
 
 ifdef HAS_SHADOW
 CFLAGS   += -DHAS_SHADOW
-LIBS     += -lshadow
+#LIBS     := -lshadow $(LIBS)
 endif
 
+# For "Pluggable Authentication Modules", see ftp.redhat.com:/pub/pam/.
 ifdef USE_PAM
 CFLAGS   += -DUSE_PAM
-LIBS     += -lpam -ldl
+LIBS     := -lpam -ldl $(LIBS)
+endif
+
+# Lock library binary for Linux is included in 'linux' subdirectory.
+ifdef LOCKLIB
+LIBS     := -llock $(LIBS)
+CFLAGS   += -DLOCKLIB=1
 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 -c -m 444 -o root pppd.8 $(MANDIR)/man8
 
 pppd: $(PPPDOBJS)
-       $(CC) $(CFLAGS) -o pppd $(PPPDOBJS) $(LIBS) # -Wl,-M >pppd.map
+       $(CC) $(CFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
 
 clean:
        rm -f $(PPPDOBJS) pppd *~ #* core