--- aclocal.m4.orig	Fri Feb  6 21:41:09 1998
+++ aclocal.m4	Fri Nov  6 16:04:05 1998
@@ -846,6 +846,8 @@
 dnl		       lib_subdirs)
 dnl
 define(V5_MAKE_SHARED_LIB,[
+syscmd([test "$PORTOBJFORMAT" = "elf"])dnl
+define(SHLIB_VER,ifelse(sysval,0,substr($2,0,index($2,.)),$2))dnl
 if test "[$]krb5_cv_staticlibs_enabled" = yes
 	then
 	SHLIB_STATIC_TARGET="$1.[\$](STEXT)"
@@ -885,11 +887,11 @@
 STEXT=$krb5_cv_noshlibs_ext
 AC_SUBST(STEXT)
 if test "$krb5_cv_shlibs_versioned_filenames" = "yes" ; then
-VEXT=".$2" # Version of library goes in archive name
+VEXT=".SHLIB_VER" # Version of library goes in archive name
 if test "$krb5_cv_shlibs_need_nover" = yes; then
-	DO_MAKE_SHLIB="$1.\$""(SHEXT).$2 $1.\$""(SHEXT)"
+	DO_MAKE_SHLIB="$1.\$""(SHEXT).SHLIB_VER $1.\$""(SHEXT)"
 else
-	DO_MAKE_SHLIB="$1.\$""(SHEXT).$2"
+	DO_MAKE_SHLIB="$1.\$""(SHEXT).SHLIB_VER"
 fi
 else # $krb5_cv_shlibs_versioned_filenames
 VEXT=
@@ -897,7 +899,7 @@
 fi
 AC_SUBST(VEXT)
 dnl export the version of the library....
-krb5_cv_shlib_version_$1=$2
+krb5_cv_shlib_version_$1=SHLIB_VER
 AC_SUBST(SHLIB_NAME)
 AC_PUSH_MAKEFILE()dnl
 
@@ -909,10 +911,10 @@
 $1.[$](SHEXT)$(VEXT): [$](LIBDONE) [$](DEPLIBS)
 	[$](BUILDTOP)/util/makeshlib [$]@	\
 		"[$](SHLIB_LIBDIRS)" \
-		"[$](SHLIB_LIBS)" "[$](SHLIB_LDFLAGS)" "$2" [$](LIB_SUBDIRS) $5
+		"[$](SHLIB_LIBS)" "[$](SHLIB_LDFLAGS)" "SHLIB_VER" [$](LIB_SUBDIRS) $5
 AC_POP_MAKEFILE()dnl
 if test "$krb5_cv_shlibs_versioned_filenames" = "yes" ; then
-LinkFile($1.[$](SHEXT),$1.[$](SHEXT).$2)
+LinkFile($1.[$](SHEXT),$1.[$](SHEXT).SHLIB_VER)
 fi
 ],[
 STEXT=$krb5_cv_noshlibs_ext
@@ -935,16 +937,16 @@
 # in ${BUILDTOP}/lib for dependencies.
 # The following makes sure that the path of symlinks traces back to the real library; it is
 # not an error that $2 is used in some places and $VEXT in others.
-LinkFileDir($3/$1.[$](SHEXT).$2, $1.[$](SHEXT)[$](VEXT), $4)
-AppendRule([$3/$1.[$](SHEXT): $3/$1.[$](SHEXT).$2
+LinkFileDir($3/$1.[$](SHEXT).SHLIB_VER, $1.[$](SHEXT)[$](VEXT), $4)
+AppendRule([$3/$1.[$](SHEXT): $3/$1.[$](SHEXT).SHLIB_VER
 	[$](RM) $3/$1.[$](SHEXT)
-	[$](LN) $1.[$](SHEXT).$2 $3/$1.[$](SHEXT)
+	[$](LN) $1.[$](SHEXT).SHLIB_VER $3/$1.[$](SHEXT)
 ])
 AppendRule(clean::[
-	[$](RM) $3/$1.[$](SHEXT).$2 $3/$1.[$](SHEXT)
+	[$](RM) $3/$1.[$](SHEXT).SHLIB_VER $3/$1.[$](SHEXT)
 ])
 if test "$krb5_cv_shlibs_need_nover" = "yes" ; then
-AppendRule([all-unix:: $3/$1.$(SHEXT).$2 $3/$1.$(SHEXT)])
+AppendRule([all-unix:: $3/$1.$(SHEXT).SHLIB_VER $3/$1.$(SHEXT)])
 else
 AppendRule([all-unix:: $3/$1.$(SHEXT)[$](VEXT)])
 fi
@@ -954,9 +956,9 @@
 		[$](DESTDIR)[$](KRB5_SHLIBDIR)[$](S)$1.[$](SHEXT)[$](VEXT)
 ])
 if test "$krb5_cv_shlibs_need_nover" = "yes" ; then
-AppendRule([install::	$1.[$](SHEXT).$2
+AppendRule([install::	$1.[$](SHEXT).SHLIB_VER
 	[$](RM) [$](DESTDIR)[$](KRB5_SHLIBDIR)[$](S)$1.[$](SHEXT)
-	[$](LN) $1.[$](SHEXT).$2 \
+	[$](LN) $1.[$](SHEXT).SHLIB_VER \
 		[$](DESTDIR)[$](KRB5_SHLIBDIR)[$](S)$1.[$](SHEXT)])
 ])
 fi
@@ -1105,9 +1107,12 @@
 	AC_CHECK_HEADER(tcl.h,dnl
 		AC_CHECK_LIB(tcl7.5, Tcl_CreateCommand, 
 			TCL_LIB="$TCL_LIB -ltcl7.5 $DL_LIB",
-			AC_CHECK_LIB(tcl, Tcl_CreateCommand, 
-				TCL_LIB="$TCL_LIB -ltcl $DL_LIB",
-				AC_MSG_WARN("tcl.h found but not library"),
+			AC_CHECK_LIB(tcl75, Tcl_CreateCommand,
+			TCL_LIB="$TCL_LIB -ltcl75 $DL_LIB",
+				AC_CHECK_LIB(tcl, Tcl_CreateCommand, 
+					TCL_LIB="$TCL_LIB -ltcl $DL_LIB",
+					AC_MSG_WARN("tcl.h found but not library"),
+					-lm $DL_LIB),
 				-lm $DL_LIB),
 			-lm $DL_LIB)
 	,dnl If tcl.h not found
