diff options
| -rw-r--r-- | .fossil-settings/manifest | 1 | ||||
| -rw-r--r-- | .gitattributes | 39 | ||||
| -rw-r--r-- | .gitignore | 41 | ||||
| -rw-r--r-- | unix/Makefile.in | 7 | ||||
| -rw-r--r-- | unix/tcl.m4 | 5 |
5 files changed, 86 insertions, 7 deletions
diff --git a/.fossil-settings/manifest b/.fossil-settings/manifest new file mode 100644 index 0000000..4ae8ef0 --- /dev/null +++ b/.fossil-settings/manifest @@ -0,0 +1 @@ +u diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..e9a67c8 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,39 @@ +# Set the default behavior, in case people don't have core.autocrlf set. +* eol=lf +* text=auto + +# Explicitly declare text files you want to always be normalized and converted +# to native line endings on checkout. +*.3 text +*.c text +*.css text +*.enc text +*.h text +*.htm text +*.html text +*.java text +*.js text +*.json text +*.n text +*.svg text +*.ts text +*.tcl text +*.test text + +# Declare files that will always have CRLF line endings on checkout. +*.bat eol=crlf +*.sln eol=crlf +*.vc eol=crlf + +# Denote all files that are truly binary and should not be modified. +*.a binary +*.dll binary +*.exe binary +*.gif binary +*.gz binary +*.jpg binary +*.lib binary +*.pdf binary +*.png binary +*.xlsx binary +*.zip binary @@ -1,4 +1,5 @@ *.a +*.bundle *.dll *.dylib *.exe @@ -10,14 +11,45 @@ *.res *.sl *.so -*/Makefile -*/config.cache -*/config.log -*/config.status +.fslckout +Makefile +Tk-Info.plist +autom4te.cache +config.cache +config.log +config.status +config.status.lineno +html +manifest.uuid +_FOSSIL_ */tkConfig.sh */wish* */tktest* */versions.vc +*/version.vc +*/libtcl.vfs +*/libtcl_*.zip +libtommath/bn.ilg +libtommath/bn.ind +libtommath/pretty.build +libtommath/tommath.src +libtommath/*.log +libtommath/*.pdf +libtommath/*.pl +libtommath/*.sh +libtommath/doc/* +libtommath/tombc/* +libtommath/pre_gen/* +libtommath/pics/* +libtommath/mtest/* +libtommath/logs/* +libtommath/etc/* +libtommath/demo/* +libtommath/*.out +libtommath/*.tex +macosx/configure +unix/autoMkindex.tcl +unix/dltest.marker unix/tk.pc unix/tclIndex win/Debug* @@ -25,4 +57,3 @@ win/Release* win/*.manifest win/nmhlp-out.txt win/nmakehlp.out - 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 |