lwip (inet's alternative) is compiled by default

diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi
index 4123fc53681dc9a083dacc5333fec46f1bedaa86..b4449a085bf81cbe59919fa70f769930ff4b648a 100644 (file)
--- 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 92ab849418a39cbf6b13357d6a900a2593cb3fda..aca399bb931c0fd9909aa541e684014be95d072f 100644 (file)
--- 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 6297edc652b45f8bf630a978758c3e7c9f5000b0..5b4b29676a1bed9f32247678eddb1b01d58ebc58 100644 (file)
--- 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 1d37c9cf23232ce574b4ce63ab79525ecf81df02..9e7482dbb27086b6c3103958d10b18d8f3b29a03 100644 (file)
--- 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