summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2008-08-13 23:04:46 (GMT)
committerdas <das>2008-08-13 23:04:46 (GMT)
commit0eae7f15242f9c4c6891754c53d402e4740ff27e (patch)
treec80ab56bd9c5c94659758bddf7076bc8c1f507c3
parentbc6df053da15ca2f4f4f8de80e02f8bcd7b5bbc3 (diff)
downloadtk-0eae7f15242f9c4c6891754c53d402e4740ff27e.zip
tk-0eae7f15242f9c4c6891754c53d402e4740ff27e.tar.gz
tk-0eae7f15242f9c4c6891754c53d402e4740ff27e.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 3a5d5a9..cdd9488 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.13
+
2008-08-06 Joe English <jenglish@users.sourceforge.net>
* generic/tk.h: Fix for [Bug 2010422]: account for X11 changing
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 6948c98..2231cd7 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2473,7 +2473,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"