diff options
| author | stanton <stanton> | 1999-03-14 19:26:02 (GMT) |
|---|---|---|
| committer | stanton <stanton> | 1999-03-14 19:26:02 (GMT) |
| commit | d944335fe86c543d54d5f8b88c9916635a1df173 (patch) | |
| tree | 35fccad686390cc8d84f4b1f296b7efd48dc1eea /unix | |
| parent | 4ae4ae1ba30d96cf9f827c5fc1eb11cc4f13cf55 (diff) | |
| download | tk-d944335fe86c543d54d5f8b88c9916635a1df173.zip tk-d944335fe86c543d54d5f8b88c9916635a1df173.tar.gz tk-d944335fe86c543d54d5f8b88c9916635a1df173.tar.bz2 | |
* unix/configure.in: Added missing stub related definitions.
* unix/Makefile.in: Install tkDecls.h in addition to tk.h.
* generic/tkStubLib.c: Added flags to ensure we are using Tcl
stub macros.
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 9 | ||||
| -rw-r--r-- | unix/configure.in | 22 |
2 files changed, 27 insertions, 4 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index d5f415c..e32e01e 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.1.4.8 1999/03/13 18:28:41 welch Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.1.4.9 1999/03/14 19:26:03 stanton Exp $ # Current Tk version; used in various names. @@ -461,8 +461,11 @@ install-libraries: else true; \ fi; \ done; - @echo "Installing tk.h" - @$(INSTALL_DATA) $(GENERIC_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h + @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \ + do \ + echo "Installing $$i"; \ + $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ + done; for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \ do \ echo "Installing $$i"; \ diff --git a/unix/configure.in b/unix/configure.in index f0540cb..48d2c27 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ 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.11 1999/03/11 00:48:54 redman Exp $ +# RCS: @(#) $Id: configure.in,v 1.1.4.12 1999/03/14 19:26:03 stanton Exp $ TK_VERSION=8.1 TK_MAJOR_VERSION=8 @@ -501,6 +501,26 @@ else TCL_STUB_FLAGS="" fi +# Replace ${VERSION} with contents of ${TK_VERSION} +eval "STUB_LIB_FILE=libtkstub${TCL_UNSHARED_LIB_SUFFIX}" +# Replace DBGX with TCL_DBGX +eval "STUB_LIB_FILE=\"${STUB_LIB_FILE}\"" + +MAKE_STUB_LIB="ar cr \${STUB_LIB_FILE} \${STUB_LIB_OBJS}" + +TK_STUB_LIB_FILE=${STUB_LIB_FILE} + +if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then + TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}\${TK_DBGX}" +else + TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`\${TK_DBGX}" +fi + +TK_BUILD_STUB_LIB_SPEC="-L`pwd` ${TK_STUB_LIB_FLAG}" +TK_STUB_LIB_SPEC="-L${exec_prefix}/lib ${TK_STUB_LIB_FLAG}" +TK_BUILD_STUB_LIB_PATH="`pwd`/${TK_STUB_LIB_FILE}" +TK_STUB_LIB_PATH="${exec_prefix}/lib/${TK_STUB_LIB_FILE}" + AC_SUBST(STUB_LIB_FILE) AC_SUBST(TK_STUB_LIB_FILE) |