insmod.static is still referenced in insmod.c, but I left it alone.

diff -Naur module-init-tools-3.6.orig/Makefile.am module-init-tools-3.6/Makefile.am
--- module-init-tools-3.6.orig/Makefile.am	2009-02-04 07:45:24.000000000 +0000
+++ module-init-tools-3.6/Makefile.am	2009-02-08 23:19:57.000000000 +0000
@@ -6,16 +6,10 @@
 modinfo_SOURCES = modinfo.c zlibsupport.c testing.h zlibsupport.h
 modindex_SOURCES = modindex.c logging.c index.c logging.h index.h
 
-insmod_static_SOURCES = insmod.c
-insmod_static_LDFLAGS = -static
-# We don't want the $(zlib_flags) here: that makes a dynamic executable
-insmod_static_LDADD = 
-
 EXTRA_insmod_SOURCES = backwards_compat.c
 EXTRA_lsmod_SOURCES = backwards_compat.c
 EXTRA_modprobe_SOURCES = 
 EXTRA_rmmod_SOURCES = backwards_compat.c
-EXTRA_insmod_static_SOURCES = backwards_compat.c
 EXTRA_depmod_SOURCES = moduleops_core.c
 EXTRA_modinfo_SOURCES = backwards_compat.c
 
@@ -30,7 +24,7 @@
 
 EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE)
 
-sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static
+sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo
 bin_PROGRAMS = lsmod
 sbin_SCRIPTS = generate-modprobe.conf
 noinst_PROGRAMS=modindex
diff -Naur module-init-tools-3.6.orig/Makefile.in module-init-tools-3.6/Makefile.in
--- module-init-tools-3.6.orig/Makefile.in	2009-02-04 07:53:14.000000000 +0000
+++ module-init-tools-3.6/Makefile.in	2009-02-08 23:18:42.000000000 +0000
@@ -35,7 +35,7 @@
 host_triplet = @host@
 target_triplet = @target@
 sbin_PROGRAMS = insmod$(EXEEXT) modprobe$(EXEEXT) rmmod$(EXEEXT) \
-	depmod$(EXEEXT) modinfo$(EXEEXT) insmod.static$(EXEEXT)
+	depmod$(EXEEXT) modinfo$(EXEEXT)
 bin_PROGRAMS = lsmod$(EXEEXT)
 noinst_PROGRAMS = modindex$(EXEEXT)
 subdir = .
@@ -67,11 +67,6 @@
 insmod_OBJECTS = $(am_insmod_OBJECTS)
 insmod_LDADD = $(LDADD)
 insmod_DEPENDENCIES =
-am_insmod_static_OBJECTS = insmod.$(OBJEXT)
-insmod_static_OBJECTS = $(am_insmod_static_OBJECTS)
-insmod_static_DEPENDENCIES =
-insmod_static_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(insmod_static_LDFLAGS) $(LDFLAGS) -o $@
 am_lsmod_OBJECTS = lsmod.$(OBJEXT)
 lsmod_OBJECTS = $(am_lsmod_OBJECTS)
 lsmod_LDADD = $(LDADD)
@@ -104,15 +99,13 @@
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(depmod_SOURCES) $(EXTRA_depmod_SOURCES) $(insmod_SOURCES) \
-	$(EXTRA_insmod_SOURCES) $(insmod_static_SOURCES) \
-	$(EXTRA_insmod_static_SOURCES) $(lsmod_SOURCES) \
+	$(EXTRA_insmod_SOURCES) $(lsmod_SOURCES) \
 	$(EXTRA_lsmod_SOURCES) $(modindex_SOURCES) $(modinfo_SOURCES) \
 	$(EXTRA_modinfo_SOURCES) $(modprobe_SOURCES) \
 	$(EXTRA_modprobe_SOURCES) $(rmmod_SOURCES) \
 	$(EXTRA_rmmod_SOURCES)
 DIST_SOURCES = $(depmod_SOURCES) $(EXTRA_depmod_SOURCES) \
 	$(insmod_SOURCES) $(EXTRA_insmod_SOURCES) \
-	$(insmod_static_SOURCES) $(EXTRA_insmod_static_SOURCES) \
 	$(lsmod_SOURCES) $(EXTRA_lsmod_SOURCES) $(modindex_SOURCES) \
 	$(modinfo_SOURCES) $(EXTRA_modinfo_SOURCES) \
 	$(modprobe_SOURCES) $(EXTRA_modprobe_SOURCES) $(rmmod_SOURCES) \
@@ -237,15 +230,10 @@
 depmod_SOURCES = depmod.c logging.c index.c moduleops.c tables.c zlibsupport.c config_filter.c depmod.h logging.h index.h moduleops.h tables.h list.h testing.h  zlibsupport.h config_filter.h
 modinfo_SOURCES = modinfo.c zlibsupport.c testing.h zlibsupport.h
 modindex_SOURCES = modindex.c logging.c index.c logging.h index.h
-insmod_static_SOURCES = insmod.c
-insmod_static_LDFLAGS = -static
-# We don't want the $(zlib_flags) here: that makes a dynamic executable
-insmod_static_LDADD = 
 EXTRA_insmod_SOURCES = backwards_compat.c
 EXTRA_lsmod_SOURCES = backwards_compat.c
 EXTRA_modprobe_SOURCES = 
 EXTRA_rmmod_SOURCES = backwards_compat.c
-EXTRA_insmod_static_SOURCES = backwards_compat.c
 EXTRA_depmod_SOURCES = moduleops_core.c
 EXTRA_modinfo_SOURCES = backwards_compat.c
 MAN5 = modprobe.conf.5 modules.dep.5 depmod.conf.5
@@ -353,9 +341,6 @@
 insmod$(EXEEXT): $(insmod_OBJECTS) $(insmod_DEPENDENCIES) 
 	@rm -f insmod$(EXEEXT)
 	$(LINK) $(insmod_OBJECTS) $(insmod_LDADD) $(LIBS)
-insmod.static$(EXEEXT): $(insmod_static_OBJECTS) $(insmod_static_DEPENDENCIES) 
-	@rm -f insmod.static$(EXEEXT)
-	$(insmod_static_LINK) $(insmod_static_OBJECTS) $(insmod_static_LDADD) $(LIBS)
 lsmod$(EXEEXT): $(lsmod_OBJECTS) $(lsmod_DEPENDENCIES) 
 	@rm -f lsmod$(EXEEXT)
 	$(LINK) $(lsmod_OBJECTS) $(lsmod_LDADD) $(LIBS)
diff -Naur module-init-tools-3.6.orig/configure module-init-tools-3.6/configure
--- module-init-tools-3.6.orig/configure	2009-02-04 07:53:22.000000000 +0000
+++ module-init-tools-3.6/configure	2009-02-08 23:18:42.000000000 +0000
@@ -2319,8 +2319,6 @@
 
 
 
-# If zlib is required, libz must be linked static, modprobe is in
-# /sbin, libz is in /usr/lib and may not be available when it is run.
 # Check whether --enable-zlib was given.
 if test "${enable_zlib+set}" = set; then
   enableval=$enable_zlib; if test "$enableval" = "yes"; then
@@ -2328,7 +2326,7 @@
 #define CONFIG_USE_ZLIB 1
 _ACEOF
 
-  zlib_flags="-Wl,-Bstatic -lz -Wl,-Bdynamic"
+  zlib_flags="-lz"
 fi
 fi
 
diff -Naur module-init-tools-3.6.orig/configure.ac module-init-tools-3.6/configure.ac
--- module-init-tools-3.6.orig/configure.ac	2009-02-04 07:45:24.000000000 +0000
+++ module-init-tools-3.6/configure.ac	2009-02-08 23:18:42.000000000 +0000
@@ -12,7 +12,7 @@
 [  --enable-zlib               Handle gzipped modules],
 [if test "$enableval" = "yes"; then
   AC_DEFINE(CONFIG_USE_ZLIB)
-  zlib_flags="-Wl,-Bstatic -lz -Wl,-Bdynamic"
+  zlib_flags="-lz"
 fi])
 
 AC_PROG_CC