2004-11-19  Gwenole Beauchesne  <gbeauchesne@mandrakesoft.com>

	* mozilla/nsprpub/pr/include/md/_linux.cfg: Define IS_LIB64 for
	x86_64 and s390x targets.
	* mozilla/modules/plugin/base/src/nsPluginsDirUnix.cpp: Fix
	DEFAULT_X11_PATH for lib64 systems.

--- mozilla/nsprpub/pr/include/md/_linux.cfg.lib64	2004-11-19 05:28:57.107007000 -0500
+++ mozilla/nsprpub/pr/include/md/_linux.cfg	2004-11-19 05:50:32.372290420 -0500
@@ -187,6 +187,7 @@
 #define IS_LITTLE_ENDIAN 1
 #undef  IS_BIG_ENDIAN
 #define IS_64
+#define IS_LIB64
 
 #define PR_BYTES_PER_BYTE   1
 #define PR_BYTES_PER_SHORT  2
@@ -555,6 +556,7 @@
 #define IS_BIG_ENDIAN 1
 #undef  IS_LITTLE_ENDIAN
 #define IS_64
+#define IS_LIB64
 
 #define PR_BYTES_PER_BYTE   1
 #define PR_BYTES_PER_SHORT  2
--- mozilla/modules/plugin/base/src/nsPluginsDirUnix.cpp.lib64	2003-11-22 16:19:35.000000000 -0500
+++ mozilla/modules/plugin/base/src/nsPluginsDirUnix.cpp	2004-11-19 05:51:08.658610151 -0500
@@ -73,7 +73,11 @@ static NS_DEFINE_CID(kPrefServiceCID, NS
 #elif defined(SOLARIS)
 #define DEFAULT_X11_PATH "/usr/openwin/lib/"
 #elif defined(LINUX)
+#ifdef IS_LIB64
+#define DEFAULT_X11_PATH "/usr/X11R6/lib64/"
+#else
 #define DEFAULT_X11_PATH "/usr/X11R6/lib/"
+#endif
 #else
 #define DEFAULT_X11_PATH ""
 #endif