(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 e373d3b6cad4a9985c585f3e5e24a59cd2e11b97..b95160fe0161bb4c3e701f8508fa8b4f24a1d985 100644 (file)
--- 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 */