diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-05 16:27:53 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-05 16:27:53 (GMT) |
| commit | 24ea39ac53ca868aec6e2e78f48f4e60138884fe (patch) | |
| tree | 65ecb3ddccea5ae2b02c8ddb56ac280b7adffdee /unix | |
| parent | 83dd76da7170a8bb9c59b60508c5df606204709c (diff) | |
| parent | 302dfe1be6830add9d1bd8b57b4bc6c00fc609b3 (diff) | |
| download | tk-24ea39ac53ca868aec6e2e78f48f4e60138884fe.zip tk-24ea39ac53ca868aec6e2e78f48f4e60138884fe.tar.gz tk-24ea39ac53ca868aec6e2e78f48f4e60138884fe.tar.bz2 | |
merge trunk
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 2 | ||||
| -rwxr-xr-x | unix/configure | 8 | ||||
| -rw-r--r-- | unix/tcl.m4 | 4 |
3 files changed, 3 insertions, 11 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 0e73871..3a20048 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -129,7 +129,7 @@ CFLAGS_WARNING = @CFLAGS_WARNING@ # The default switches for optimization or debugging CFLAGS_DEBUG = @CFLAGS_DEBUG@ -CFLAGS_OPTIMIZE = -DNDEBUG @CFLAGS_OPTIMIZE@ +CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ # To change the compiler switches, for example to change from optimization to # debugging symbols, change the following line: 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} |