diff options
Diffstat (limited to 'unix/configure.in')
| -rw-r--r-- | unix/configure.in | 65 |
1 files changed, 59 insertions, 6 deletions
diff --git a/unix/configure.in b/unix/configure.in index 995cb5b..eb7320a 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -1,8 +1,9 @@ +#! /bin/bash -norc dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tk installation dnl to configure the system for the local environment. AC_INIT(../generic/tk.h) -# RCS: @(#) $Id: configure.in,v 1.1.4.9 1999/02/12 01:09:02 stanton Exp $ +# RCS: @(#) $Id: configure.in,v 1.1.4.9.2.1 1999/03/10 02:23:06 redman Exp $ TK_VERSION=8.1 TK_MAJOR_VERSION=8 @@ -453,13 +454,64 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}" # AIX remembers this path and will attempt to use it at run-time to look # up the Tcl library. -if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then - TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}" +if test $TK_SHARED_BUILD = 0 -o $TCL_NEEDS_EXP_FILE = 0; then + if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then + TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}" + else + TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}" + fi + TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" + TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_FLAG}" + TK_BUILD_EXP_FILE="" + TK_EXP_FILE="" +else + TK_BUILD_EXP_FILE="lib.exp" + eval "TK_EXP_FILE=libtk${TCL_EXPORT_FILE_SUFFIX}" + + TK_BUILD_LIB_SPEC="-bI:`pwd`/${TK_BUILD_EXP_FILE}" + TK_LIB_SPEC="-bI:${exec_prefix}/lib/${TK_EXP_FILE}" +fi + +#-------------------------------------------------------------------- +# The statements below define various symbols relating to Tk +# using tcl stub support. +#-------------------------------------------------------------------- + +AC_MSG_CHECKING(how to link to Tcl) + +AC_ARG_ENABLE(tcl-stub, + [ --enable-tcl-stub use the Tcl stub interface], + [tk_ok=$enableval], [tk_ok=no]) + +if test "$tk_ok" = "yes" ; then + + AC_MSG_RESULT(using Tcl stub interface) + + MAKE_STUB_LIB="ar cr \${STUB_LIB_FILE} \${STUB_LIB_OBJS}" + TCL_STUB_FLAGS="-DUSE_TCL_STUBS" + + # Don't link Tk directly to Tcl. + + SHLIB_LD_LIBS="\${TCL_BUILD_STUB_LIB_SPEC}" else - TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}" + AC_MSG_RESULT(dynamic linking) + + TCL_BUILD_STUB_LIB_SPEC="" + TCL_STUB_FLAGS="" fi -TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" -TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_FLAG}" + +AC_SUBST(STUB_LIB_FILE) + +AC_SUBST(TK_STUB_LIB_FILE) +AC_SUBST(TK_STUB_LIB_FLAG) +AC_SUBST(TK_BUILD_STUB_LIB_SPEC) +AC_SUBST(TK_STUB_LIB_SPEC) +AC_SUBST(TK_BUILD_STUB_LIB_PATH) +AC_SUBST(TK_STUB_LIB_PATH) +AC_SUBST(MAKE_STUB_LIB) +AC_SUBST(TCL_STUB_FLAGS) +AC_SUBST(TK_BUILD_EXP_FILE) +AC_SUBST(TK_EXP_FILE) AC_SUBST(CFLAGS_DEBUG) AC_SUBST(CFLAGS_DEFAULT) @@ -477,6 +529,7 @@ AC_SUBST(SHLIB_LD_LIBS) AC_SUBST(SHLIB_SUFFIX) AC_SUBST(SHLIB_VERSION) AC_SUBST(TCL_BIN_DIR) +AC_SUBST(TCL_BUILD_STUB_LIB_SPEC) AC_SUBST(TCL_BUILD_LIB_SPEC) AC_SUBST(TCL_DBGX) AC_SUBST(TCL_LIB_FLAG) |