summaryrefslogtreecommitdiff
path: root/src/s
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1995-12-26 04:35:42 +0000
committerRichard M. Stallman <rms@gnu.org>1995-12-26 04:35:42 +0000
commit4fe00c0433cdbdd217d55758a443316ab78b1de5 (patch)
tree61d24312b49f2dee8c48d24798cd939c0b2891f7 /src/s
parent19ff9de2a56fccb1610c0909b4694ce10a529b40 (diff)
downloademacs-4fe00c0433cdbdd217d55758a443316ab78b1de5.tar.gz
(LIBXMU): Replace previous change.
Bring back the old definition, but conditionalize on ! HAVE_X11R6.
Diffstat (limited to 'src/s')
-rw-r--r--src/s/sunos4shr.h10
1 files changed, 8 insertions, 2 deletions
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 */