diff -Nur modutils-2.3.7/ChangeLog modutils-2.3.8/ChangeLog
--- modutils-2.3.7/ChangeLog	Fri Nov 26 00:45:07 1999
+++ modutils-2.3.8/ChangeLog	Sat Dec 11 04:17:50 1999
@@ -1,12 +1,27 @@
+1999-12-11  Keith Owens  <kaos@ocs.com.au>
+
+	modutils 2.3.8
+
+	* More flexible recognition of the way the utility was called.
+	  Suggested by Stepan Kasal, different implementation by Keith Owens.
+	* Add option to strip binaries during install.
+	  Suggested by Stepan Kasal, different implementation by Keith Owens.
+	* Rework --enable-combined configure options, default is now to build
+	  a single module containing insmod, rmmod, modprobe, lsmod and ksyms.
+	  Stepan Kasal.
+	* Change --enable-combined-sparc to --enable-common-sparc, using
+	  "combined" for a single module as well as common sparc 32/64 code was
+	  confusing.  Keith Owens.
+	* Reduce ambiguity when an alias and a module have the same name.
+	  Keith Owens.
+	* Rework common sparc code.  Stepan Kasal.
+
 1999-11-21  Keith Owens  <kaos@ocs.com.au>
 
 	modutils 2.3.7
 
 	* Reinstate kernel 2.0 support in rmmod.
 	* Include mips in target cpu list.  Debian #48875.
-	* Standard support for cross compilation, suggested by Peter
-	  Loje Hansen.  Implemented by kaos using a different method
-	  to make it compatible with the Linux kernel.
 	* insmod_ksymoops_clean checks if /proc/ksyms exists.  Debian #49013.
 	* snap_shot remove test for symlink.  Debian #49059.
 	* Correct RPM spec file.  Niels Kristian Bech Jensen.
@@ -18,6 +33,7 @@
 	  Jelinek.
 	* Cross compile support with thanks to Peter Loje Hansen.
 	* Add --disable-insmod-static.
+	* Add MOD_INITIALIZING.
 
 1999-10-18  Keith Owens  <kaos@ocs.com.au>
 
diff -Nur modutils-2.3.7/INSTALL modutils-2.3.8/INSTALL
--- modutils-2.3.7/INSTALL	Thu Nov 25 23:47:48 1999
+++ modutils-2.3.8/INSTALL	Tue Dec  7 21:42:01 1999
@@ -47,13 +47,22 @@
                 programs to suppress the warnings, default is
                 "-Wno-uninitialized".
 
-configure takes six modutils specific options, as well as the standard
+configure takes ten modutils specific options, as well as the standard
 configure options.
 
+--enable-combined               Create insmod and rmmod/modprobe/lsmod/ksyms as 
+                                one executable.  Default is one combined module, 
+                                if you --disable-combined you can still combine
+                                individual modules into insmod with
+                                --enable-combined-X.
 --enable-combined-rmmod         Create insmod and rmmod as one executable,
-                                default is yes.
+                                default is taken from --enable-combined.
 --enable-combined-modprobe      Create insmod and modprobe as one executable,
-                                default is yes.
+                                default is taken from --enable-combined.
+--enable-combined-lsmod         Create insmod and lsmod as one executable,
+                                default is taken from --enable-combined.
+--enable-combined-ksyms         Create insmod and ksyms as one executable,
+                                default is taken from --enable-combined.
 --enable-compat-2-0             Create utilities runnable on a Linux 2.0 system,
                                 default is yes.
 --enable-kerneld                The default is to compile kerneld, even though
@@ -61,12 +70,14 @@
                                 2.1.91, the option exists for backwards
                                 compatibility.  Distributions can use
                                 --disable-kerneld to remove the crud.
---enable-combined-sparc         Make all the utilities work on both sparc32 and
+--enable-common-sparc           Make all the utilities work on both sparc32 and
                                 sparc64 as one executable.  Default is yes for
                                 sparc, no for other architectures.
 --disable-insmod-static         The default is not to build insmod.static.  You
                                 probably only need this if you are building your
                                 own initrd boot system.
+--enable-strip                  Are binaries to be stripped during install?
+                                Default is yes.
 
 To disable any of these, specify --disable-<option>.
 
@@ -132,6 +143,8 @@
 	kerneld		A "user level kernel extension" that allows
 			the kernel to perform some tasks in user space.
 			Suitable tasks are e.g. loading of modules.
+			Obsolete since kernel 2.1.91 but included to support
+			kernel 2.0.
 
 
 Keith Owens <kaos@ocs.com.au>
diff -Nur modutils-2.3.7/TODO modutils-2.3.8/TODO
--- modutils-2.3.7/TODO	Fri Oct  8 20:23:53 1999
+++ modutils-2.3.8/TODO	Fri Nov 26 01:33:48 1999
@@ -1,3 +1,8 @@
+From modutils-2.3.7
+
+	- Fix the confusion when an alias is specified with options and
+	  that alias is also a module name which is loaded in the same run.
+
 From modutils-2.2.2-pre6:
 
 	- Test and verify meta_expand, especially the completely
@@ -6,8 +11,6 @@
 	- Are there more optimizations to do for handling meta-characters?
 	  Example: look for $VAR in the environment instead of "/bin/echo"
 
-	- Check if all received patches have been handled.
-	- Some Debian patches in kerneld not merged (yet)
 	- Check for full (and consistent) set of options for all apps,
 	  especially depmod vs. modprobe (and insmod too)
 
diff -Nur modutils-2.3.7/configure modutils-2.3.8/configure
--- modutils-2.3.7/configure	Thu Nov 25 23:47:48 1999
+++ modutils-2.3.8/configure	Wed Dec  8 00:11:22 1999
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12 
+# Generated automatically using autoconf version 2.13 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -13,17 +13,30 @@
 # Any additions from configure.in:
 ac_default_prefix=/usr
 ac_help="$ac_help
-  --enable-combined-sparc   Make all the utilities work on both sparc32 and sparc64 as one executable (default on sparc)"
+  --enable-combined            Create insmod and rmmod/modprobe/lsmod/ksyms as
+                                one executable.  Default is one combined module,
+                                if you --disable-combined you can still combine
+                                individual modules into insmod with --enable-combined-X."
 ac_help="$ac_help
-  --enable-combined-rmmod   Create insmod and rmmod as one executable (default)"
+  --enable-combined-rmmod      Create insmod and rmmod as one executable (default)"
 ac_help="$ac_help
   --enable-combined-modprobe   Create insmod and modprobe as one executable (default)"
 ac_help="$ac_help
-  --enable-compat-2-0   Create utilities runnable on a Linux 2.0 system (default)"
+  --enable-combined-lsmod      Create insmod and lsmod as one executable (default)"
 ac_help="$ac_help
-  --enable-kerneld   Create kerneld binary (default)"
+  --enable-combined-ksyms      Create insmod and ksyms as one executable (default)"
 ac_help="$ac_help
-  --disable-insmod-static   Do not create insmod.static binary (default)"
+  --enable-compat-2-0          Create utilities runnable on a Linux 2.0 system (default)"
+ac_help="$ac_help
+  --enable-kerneld             Create kerneld binary (default)"
+ac_help="$ac_help
+  --disable-insmod-static      Do not create insmod.static binary (default)"
+ac_help="$ac_help
+  --enable-common-sparc        Make all the utilities work on both sparc32 and sparc64
+                                as one executable (default on sparc is yes, default on
+                                other architectures is no)"
+ac_help="$ac_help
+  --enable-strip               Strip binaries during install (default)"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -62,6 +75,7 @@
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
 # Maximum number of lines to put in a shell here document.
 ac_max_here_lines=12
 
@@ -345,7 +359,7 @@
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12"
+    echo "configure generated by autoconf version 2.13"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -515,9 +529,11 @@
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+ac_exeext=
+ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -533,7 +549,7 @@
 
 
 
-# Canonical system must use HOSTCC and flags, not CC.  ALso
+# Canonical system must use HOSTCC and flags, not CC.  Also
 # AC_CANONICAL_SYSTEM gives incorrect results if CC is explictly set to
 # a null string so unset null fields.
 CC_save="$CC"
@@ -588,33 +604,33 @@
 
 
 # Make sure we can run config.sub.
-if $ac_config_sub sun4 >/dev/null 2>&1; then :
+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:597: checking host system type" >&5
+echo "configure:613: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
 NONE)
   case $nonopt in
   NONE)
-    if host_alias=`$ac_config_guess`; then :
+    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
     else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
     fi ;;
   *) host_alias=$nonopt ;;
   esac ;;
 esac
 
-host=`$ac_config_sub $host_alias`
+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
 host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:618: checking target system type" >&5
+echo "configure:634: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -625,14 +641,14 @@
   esac ;;
 esac
 
-target=`$ac_config_sub $target_alias`
+target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
 target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:636: checking build system type" >&5
+echo "configure:652: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -643,7 +659,7 @@
   esac ;;
 esac
 
-build=`$ac_config_sub $build_alias`
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
 build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
@@ -672,23 +688,19 @@
   *)       ARCH=$target_cpu ;;
 esac
 
-COMBINE_sparc=yes
-# Check whether --enable-combined-sparc or --disable-combined-sparc was given.
-if test "${enable_combined_sparc+set}" = set; then
-  enableval="$enable_combined_sparc"
-  if test "$enableval" = "yes"; then
-  COMBINE_sparc=yes
-  else
-  COMBINE_sparc=no
+for i in rmmod modprobe lsmod ksyms
+do eval COMBINE_$i=$i
+done
+# Check whether --enable-combined or --disable-combined was given.
+if test "${enable_combined+set}" = set; then
+  enableval="$enable_combined"
+  if test "$enableval" = "no"; then
+	for i in rmmod modprobe lsmod ksyms
+	do eval COMBINE_$i=""
+	done
 fi
 fi
 
-case "$ARCH" in
-  sparc64) if test "$COMBINE_sparc" = "yes"; then ARCH="sparc"; fi ;;
-  sparc*) ;;
-  *) COMBINE_sparc=no ;;
-esac
-
 
 # Check whether --enable-combined-rmmod or --disable-combined-rmmod was given.
 if test "${enable_combined_rmmod+set}" = set; then
@@ -698,8 +710,6 @@
   else
   COMBINE_rmmod=""
 fi
-else
-  COMBINE_rmmod=rmmod
 fi
 
 
@@ -712,8 +722,30 @@
   else
   COMBINE_modprobe=""
 fi
-else
-  COMBINE_modprobe=modprobe
+fi
+
+
+
+# Check whether --enable-combined-lsmod or --disable-combined-lsmod was given.
+if test "${enable_combined_lsmod+set}" = set; then
+  enableval="$enable_combined_lsmod"
+  if test "$enableval" = "yes"; then
+  COMBINE_lsmod=lsmod
+  else
+  COMBINE_lsmod=""
+fi
+fi
+
+
+
+# Check whether --enable-combined-ksyms or --disable-combined-ksyms was given.
+if test "${enable_combined_ksyms+set}" = set; then
+  enableval="$enable_combined_ksyms"
+  if test "$enableval" = "yes"; then
+  COMBINE_ksyms=ksyms
+  else
+  COMBINE_ksyms=""
+fi
 fi
 
 
@@ -752,10 +784,44 @@
 if test "${enable_insmod_static+set}" = set; then
   enableval="$enable_insmod_static"
   if test "$enableval" = "yes"; then
-  insmod_static=insmod.static
+  insmod_static=yes
+else
+  insmod_static=no
 fi
 else
-  insmod_static=
+  insmod_static=no
+fi
+
+
+
+COMMON_sparc=yes
+# Check whether --enable-common-sparc or --disable-common-sparc was given.
+if test "${enable_common_sparc+set}" = set; then
+  enableval="$enable_common_sparc"
+  if test "$enableval" = "yes"; then
+  COMMON_sparc=yes
+  else
+  COMMON_sparc=no
+fi
+fi
+
+case "$ARCH" in
+  sparc64) if test "$COMMON_sparc" = "yes"; then ARCH="sparc"; fi ;;
+  sparc*) ;;
+  *) COMMON_sparc=no ;;
+esac
+
+
+# Check whether --enable-strip or --disable-strip was given.
+if test "${enable_strip+set}" = set; then
+  enableval="$enable_strip"
+  if test "$enableval" = "yes"; then
+  STRIP=-s
+else
+  STRIP=
+fi
+else
+  STRIP=-s
 fi
 
 
@@ -770,15 +836,16 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:774: checking for $ac_word" >&5
+echo "configure:840: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_CC="gcc"
@@ -799,16 +866,17 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:803: checking for $ac_word" >&5
+echo "configure:870: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_prog_rejected=no
-  for ac_dir in $PATH; do
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
@@ -843,25 +911,61 @@
   echo "$ac_t""no" 1>&6
 fi
 
+  if test -z "$CC"; then
+    case "`uname -s`" in
+    *win32* | *WIN32*)
+      # Extract the first word of "cl", so it can be a program name with args.
+set dummy cl; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:921: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="cl"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+ ;;
+    esac
+  fi
   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:851: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:953: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
-cat > conftest.$ac_ext <<EOF
-#line 861 "configure"
+cat > conftest.$ac_ext << EOF
+
+#line 964 "configure"
 #include "confdefs.h"
+
 main(){return(0);}
 EOF
-if { (eval echo configure:865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -875,18 +979,24 @@
   ac_cv_prog_cc_works=no
 fi
 rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
 echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
 if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:885: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:995: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:890: checking whether we are using GNU C" >&5
+echo "configure:1000: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -895,7 +1005,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -906,11 +1016,15 @@
 
 if test $ac_cv_prog_gcc = yes; then
   GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:914: checking whether ${CC-cc} accepts -g" >&5
+else
+  GCC=
+fi
+
+ac_test_CFLAGS="${CFLAGS+set}"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS=
+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:1028: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -925,30 +1039,35 @@
 fi
 
 echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS="$ac_save_CFLAGS"
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
     CFLAGS="-g -O2"
   else
-    CFLAGS="-O2"
+    CFLAGS="-g"
   fi
 else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
 fi
 
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:944: checking for $ac_word" >&5
+echo "configure:1062: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_RANLIB="ranlib"
@@ -967,7 +1086,7 @@
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:971: checking whether ln -s works" >&5
+echo "configure:1090: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1024,12 +1143,12 @@
 fi
 
 echo $ac_n "checking for wordexp""... $ac_c" 1>&6
-echo "configure:1028: checking for wordexp" >&5
+echo "configure:1147: checking for wordexp" >&5
 if eval "test \"`echo '$''{'ac_cv_func_wordexp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1033 "configure"
+#line 1152 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char wordexp(); below.  */
@@ -1052,7 +1171,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_wordexp=yes"
 else
@@ -1073,12 +1192,12 @@
 fi
 
 echo $ac_n "checking for glob""... $ac_c" 1>&6
-echo "configure:1077: checking for glob" >&5
+echo "configure:1196: checking for glob" >&5
 if eval "test \"`echo '$''{'ac_cv_func_glob'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1082 "configure"
+#line 1201 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char glob(); below.  */
@@ -1101,7 +1220,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_glob=yes"
 else
@@ -1131,13 +1250,13 @@
 
 if test "$ARCH" = "alpha"; then
   echo $ac_n "checking for broken alpha assembler""... $ac_c" 1>&6
-echo "configure:1135: checking for broken alpha assembler" >&5
+echo "configure:1254: checking for broken alpha assembler" >&5
   cat > conftest.c <<EOF
-#line 1137 "configure"
+#line 1256 "configure"
 static int x, y;
 int main() { return y; }
 EOF
-  if { (eval echo configure:1141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:1260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     ac_broken_gas=no
     if objdump -r conftest.o | grep 'LITERAL.*y.*4$' > /dev/null; then
       cat >> confdefs.h <<\EOF
@@ -1184,7 +1303,7 @@
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
-  case `(ac_space=' '; set) 2>&1` in
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
   *ac_space=\ *)
     # `set' does not quote correctly, so add quotes (double-quote substitution
     # turns \\\\ into \\, and sed turns \\ into \).
@@ -1263,7 +1382,7 @@
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.12"
+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -1284,9 +1403,11 @@
  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
 $ac_vpsub
 $extrasub
+s%@SHELL@%$SHELL%g
 s%@CFLAGS@%$CFLAGS%g
 s%@CPPFLAGS@%$CPPFLAGS%g
 s%@CXXFLAGS@%$CXXFLAGS%g
+s%@FFLAGS@%$FFLAGS%g
 s%@DEFS@%$DEFS%g
 s%@LDFLAGS@%$LDFLAGS%g
 s%@LIBS@%$LIBS%g
@@ -1320,11 +1441,14 @@
 s%@build_cpu@%$build_cpu%g
 s%@build_vendor@%$build_vendor%g
 s%@build_os@%$build_os%g
-s%@COMBINE_sparc@%$COMBINE_sparc%g
 s%@COMBINE_rmmod@%$COMBINE_rmmod%g
 s%@COMBINE_modprobe@%$COMBINE_modprobe%g
+s%@COMBINE_lsmod@%$COMBINE_lsmod%g
+s%@COMBINE_ksyms@%$COMBINE_ksyms%g
 s%@kerneld_SUBDIR@%$kerneld_SUBDIR%g
 s%@insmod_static@%$insmod_static%g
+s%@COMMON_sparc@%$COMMON_sparc%g
+s%@STRIP@%$STRIP%g
 s%@ARCH@%$ARCH%g
 s%@CC@%$CC%g
 s%@RANLIB@%$RANLIB%g
diff -Nur modutils-2.3.7/configure.in modutils-2.3.8/configure.in
--- modutils-2.3.7/configure.in	Thu Nov 25 23:47:48 1999
+++ modutils-2.3.8/configure.in	Wed Dec  8 00:11:22 1999
@@ -1,9 +1,9 @@
-dnl $Id: configure.in 1.7 Thu, 25 Nov 1999 23:47:48 +1100 keith $
+dnl $Id: configure.in 1.10 Wed, 08 Dec 1999 00:11:22 +1100 keith $
 
 AC_INIT(insmod/insmod.c)
 AC_PREFIX_DEFAULT(/usr)
 
-# Canonical system must use HOSTCC and flags, not CC.  ALso
+# Canonical system must use HOSTCC and flags, not CC.  Also
 # AC_CANONICAL_SYSTEM gives incorrect results if CC is explictly set to
 # a null string so unset null fields.
 CC_save="$CC"
@@ -35,28 +35,27 @@
   *)       ARCH=$target_cpu ;;
 esac
 
-COMBINE_sparc=yes
-AC_ARG_ENABLE(combined-sparc,
-[  --enable-combined-sparc   Make all the utilities work on both sparc32 and sparc64 as one executable (default on sparc)],
-[if test "$enableval" = "yes"; then
-  COMBINE_sparc=yes
-  else
-  COMBINE_sparc=no
+for i in rmmod modprobe lsmod ksyms
+do eval COMBINE_$i=$i
+done
+AC_ARG_ENABLE(combined,
+[  --enable-combined            Create insmod and rmmod/modprobe/lsmod/ksyms as
+                                one executable.  Default is one combined module,
+                                if you --disable-combined you can still combine
+                                individual modules into insmod with --enable-combined-X.],
+[if test "$enableval" = "no"; then
+	for i in rmmod modprobe lsmod ksyms
+	do eval COMBINE_$i=""
+	done
 fi])
-case "$ARCH" in
-  sparc64) if test "$COMBINE_sparc" = "yes"; then ARCH="sparc"; fi ;;
-  sparc*) ;;
-  *) COMBINE_sparc=no ;;
-esac
-AC_SUBST(COMBINE_sparc)
 
 AC_ARG_ENABLE(combined-rmmod,
-[  --enable-combined-rmmod   Create insmod and rmmod as one executable (default)],
+[  --enable-combined-rmmod      Create insmod and rmmod as one executable (default)],
 [if test "$enableval" = "yes"; then
   COMBINE_rmmod=rmmod
   else
   COMBINE_rmmod=""
-fi],[COMBINE_rmmod=rmmod])
+fi])
 AC_SUBST(COMBINE_rmmod)
 
 AC_ARG_ENABLE(combined-modprobe,
@@ -65,17 +64,35 @@
   COMBINE_modprobe=modprobe
   else
   COMBINE_modprobe=""
-fi],[COMBINE_modprobe=modprobe])
+fi])
 AC_SUBST(COMBINE_modprobe)
 
+AC_ARG_ENABLE(combined-lsmod,
+[  --enable-combined-lsmod      Create insmod and lsmod as one executable (default)],
+[if test "$enableval" = "yes"; then
+  COMBINE_lsmod=lsmod
+  else
+  COMBINE_lsmod=""
+fi])
+AC_SUBST(COMBINE_lsmod)
+
+AC_ARG_ENABLE(combined-ksyms,
+[  --enable-combined-ksyms      Create insmod and ksyms as one executable (default)],
+[if test "$enableval" = "yes"; then
+  COMBINE_ksyms=ksyms
+  else
+  COMBINE_ksyms=""
+fi])
+AC_SUBST(COMBINE_ksyms)
+
 AC_ARG_ENABLE(compat-2-0,
-[  --enable-compat-2-0   Create utilities runnable on a Linux 2.0 system (default)],
+[  --enable-compat-2-0          Create utilities runnable on a Linux 2.0 system (default)],
 [if test "$enableval" = "yes"; then
   AC_DEFINE(COMPAT_2_0)
 fi],[AC_DEFINE(COMPAT_2_0)])
 
 AC_ARG_ENABLE(kerneld,
-[  --enable-kerneld   Create kerneld binary (default)],
+[  --enable-kerneld             Create kerneld binary (default)],
 [if test "$enableval" = "yes"; then
   kerneld_SUBDIR=kerneld
   kerneld_Makefile=kerneld/Makefile
@@ -83,11 +100,39 @@
 AC_SUBST(kerneld_SUBDIR)
 
 AC_ARG_ENABLE(insmod-static,
-[  --disable-insmod-static   Do not create insmod.static binary (default)],
+[  --disable-insmod-static      Do not create insmod.static binary (default)],
 [if test "$enableval" = "yes"; then
-  insmod_static=insmod.static
-fi],[insmod_static=])
+  insmod_static=yes
+else
+  insmod_static=no
+fi],[insmod_static=no])
 AC_SUBST(insmod_static)
+
+COMMON_sparc=yes
+AC_ARG_ENABLE(common-sparc,
+[  --enable-common-sparc        Make all the utilities work on both sparc32 and sparc64
+                                as one executable (default on sparc is yes, default on
+                                other architectures is no)],
+[if test "$enableval" = "yes"; then
+  COMMON_sparc=yes
+  else
+  COMMON_sparc=no
+fi])
+case "$ARCH" in
+  sparc64) if test "$COMMON_sparc" = "yes"; then ARCH="sparc"; fi ;;
+  sparc*) ;;
+  *) COMMON_sparc=no ;;
+esac
+AC_SUBST(COMMON_sparc)
+
+AC_ARG_ENABLE(strip,
+[  --enable-strip               Strip binaries during install (default)],
+[if test "$enableval" = "yes"; then
+  STRIP=-s
+else
+  STRIP=
+fi],[STRIP=-s])
+AC_SUBST(STRIP)
 
 AC_SUBST(ARCH)
 
diff -Nur modutils-2.3.7/depmod/Makefile.in modutils-2.3.8/depmod/Makefile.in
--- modutils-2.3.7/depmod/Makefile.in	Wed Nov 24 13:16:37 1999
+++ modutils-2.3.8/depmod/Makefile.in	Tue Dec  7 21:42:01 1999
@@ -1,4 +1,4 @@
-# $Id: Makefile.in 1.6 Wed, 24 Nov 1999 13:16:37 +1100 keith $
+# $Id: Makefile.in 1.8 Tue, 07 Dec 1999 21:42:01 +1100 keith $
 
 srcdir=@srcdir@
 VPATH=@srcdir@
@@ -16,13 +16,14 @@
 AR		= @AR@
 RANLIB		= @RANLIB@
 INSTALL		= @INSTALL_LOCAL@
+STRIP		= @STRIP@
 
 DEFSNOARCH = -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@ $(EXTRA_DEFS)
 DEFS = $(DEFSNOARCH) -DELF_MACHINE_H='"elf_$(ARCH).h"' -DARCH_$(ARCH)
 OBJS = depmod.o
 
-ifeq (@COMBINE_sparc@,yes)
-DEFSNOARCH += -DCOMBINE_sparc
+ifeq (@COMMON_sparc@,yes)
+DEFSNOARCH += -DCOMMON_sparc
 OBJS += depmod_64.o
 
 %_64.o: %.c
@@ -51,7 +52,7 @@
 	rm -f Makefile
 
 install install-bin: all
-	$(INSTALL) depmod $(sbindir)
+	$(INSTALL) $(STRIP) depmod $(sbindir)
 
 dep depend .depend: depmod.c
 	$(CC) -M $(CFLAGS) $(DEFS) $^ > .depend
diff -Nur modutils-2.3.7/depmod/depmod.c modutils-2.3.8/depmod/depmod.c
--- modutils-2.3.7/depmod/depmod.c	Mon Nov 22 01:38:27 1999
+++ modutils-2.3.8/depmod/depmod.c	Tue Dec  7 21:42:01 1999
@@ -29,7 +29,7 @@
      Add -r flag: Keith Owens <kaos@ocs.com.au> October 1999.
    */
 
-#ident "$Id: depmod.c 1.4 Mon, 22 Nov 1999 01:38:27 +1100 keith $"
+#ident "$Id: depmod.c 1.5 Tue, 07 Dec 1999 21:42:01 +1100 keith $"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -54,7 +54,7 @@
 #include "config.h"
 #include "modstat.h"
 
-#if defined(COMBINE_sparc)
+#if defined(COMMON_sparc)
 #if defined(ARCH_sparc)
 #define main depmod32_main
 #elif defined(ARCH_sparc64)
@@ -709,7 +709,7 @@
 	return ret;
 }
 
-#if defined(COMBINE_sparc) && defined(ARCH_sparc)
+#if defined(COMMON_sparc) && defined(ARCH_sparc)
 
 #undef main
 
diff -Nur modutils-2.3.7/genksyms/Makefile.in modutils-2.3.8/genksyms/Makefile.in
--- modutils-2.3.7/genksyms/Makefile.in	Wed Nov 24 13:16:37 1999
+++ modutils-2.3.8/genksyms/Makefile.in	Tue Dec  7 18:15:35 1999
@@ -1,4 +1,4 @@
-# $Id: Makefile.in 1.6 Wed, 24 Nov 1999 13:16:37 +1100 keith $
+# $Id: Makefile.in 1.7 Tue, 07 Dec 1999 18:15:35 +1100 keith $
 
 srcdir=@srcdir@
 VPATH=@srcdir@
@@ -16,6 +16,7 @@
 AR		= @AR@
 RANLIB		= @RANLIB@
 INSTALL		= @INSTALL_LOCAL@
+STRIP		= @STRIP@
 
 PARSERCFLAGS	= @PARSERCFLAGS@
 
@@ -65,7 +66,7 @@
 	rm -f Makefile
 
 install install-bin: all
-	$(INSTALL) genksyms $(sbindir)
+	$(INSTALL) $(STRIP) genksyms $(sbindir)
 
 # auto-generated dependancies are almost redundant once we add all the 
 # rules to get the generated files built first.
diff -Nur modutils-2.3.7/include/version.h modutils-2.3.8/include/version.h
--- modutils-2.3.7/include/version.h	Mon Oct 18 17:56:33 1999
+++ modutils-2.3.8/include/version.h	Fri Nov 26 01:08:49 1999
@@ -1 +1 @@
-#define MODUTILS_VERSION "2.3.7"
+#define MODUTILS_VERSION "2.3.8"
diff -Nur modutils-2.3.7/insmod/Makefile.in modutils-2.3.8/insmod/Makefile.in
--- modutils-2.3.7/insmod/Makefile.in	Thu Nov 25 23:47:48 1999
+++ modutils-2.3.8/insmod/Makefile.in	Sat Dec 11 04:17:50 1999
@@ -1,4 +1,4 @@
-# $Id: Makefile.in 1.12 Thu, 25 Nov 1999 23:47:48 +1100 keith $
+# $Id: Makefile.in 1.15 Sat, 11 Dec 1999 04:17:50 +1100 keith $
 
 srcdir=@srcdir@
 VPATH=@srcdir@
@@ -6,6 +6,7 @@
 exec_prefix=@exec_prefix@
 sbindir=@sbindir@
 mandir=@mandir@
+insmod_static=@insmod_static@
 
 ARCH		= @ARCH@
 CC		= @CC@
@@ -16,27 +17,36 @@
 AR		= @AR@
 RANLIB		= @RANLIB@
 INSTALL		= @INSTALL_LOCAL@
+STRIP		= @STRIP@
 
 DEFSNOARCH = -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@ $(EXTRA_DEFS)
 DEFS = $(DEFSNOARCH) -DELF_MACHINE_H='"elf_$(ARCH).h"' -DARCH_$(ARCH)
 
-TARGETS = insmod modprobe rmmod lsmod ksyms modinfo @insmod_static@
+PROGS = insmod modprobe rmmod lsmod ksyms modinfo
 
 # COMB is the list of utilities to combine with insmod into one executable
-COMB = @COMBINE_rmmod@ @COMBINE_modprobe@
+COMB = @COMBINE_rmmod@ @COMBINE_modprobe@ @COMBINE_lsmod@ @COMBINE_ksyms@
 COMBDEFS = $(addprefix -DCOMBINE_, $(COMB))
-COMBOBJS = $(addsuffix .o, $(COMB))
+COMB_STATIC = $(addsuffix .static, $(COMB))
+
+TARGETS_REAL = $(filter-out $(COMB),$(PROGS))
+TARGETS = $(PROGS)
+
+ifeq ($(insmod_static),yes)
+TARGETS_REAL += insmod.static
+TARGETS += insmod.static $(COMB_STATIC)
+endif
 
 INSMODOBJS = insmod.o
 MODINFOOBJS = modinfo.o
 
-ifeq (@COMBINE_sparc@,yes)
+ifeq (@COMMON_sparc@,yes)
 INSMODOBJS += insmod_64.o
 MODINFOOBJS += modinfo_64.o
-DEFSNOARCH += -DCOMBINE_sparc
+DEFSNOARCH += -DCOMMON_sparc
 endif
 
-INSMODOBJS += $(COMBOBJS)
+INSMODOBJS += $(addsuffix .o, $(COMB))
 
 #=====================================================================
 
@@ -44,7 +54,7 @@
 %.o: %.c
 	$(CC) $(CFLAGS) $(DEFS) $(COMBDEFS) -c -o $@ $<
 
-ifeq (@COMBINE_sparc@,yes)
+ifeq (@COMMON_sparc@,yes)
 %_64.o: %.c
 	$(CC) $(CFLAGS) $(DEFSNOARCH) -DELF_MACHINE_H='"elf_sparc64.h"' \
 	-DARCH_sparc64 $(COMBDEFS) -c -o $@ $<
@@ -52,7 +62,7 @@
 
 # Rule for building "normal" modutils executables (non-combined)
 %: %.c ../util/libutil.a
-	$(CC) $(CFLAGS) $(DEFS) -o $@ $< ../util/libutil.a $(LDFLAGS)
+	$(CC) $(CFLAGS) $(DEFS) -o $@ $^ $(LDFLAGS)
 
 #=====================================================================
 
@@ -65,20 +75,28 @@
 	$(CC) -static $(CFLAGS) -o $@ $^ $(LDFLAGS)
 
 $(COMB): insmod
-	ln -sf $^ $@
+	ln -sf $< $@
+
+$(COMB_STATIC): insmod.static
+	ln -sf $< $@
 
 modinfo: $(MODINFOOBJS) ../obj/libobj.a ../util/libutil.a
 	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
 
 install install-bin: all
 	@set -x;\
-	for i in $(filter-out $(COMB), $(TARGETS)) $(srcdir)/insmod_ksymoops_clean $(srcdir)/kernelversion; do \
-	$(INSTALL) $$i $(sbindir); done; \
+	for i in $(TARGETS_REAL); do \
+	$(INSTALL) $(STRIP) $$i $(sbindir); done;
+	for i in $(srcdir)/insmod_ksymoops_clean $(srcdir)/kernelversion; do \
+	$(INSTALL) $$i $(sbindir); done;
 	for i in $(COMB); do \
-	ln -sf insmod $(sbindir)/$$i; done
+	ln -sf insmod $(sbindir)/$$i; \
+	test "$(insmod_static)" = yes && \
+		ln -sf insmod.static $(sbindir)/$$i.static; \
+	done
 
 clean:
-	rm -f *.o $(TARGETS) insmod.static
+	rm -f *.o $(PROGS) *.static
 
 realclean: clean
 	rm -f .depend
@@ -86,7 +104,7 @@
 distclean: realclean
 	rm -f Makefile
 
-dep depend .depend: $(addsuffix .c, $(filter-out insmod.static, $(TARGETS)))
+dep depend .depend: $(addsuffix .c, $(PROGS))
 	$(CC) -M $(CFLAGS) $(DEFS) $^ > .depend
 
 ifeq (.depend,$(wildcard .depend))
diff -Nur modutils-2.3.7/insmod/insmod.c modutils-2.3.8/insmod/insmod.c
--- modutils-2.3.7/insmod/insmod.c	Mon Nov 22 01:38:27 1999
+++ modutils-2.3.8/insmod/insmod.c	Sat Dec 11 04:17:50 1999
@@ -35,9 +35,13 @@
      Ksymoops support: Keith Owens <kaos@ocs.com.au> August 1999.
 
      Add -r flag: Keith Owens <kaos@ocs.com.au> October 1999.
+
+     More flexible recognition of the way the utility was called.
+     Suggested by Stepan Kasal, implemented in a different way by Keith
+     Owens <kaos@ocs.com.au> December 1999.
    */
 
-#ident "$Id: insmod.c 1.6 Mon, 22 Nov 1999 01:38:27 +1100 keith $"
+#ident "$Id: insmod.c 1.9 Sat, 11 Dec 1999 04:17:50 +1100 keith $"
 
 #include <sys/types.h>
 #include <stdlib.h>
@@ -61,7 +65,7 @@
 #include "modstat.h"
 #include "config.h"
 
-#if defined(COMBINE_sparc)
+#if defined(COMMON_sparc)
 #if defined(ARCH_sparc)
 #define main insmod32_main
 #elif defined(ARCH_sparc64)
@@ -1057,8 +1061,11 @@
 /* end compat */
 /************************************************************************/
 
+#if defined(COMMON_sparc) && !defined(ARCH_sparc)
+extern void insmod_usage(void);
+#else
 /* Print the usage message. */
-static void usage(void)
+void insmod_usage(void)
 {
 	fputs("Usage:\n"
 	      "insmod [-fkmopsvVxXyY] [-o name] [-P prefix] module [[sym=value]...]\n"
@@ -1085,6 +1092,7 @@
 	      ,stderr);
 	exit(1);
 }
+#endif
 
 int main(int argc, char **argv)
 {
@@ -1188,12 +1196,12 @@
 			set_ncv_prefix(optarg);
 			break;
 		default:
-			usage();
+			insmod_usage();
 			break;
 		}
 
 	if (optind >= argc) {
-		usage();
+		insmod_usage();
 	}
 	filename = argv[optind++];
 
@@ -1397,7 +1405,7 @@
 	return exit_status;
 }
 
-#if defined(COMBINE_sparc) && defined(ARCH_sparc)
+#if defined(COMMON_sparc) && defined(ARCH_sparc)
 extern int insmod64_main(int argc, char **argv);
 
 #undef main
@@ -1418,7 +1426,7 @@
 
 #endif
 
-#if !defined(COMBINE_sparc) || !defined(ARCH_sparc64)
+#if !defined(COMMON_sparc) || !defined(ARCH_sparc64)
 #if defined(COMBINE_rmmod) || defined(COMBINE_modprobe) || defined(COMBINE_ksyms) || defined(COMBINE_lsmod)
 
 #undef main
@@ -1442,22 +1450,22 @@
 
 	p = p ? p + 1 : argv[0];
 
-	if (strcmp(p, "insmod") == 0 || strcmp(p, "insmod.static") == 0)
+	if (strstr(p, "insmod"))
 		return insmod_main(argc, argv);
 #ifdef COMBINE_modprobe
-	else if (strcmp(p, "modprobe") == 0)
+	else if (strstr(p, "modprobe"))
 		return modprobe_main(argc, argv);
 #endif
 #ifdef COMBINE_rmmod
-	else if (strcmp(p, "rmmod") == 0)
+	else if (strstr(p, "rmmod"))
 		return rmmod_main(argc, argv);
 #endif
 #ifdef COMBINE_ksyms
-	else if (strcmp(p, "ksyms") == 0)
+	else if (strstr(p, "ksyms"))
 		return ksyms_main(argc, argv);
 #endif
 #ifdef COMBINE_lsmod
-	else if (strcmp(p, "lsmod") == 0)
+	else if (strstr(p, "lsmod"))
 		return lsmod_main(argc, argv);
 #endif
 	else {
diff -Nur modutils-2.3.7/insmod/modinfo.c modutils-2.3.8/insmod/modinfo.c
--- modutils-2.3.7/insmod/modinfo.c	Mon Nov 22 01:38:27 1999
+++ modutils-2.3.8/insmod/modinfo.c	Sat Dec 11 04:17:50 1999
@@ -27,7 +27,7 @@
  * unified module path handling: Bjorn Ekwall <bj0rn@blox.se> February 1999
  */
 
-#ident "$Id: modinfo.c 1.2 Mon, 22 Nov 1999 01:38:27 +1100 keith $"
+#ident "$Id: modinfo.c 1.4 Sat, 11 Dec 1999 04:17:50 +1100 keith $"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -45,11 +45,11 @@
 #include "version.h"
 #include "config.h"
 
-#if defined(COMBINE_sparc)
+#if defined(COMMON_sparc)
 #if defined(ARCH_sparc)
-#define main modinfo32_main
+extern int show_module_info_64(char *filename, char *fmtstr, int do_parameters);
 #elif defined(ARCH_sparc64)
-#define main modinfo64_main
+#define show_module_info show_module_info_64
 #endif
 #endif
 
@@ -275,7 +275,7 @@
 	}
 }
 
-static int show_module_info(char *filename, char *fmtstr, int do_parameters)
+int show_module_info(char *filename, char *fmtstr, int do_parameters)
 {
 	FILE *fp;
 	struct obj_file *f;
@@ -310,7 +310,8 @@
 	return 0;
 }
 
-static void usage(void)
+#if !defined(COMMON_sparc) || defined(ARCH_sparc)
+void usage(void)
 {
 	printf("usage: modinfo <parameters> <module>\n");
 	printf("  -a, --author            display module author\n");
@@ -336,6 +337,9 @@
 	};
 	int do_parameters = 0, opt;
 	char *fmtstr = NULL;
+#if defined(COMMON_sparc)
+	struct utsname u;
+#endif
 
 	while ((opt = getopt_long(argc, argv, "adq:pVh",
 				  &long_opts[0], NULL)) != EOF)
@@ -367,26 +371,16 @@
 	}
 	error_file = "modinfo";
 
+#if defined(COMMON_sparc)
+	if (!uname (&u) && !strcmp (u.machine, "sparc64"))
+	    while (optind < argc)
+		show_module_info_64(argv[optind++], fmtstr, do_parameters);
+	else
+#endif
 	while (optind < argc)
 		show_module_info(argv[optind++], fmtstr, do_parameters);
 
 	return 0;
 }
 
-#if defined(COMBINE_sparc) && defined(ARCH_sparc)
-
-#undef main
-
-extern int modinfo64_main(int argc, char **argv);
-
-int
-main(int argc, char **argv)
-{
-	struct utsname u;
-  
-	if (!uname (&u) && !strcmp (u.machine, "sparc64"))
-		return modinfo64_main(argc, argv);
-	else
-		return modinfo32_main(argc, argv);
-}
-#endif
+#endif /* !defined(COMMON_sparc) || defined(ARCH_sparc) */
diff -Nur modutils-2.3.7/insmod/modprobe.c modutils-2.3.8/insmod/modprobe.c
--- modutils-2.3.7/insmod/modprobe.c	Sun Oct 17 18:47:36 1999
+++ modutils-2.3.8/insmod/modprobe.c	Wed Dec  8 00:11:22 1999
@@ -278,7 +278,7 @@
 	return me;
 }
 
-static DESC *build_desc(const char *name, const char *objname)
+static DESC *build_desc(const char *name, const char *objname, int allow_alias)
 {
 	DESC *desc;
 	GLOB_LIST *g;
@@ -294,7 +294,7 @@
 	desc->kname = NULL;
 	desc->nod = objname ? nod : NULL;
 
-	for (p = name; p; p = any_alias(p)) {
+	for (p = name; p; p = allow_alias ? any_alias(p) : NULL) {
 		if (strcmp(p, "off") == 0) {
 			desc->objkey = NULL;
 			break;
@@ -333,7 +333,7 @@
  *	aliased off	-1
  *	error		-2
  */
-static int build_stack(LINK **stack, const char *name, const char *objname, int dir, DESC *rev, int mode)
+static int build_stack(LINK **stack, const char *name, const char *objname, int dir, DESC *rev, int mode, int allow_alias)
 {
 	NODE *nod;
 	DESC *desc;
@@ -343,7 +343,7 @@
 	int i;
 	int r;
 
-	if ((desc = build_desc(name, objname)) == NULL)
+	if ((desc = build_desc(name, objname, allow_alias)) == NULL)
 		return -2;
 	if (desc->kname == NULL)
 		return -1; /* aliased off */
@@ -372,7 +372,7 @@
 					r = build_stack(stack, g->pathv[i],
 							NULL, dir,
 							rev ? rev : desc,
-							MODE_ABOVE);
+							MODE_ABOVE, 1);
 					if (r < 0)
 						return r;
 				}
@@ -411,7 +411,7 @@
 						NULL,
 						dir,
 						rev,
-						MODE_BELOW)) < 0)
+						MODE_BELOW, 1)) < 0)
 					return r;
 			}
 		}
@@ -419,10 +419,11 @@
 
 	/*
 	 * Get the modules that this one depends on
-	 * according to modules.dep
+	 * according to modules.dep.  These are real modules, alias expansion is
+	 * not allowed.
 	 */
 	for (nod = desc->nod->dep; nod; nod = nod->next) {
-		if ((r = build_stack(stack, nod->key, nod->str, dir, rev, MODE_NORMAL)) < 0)
+		if ((r = build_stack(stack, nod->key, nod->str, dir, rev, MODE_NORMAL, 0)) < 0)
 			return r;
 	}
 
@@ -1159,7 +1160,7 @@
 	}
 	/* else */
 
-	ret = build_stack(&stack, mod, NULL, 1, NULL, MODE_NORMAL);
+	ret = build_stack(&stack, mod, NULL, 1, NULL, MODE_NORMAL, 1);
 
 	if (debug)
 		dump_stack(stack);
@@ -1209,7 +1210,7 @@
 
 	new_in_kernel = stack = NULL;
 
-	if ((status = build_stack(&stack, name, obj, 0, NULL, MODE_NORMAL)) < 0)
+	if ((status = build_stack(&stack, name, obj, 0, NULL, MODE_NORMAL, 1)) < 0)
 		return status;
 
 	if (debug)
diff -Nur modutils-2.3.7/kerneld/Makefile.in modutils-2.3.8/kerneld/Makefile.in
--- modutils-2.3.7/kerneld/Makefile.in	Wed Nov 24 13:16:37 1999
+++ modutils-2.3.8/kerneld/Makefile.in	Tue Dec  7 18:15:35 1999
@@ -1,4 +1,4 @@
-# $Id: Makefile.in 1.6 Wed, 24 Nov 1999 13:16:37 +1100 keith $
+# $Id: Makefile.in 1.7 Tue, 07 Dec 1999 18:15:35 +1100 keith $
 
 srcdir=@srcdir@
 VPATH=@srcdir@
@@ -16,6 +16,7 @@
 AR		= @AR@
 RANLIB		= @RANLIB@
 INSTALL		= @INSTALL_LOCAL@
+STRIP		= @STRIP@
 
 DEFS = -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@
 DEFS += $(DEBUG) $(NO_GDBM) $(EXTRA_DEFS)
@@ -55,7 +56,7 @@
 
 install install-bin: all
 	for i in $(PROGS); do \
-	  $(INSTALL) $$i $(sbindir); \
+	  $(INSTALL) $(STRIP) $$i $(sbindir); \
 	done
 
 install-scripts:
diff -Nur modutils-2.3.7/man/Makefile.in modutils-2.3.8/man/Makefile.in
--- modutils-2.3.7/man/Makefile.in	Wed Nov 24 13:16:37 1999
+++ modutils-2.3.8/man/Makefile.in	Tue Dec  7 18:15:35 1999
@@ -1,4 +1,4 @@
-# $Id: Makefile.in 1.4 Wed, 24 Nov 1999 13:16:37 +1100 keith $
+# $Id: Makefile.in 1.5 Tue, 07 Dec 1999 18:15:35 +1100 keith $
 
 srcdir=@srcdir@
 VPATH=@srcdir@
@@ -16,6 +16,7 @@
 AR		= @AR@
 RANLIB		= @RANLIB@
 INSTALL		= @INSTALL_LOCAL@
+STRIP		= @STRIP@
 
 ######################################################################
 
diff -Nur modutils-2.3.7/man/modules.conf.5 modutils-2.3.8/man/modules.conf.5
--- modutils-2.3.7/man/modules.conf.5	Fri Oct  8 20:23:53 1999
+++ modutils-2.3.8/man/modules.conf.5	Wed Dec  8 00:11:22 1999
@@ -2,7 +2,7 @@
 .\" This program is distributed according to the Gnu General Public License.
 .\" See the file COPYING in the base distribution directory
 .\" 
-.TH MODULES.CONF 5 "25 August 1999"
+.TH MODULES.CONF 5 "07 December 1999"
 .UC 4
 .SH NAME
 modules.conf \- configuration file for loading kernel modules
@@ -286,6 +286,24 @@
 .I alias
 directives, since all aliases will be recursively expanded in
 order to find the physical module actually referred to.
+.br
+.nf
+
+.fi
+.ne 7
+It is legal for an alias to map module A to module B and for module
+A to exist at the same time but this construct is ambiguous and is
+.B not
+recommended.  For historical reasons, the kernel sound system has a
+module called sound.o but the sound developers also want an alias from
+sound to the module for the user's sound card, e.g. "alias\ sound\ sb".
+In an attempt to support this requirement but still maintain the
+defined behaviour where options can be applied to aliases, modprobe
+bypasses alias expansion when processing a module name if the name was
+obtained via modules.dep, otherwise aliases are expanded.  This is not
+guaranteed to give the expected behaviour on all combinations of
+aliases and real modules, you should avoid using an alias with the same
+name as a real module.
 .TP
 .I "[add] probe name module_list"
 .TP
@@ -374,7 +392,7 @@
 commands when loading and unloading a module.  Note that even aliased
 module names can have these directives,
 which will be executed in the proper order together with any
-directives for the unalised module name.
+directives for the unaliased module name.
 .TP
 .I "pre-install module command"
 Execute
diff -Nur modutils-2.3.7/modutils.spec modutils-2.3.8/modutils.spec
--- modutils-2.3.7/modutils.spec	Thu Nov 25 23:47:48 1999
+++ modutils-2.3.8/modutils.spec	Wed Dec  8 00:11:22 1999
@@ -1,6 +1,6 @@
 Summary: Module utilities
 Name: modutils
-Version: 2.3.7
+Version: 2.3.8
 Release: 1
 Copyright: GPL
 Group: Utilities/System
@@ -23,7 +23,7 @@
 %prep
 %setup
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --disable-kerneld --disable-compat-2-0 --enable-insmod-static
+CFLAGS="$RPM_OPT_FLAGS" ./configure --disable-kerneld --disable-compat-2-0 --enable-insmod-static
 make dep all
 
 %install
@@ -37,9 +37,6 @@
 # )
 # security hole, works poorly anyway
 rm -f $RPM_BUILD_ROOT/sbin/request-route
-# Add kerneld to the list below if required
-for f in depmod genksyms insmod insmod.static ksyms lsmod modinfo ; \
-do strip $RPM_BUILD_ROOT/sbin/$f || : ; done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff -Nur modutils-2.3.7/obj/Makefile.in modutils-2.3.8/obj/Makefile.in
--- modutils-2.3.7/obj/Makefile.in	Wed Nov 24 13:16:37 1999
+++ modutils-2.3.8/obj/Makefile.in	Sat Dec 11 04:17:50 1999
@@ -1,4 +1,4 @@
-# $Id: Makefile.in 1.6 Wed, 24 Nov 1999 13:16:37 +1100 keith $
+# $Id: Makefile.in 1.9 Sat, 11 Dec 1999 04:17:50 +1100 keith $
 
 srcdir=@srcdir@
 VPATH=@srcdir@
@@ -16,29 +16,31 @@
 AR		= @AR@
 RANLIB		= @RANLIB@
 INSTALL		= @INSTALL_LOCAL@
+STRIP		= @STRIP@
 
 DEFSNOARCH = -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@ $(EXTRA_DEFS)
 DEFS = $(DEFSNOARCH) -DELF_MACHINE_H='"elf_$(ARCH).h"' -DARCH_$(ARCH)
 
-%.o: %.c
-	$(CC) $(CFLAGS) $(DEFS) -c -o $@ $<
-
-######################################################################
-
-all: .depend libobj.a
-
 LIBOBJ_OBJS := obj_common.o obj_load.o obj_reloc.o obj_$(ARCH).o
 LIBOBJ_SRCS := $(LIBOBJ_OBJS:.o=.c)
 
-ifeq (@COMBINE_sparc@,yes)
+ifeq (@COMMON_sparc@,yes)
 
 LIBOBJ_OBJS += obj_common_64.o obj_load_64.o obj_reloc_64.o obj_sparc64_64.o
+LIBOBJ_SRCS += obj_sparc64.c
 
 %_64.o: %.c
 	$(CC) $(CFLAGS) $(DEFSNOARCH) -DELF_MACHINE_H='"elf_sparc64.h"' \
 	-DARCH_sparc64 -c -o $@ $<
 
 endif
+
+%.o: %.c
+	$(CC) $(CFLAGS) $(DEFS) -c -o $@ $<
+
+######################################################################
+
+all: .depend libobj.a
 
 libobj.a: $(LIBOBJ_OBJS)
 	$(AR) rv $@ $?
diff -Nur modutils-2.3.7/util/Makefile.in modutils-2.3.8/util/Makefile.in
--- modutils-2.3.7/util/Makefile.in	Wed Nov 24 13:16:37 1999
+++ modutils-2.3.8/util/Makefile.in	Tue Dec  7 18:15:35 1999
@@ -1,4 +1,4 @@
-# $Id: Makefile.in 1.7 Wed, 24 Nov 1999 13:16:37 +1100 keith $
+# $Id: Makefile.in 1.8 Tue, 07 Dec 1999 18:15:35 +1100 keith $
 
 srcdir=@srcdir@
 VPATH=@srcdir@
@@ -16,6 +16,7 @@
 AR		= @AR@
 RANLIB		= @RANLIB@
 INSTALL		= @INSTALL_LOCAL@
+STRIP		= @STRIP@
 
 DEFS = -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@
 DEFS += -DELF_MACHINE_H='"elf_$(ARCH).h"' -DARCH_$(ARCH) $(EXTRA_DEFS)