diff options
| -rw-r--r-- | unix/Makefile.in | 3 | ||||
| -rw-r--r-- | unix/configure.in | 11 | ||||
| -rw-r--r-- | unix/tkConfig.sh.in | 3 |
3 files changed, 11 insertions, 6 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 0b3989d..ba3f119 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -82,7 +82,8 @@ TCL_GENERIC_DIR = @TCL_SRC_DIR@/generic TCL_BIN_DIR = @TCL_BIN_DIR@ # Libraries built with optimization switches have this additional extension -DBGX = @DBGX@ +TK_DBGX = @TK_DBGX@ +TCL_DBGX = @TCL_DBGX@ # warning flags CFLAGS_WARNING = @CFLAGS_WARNING@ diff --git a/unix/configure.in b/unix/configure.in index 95a4d38..45528da 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -70,10 +70,10 @@ AC_ARG_ENABLE(symbols, [ --enable-symbols build with debugging symbols], [tcl_ok=$enableval], [tcl_ok=no]) if test "$tcl_ok" = "yes"; then CFLAGS_DEFAULT=CFLAGS_DEBUG - DBGX=g + TK_DBGX=g else CFLAGS_DEFAULT=CFLAGS_OPTIMIZE - DBGX="" + TK_DBGX="" fi SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS @@ -395,9 +395,9 @@ fi # up the Tcl library. if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then - TK_LIB_FLAG="-ltk${VERSION}\${DBGX}" + TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}" else - TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${DBGX}" + 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}" @@ -406,7 +406,7 @@ AC_SUBST(CFLAGS_DEBUG) AC_SUBST(CFLAGS_DEFAULT) AC_SUBST(CFLAGS_OPTIMIZE) AC_SUBST(CFLAGS_WARNING) -AC_SUBST(DBGX) +AC_SUBST(TK_DBGX) AC_SUBST(DL_LIBS) AC_SUBST(LD_FLAGS) AC_SUBST(MATH_LIBS) @@ -418,6 +418,7 @@ AC_SUBST(SHLIB_SUFFIX) AC_SUBST(SHLIB_VERSION) AC_SUBST(TCL_BIN_DIR) AC_SUBST(TCL_BUILD_LIB_SPEC) +AC_SUBST(TCL_DBGX) AC_SUBST(TCL_LIB_FLAG) AC_SUBST(TCL_SRC_DIR) AC_SUBST(TCL_VERSION) diff --git a/unix/tkConfig.sh.in b/unix/tkConfig.sh.in index 9252439..c818047 100644 --- a/unix/tkConfig.sh.in +++ b/unix/tkConfig.sh.in @@ -25,6 +25,9 @@ TK_DEFS='@DEFS@' # Flag, 1: we built a shared lib, 0 we didn't TK_SHARED_BUILD=@TK_SHARED_BUILD@ +# This indicates if Tk was build with debugging symbols +TK_DBGX=@TK_DBGX@ + # The name of the Tk library (may be either a .a file or a shared library): TK_LIB_FILE=@TK_LIB_FILE@ |