--- configure.in.orig	Wed Sep  6 15:36:32 2000
+++ configure.in	Wed Sep  6 15:39:22 2000
@@ -10,6 +10,7 @@
 TK_MINOR_VERSION=0
 TK_PATCH_LEVEL=".5"
 VERSION=${TK_VERSION}
+TCL_L10N=jp
 
 if test "${prefix}" = "NONE"; then
     prefix=/usr/local
@@ -68,8 +69,8 @@
 if test ! -d $TCL_BIN_DIR; then
     AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR doesn't exist)
 fi
-if test ! -f $TCL_BIN_DIR/Makefile; then
-    AC_MSG_ERROR(There's no Makefile in $TCL_BIN_DIR;  perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?)
+if test ! -f $TCL_BIN_DIR/tclConfig.sh; then
+    AC_MSG_ERROR(There's no tclConfig.sh in $TCL_BIN_DIR;  perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?)
 fi
 
 #--------------------------------------------------------------------
@@ -104,6 +105,8 @@
 CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
 EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
 
+TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
+
 LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
 
 # If Tcl and Tk are installed in different places, adjust the library
@@ -586,7 +589,11 @@
     TK_SHARED_BUILD=1
     TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
     eval "TK_LIB_FILE=libtk${STEP}${TCL_SHARED_LIB_SUFFIX}"
+    if test "X$PORTOBJFORMAT" = "Xelf"; then
+    MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} -Wl,-soname,\${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
+    else
     MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
+    fi
     RANLIB=":"
 else
     TK_SHARED_BUILD=0
@@ -700,10 +707,12 @@
 AC_SUBST(SHLIB_VERSION)
 AC_SUBST(TCL_BIN_DIR)
 AC_SUBST(TCL_BUILD_LIB_SPEC)
+AC_SUBST(TCL_LIB_SPEC)
 AC_SUBST(TCL_DBGX)
 AC_SUBST(TCL_LIB_FLAG)
 AC_SUBST(TCL_SRC_DIR)
 AC_SUBST(TCL_VERSION)
+AC_SUBST(TCL_L10N)
 AC_SUBST(TK_BUILD_LIB_SPEC)
 AC_SUBST(TK_CC_SEARCH_FLAGS)
 AC_SUBST(TK_LD_SEARCH_FLAGS)