hi,
apparently my git-fu went on holidays, so the attached needs some
manual intervention: after having applied (or before, as you see fit),
manually remove the following files:
wrlib/CmapAlloc.c wrlib/CrCmap.c wrlib/DelCmap.c
wrlib/LookupCmap.c wrlib/StdCmap.c wrlib/StdCmap.h
what this does it removes bits and pieces of xmu that for some reason
have been bundled with wm. i can very well imagine that at the time
they were bundled, xmu was not, was not available everywhere, or
whatever.
i couldn't come across a system that doesn't have these things in its
system-supplied x libs, though i've been carrying this since january,
and my memory is quite flakey at times.
certainly nothing xorg is at danger, nor xfree86 dating back to at
least 3.3. i believe this stuff should be everywhere that calls itself
to be on par with x11r6.3 at the very least.
it would be incredibly useful if people having access to commercial
unixes could check this on things released in the past, say, 15 years.
i believe back then i had solaris 8+and sco openserver 5+ covered.
anyway this is just me being overly cautios. just apply, and if
there's a fallout, it'll eventually surface! ;)
diff --git a/configure.ac b/configure.ac
index 9acfe86..2b4f347 100644
--- a/configure.ac
+++ b/configure.ac
@@ -428,7 +428,7 @@ XCFLAGS="$X_CFLAGS"
XLFLAGS="$X_LIBS"
-XLIBS="-lX11 $X_EXTRA_LIBS"
+XLIBS="-lX11 -lXmu $X_EXTRA_LIBS"
lib_search_path="$lib_search_path $XLFLAGS"
diff --git a/wrlib/Makefile.am b/wrlib/Makefile.am
index a43b89b..f376e50 100644
--- a/wrlib/Makefile.am
+++ b/wrlib/Makefile.am
@@ -15,12 +15,6 @@ bin_SCRIPTS = get-wraster-flags
include_HEADERS = wraster.h
libwraster_la_SOURCES = \
- LookupCmap.c \
- StdCmap.c \
- StdCmap.h \
- CrCmap.c \
- DelCmap.c \
- CmapAlloc.c \
raster.c \
draw.c \
color.c \
diff --git a/wrlib/context.c b/wrlib/context.c
index 3c06188..c4d0e81 100644
--- a/wrlib/context.c
+++ b/wrlib/context.c
@@ -24,6 +24,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
+#include <X11/Xmu/StdCmap.h>
#include <stdio.h>
#include <stdlib.h>
@@ -32,8 +33,6 @@
#include <math.h>
-#include "StdCmap.h"
-
#include "wraster.h"
extern void _wraster_change_filter(int type);
--
[-]
mkdir /nonexistentdiff --git a/configure.ac b/configure.ac
index 9acfe86..2b4f347 100644
--- a/configure.ac
+++ b/configure.ac
@@ -428,7 +428,7 @@ XCFLAGS="$X_CFLAGS"
XLFLAGS="$X_LIBS"
-XLIBS="-lX11 $X_EXTRA_LIBS"
+XLIBS="-lX11 -lXmu $X_EXTRA_LIBS"
lib_search_path="$lib_search_path $XLFLAGS"
diff --git a/wrlib/Makefile.am b/wrlib/Makefile.am
index a43b89b..f376e50 100644
--- a/wrlib/Makefile.am
+++ b/wrlib/Makefile.am
@@ -15,12 +15,6 @@ bin_SCRIPTS = get-wraster-flags
include_HEADERS = wraster.h
libwraster_la_SOURCES = \
- LookupCmap.c \
- StdCmap.c \
- StdCmap.h \
- CrCmap.c \
- DelCmap.c \
- CmapAlloc.c \
raster.c \
draw.c \
color.c \
diff --git a/wrlib/context.c b/wrlib/context.c
index 3c06188..c4d0e81 100644
--- a/wrlib/context.c
+++ b/wrlib/context.c
@@ -24,6 +24,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
+#include <X11/Xmu/StdCmap.h>
#include <stdio.h>
#include <stdlib.h>
@@ -32,8 +33,6 @@
#include <math.h>
-#include "StdCmap.h"
-
#include "wraster.h"
extern void _wraster_change_filter(int type);
