summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2005-03-22 22:20:27 +0000
committermartin <martin@NetBSD.org>2005-03-22 22:20:27 +0000
commit58a5eedc83e60596fb262e2cf153303615d5aaeb (patch)
tree63f3dd842aed70a1c23235a12403dd167bfd2298
parent656cf52a10340cec86fd42549b47498b811340b2 (diff)
If SMALLPROG is set, do not build in PAM support. While there, depend
USE_INET6 on SMALLPROG/SMALLPROG_INET6 like ftp does it. This fixes the build of install media (pc532 and sparc64) that include ppp support.
-rw-r--r--usr.sbin/pppd/pppd/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/pppd/pppd/Makefile b/usr.sbin/pppd/pppd/Makefile
index 5242d85e187..da2943b4007 100644
--- a/usr.sbin/pppd/pppd/Makefile
+++ b/usr.sbin/pppd/pppd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/03/04 20:41:09 he Exp $
+# $NetBSD: Makefile,v 1.37 2005/03/22 22:20:27 martin Exp $
.include <bsd.own.mk>
@@ -19,12 +19,12 @@ CPPFLAGS+= -I${PPPDDIR} -DPPP_FILTER
CPPFLAGS+= -DCBCP_SUPPORT -DUSE_CRYPT -DCHAPMS -DMSLANMAN -DMPPE
CPPFLAGS+= -DHAVE_MULTILINK -DUSE_TDB
-.if (${USE_INET6} != "no")
+.if (!defined(SMALLPROG) || defined(SMALLPROG_INET6)) && (${USE_INET6} != "no")
CPPFLAGS+= -DINET6
SRCS+= eui64.c ipv6cp.c
.endif
-.if (${USE_PAM} != "no")
+.if (!defined(SMALLPROG)) && (${USE_PAM} != "no")
CPPFLAGS+= -DUSE_PAM
LDADD+=-lpam ${PAM_STATIC_LDADD}
DPADD+=${LIBPAM} ${PAM_STATIC_DPADD}