X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2FMakefile.am;h=3607f574aa4f56f9377752d1b55449eaa9907a12;hb=c95c6162dd3b5774ee680f9c7df60db217cae161;hp=1397088d1657d1a849d1e30a6fd2189eb5457b45;hpb=789e867f6e51b2d3e7f6ebe723f43764d5d8b595;p=ppp.git

diff --git a/pppd/Makefile.am b/pppd/Makefile.am
index 1397088..3607f57 100644
--- a/pppd/Makefile.am
+++ b/pppd/Makefile.am
@@ -32,7 +32,6 @@ pppd_include_HEADERS = \
     fsm.h \
     ipcp.h \
     ipv6cp.h \
-    ipxcp.h \
     lcp.h \
     magic.h \
     md4.h \
@@ -75,7 +74,7 @@ pppd_LDFLAGS =
 pppd_LIBS =
 
 if LINUX
-pppd_SOURCES += sys-linux.c
+pppd_SOURCES += sys-linux.c termios_linux.h
 pppd_LIBS += $(CRYPT_LIBS) $(UTIL_LIBS)
 endif
 
@@ -84,7 +83,7 @@ pppd_SOURCES += sys-solaris.c
 pppd_LIBS += -lsocket -lnsl
 endif
 
-if WITH_CHAPMS
+if PPP_WITH_CHAPMS
 pppd_SOURCES += chap_ms.c
 pppd_SOURCES += pppcrypt.c
 check_PROGRAMS += utest_chap
@@ -94,25 +93,21 @@ pppd_SOURCES += pppcrypt.c
 endif
 endif
 
-if WITH_CBCP
+if PPP_WITH_CBCP
 pppd_SOURCES += cbcp.c
 endif
 
-if WITH_IPXCP
-pppd_SOURCES += ipxcp.c
-endif
-
-if WITH_MPPE
+if PPP_WITH_MPPE
 pppd_SOURCES += mppe.c
 endif
 
-if WITH_FILTER
+if PPP_WITH_FILTER
 pppd_CPPFLAGS += $(PCAP_CFLAGS)
 pppd_LDFLAGS += $(PCAP_LDFLAGS)
 pppd_LIBS += $(PCAP_LIBS)
 endif
 
-if WITH_PLUGINS
+if PPP_WITH_PLUGINS
 pppd_CPPFLAGS += -DPPPD_PLUGIN_DIR='"@PPPD_PLUGIN_DIR@"'
 pppd_LIBS += -ldl
 if LINUX
@@ -120,15 +115,15 @@ pppd_LDFLAGS += -Wl,-E
 endif
 endif
 
-if WITH_MULTILINK
+if PPP_WITH_MULTILINK
 pppd_SOURCES += multilink.c
 endif
 
-if WITH_TDB
+if PPP_WITH_TDB
 pppd_SOURCES += tdb.c spinlock.c
 endif
 
-if WITH_INET6
+if PPP_WITH_IPV6CP
 pppd_SOURCES += ipv6cp.c eui64.c
 endif
 
@@ -136,7 +131,7 @@ if WITH_PAM
 pppd_LIBS += -lpam -ldl
 endif
 
-if WITH_EAPTLS
+if PPP_WITH_EAPTLS
 pppd_SOURCES += eap-tls.c tls.c
 else
 if WITH_PEAP