Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.365.2.140
diff -u -2 -0 -r1.365.2.140 ChangeLog
--- xc/ChangeLog	1 Feb 2005 03:32:37 -0000	1.365.2.140
+++ xc/ChangeLog	1 Feb 2005 03:58:44 -0000
@@ -1,21 +1,30 @@
 2005-02-01 Roland Mainz <roland.mainz@nrubsig.org>
+	* xc/config/cf/X11.tmpl
+	Bugzilla #2410 (https://bugs.freedesktop.org/show_bug.cgi?id=2410)
+	attachment #1782 (https://bugs.freedesktop.org/attachment.cgi?id=1782):
+	Build the XRX plugin only if the system supports shared libraries
+	(which is a requirement for this plugin).
+	Patch by Matthieu Herrb <matthieu.herrb@laas.fr>.
+	Approved in the 2005-01-31 Xorg release-wranglers phone call.
+
+2005-02-01 Roland Mainz <roland.mainz@nrubsig.org>
 	* xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.c
 	Bugzilla #2252 (https://bugs.freedesktop.org/show_bug.cgi?id=2252)
 	attachment #1791 (https://bugs.freedesktop.org/attachment.cgi?id=1791):
 	Fix option dontVTSwitch under *BSD, when XKB is disabled.
 	Patch by Matthieu Herrb <matthieu.herrb@laas.fr>.
 	Approved in the 2005-01-31 Xorg release-wranglers phone call.
 
 2005-02-01 Roland Mainz <roland.mainz@nrubsig.org>
 	* xc/nls/Compose/pt_BR.UTF-8
 	* xc/nls/XLC_LOCALE/pt_BR.UTF-8
 	Bugzilla #2400 (https://bugs.freedesktop.org/show_bug.cgi?id=2400)
 	attachment #1762 (https://bugs.freedesktop.org/attachment.cgi?id=1762):
 	Fix build bustage caused by broken patch for brazillian locale support
 	(see Bugzilla #1896).
 	Patch by Kevin E. Martin <kem@freedesktop.org>.
 	Approved in the 2005-01-31 Xorg release-wranglers phone call.
 
 2005-01-25 Roland Mainz <roland.mainz@nrubsig.org>
 	* xc/config/cf/xorgversion.def
 	Bugzilla #2378 (https://bugs.freedesktop.org/show_bug.cgi?id=2378)
Index: xc/config/cf/X11.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v
retrieving revision 1.35.2.2
diff -u -2 -0 -r1.35.2.2 X11.tmpl
--- xc/config/cf/X11.tmpl	24 Jan 2005 05:01:54 -0000	1.35.2.2
+++ xc/config/cf/X11.tmpl	1 Feb 2005 03:58:46 -0000
@@ -456,41 +456,44 @@
 #ifndef BuildXineramaLibrary
 #define BuildXineramaLibrary	(BuildXinerama && !BuildServersOnly)
 #endif
 #ifndef BuildDmxDevelTools
 #define BuildDmxDevelTools	NO
 #endif
 #ifndef BuildDmxLibrary
 #define BuildDmxLibrary		(BuildDmx && \
 				 (!BuildServersOnly || BuildDmxDevelTools))
 #endif
 #ifndef BuildXCSecurity
 #define BuildXCSecurity		YES
 #endif
 #ifndef BuildAppgroup
 #define BuildAppgroup		YES
 #endif
 #ifndef BuildCup
 #define BuildCup		YES
 #endif
 #ifndef HasPlugin
-#define HasPlugin		YES
+/* Browser plugins are shared libraries - only build them if the OS
+ * supports shared libs.
+ */
+#define HasPlugin		HasSharedLibraries
 #endif
 #ifndef BuildPlugin
 #define BuildPlugin		HasPlugin
 #endif
 #ifndef XpRasterDDX
 #define XpRasterDDX             YES
 #endif
 #ifndef XpColorPclDDX
 #define XpColorPclDDX           YES
 #endif
 #ifndef XpMonoPclDDX
 #define XpMonoPclDDX            YES
 #endif
 #ifndef XpPostScriptDDX
 #define XpPostScriptDDX         YES
 #endif
 #ifndef XpPdfDDX
 #define XpPdfDDX                YES
 #endif
 #ifndef XpSvgDDX