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

1351N/Aindex 486752b..c2cfc90 100644

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

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

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

1018N/A */

1265N/A #ifndef ALL_CONFIGPATH

1265N/A #define ALL_CONFIGPATH "%A," "%R," \

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

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

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

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

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

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

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

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

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

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

1018N/A #endif

1265N/A #ifndef RESTRICTED_CONFIGPATH

1265N/A-#define RESTRICTED_CONFIGPATH "/etc/X11/%S," "%P/etc/X11/%S," \

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

1265N/A+#define RESTRICTED_CONFIGPATH "/etc/X11/%S," "%P/lib/X11/%S," \

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

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

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

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

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

1351N/Aindex 7df7a80..74e503c 100644

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

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

1351N/A@@ -141,7 +141,8 @@ xf86InfoRec xf86Info = {

1276N/A

851N/A const char *xf86ConfigFile = NULL;

1088N/A const char *xf86ConfigDir = NULL;

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

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

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

851N/A MessageType xf86ModPathFrom = X_DEFAULT;

851N/A const char *xf86LogFile = DEFAULT_LOGPREFIX;

851N/A MessageType xf86LogFileFrom = X_DEFAULT;

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

1351N/Aindex 5d92bbe..2b5a8f6 100644

1265N/A--- a/hw/xfree86/man/xorg.conf.man

1265N/A+++ b/hw/xfree86/man/xorg.conf.man

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

1018N/A .RS 4

1018N/A .nf

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

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

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

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

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

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

1351N/A .I /etc/X11/xorg.conf

1351N/A .I /etc/xorg.conf

1351N/A .IR __projectroot__/etc/X11/xorg.conf. <hostname>

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

1018N/A .nf

1018N/A <cmdline>

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

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

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

1018N/A .B $XORGCONFIG

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

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

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

1351N/A .I /etc/X11/xorg.conf

1351N/A .I /etc/xorg.conf

1351N/A .IR __projectroot__/etc/X11/xorg.conf. <hostname>

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

1351N/Aindex 81935be..9473e34 100644

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

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

1351N/A@@ -208,6 +208,7 @@

1351N/A /* Have X server platform bus support */

1351N/A #undef XSERVER_PLATFORM_BUS

1088N/A

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

1088N/A #ifdef _LP64

1088N/A #define _XSERVER64 1

1088N/A #endif