summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-04-06 09:29:14 (GMT)
committernijtmans <nijtmans>2010-04-06 09:29:14 (GMT)
commit3b668a10084cd1d859858124bfa1799162453d08 (patch)
tree26f1dc7e95cba92724fb436c2f6005a284f3823c
parent0be781ffb3bbb929681ed95f944c91717e85e01b (diff)
downloadtk-3b668a10084cd1d859858124bfa1799162453d08.zip
tk-3b668a10084cd1d859858124bfa1799162453d08.tar.gz
tk-3b668a10084cd1d859858124bfa1799162453d08.tar.bz2
regenerated with autoconf-2.59
[Bug 2982540] configure and install* script files should always have LF
-rw-r--r--ChangeLog8
-rwxr-xr-xunix/configure8
-rw-r--r--unix/tcl.m46
-rwxr-xr-xwin/configure6
-rw-r--r--win/tcl.m44
5 files changed, 20 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 518dd4a..39de470 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-06 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * win/tcl.m4 Sync with Tcl version
+ * unix/tcl.m4
+ * win/configure (regenerate with autoconf-2.59)
+ * unix/configure [Bug 2982540] configure and install* script files
+ should always have LF
+
2010-03-29 Jan Nijtmans <nijtmans@users.sf.net>
* unix/tcl.m4 Only test for -visibility=hidden with gcc
diff --git a/unix/configure b/unix/configure
index ac29947..862ca1d 100755
--- a/unix/configure
+++ b/unix/configure
@@ -852,7 +852,7 @@ Optional Features:
use STRING as a suffix to manpage file names
(default: no, tk if enabled without
specifying STRING)
- --enable-threads build with threads (default: off)
+ --enable-threads build with threads (default: on)
--enable-shared build and link with shared libraries (default: on)
--enable-64bit enable 64bit support (default: off)
--enable-64bit-vis enable 64bit Sparc VIS support (default: off)
@@ -3605,7 +3605,7 @@ if test "${enable_threads+set}" = set; then
enableval="$enable_threads"
tcl_ok=$enableval
else
- tcl_ok=no
+ tcl_ok=yes
fi;
if test "${TCL_THREADS}" = 1; then
@@ -4141,8 +4141,8 @@ echo "${ECHO_T}yes (threaded core)" >&6
echo "${ECHO_T}yes" >&6
fi
else
- echo "$as_me:$LINENO: result: no (default)" >&5
-echo "${ECHO_T}no (default)" >&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 06b6ae6..32b8215 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -618,8 +618,8 @@ AC_DEFUN([SC_ENABLE_FRAMEWORK], [
AC_DEFUN([SC_ENABLE_THREADS], [
AC_ARG_ENABLE(threads,
AC_HELP_STRING([--enable-threads],
- [build with threads (default: off)]),
- [tcl_ok=$enableval], [tcl_ok=no])
+ [build with threads (default: on)]),
+ [tcl_ok=$enableval], [tcl_ok=yes])
if test "${TCL_THREADS}" = 1; then
tcl_threaded_core=1;
@@ -690,7 +690,7 @@ AC_DEFUN([SC_ENABLE_THREADS], [
AC_MSG_RESULT([yes])
fi
else
- AC_MSG_RESULT([no (default)])
+ AC_MSG_RESULT([no])
fi
AC_SUBST(TCL_THREADS)
diff --git a/win/configure b/win/configure
index ed417a5..fe265c4 100755
--- a/win/configure
+++ b/win/configure
@@ -2943,7 +2943,7 @@ if test "${enable_threads+set}" = set; then
enableval="$enable_threads"
tcl_ok=$enableval
else
- tcl_ok=no
+ tcl_ok=yes
fi;
if test "$tcl_ok" = "yes"; then
@@ -2962,8 +2962,8 @@ _ACEOF
else
TCL_THREADS=0
- echo "$as_me:$LINENO: result: no (default)" >&5
-echo "${ECHO_T}no (default)" >&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
diff --git a/win/tcl.m4 b/win/tcl.m4
index bdcced8..6dbd69e 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -248,7 +248,7 @@ AC_DEFUN([SC_ENABLE_SHARED], [
AC_DEFUN([SC_ENABLE_THREADS], [
AC_MSG_CHECKING(for building with threads)
AC_ARG_ENABLE(threads, [ --enable-threads build with threads],
- [tcl_ok=$enableval], [tcl_ok=no])
+ [tcl_ok=$enableval], [tcl_ok=yes])
if test "$tcl_ok" = "yes"; then
AC_MSG_RESULT(yes)
@@ -259,7 +259,7 @@ AC_DEFUN([SC_ENABLE_THREADS], [
AC_DEFINE(USE_THREAD_ALLOC)
else
TCL_THREADS=0
- AC_MSG_RESULT([no (default)])
+ AC_MSG_RESULT(no)
fi
AC_SUBST(TCL_THREADS)
])