linux/mppe/linux-2.2.20-make.patch

   1 --- linux/drivers/net/Makefile.orig     Mon Mar 25 11:38:09 2002
   2 +++ linux/drivers/net/Makefile  Mon Mar 25 11:42:18 2002
   3 @@ -26,6 +26,8 @@
   4  CONFIG_BSDCOMP_MODULE  :=
   5  CONFIG_PPPDEF_BUILTIN :=
   6  CONFIG_PPPDEF_MODULE  :=
   7 +CONFIG_PPPMPPE_BUILTIN :=
   8 +CONFIG_PPPMPPE_MODULE  :=
   9  CONFIG_7990_BUILTIN :=
  10  CONFIG_7990_MODULE :=
  11  CONFIG_82596_BUILTIN :=
  12 @@ -40,6 +42,7 @@
  13      CONFIG_BSDCOMP_BUILTIN = y
  14      CONFIG_SLHC_BUILTIN = y
  15      CONFIG_PPPDEF_BUILTIN = y
  16 +    CONFIG_PPPMPPE_BUILTIN = y
  17    endif
  18  else
  19    ifeq ($(CONFIG_ISDN),m)
  20 @@ -47,6 +50,7 @@
  21        CONFIG_BSDCOMP_MODULE = y
  22        CONFIG_SLHC_MODULE = y
  23        CONFIG_PPPDEF_MODULE = y
  24 +      CONFIG_PPPMPPE_MODULE = y
  25      endif
  26    endif
  27  endif
  28 @@ -325,11 +329,13 @@
  29  CONFIG_BSDCOMP_BUILTIN = y
  30  CONFIG_SLHC_BUILTIN = y
  31  CONFIG_PPPDEF_BUILTIN = y
  32 +CONFIG_PPPMPPE_BUILTIN = y
  33  else
  34    ifeq ($(CONFIG_PPP),m)
  35    CONFIG_BSDCOMP_MODULE = y
  36    CONFIG_SLHC_MODULE = y
  37    CONFIG_PPPDEF_MODULE = y
  38 +  CONFIG_PPPMPPE_MODULE = y
  39    MX_OBJS += ppp.o
  40    endif
  41  endif
  42 @@ -1120,6 +1126,17 @@
  43    endif
  44  endif
  45
  46 +# If anything built-in uses ppp_mppe, then build it into the kernel also.
  47 +# If not, but a module uses it, build as a module.
  48 +ifdef CONFIG_PPPMPPE_BUILTIN
  49 +L_OBJS += ppp_mppe_compress.o arcfour.o sha1.o
  50 +else
  51 +  ifdef CONFIG_PPPMPPE_MODULE
  52 +  PPPMPPE_OBJS = ppp_mppe_compress.o arcfour.o sha1.o
  53 +  M_OBJS += ppp_mppe.o
  54 +  endif
  55 +endif
  56 +
  57  ifeq ($(CONFIG_ARIADNE2),y)
  58  L_OBJS += ariadne2.o
  59  CONFIG_8390_BUILTIN = y
  60 @@ -1469,3 +1486,6 @@
  61
  62  rcpci.o: rcpci45.o rclanmtl.o
  63         $(LD) -r -o rcpci.o rcpci45.o rclanmtl.o
  64 +
  65 +ppp_mppe.o: $(PPPMPPE_OBJS)
  66 +       $(LD) -r -o $@ $(PPPMPPE_OBJS)