diff options
| author | dgp@users.sourceforge.net <dgp> | 2012-07-24 16:29:22 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2012-07-24 16:29:22 (GMT) |
| commit | 74ccc73b243adb09329ca9cfc6abbf433e255bb1 (patch) | |
| tree | 2fdc28b79d7af8d482a4bdd3fc00b6a781593a7f /win | |
| parent | 50173aceb6f1c7ece8a5175c46b4d52260bf028a (diff) | |
| parent | 21d9ea65e24926797af0fe4ac6f84ca9a3e1e850 (diff) | |
| download | tk-74ccc73b243adb09329ca9cfc6abbf433e255bb1.zip tk-74ccc73b243adb09329ca9cfc6abbf433e255bb1.tar.gz tk-74ccc73b243adb09329ca9cfc6abbf433e255bb1.tar.bz2 | |
merge 8.5
Diffstat (limited to 'win')
| -rwxr-xr-x | win/configure | 6 | ||||
| -rw-r--r-- | win/tcl.m4 | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/win/configure b/win/configure index dd4303a..dedbedb 100755 --- a/win/configure +++ b/win/configure @@ -840,11 +840,11 @@ if test -n "$ac_init_help"; then Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-threads build with threads - --enable-shared build and link with shared libraries --enable-shared + --enable-threads build with threads (default: off) + --enable-shared build and link with shared libraries (default: on) --enable-64bit enable 64bit support (where applicable) --enable-wince enable Win/CE support (where applicable) - --enable-symbols build with debugging symbols --disable-symbols + --enable-symbols build with debugging symbols (default: off) --enable-embedded-manifest embed manifest if possible (default: yes) @@ -211,7 +211,7 @@ AC_DEFUN([SC_LOAD_TKCONFIG], [ AC_DEFUN([SC_ENABLE_SHARED], [ AC_MSG_CHECKING([how to build libraries]) AC_ARG_ENABLE(shared, - [ --enable-shared build and link with shared libraries [--enable-shared]], + [ --enable-shared build and link with shared libraries (default: on)], [tcl_ok=$enableval], [tcl_ok=yes]) if test "${enable_shared+set}" = set; then @@ -250,7 +250,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], + AC_ARG_ENABLE(threads, [ --enable-threads build with threads (default: off)], [tcl_ok=$enableval], [tcl_ok=no]) if test "$tcl_ok" = "yes"; then @@ -297,7 +297,7 @@ AC_DEFUN([SC_ENABLE_THREADS], [ AC_DEFUN([SC_ENABLE_SYMBOLS], [ AC_MSG_CHECKING([for build with symbols]) - AC_ARG_ENABLE(symbols, [ --enable-symbols build with debugging symbols [--disable-symbols]], [tcl_ok=$enableval], [tcl_ok=no]) + AC_ARG_ENABLE(symbols, [ --enable-symbols build with debugging symbols (default: off)], [tcl_ok=$enableval], [tcl_ok=no]) # FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT. if test "$tcl_ok" = "no"; then CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)' @@ -1059,7 +1059,7 @@ AC_DEFUN([SC_BUILD_TCLSH], [ #-------------------------------------------------------------------- AC_DEFUN([SC_TCL_CFG_ENCODING], [ - AC_ARG_WITH(encoding, [ --with-encoding encoding for configuration values], with_tcencoding=${withval}) + AC_ARG_WITH(encoding, [ --with-encoding encoding for configuration values], with_tcencoding=${withval}) if test x"${with_tcencoding}" != x ; then AC_DEFINE_UNQUOTED(TCL_CFGVAL_ENCODING,"${with_tcencoding}") |