Remove an extraneous HAVE_CRYPT_H definition

[ppp.git] / pppd / Makefile.linux

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index d6cd4881db4b033b890af81d82a6b0ef3650df1f..0ab8c760f87e71aedc4085982a1792b9e05dd254 100644 (file)
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -1,6 +1,6 @@
 #
 # pppd makefile for Linux
-# $Id: Makefile.linux,v 1.55 2002/11/05 11:52:07 carlsonj Exp $
+# $Id: Makefile.linux,v 1.58 2003/05/12 08:18:54 fcusack Exp $
 #
 
 # Default installation locations
@@ -37,13 +37,11 @@ LIBS =
 # MS-CHAP authentication protocol.  Also, edit plugins/radius/Makefile.linux.
 CHAPMS=y
 USE_CRYPT=y
-MSLANMAN=y
+# Don't use MSLANMAN unless you really know what you're doing.
+#MSLANMAN=y
 # Uncomment the next line to include support for MPPE.  CHAPMS (above) must
 # also be enabled.  Also, edit plugins/radius/Makefile.linux.
 MPPE=y
-ifneq ($(wildcard /usr/lib/libcrypt.*),)
-HAVE_CRYPT_H=y
-endif
 
 # Uncomment the next line to include support for PPP packet filtering.
 # This requires that the libpcap library and headers be installed
@@ -118,17 +116,18 @@ CFLAGS   += -DHAS_SHADOW
 #LIBS     += -lshadow $(LIBS)
 endif
 
-ifdef NEEDDES
-ifndef USE_CRYPT
-LIBS     += -ldes $(LIBS)
-else
-CFLAGS   += -DUSE_CRYPT=1
 ifneq ($(wildcard /usr/include/crypt.h),)
 CFLAGS   += -DHAVE_CRYPT_H=1
 endif
 ifneq ($(wildcard /usr/lib/libcrypt.*),)
 LIBS   += -lcrypt
 endif
+
+ifdef NEEDDES
+ifndef USE_CRYPT
+LIBS     += -ldes $(LIBS)
+else
+CFLAGS   += -DUSE_CRYPT=1
 endif
 PPPDOBJS += pppcrypt.o
 HEADERS += pppcrypt.h