diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-25 07:38:27 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-25 07:38:27 (GMT) |
| commit | 53a1c724ce9fb550d72eb58cf3599411674da0c2 (patch) | |
| tree | 449d8c1cc6194a4789aba2a199397abd7f1a4696 /unix | |
| parent | 3f90f816f86882d82b3bda1af1d503759acf5039 (diff) | |
| parent | 56d2c7e23c1acd887d31a182324a9861cb6e68dd (diff) | |
| download | tcl-53a1c724ce9fb550d72eb58cf3599411674da0c2.zip tcl-53a1c724ce9fb550d72eb58cf3599411674da0c2.tar.gz tcl-53a1c724ce9fb550d72eb58cf3599411674da0c2.tar.bz2 | |
Merge 8.5
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 7 | ||||
| -rwxr-xr-x | unix/configure | 7 | ||||
| -rw-r--r-- | unix/configure.in | 1 | ||||
| -rw-r--r-- | unix/tcl.m4 | 5 |
4 files changed, 18 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index f500366..5a023e2 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -2044,9 +2044,14 @@ $(MAC_OSX_DIR)/configure: $(MAC_OSX_DIR)/configure.ac $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in: $(MAC_OSX_DIR)/configure cd $(MAC_OSX_DIR); autoheader; touch $@ -dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in $(MAC_OSX_DIR)/configure genstubs dist-packages ${NATIVE_TCLSH} +$(TOP_DIR)/manifest.uuid: + printf "git." >$(TOP_DIR)/manifest.uuid + git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid + +dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in $(MAC_OSX_DIR)/configure $(TOP_DIR)/manifest.uuid genstubs dist-packages ${NATIVE_TCLSH} rm -rf $(DISTDIR) mkdir -p $(DISTDIR)/unix + cp -p $(TOP_DIR)/manifest.uuid $(DISTDIR) cp -p $(UNIX_DIR)/*.[ch] $(DISTDIR)/unix cp $(UNIX_DIR)/Makefile.in $(DISTDIR)/unix chmod 664 $(DISTDIR)/unix/Makefile.in diff --git a/unix/configure b/unix/configure index b064de4..73a8eac 100755 --- a/unix/configure +++ b/unix/configure @@ -14922,6 +14922,9 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ + +#include <stdlib.h> +#include <string.h> int main() { extern int strstr(); exit(strstr("\0test", "test") ? 1 : 0); @@ -15089,6 +15092,9 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ + +#include <stdlib.h> +#include <string.h> int main() { extern int strtoul(); char *term, *string = "0"; @@ -16462,6 +16468,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <stdlib.h> + #include <string.h> #define OURVAR "havecopy=yes" int main (int argc, char *argv[]) { diff --git a/unix/configure.in b/unix/configure.in index 0c66258..9dd9b7f 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -499,6 +499,7 @@ fi AC_CACHE_CHECK([for a putenv() that copies the buffer], tcl_cv_putenv_copy, [ AC_TRY_RUN([ #include <stdlib.h> + #include <string.h> #define OURVAR "havecopy=yes" int main (int argc, char *argv[]) { diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 24e00cd..25a01ac 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -2628,7 +2628,10 @@ AC_DEFUN([SC_TCL_CHECK_BROKEN_FUNC],[ AC_CHECK_FUNC($1, tcl_ok=1, tcl_ok=0) if test ["$tcl_ok"] = 1; then AC_CACHE_CHECK([proper ]$1[ implementation], [tcl_cv_]$1[_unbroken], - AC_TRY_RUN([[int main() {]$2[}]],[tcl_cv_]$1[_unbroken]=ok, + AC_TRY_RUN([[ +#include <stdlib.h> +#include <string.h> +int main() {]$2[}]],[tcl_cv_]$1[_unbroken]=ok, [tcl_cv_]$1[_unbroken]=broken,[tcl_cv_]$1[_unbroken]=unknown)) if test ["$tcl_cv_]$1[_unbroken"] = "ok"; then tcl_ok=1 |