diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-11-26 16:04:48 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-11-26 16:04:48 (GMT) |
| commit | cdd06df9dbc4004de5734dde40d47da74ceb93a6 (patch) | |
| tree | 3f37ca0f0e55c4e389f3a0255d95c10b39f12813 | |
| parent | b3e1ffc1797fa7eec61848d7a3f9d120afd0b0fe (diff) | |
| parent | 43b8bf64301dcc8edaad610a7d8a2a21091171be (diff) | |
| download | tcl-cdd06df9dbc4004de5734dde40d47da74ceb93a6.zip tcl-cdd06df9dbc4004de5734dde40d47da74ceb93a6.tar.gz tcl-cdd06df9dbc4004de5734dde40d47da74ceb93a6.tar.bz2 | |
Merge 8.6. Add win/*.in to "make dist"
| -rw-r--r-- | unix/Makefile.in | 3 | ||||
| -rw-r--r-- | unix/tclConfig.h.in | 6 | ||||
| -rw-r--r-- | win/svnmanifest.in | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 161b7c6..33a87bb 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -2318,7 +2318,8 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in gen cp -p $(TOP_DIR)/win/configure.ac $(TOP_DIR)/win/configure \ $(TOP_DIR)/win/tclConfig.sh.in $(TOP_DIR)/win/tclooConfig.sh \ $(TOP_DIR)/win/tcl.m4 $(TOP_DIR)/win/aclocal.m4 \ - $(TOP_DIR)/win/tclsh.exe.manifest.in \ + $(TOP_DIR)/win/tclsh.exe.manifest.in $(TOP_DIR)/win/tclUuid.h.in \ + $(TOP_DIR)/win/gitmanifest.in $(TOP_DIR)/win/svnmanifest.in \ $(DISTDIR)/win cp -p $(TOP_DIR)/win/*.[ch] $(TOP_DIR)/win/*.ico $(TOP_DIR)/win/*.rc \ $(DISTDIR)/win diff --git a/unix/tclConfig.h.in b/unix/tclConfig.h.in index d7f51bf..5c24d40 100644 --- a/unix/tclConfig.h.in +++ b/unix/tclConfig.h.in @@ -184,15 +184,15 @@ /* Define to 1 if you have the `OSSpinLockLock' function. */ #undef HAVE_OSSPINLOCKLOCK +/* Should we use pselect()? */ +#undef HAVE_PSELECT + /* Define to 1 if you have the `pthread_atfork' function. */ #undef HAVE_PTHREAD_ATFORK /* Define to 1 if you have the `pthread_attr_setstacksize' function. */ #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE -/* Define to 1 if you have the `pselect' function */ -#undef HAVE_PSELECT - /* Does putenv() copy strings or incorporate them by reference? */ #undef HAVE_PUTENV_THAT_COPIES diff --git a/win/svnmanifest.in b/win/svnmanifest.in new file mode 100644 index 0000000..18d2cad --- /dev/null +++ b/win/svnmanifest.in @@ -0,0 +1 @@ +svn-r
\ No newline at end of file |