From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 26 Dec 1995 04:35:42 +0000 (+0000)
Subject: (LIBXMU): Replace previous change.
X-Git-Tag: emacs-19.34~1997
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6ef338b79955cc159b3330c0c9cbcf923d40434b;p=emacs.git

(LIBXMU): Replace previous change.
Bring back the old definition, but conditionalize on ! HAVE_X11R6.
---

diff --git a/src/s/sunos4shr.h b/src/s/sunos4shr.h
index e373d3b6cad..b95160fe016 100644
--- a/src/s/sunos4shr.h
+++ b/src/s/sunos4shr.h
@@ -45,8 +45,14 @@
 
 #undef USE_DL_STUBS
 
+#ifndef HAVE_X11R6
+/* With X11R5 it was reported that linking -lXmu dynamically
+   did not work.  With X11R6, it does work; and since normally
+   only the dynamic libraries are available, we should use them.  */
 #ifdef __GNUC__
-#define LIBXMU -Xlinker -Bdynamic -lXmu -Xlinker -Bdynamic
+#define LIBXMU -Xlinker -Bstatic -lXmu -Xlinker -Bdynamic
 #else
-#define LIBXMU -Bdynamic -lXmu -Bdynamic
+#define LIBXMU -Bstatic -lXmu -Bdynamic
 #endif
+
+#endif  /* not HAVE_X11R6 */