diff options
| author | davidg <davidg> | 2000-10-31 01:28:26 (GMT) |
|---|---|---|
| committer | davidg <davidg> | 2000-10-31 01:28:26 (GMT) |
| commit | 602847c46a67fa8c43e969030dec4abdcced0112 (patch) | |
| tree | b13fd16f936965b859cf61eae97a7c1eb038bd6e /win/configure.in | |
| parent | 80b94e9692eaf9c9405fe71dbb8eba3a380dd89a (diff) | |
| download | tk-602847c46a67fa8c43e969030dec4abdcced0112.zip tk-602847c46a67fa8c43e969030dec4abdcced0112.tar.gz tk-602847c46a67fa8c43e969030dec4abdcced0112.tar.bz2 | |
2000-10-30 David Gravereaux <davygrvy@ajubasolutions.com>
* win/configure.in:
* win/Makefile.in:
* win/makefile.vc:
* win/rc/tk.rc:
* win/rc/tk_base.rc (new):
* win/rc/wish.rc: Added logic to derive filenames better in the resource
scripts based on compile options along with better support for building
a static wish shell with cursor resources.
Diffstat (limited to 'win/configure.in')
| -rw-r--r-- | win/configure.in | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/win/configure.in b/win/configure.in index 711ed7e..3a4a8c8 100644 --- a/win/configure.in +++ b/win/configure.in @@ -2,7 +2,7 @@ # generate the file "configure", which is run during Tk installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.23 2000/09/06 19:05:16 hobbs Exp $ +# RCS: @(#) $Id: configure.in,v 1.24 2000/10/31 01:28:26 davidg Exp $ AC_INIT(../generic/tk.h) @@ -145,6 +145,27 @@ CFG_TK_SHARED_LIB_SUFFIX=${TK_SHARED_LIB_SUFFIX} CFG_TK_UNSHARED_LIB_SUFFIX=${TK_UNSHARED_LIB_SUFFIX} CFG_TK_EXPORT_FILE_SUFFIX=${TK_EXPORT_FILE_SUFFIX} +#-------------------------------------------------------------------- +# Adjust the defines for how the resources are built depending +# on symbols and static vs. shared. +#-------------------------------------------------------------------- + +if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then + if test "${DBGX}" = "d"; then + RC_DEFINES="-d STATIC_BUILD -d DEBUG" + else + RC_DEFINES="-d STATIC_BUILD" + fi + TK_RES="" +else + if test "${DBGX}" = "d"; then + RC_DEFINES="-d DEBUG" + else + RC_DEFINES="" + fi + TK_RES=tk.res +fi + AC_SUBST(TK_VERSION) AC_SUBST(TK_MAJOR_VERSION) AC_SUBST(TK_MINOR_VERSION) @@ -200,6 +221,8 @@ AC_SUBST(RC) AC_SUBST(RC_OUT) AC_SUBST(RC_TYPE) AC_SUBST(RC_INCLUDE) +AC_SUBST(RC_DEFINES) +AC_SUBST(TK_RES) AC_SUBST(RES) AC_SUBST(LIBS) AC_SUBST(LIBS_GUI) |