1999-01-26 01:42:10 +00:00
--- configure.orig Fri Dec 11 17:38:40 1998
+++ configure Sun Jan 24 16:12:10 1999
1999-01-17 14:26:55 +00:00
@@ -854,14 +854,14 @@
1998-03-02 02:10:01 +00:00
withval="$with_tcl"
1997-08-20 20:00:00 +00:00
TCL_BIN_DIR=$withval
else
1999-01-17 14:26:55 +00:00
- TCL_BIN_DIR=`cd $TCL_BIN_DEFAULT; pwd`
1998-02-16 16:00:13 +00:00
+ TCL_BIN_DIR=${prefix}/lib/tcl8.1
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; }
1999-01-17 14:26:55 +00:00
+if test ! -f $TCL_BIN_DIR/tclConfig.sh; then
1997-10-01 09:20:37 +00:00
+ { echo "configure: 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?" 1>&2; exit 1; }
fi
#--------------------------------------------------------------------
1999-01-17 14:26:55 +00:00
@@ -902,6 +902,8 @@
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}
+
LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
# If Tcl and Tk are installed in different places, adjust the library
1999-01-26 01:42:10 +00:00
@@ -2302,7 +2304,7 @@
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
1999-01-17 14:26:55 +00:00
@@ -2513,6 +2515,7 @@
1997-10-01 09:20:37 +00:00
s%@SHLIB_VERSION@%$SHLIB_VERSION%g
s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
+s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
1999-01-17 14:26:55 +00:00
s%@TCL_DBGX@%$TCL_DBGX%g
s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g
1997-10-01 09:20:37 +00:00
s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g