Mercurial > emacs

changeset 13863:8b143e9a5394

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(LIBXMU): Replace previous change. Bring back the old definition, but conditionalize on ! HAVE_X11R6.
author Richard M. Stallman <rms@gnu.org>
date Tue, 26 Dec 1995 04:35:42 +0000
parents 817ecef2d2d0
children 8389738a7792
files src/s/sunos4shr.h
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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 */