MD4Update takes bytes not bits! Now the regression test of the README.MSCHAP80

[ppp.git] / pppd / Makefile.linux

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 311cc1886c049c093ed1ea32c826f9e853df40d2..132e768cc0b1d515dbfcf72c40455b5b7a8508fd 100644 (file)
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,6 +1,6 @@
 #
 # pppd makefile for Linux
 #
 # pppd makefile for Linux

-# $Id: Makefile.linux,v 1.17 1996/10/08 04:35:01 paulus Exp $
+# $Id: Makefile.linux,v 1.26 1998/05/04 06:10:29 paulus Exp $

 #
 
 # Default installation locations
 #
 
 # Default installation locations


@@ -26,34 +26,69 @@ endif
 
 # CC = gcc
 #
 
 # CC = gcc
 #

-COPTS = -O2 # -g
-VER = 2.3.0
-LIBS = -lc -lbsd
+COPTS = -O2 -pipe -Wall -g
+VER = 2.3.5
+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

 
 

-# 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=
+
+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)
 
 
 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
 ifdef HAS_SHADOW
 CFLAGS   += -DHAS_SHADOW

-LIBS     += -lshadow
+#LIBS     := -lshadow $(LIBS)

 endif
 
 endif
 

+# For "Pluggable Authentication Modules", see ftp.redhat.com:/pub/pam/.

 ifdef USE_PAM
 CFLAGS   += -DUSE_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
 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)
 
 pppd: $(PPPDOBJS)
        $(CC) $(CFLAGS) -o pppd $(PPPDOBJS) $(LIBS)