--- configure.orig	Fri Aug 13 18:06:14 1999
+++ configure	Sat Sep  4 15:22:21 1999
@@ -1756,7 +1756,7 @@
 	    LDFLAGS="-Wl,-Bexport"
 	    LD_SEARCH_FLAGS=""
 	    ;;
-	NetBSD-*|FreeBSD-[12].*|OpenBSD-*)
+	NetBSD-*|FreeBSD-*|OpenBSD-*)
 	    # Not available on all versions:  check for include file.
 	    ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
@@ -1788,14 +1788,19 @@
   echo "$ac_t""yes" 1>&6
   
 		SHLIB_CFLAGS="-fpic"
-		SHLIB_LD="ld -Bshareable -x"
 		SHLIB_LD_LIBS=""
 		SHLIB_SUFFIX=".so"
 		DL_OBJS="tclLoadDl.o"
 		DL_LIBS=""
 		LDFLAGS=""
 		LD_SEARCH_FLAGS=""
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+          if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then
+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
+		SHLIB_LD="ld -shared -x -soname \$@"
+	  else
+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
+		SHLIB_LD="ld -Bshareable -x"
+	  fi
 	    
 else
   echo "$ac_t""no" 1>&6
@@ -2266,6 +2271,7 @@
 	echo "$ac_t""no" 1>&6
     fi
 
+TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
 
 LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'