summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-03-04 16:57:04 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-03-04 16:57:04 (GMT)
commit737dfa9bcb107e65f0a5070c248eeffc9b48a029 (patch)
tree6ac3227647371e9bd5806e15e73d0d2c73cd7ea2 /unix
parent5f980e90395c85af59bb9286b197a620d8ba911f (diff)
parentc7743f2ce4ec3fec9d6ea18f1edb649f89085448 (diff)
downloadtk-737dfa9bcb107e65f0a5070c248eeffc9b48a029.zip
tk-737dfa9bcb107e65f0a5070c248eeffc9b48a029.tar.gz
tk-737dfa9bcb107e65f0a5070c248eeffc9b48a029.tar.bz2
Patch from the cygwin folks
Diffstat (limited to 'unix')
-rwxr-xr-xunix/configure15
-rw-r--r--unix/tcl.m43
2 files changed, 12 insertions, 6 deletions
diff --git a/unix/configure b/unix/configure
index 81bc617..5b28fa9 100755
--- a/unix/configure
+++ b/unix/configure
@@ -4898,6 +4898,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"
@@ -9790,7 +9793,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. */
@@ -9798,7 +9801,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
@@ -9825,7 +9828,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
@@ -9839,18 +9842,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 229e0b8..cb6c842 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1228,6 +1228,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"