--- a/configure.in	Mon Feb 20 03:57:03 2006 +0000
+++ b/configure.in	Mon Feb 20 08:49:00 2006 +0000
@@ -737,20 +737,24 @@
                           , enable_x11_shared=yes)
 
             case "$target" in
-                *-*-darwin* )
+                *-*-darwin*)
                     x11_lib='/usr/X11R6/lib/libX11.6.dylib'
                     x11ext_lib='/usr/X11R6/lib/libXext.6.dylib'
                     ;;
-                *-*-osf* )
+                *-*-osf*)
+                    x11_lib='libX11.so'
+                    x11ext_lib='libXext.so'
+                    ;;
+                *-*-irix*) # IRIX 6.5 requires that we use /usr/lib32
                     x11_lib='libX11.so'
                     x11ext_lib='libXext.so'
                     ;;
                 *)
                     if test x$X_LIBS = x; then X_LIBS="-L/usr/lib"; fi
-                    x11_lib_spec=`echo $X_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libX11.so.*/'`
-                    x11_lib=`ls $x11_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
-                    x11ext_lib_spec=`echo $X_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libXext.so.*/'`
-                    x11ext_lib=`ls $x11ext_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
+                    x11_lib_spec=`echo $X_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libX11.so*/'`
+                    x11_lib=`ls $x11_lib_spec 2>/dev/null | sort -r | sed 's/.*\/\(.*\)/\1/; q'`
+                    x11ext_lib_spec=`echo $X_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libXext.so*/'`
+                    x11ext_lib=`ls $x11ext_lib_spec 2>/dev/null | sort -r | sed 's/.*\/\(.*\)/\1/; q'`
                     ;;
             esac
 
@@ -2352,7 +2356,7 @@
 # Set runtime shared library paths as needed
 
 if test "x$enable_rpath" = "xyes"; then
-  if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi; then
+  if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi -o $ARCH = irix; then
     SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
   fi
   if test $ARCH = solaris; then

--- a/src/video/Xext/XME/xme.c	Mon Feb 20 03:57:03 2006 +0000
+++ b/src/video/Xext/XME/xme.c	Mon Feb 20 08:49:00 2006 +0000
@@ -14,15 +14,15 @@
 #define NEED_EVENTS
 #define NEED_REPLIES
 
-#include <X11/Xlibint.h>
+#include "../../x11/SDL_x11dyn.h"
+
+/*#include <X11/Xlibint.h>*/
 #include <X11/Xthreads.h>
 #include <X11/Xmd.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/Xext.h>
 #include "../extensions/extutil.h"
 
-#include "../../x11/SDL_x11dyn.h"
-
 /*****************************************************************************/
 
 

--- a/src/video/Xext/Xinerama/Xinerama.c	Mon Feb 20 03:57:03 2006 +0000
+++ b/src/video/Xext/Xinerama/Xinerama.c	Mon Feb 20 08:49:00 2006 +0000
@@ -27,7 +27,10 @@
 
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include <X11/Xlibint.h>
+
+#include "../../x11/SDL_x11dyn.h"
+
+/*#include <X11/Xlibint.h>*/
 #include <X11/Xutil.h>
 #include <X11/extensions/Xext.h>	/* in ../include */
 #include "../extensions/extutil.h"			/* in ../include */
@@ -35,8 +38,6 @@
 #include "../extensions/panoramiXproto.h"		/* in ../include */
 #include "../extensions/Xinerama.h"
 
-#include "../../x11/SDL_x11dyn.h"
-
 static XExtensionInfo _panoramiX_ext_info_data;
 static XExtensionInfo *panoramiX_ext_info = &_panoramiX_ext_info_data;
 static /* const */ char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME;

--- a/src/video/Xext/Xv/Xv.c	Mon Feb 20 03:57:03 2006 +0000
+++ b/src/video/Xext/Xv/Xv.c	Mon Feb 20 08:49:00 2006 +0000
@@ -56,8 +56,6 @@
 #include <X11/extensions/XShm.h>
 #include "../extensions/extutil.h"
 
-#include "../../x11/SDL_x11dyn.h"
-
 static XExtensionInfo _xv_info_data;
 static XExtensionInfo *xv_info = &_xv_info_data;
 static char *xv_extension_name = XvName;

--- a/src/video/Xext/Xv/Xvlibint.h	Mon Feb 20 03:57:03 2006 +0000
+++ b/src/video/Xext/Xv/Xvlibint.h	Mon Feb 20 08:49:00 2006 +0000
@@ -43,7 +43,9 @@
 
 #define NEED_REPLIES
 
-#include <X11/Xlibint.h>
+#include "../../x11/SDL_x11dyn.h"
+
+/*#include <X11/Xlibint.h>*/
 #include "../extensions/Xvproto.h"
 #include "../extensions/Xvlib.h"
 

--- a/src/video/Xext/Xxf86dga/XF86DGA.c	Mon Feb 20 03:57:03 2006 +0000
+++ b/src/video/Xext/Xxf86dga/XF86DGA.c	Mon Feb 20 08:49:00 2006 +0000
@@ -58,14 +58,15 @@
 
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include <X11/Xlibint.h>
+
+#include "../../x11/SDL_x11dyn.h"
+
+/*#include <X11/Xlibint.h>*/
 #include "../extensions/xf86dga.h"
 #include "../extensions/xf86dgastr.h"
 #include <X11/extensions/Xext.h>
 #include "../extensions/extutil.h"
 
-#include "../../x11/SDL_x11dyn.h"
-
 extern XExtDisplayInfo* SDL_NAME(xdga_find_display)(Display*);
 extern char *SDL_NAME(xdga_extension_name);
 

--- a/src/video/Xext/Xxf86dga/XF86DGA2.c	Mon Feb 20 03:57:03 2006 +0000
+++ b/src/video/Xext/Xxf86dga/XF86DGA2.c	Mon Feb 20 08:49:00 2006 +0000
@@ -16,7 +16,10 @@
 
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include <X11/Xlibint.h>
+
+#include "../../x11/SDL_x11dyn.h"
+
+/*#include <X11/Xlibint.h>*/
 #include "../extensions/xf86dga.h"
 #include "../extensions/xf86dgastr.h"
 #include <X11/extensions/Xext.h>
@@ -28,8 +31,6 @@
 #include <linux/fb.h>
 #endif
 
-#include "../../x11/SDL_x11dyn.h"
-
 /* If you change this, change the Bases[] array below as well */
 #define MAX_HEADS 16
 

--- a/src/video/Xext/Xxf86vm/XF86VMode.c	Mon Feb 20 03:57:03 2006 +0000
+++ b/src/video/Xext/Xxf86vm/XF86VMode.c	Mon Feb 20 08:49:00 2006 +0000
@@ -35,8 +35,11 @@
 
 #define NEED_EVENTS
 #define NEED_REPLIES
+
+#include "../../x11/SDL_x11dyn.h"
+
 #ifndef XBUILD_IN_CLIENT
-#include <X11/Xlibint.h>
+/*#include <X11/Xlibint.h>*/
 #include "../extensions/xf86vmstr.h"
 #include <X11/extensions/Xext.h>
 #include "../extensions/extutil.h"
@@ -47,8 +50,6 @@
 #include "include/extensions/extutil.h"
 #endif
 
-#include "../../x11/SDL_x11dyn.h"
-
 #ifdef DEBUG
 #include <stdio.h>
 #endif