diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-25 09:26:27 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-25 09:26:27 (GMT) |
| commit | 4d4d463c45a62a023a347cbe3cdfdad198ab0020 (patch) | |
| tree | b29e4c0eb2230b1d2b68bdd1e82d827e2902bdda /unix | |
| parent | 8ffe639903cda423a32d6f724dd3c54ebf42dced (diff) | |
| parent | f11d46a5391bad92ada8f86f1dac44e43f359c28 (diff) | |
| download | tk-4d4d463c45a62a023a347cbe3cdfdad198ab0020.zip tk-4d4d463c45a62a023a347cbe3cdfdad198ab0020.tar.gz tk-4d4d463c45a62a023a347cbe3cdfdad198ab0020.tar.bz2 | |
Merge 8.5
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 7 | ||||
| -rw-r--r-- | unix/tcl.m4 | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 5c70650..8bda152 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1547,9 +1547,14 @@ $(MAC_OSX_DIR)/configure: $(MAC_OSX_DIR)/configure.ac $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in: $(MAC_OSX_DIR)/configure cd $(MAC_OSX_DIR); autoheader; touch $@ -dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure $(TOP_DIR)/doc/man.macros genstubs +$(TOP_DIR)/manifest.uuid: + printf "git." >$(TOP_DIR)/manifest.uuid + git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid + +dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure $(TOP_DIR)/doc/man.macros $(TOP_DIR)/manifest.uuid genstubs rm -rf $(DISTDIR) mkdir -p $(DISTDIR)/unix + cp -p $(TOP_DIR)/manifest.uuid $(DISTDIR) cp -p $(UNIX_DIR)/*.c $(UNIX_DIR)/*.h $(DISTDIR)/unix cp $(TOP_DIR)/license.terms $(UNIX_DIR)/Makefile.in $(DISTDIR)/unix chmod 664 $(DISTDIR)/unix/Makefile.in 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 |