0N/Adiff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c

0N/Aindex 5312ca6..9622eab 100644

0N/A--- a/hw/xfree86/common/xf86Config.c

0N/A+++ b/hw/xfree86/common/xf86Config.c

0N/A@@ -74,9 +74,9 @@

0N/A */

0N/A #ifndef ROOT_CONFIGPATH

0N/A #define ROOT_CONFIGPATH "%A," "%R," \

0N/A- "/etc/X11/%R," "%P/etc/X11/%R," \

0N/A+ "/etc/X11/%R," "%P/lib/X11/%R," \

0N/A "%E," "%F," \

0N/A- "/etc/X11/%F," "%P/etc/X11/%F," \

0N/A+ "/etc/X11/%F," "%P/lib/X11/%F," \

0N/A "/etc/X11/%X," "/etc/%X," \

0N/A "%P/etc/X11/%X.%H," \

0N/A "%P/etc/X11/%X," \

0N/A@@ -84,8 +84,8 @@

0N/A "%P/lib/X11/%X"

0N/A #endif

0N/A #ifndef USER_CONFIGPATH

143N/A-#define USER_CONFIGPATH "/etc/X11/%S," "%P/etc/X11/%S," \

0N/A- "/etc/X11/%G," "%P/etc/X11/%G," \

0N/A+#define USER_CONFIGPATH "/etc/X11/%S," "%P/lib/X11/%S," \

0N/A+ "/etc/X11/%G," "%P/lib/X11/%G," \

0N/A "/etc/X11/%X," "/etc/%X," \

143N/A "%P/etc/X11/%X.%H," \

143N/A "%P/etc/X11/%X," \

143N/Adiff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c

143N/Aindex 16d5557..f87c1eb 100644

143N/A--- a/hw/xfree86/common/xf86Globals.c

143N/A+++ b/hw/xfree86/common/xf86Globals.c

202N/A@@ -138,7 +138,8 @@ xf86InfoRec xf86Info = {

421N/A };

200N/A const char *xf86ConfigFile = NULL;

143N/A const char *xf86ConfigDir = NULL;

143N/A-const char *xf86ModulePath = DEFAULT_MODULE_PATH;

424N/A+/* Sun: add old module path for compatibility with out-of-tree driver packages */

143N/A+const char *xf86ModulePath = DEFAULT_MODULE_PATH ",/usr/X11/lib/modules/";

143N/A MessageType xf86ModPathFrom = X_DEFAULT;

99N/A const char *xf86LogFile = DEFAULT_LOGPREFIX;

424N/A MessageType xf86LogFileFrom = X_DEFAULT;

0N/Adiff --git a/hw/xfree86/doc/man/xorg.conf.man b/hw/xfree86/doc/man/xorg.conf.man

202N/Aindex e3fd0ea..dac9a10 100644

202N/A--- a/hw/xfree86/doc/man/xorg.conf.man

202N/A+++ b/hw/xfree86/doc/man/xorg.conf.man

202N/A@@ -36,9 +36,9 @@ server is started as a normal user:

202N/A .RS 4

202N/A .nf

202N/A .IR /etc/X11/ <cmdline>

202N/A-.IR __projectroot__/etc/X11/ <cmdline>

202N/A+.IR __projectroot__/lib/X11/ <cmdline>

202N/A .IB /etc/X11/ $XORGCONFIG

202N/A-.IB __projectroot__/etc/X11/ $XORGCONFIG

202N/A+.IB __projectroot__/lib/X11/ $XORGCONFIG

202N/A .I /etc/X11/__xconfigfile__

202N/A .I /etc/__xconfigfile__

202N/A .IR __projectroot__/etc/X11/__xconfigfile__. <hostname>

202N/A@@ -67,10 +67,10 @@ search locations are as follows:

202N/A .nf

244N/A <cmdline>

58N/A .IR /etc/X11/ <cmdline>

143N/A-.IR __projectroot__/etc/X11/ <cmdline>

143N/A+.IR __projectroot__/lib/X11/ <cmdline>

143N/A .B $XORGCONFIG

0N/A .IB /etc/X11/ $XORGCONFIG

0N/A-.IB __projectroot__/etc/X11/ $XORGCONFIG

0N/A+.IB __projectroot__/lib/X11/ $XORGCONFIG

143N/A .I /etc/X11/__xconfigfile__

143N/A .I /etc/__xconfigfile__

143N/A .IR __projectroot__/etc/X11/__xconfigfile__. <hostname>

143N/Adiff --git a/include/xorg-server.h.in b/include/xorg-server.h.in

0N/Aindex b10b994..feaedfc 100644

0N/A--- a/include/xorg-server.h.in

0N/A+++ b/include/xorg-server.h.in

0N/A@@ -184,6 +184,7 @@

143N/A /* X Access Control Extension */

202N/A #undef XACE

202N/A

202N/A+#include <sys/isa_defs.h> /* Ensure _LP64 is defined when needed on Solaris */

202N/A #ifdef _LP64

483N/A #define _XSERVER64 1

483N/A #endif

483N/A