$NetBSD$

--- configure.in.orig
+++ configure.in
@@ -16,7 +16,10 @@
 # determine the kind of the machine which is running this script
 os=`uname -s`
 version=`uname -r`
-machine=`uname -m`
+# NetBSD:
+# allow sharing between different arch's which use the same processor
+# Ie, use 'm68k' instead of 'amiga', 'mac68k', 'hp300', etc.
+machine=`uname -p`
 
 case $os in
   Linux*) 
@@ -113,7 +116,7 @@
   ULTRIX*)   OS=ULTRIX;;
   HP*)	     OS=HPUX; DFLGS="$DFLGS -Dhpux";;
   Linux*)    OS=LINUX;;
-  NetBSD-1*) OS=NETBSD1;;
+  NetBSD*)   OS=NETBSD;;
   FreeBSD*)  OS=FREEBSD;;
   IRIX-5*)   OS=IRIX5;;
   IRIX*-6*)  OS=IRIX5;;
@@ -443,11 +446,12 @@
      SH_LDFLAGS="-shared -o"
      SH_LOADER="ld"
      SH_SUFFIX='so' ;;
-   NETBSD1) 
-     SH_CCFLAGS="-fpic"
-     SH_LDFLAGS="-Bshareable -o"
-     SH_LOADER="ld"
-     SH_SUFFIX='so';;
+   NETBSD) 
+     SH_CCFLAGS="-fPIC"
+     SH_LDFLAGS="-shared -o"
+     SH_LOADER="cc"
+     SH_SUFFIX="so"
+     STKLDFLAGS="-Wl,-E";;
    HPUX)
      SH_CCFLAGS="+Z"
      SH_LDFLAGS="-b -o"
