1999-04-30 16:11:52 +00:00
--- configure.orig Mon Mar 8 22:53:50 1999
+++ configure Thu Apr 29 11:23:44 1999
@@ -874,14 +874,14 @@
1998-12-19 07:27:40 +00:00
withval="$with_tcl"
1997-08-20 20:00:00 +00:00
TCL_BIN_DIR=$withval
else
1998-12-19 07:27:40 +00:00
- TCL_BIN_DIR=`cd ../../tcl8.0$TK_PATCH_LEVEL/unix; pwd`
1997-10-01 09:20:37 +00:00
+ TCL_BIN_DIR=${prefix}/lib/tcl8.0
1997-08-20 20:00:00 +00:00
fi
if test ! -d $TCL_BIN_DIR; then
1997-10-01 09:20:37 +00:00
{ echo "configure: error: Tcl directory $TCL_BIN_DIR doesn't exist" 1>&2; exit 1; }
fi
-if test ! -f $TCL_BIN_DIR/Makefile; then
- { echo "configure: 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?" 1>&2; exit 1; }
+if test ! -f $TCL_BIN_DIR/tclConfig.sh; then
1998-12-19 07:27:40 +00:00
+ { echo "configure: error: There's no tclConfig.sh in $TCL_BIN_DIR; perhaps your Tcl installation has been corrupted. Verify the installation of Tcl8.0 and try again." 1>&2; exit 1; }
1997-10-01 09:20:37 +00:00
fi
#--------------------------------------------------------------------
1999-04-30 16:11:52 +00:00
@@ -921,6 +921,7 @@
1998-12-19 07:27:40 +00:00
CFLAGS_DEBUG=$TCL_CFLAGS_DEBUG
CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
1997-10-01 09:20:37 +00:00
+TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
1998-12-19 07:27:40 +00:00
1997-10-01 09:20:37 +00:00
LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
1999-04-30 16:11:52 +00:00
@@ -2387,7 +2388,7 @@
1998-12-19 07:27:40 +00:00
if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then
TK_SHARED_BUILD=1
TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
- TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}
+ TK_LIB_FILE=${TK_LIB_FILE}
MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
RANLIB=":"
else