diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-02 22:16:30 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-02 22:16:30 (GMT) |
| commit | d9df4d392d528489c139f609482da610a6c4321e (patch) | |
| tree | f3cf740895cc1e25f4e5d59869eb59bee7c80894 /unix | |
| parent | 5df3264a13d55f5084edd72ee1d3f46b6009c389 (diff) | |
| parent | 981f889680a6877ca69f9e264ed3d0fb9567d0dd (diff) | |
| download | tk-d9df4d392d528489c139f609482da610a6c4321e.zip tk-d9df4d392d528489c139f609482da610a6c4321e.tar.gz tk-d9df4d392d528489c139f609482da610a6c4321e.tar.bz2 | |
sync tcl.m4 with Tcl version
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 8 | ||||
| -rw-r--r-- | unix/tcl.m4 | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/unix/configure b/unix/configure index 7c8b7cf..132f11e 100755 --- a/unix/configure +++ b/unix/configure @@ -6969,7 +6969,7 @@ fi UNSHARED_LIB_SUFFIX='${VERSION}.a' fi - DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)" + DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)" if test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""; then @@ -7178,12 +7178,6 @@ echo "${ECHO_T}yes (standard debugging)" >&6 fi - ### FIXME: Surely TCL_CFG_DEBUG should be set to whether we're debugging? - -cat >>confdefs.h <<\_ACEOF -#define TCL_CFG_DEBUG 1 -_ACEOF - if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 28b323f..85b48fa 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -750,8 +750,6 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [ fi AC_SUBST(CFLAGS_DEFAULT) AC_SUBST(LDFLAGS_DEFAULT) - ### FIXME: Surely TCL_CFG_DEBUG should be set to whether we're debugging? - AC_DEFINE(TCL_CFG_DEBUG, 1, [Is debugging enabled?]) if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then AC_DEFINE(TCL_MEM_DEBUG, 1, [Is memory debugging enabled?]) @@ -2090,7 +2088,7 @@ dnl # preprocessing tests use only CPPFLAGS. SHARED_LIB_SUFFIX='${VERSION}${SHLIB_SUFFIX}']) AS_IF([test "$UNSHARED_LIB_SUFFIX" = ""], [ UNSHARED_LIB_SUFFIX='${VERSION}.a']) - DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)" + DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)" AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [ LIB_SUFFIX=${SHARED_LIB_SUFFIX} |