Peter O'Gorman wrote:
> [cross-posting, if emails from mailman about awaiting moderator approval
> bother you, feel free to drop xquartz-dev]
>
> Hi,
>
> Martin Costabel reported on Apple's xquartz-dev mailing list that
> AC_PATH_X fails to work on the latest release candidate of X11 for Mac
> OS X because the latest release candidate no longer includes imake or xmkmf.
>
> http://lists.macosforge.org/pipermail/xquartz-dev/2008-March/000455.html
Proposed patch.
2008-03-28 Peter O'Gorman <[EMAIL PROTECTED]>
Find X11 on Mac OS X too.
* lib/autoconf/libs.m4 (_AC_PATH_X_DIRECT,_AC_PATH_X_XMKMF):
Check for libX11 with extensions dylib la and dll too.
* THANKS: Update.
Reported by Martin Costabel.
I don't have commit to autoconf, so someone else will have to apply it.
Peter
--
Peter O'Gorman
http://pogma.com
>From e7e9199f0fd30287c3bdfd9801b2690008384e21 Mon Sep 17 00:00:00 2001
From: Peter O'Gorman <[EMAIL PROTECTED]>
Date: Fri, 28 Mar 2008 12:37:23 -0500
Subject: [PATCH] Find X11 on Mac OS X too.
* lib/autoconf/libs.m4 (_AC_PATH_X_DIRECT,_AC_PATH_X_XMKMF):
Check for libX11 with extensions dylib la and dll too.
* THANKS: Update.
Reported by Martin Costabel.
---
ChangeLog | 8 ++++++++
THANKS | 1 +
lib/autoconf/libs.m4 | 4 ++--
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a868e45..26d2d4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-28 Peter O'Gorman <[EMAIL PROTECTED]>
+
+ Find X11 on Mac OS X too.
+ * lib/autoconf/libs.m4 (_AC_PATH_X_DIRECT,_AC_PATH_X_XMKMF):
+ Check for libX11 with extensions dylib la and dll too.
+ * THANKS: Update.
+ Reported by Martin Costabel.
+
2008-03-28 Eric Blake <[EMAIL PROTECTED]>
Update TODO based on completed tasks.
diff --git a/THANKS b/THANKS
index c6b5f4c..bc6dca2 100644
--- a/THANKS
+++ b/THANKS
@@ -212,6 +212,7 @@ Mark Kettenis [EMAIL PROTECTED]
Markku Savela [EMAIL PROTECTED]
Markus Oberhumer [EMAIL PROTECTED]
Martin Buchholz [EMAIL PROTECTED]
+Martin Costabel [EMAIL PROTECTED]
Martin Frydl [EMAIL PROTECTED]
Martin Koeppe [EMAIL PROTECTED]
Martin Mokrejs [EMAIL PROTECTED]
diff --git a/lib/autoconf/libs.m4 b/lib/autoconf/libs.m4
index 37c0952..b1305b8 100644
--- a/lib/autoconf/libs.m4
+++ b/lib/autoconf/libs.m4
@@ -201,7 +201,7 @@ _ACEOF
eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
done
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
- for ac_extension in a so sl; do
+ for ac_extension in a so sl dylib la dll; do
if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
test -f "$ac_im_libdir/libX11.$ac_extension"; then
ac_im_usrlibdir=$ac_im_libdir; break
@@ -296,7 +296,7 @@ ac_x_libraries=],
for ac_dir in `AS_ECHO(["$ac_x_includes $ac_x_header_dirs"]) | sed s/include/lib/g`
do
# Don't even attempt the hair of trying to link an X program!
- for ac_extension in a so sl; do
+ for ac_extension in a so sl dylib la dll; do
if test -r "$ac_dir/libX11.$ac_extension"; then
ac_x_libraries=$ac_dir
break 2
--
1.5.3.7
