mods to get it to compile better on linux

[ppp.git] / pppd / Makefile.linux

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index e759a6192a420565c1086d182d771eb24eee823b..1d5e75e7e31b5672a909bbebb1aff3c1d67870ed 100644 (file)
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,6 +1,6 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.18 1996/10/08 06:42:41 paulus Exp $
+# $Id: Makefile.linux,v 1.21 1997/07/14 03:52:08 paulus Exp $
 #
 
 # Default installation locations
@@ -27,8 +27,12 @@ endif
 # CC = gcc
 #
 COPTS = -O2 # -g
-VER = 2.3.0
-LIBS = -lc -lbsd
+VER = 2.3.1
+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
@@ -42,8 +46,15 @@ CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS)
 
 ifdef CHAPMS
 CFLAGS   += -DCHAPMS=1
+ifndef USE_CRYPT
 LIBS     := -ldes $(LIBS)
+else
+CFLAGS   += -DUSE_CRYPT=1
+endif
 PPPDOBJS += md4.o chap_ms.o
+ifdef MSLANMAN
+CFLAGS   += -DMSLANMAN=1
+endif
 endif
 
 ifdef HAS_SHADOW
@@ -57,6 +68,12 @@ CFLAGS   += -DUSE_PAM
 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