summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2008-08-13 23:04:20 (GMT)
committerdas <das>2008-08-13 23:04:20 (GMT)
commit3c9c880612ee5a32b84b24822f9c6c09953f710b (patch)
tree2ffda1b11fae6f788f6fd5c5886a87a93e1a23e7
parent85f8100f4ad76f94d880796df90d2eec9e0c18b6 (diff)
downloadtk-3c9c880612ee5a32b84b24822f9c6c09953f710b.zip
tk-3c9c880612ee5a32b84b24822f9c6c09953f710b.tar.gz
tk-3c9c880612ee5a32b84b24822f9c6c09953f710b.tar.bz2
* unix/tcl.m4 (SC_PATH_X): check for libX11.dylib in addition to
libX11.so et al.
-rw-r--r--ChangeLog7
-rw-r--r--unix/tcl.m42
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 230c23a..3ba114c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-14 Daniel Steffen <das@users.sourceforge.net>
+
+ * unix/tcl.m4 (SC_PATH_X): check for libX11.dylib in addition to
+ libX11.so et al.
+
+ * unix/configure: autoconf-2.59
+
2008-08-12 Ania Pawelczyk <aniap@users.sourceforge.net>
* test/choosedir.test: Update to tcltest2
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 1659a12..c7a13c6 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2407,7 +2407,7 @@ AC_DEFUN([SC_PATH_X], [
XLIBSW=nope
dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
for i in $dirs ; do
- if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then
+ if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then
AC_MSG_RESULT([$i])
XLIBSW="-L$i -lX11"
x_libraries="$i"