From: Tomas Hruby <tom@minix3.org>
Date: Wed, 6 Feb 2013 10:43:02 +0000 (+0000)
Subject: lwip (inet's alternative) is compiled by default
X-Git-Tag: v3.3.0~1063
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zlib_tech.html?a=commitdiff_plain;h=a1fa603ed556eeccf5269ac79e31bbf89fbeee3f;p=minix.git

lwip (inet's alternative) is compiled by default
---

diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi
index 4123fc536..b4449a085 100644
--- a/distrib/sets/lists/minix/mi
+++ b/distrib/sets/lists/minix/mi
@@ -1093,6 +1093,8 @@
 ./usr/lib/libfl.a			minix-sys
 ./usr/lib/libgcc.a			minix-sys
 ./usr/lib/libl.a			minix-sys
+./usr/lib/liblwip.a			minix-sys
+./usr/lib/liblwip_pic.a			minix-sys
 ./usr/lib/liblzma.a			minix-sys
 ./usr/lib/liblzma_pic.a			minix-sys
 ./usr/lib/liblzma.so.0.0		minix-sys
@@ -3801,6 +3803,7 @@
 ./usr/sbin/ipc				minix-sys
 ./usr/sbin/kernel			minix-sys
 ./usr/sbin/log				minix-sys
+./usr/sbin/lwip				minix-sys
 ./usr/sbin/memory			minix-sys
 ./usr/sbin					minix-sys
 ./usr/sbin/mkproto			minix-sys
diff --git a/lib/Makefile b/lib/Makefile
index 92ab84941..aca399bb9 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -43,7 +43,11 @@ SUBDIR+= libcompat_minix libblockdriver libchardriver     \
        libexec libdevman libusb libasyn librmt \
        libddekit libminixfs libbdev libelf libminc libcrypt libterminfo \
        libutil libbz2 libprop \
-       libnetsock libpuffs libsffs
+       libpuffs libsffs
+
+.if (${MKLWIP} == "yes")
+SUBDIR += liblwip libnetsock
+.endif
 
 .if (${MACHINE_ARCH} == "i386")
 SUBDIR += libvassert libhgfs libvboxfs libvirtio
diff --git a/servers/Makefile b/servers/Makefile
index 6297edc65..5b4b29676 100644
--- a/servers/Makefile
+++ b/servers/Makefile
@@ -16,6 +16,10 @@ SUBDIR=	ds ext2 inet init ipc is iso9660fs \
 SUBDIR+= hgfs vbfs
 .endif
 
+.if ${MKLWIP} == "yes"
+SUBDIR += lwip
+.endif
+
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 1d37c9cf2..9e7482dbb 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -928,7 +928,7 @@ _MKVARS.yes= \
 
 #MINIX-specific vars
 _MKVARS.yes+= \
-	MKMCONTEXT MKSYSDEBUG MKLIVEUPDATE MKSTATECTL MKTRACE
+	MKMCONTEXT MKSYSDEBUG MKLIVEUPDATE MKSTATECTL MKTRACE MKLWIP
 .if (${MACHINE_ARCH} == "i386")
 _MKVARS.yes+= \
 	MKWATCHDOG MKACPI MKAPIC MKDEBUGREG MKINSTALLBOOT MKPCI