# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 819952542 0
# Node ID 8b143e9a5394c54604894eb549e1439328e5bc14
# Parent  817ecef2d2d0986de9a99d668953a55f203d4114
(LIBXMU): Replace previous change.
Bring back the old definition, but conditionalize on ! HAVE_X11R6.

diff -r 817ecef2d2d0 -r 8b143e9a5394 src/s/sunos4shr.h
--- a/src/s/sunos4shr.h	Tue Dec 26 04:34:05 1995 +0000
+++ b/src/s/sunos4shr.h	Tue Dec 26 04:35:42 1995 +0000
@@ -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 */