Index: loadmod.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/loadmod.c,v
retrieving revision 1.2
diff -u -d -r1.2 loadmod.c
--- loadmod.c	23 Apr 2004 19:54:06 -0000	1.2
+++ loadmod.c	15 Jan 2005 23:20:17 -0000
@@ -218,6 +218,7 @@
  * Standard set of module name patterns to check, in order of preference
  * These are regular expressions (suitable for use with POSIX regex(3)).
  */
+#ifdef DLOPEN_HACK
 static PatternRec stdPatterns[] = {
     {"^lib(.*)\\.so$",},
     {"^lib(.*)\\.a$",},
@@ -228,6 +229,18 @@
     {"(.*)\\.o$",},
     {NULL,}
 };
+#else
+static PatternRec stdPatterns[] = {
+    {"^lib(.*)\\.a$",},
+    {"^lib(.*)\\.so$",},
+    {"(.*)_drv\\.o$",},
+    {"(.*)_drv\\.so$",},
+    {"(.*)\\.a$",},
+    {"(.*)\\.o$",},
+    {"(.*)\\.so$",},
+    {NULL,}
+};
+#endif
 
 static PatternPtr
 InitPatterns(const char **patternlist)