summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-03-04 16:55:54 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-03-04 16:55:54 (GMT)
commitc7743f2ce4ec3fec9d6ea18f1edb649f89085448 (patch)
treea92fe1ea0f9e70ec3521f967e287bdeb189f06ec
parent220b6aecbb178564d3ee630cf19c6aa8ae93a67d (diff)
parenteb82b46a885ed7d88adf980f37e1c70ed25acda0 (diff)
downloadtk-c7743f2ce4ec3fec9d6ea18f1edb649f89085448.zip
tk-c7743f2ce4ec3fec9d6ea18f1edb649f89085448.tar.gz
tk-c7743f2ce4ec3fec9d6ea18f1edb649f89085448.tar.bz2
Patch from the cygwin folks
-rw-r--r--ChangeLog5
-rwxr-xr-xunix/configure15
-rw-r--r--unix/tcl.m43
3 files changed, 17 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 5360007..63f52e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-04 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * unix/tcl.m4: Patch from the cygwin folks
+ * unix/configure: (re-generated)
+
2012-02-28 Francois Vogel <fvogelnew1@free.fr>
* generic/tkText.c: [Bug-1630262], [Bug-1615425]: segfault
diff --git a/unix/configure b/unix/configure
index a08ada4..6ea35a4 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5141,6 +5141,9 @@ fi
DL_LIBS="-ldl"
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
+ TCL_NEEDS_EXP_FILE=1
+ TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.dll.a'
+ TCL_SHLIB_LD_EXTRAS='-Wl,--out-implib,$@.a'
;;
dgux*)
SHLIB_CFLAGS="-K PIC"
@@ -9950,7 +9953,7 @@ ac_x_header_dirs='
/usr/openwin/share/include'
if test "$ac_x_includes" = no; then
- # Guess where to find include files, by looking for Xlib.h.
+ # Guess where to find include files, by looking for Intrinsic.h.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -9958,7 +9961,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -9985,7 +9988,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Xlib.h"; then
+ if test -r "$ac_dir/X11/Intrinsic.h"; then
ac_x_includes=$ac_dir
break
fi
@@ -9999,18 +10002,18 @@ if test "$ac_x_libraries" = no; then
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lX11 $LIBS"
+ LIBS="-lXt $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
int
main ()
{
-XrmInitialize ()
+XtMalloc (0)
;
return 0;
}
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 78eacd9..37c7c74 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1245,6 +1245,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
DL_LIBS="-ldl"
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
+ TCL_NEEDS_EXP_FILE=1
+ TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.dll.a'
+ TCL_SHLIB_LD_EXTRAS='-Wl,--out-implib,$[@].a'
;;
dgux*)
SHLIB_CFLAGS="-K PIC"