changes to linux interface for new kernel driver,

[ppp.git] / pppd / Makefile.linux

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index bf2bcc55cd774542bb3641a466f60d98e438e82b..f36d841686276b3fb9c4589d4403c3df23e84f50 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.33 1999/08/24 05:31:08 paulus Exp $
+# $Id: Makefile.linux,v 1.36 2000/03/27 06:02:59 paulus Exp $

 #
 
 # Default installation locations
 #
 
 # Default installation locations


@@ -29,7 +29,7 @@ endif
 COPTS = -O2 -pipe -Wall -g
 LIBS =
 
 COPTS = -O2 -pipe -Wall -g
 LIBS =
 

-ifneq ($(wildcard /usr/lib/libcrypt*),)
+ifneq ($(wildcard /usr/lib/libcrypt.*),)

 LIBS += -lcrypt
 endif
 
 LIBS += -lcrypt
 endif
 


@@ -37,7 +37,7 @@ endif
 # MS-CHAP authentication protocol.
 CHAPMS=y
 USE_CRYPT=y
 # MS-CHAP authentication protocol.
 CHAPMS=y
 USE_CRYPT=y

-ifneq ($(wildcard /usr/lib/libcrypt*),)
+ifneq ($(wildcard /usr/lib/libcrypt.*),)

 HAVE_CRYPT_H=y
 endif
 
 HAVE_CRYPT_H=y
 endif
 


@@ -46,9 +46,11 @@ HAS_SHADOW=y
 #USE_PAM=y
 #HAVE_INET6=y
 
 #USE_PAM=y
 #HAVE_INET6=y
 

+PLUGIN=y
+

 INCLUDE_DIRS= -I../include
 
 INCLUDE_DIRS= -I../include
 

-COMPILE_FLAGS= -D_linux_=1 -DHAVE_PATHS_H -DIPX_CHANGE
+COMPILE_FLAGS= -D_linux_=1 -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MULTILINK

 
 CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS)
 
 
 CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS)
 


@@ -85,6 +87,12 @@ LIBS     := -llock $(LIBS)
 CFLAGS   += -DLOCKLIB=1
 endif
 
 CFLAGS   += -DLOCKLIB=1
 endif
 

+ifdef PLUGIN
+CFLAGS += -DPLUGIN
+LDFLAGS        += -Wl,-E
+LIBS   += -ldl
+endif
+

 ifdef HAVE_INET6
      PPPDSRCS += ipv6cp.c eui64.c
      HEADERS  += ipv6cp.h eui64.h
 ifdef HAVE_INET6
      PPPDSRCS += ipv6cp.c eui64.c
      HEADERS  += ipv6cp.h eui64.h


@@ -103,7 +111,7 @@ install: pppd
        $(INSTALL) -c -m 444 pppd.8 $(MANDIR)/man8
 
 pppd: $(PPPDOBJS)
        $(INSTALL) -c -m 444 pppd.8 $(MANDIR)/man8
 
 pppd: $(PPPDOBJS)

-       $(CC) $(CFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
+       $(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)

 
 clean:
        rm -f $(PPPDOBJS) pppd *~ #* core
 
 clean:
        rm -f $(PPPDOBJS) pppd *~ #* core