From 6053637c8f000cb1a688df4db083b48af9ef3f39 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Sat, 9 Sep 2000 23:11:31 +0000
Subject: [PATCH] Disable vmlinux for now.

committer: mfx <mfx> 968541091 +0000
---
 src/Makefile     | 13 ++++++++-----
 src/packmast.cpp |  2 ++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index a49b2957..27b1f55a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,7 +13,7 @@
 
 ifeq ($(strip $(UCLDIR)),)
 # change this to reflect where the UCL library is
-UCLDIR = $(HOME)/local/src/ucl-0.90
+UCLDIR = $(HOME)/local/src/ucl-0.91
 endif
 
 DEBUG = 1
@@ -55,7 +55,7 @@ OBJECTS1 = \
 	packer$o packhead$o packmast$o \
 	p_com$o p_djgpp2$o p_exe$o p_lx_elf$o p_lx_sep$o p_lx_sh$o \
 	p_sys$o p_tmt$o p_tos$o \
-	p_unix$o p_vmlinux$o p_w32pe$o p_wcle$o
+	p_unix$o p_w32pe$o p_wcle$o
 
 # no exceptions or RTTI
 OBJECTS2 = \
@@ -117,7 +117,8 @@ else
 LDFLAGS = -s
 endif
 LDFLAGS += -Wl,-Map,$(basename $@).map
-LDLIBS = -lz
+LDLIBS =
+##LDLIBS = -lz
 LIBDIRS =
 
 
@@ -254,11 +255,13 @@ export LIB
 ifeq (1,2)
   # statically link libc
   CC += -ML
-  LDLIBS = $(u)_s.lib zlib_s.lib setargv.obj
+  ##LDLIBS = $(u)_s.lib zlib_s.lib setargv.obj
+  LDLIBS = $(u)_s.lib setargv.obj
 else
   # link against msvcrt.dll
   CC += -MD
-  LDLIBS = $(u).lib zlib.lib setargv.obj
+  ##LDLIBS = $(u).lib zlib.lib setargv.obj
+  LDLIBS = $(u).lib setargv.obj
 endif
 ifeq ($(DEBUG),1)
   CFLAGS += -Od -ZI
diff --git a/src/packmast.cpp b/src/packmast.cpp
index 27fa7736..46f9a565 100644
--- a/src/packmast.cpp
+++ b/src/packmast.cpp
@@ -169,8 +169,10 @@ static Packer* try_packers(InputFile *f, try_function func)
         return p;
     if ((p = func(new PackLinuxI386sh(f),f)) != NULL)
         return p;
+#if 0
     if ((p = func(new PackBvmlinuxI386(f),f)) != NULL)
         return p;
+#endif
     if ((p = func(new PackLinuxI386(f),f)) != NULL)
         return p;
     if ((p = func(new PackSys(f),f)) != NULL)