Changing HAVE_MULTILINK to PPP_WITH_MULTILINK

[ppp.git] / pppd / Makefile.am

diff --git a/pppd/Makefile.am b/pppd/Makefile.am
index e6aaac03a7656a707d537be073bae1b93c8cfc68..9675208fd847213c40a093348ef67935c566e7df 100644 (file)
--- 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 \
@@ -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
@@ -98,11 +97,7 @@ if 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
 
@@ -120,7 +115,7 @@ pppd_LDFLAGS += -Wl,-E
 endif
 endif
 
-if WITH_MULTILINK
+if PPP_WITH_MULTILINK
 pppd_SOURCES += multilink.c
 endif
 
@@ -128,7 +123,7 @@ if WITH_TDB
 pppd_SOURCES += tdb.c spinlock.c
 endif
 
-if WITH_INET6
+if PPP_WITH_IPV6CP
 pppd_SOURCES += ipv6cp.c eui64.c
 endif