diff options
| -rwxr-xr-x | Makefile.in | 12 | ||||
| -rwxr-xr-x | configure | 44 | ||||
| -rwxr-xr-x | configure.in | 6 |
3 files changed, 42 insertions, 20 deletions
diff --git a/Makefile.in b/Makefile.in index 9a1df23..f384631 100755 --- a/Makefile.in +++ b/Makefile.in @@ -181,7 +181,7 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(C # for the BINARIES that you specified above have already been done. #======================================================================== -all: binaries libraries doc +all: binaries libraries #doc #======================================================================== # The binaries target builds executable programs, Windows .dll's, unix @@ -201,12 +201,12 @@ libraries: #======================================================================== doc: -# @echo "If you have documentation to create, place the commands to" -# @echo "build the docs in the 'doc:' target. For example:" -# @echo " xml2nroff sample.xml > sample.n" -# @echo " xml2html sample.xml > sample.html" + @echo "If you have documentation to create, place the commands to" + @echo "build the docs in the 'doc:' target. For example:" + @echo " xml2nroff sample.xml > sample.n" + @echo " xml2html sample.xml > sample.html" -install: all install-binaries install-libraries install-doc +install: all install-binaries install-libraries #install-doc install-binaries: binaries install-lib-binaries install-bin-binaries @@ -620,6 +620,7 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS +WISH_PROG TCLSH_PROG VC_MANIFEST_EMBED_EXE VC_MANIFEST_EMBED_DLL @@ -5676,7 +5677,7 @@ done # TEA_ADD_* any platform specific compiler/build info here. #-------------------------------------------------------------------- -CLEANFILES="$CLEANFILES config.status config.log Makefile" +#CLEANFILES="$CLEANFILES pkgIndex.tcl" if test "${TEA_PLATFORM}" = "windows" ; then # Ensure no empty if clauses : @@ -6339,14 +6340,6 @@ $as_echo "could not find any! Using -lX11." >&6; } fi - - vars="${XINCLUDES}" - for i in $vars; do - PKG_INCLUDES="$PKG_INCLUDES $i" - done - - - #-------------------------------------------------------------------- # Check whether --enable-threads or --disable-threads was given. # This auto-enables if Tcl was compiled threaded. @@ -9373,7 +9366,38 @@ $as_echo_n "checking for tclsh... " >&6; } $as_echo "${TCLSH_PROG}" >&6; } -#TEA_PROG_WISH + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wish" >&5 +$as_echo_n "checking for wish... " >&6; } + if test -f "${TK_BIN_DIR}/Makefile" ; then + # tkConfig.sh is in Tk build directory + if test "${TEA_PLATFORM}" = "windows"; then + WISH_PROG="${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}${EXEEXT}" + else + WISH_PROG="${TK_BIN_DIR}/wish" + fi + else + # tkConfig.sh is in install location + if test "${TEA_PLATFORM}" = "windows"; then + WISH_PROG="wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}${EXEEXT}" + else + WISH_PROG="wish${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}${TK_DBGX}" + fi + list="`ls -d ${TK_BIN_DIR}/../bin 2>/dev/null` \ + `ls -d ${TK_BIN_DIR}/.. 2>/dev/null` \ + `ls -d ${TK_PREFIX}/bin 2>/dev/null`" + for i in $list ; do + if test -f "$i/${WISH_PROG}" ; then + REAL_TK_BIN_DIR="`cd "$i"; pwd`/" + break + fi + done + WISH_PROG="${REAL_TK_BIN_DIR}${WISH_PROG}" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${WISH_PROG}" >&5 +$as_echo "${WISH_PROG}" >&6; } + + #-------------------------------------------------------------------- # Finally, substitute all of the various values into the Makefile. diff --git a/configure.in b/configure.in index 1ba0d53..8cdaa6f 100755 --- a/configure.in +++ b/configure.in @@ -127,7 +127,7 @@ TEA_ADD_TCL_SOURCES([library/graph.tcl library/bltGraph.pro]) # TEA_ADD_* any platform specific compiler/build info here. #-------------------------------------------------------------------- -CLEANFILES="$CLEANFILES config.status config.log Makefile" +#CLEANFILES="$CLEANFILES pkgIndex.tcl" if test "${TEA_PLATFORM}" = "windows" ; then # Ensure no empty if clauses : @@ -156,8 +156,6 @@ TEA_PUBLIC_TK_HEADERS TEA_PRIVATE_TK_HEADERS TEA_PATH_X -TEA_ADD_INCLUDES([${XINCLUDES}]) - #-------------------------------------------------------------------- # Check whether --enable-threads or --disable-threads was given. # This auto-enables if Tcl was compiled threaded. @@ -213,7 +211,7 @@ TEA_MAKE_LIB #-------------------------------------------------------------------- TEA_PROG_TCLSH -#TEA_PROG_WISH +TEA_PROG_WISH #-------------------------------------------------------------------- # Finally, substitute all of the various values into the Makefile. |