diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-31 09:57:44 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-31 09:57:44 (GMT) |
| commit | b2e27ce18781f48929b50a16a5f6bd6e9f46d90f (patch) | |
| tree | 1e68260fd213f0b6dfc3f756acb885b67d8b3982 /unix/configure | |
| parent | 8e9e7cb41c0f5540842a7ee8d87c413d586b88fe (diff) | |
| parent | 879c2a77024c6f7599ee7b438d236d2828cf5dc2 (diff) | |
| download | tk-b2e27ce18781f48929b50a16a5f6bd6e9f46d90f.zip tk-b2e27ce18781f48929b50a16a5f6bd6e9f46d90f.tar.gz tk-b2e27ce18781f48929b50a16a5f6bd6e9f46d90f.tar.bz2 | |
Fix [056f9e85dc]: debian patches
Don't define HAVE_STDINT_H in win/makefile.vc: Most (older) Visual Studio versions still don't have stdint.h, and it isn't used by Tk.
Diffstat (limited to 'unix/configure')
| -rwxr-xr-x | unix/configure | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/unix/configure b/unix/configure index e906c58..6bcf65c 100755 --- a/unix/configure +++ b/unix/configure @@ -1431,6 +1431,7 @@ echo "$as_me: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" > `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/pkg/lib 2>/dev/null` \ + `ls -d /usr/lib/tcl8.5 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ `ls -d /usr/local/lib/tcl8.6 2>/dev/null` \ @@ -4293,6 +4294,9 @@ echo "$as_me: WARNING: can't find uname command" >&2;} if test "`uname -s`" = "AIX" ; then tcl_cv_sys_version=AIX-`uname -v`.`uname -r` fi + if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then + tcl_cv_sys_version=NetBSD-Debian + fi fi fi @@ -10005,8 +10009,8 @@ echo "${ECHO_T}$enable_xft" >&6 XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no" if test "$found_xft" = "no" ; then found_xft=yes - XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no" - XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no" + XFT_CFLAGS=`pkg-config --cflags xft fontconfig 2>/dev/null` || found_xft="no" + XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no" fi echo "$as_me:$LINENO: result: $found_xft" >&5 echo "${ECHO_T}$found_xft" >&6 @@ -10930,7 +10934,7 @@ if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then TCL_STUB_FLAGS="-DUSE_TCL_STUBS" fi -TK_LIBRARY='$(prefix)/lib/tk$(VERSION)' +test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)' PRIVATE_INCLUDE_DIR='$(includedir)' HTML_DIR='$(DISTDIR)/html' TK_PKG_DIR='tk$(VERSION)' |