Index: xlwcheckbox.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/lwlib/Attic/xlwcheckbox.c,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 xlwcheckbox.c
--- xlwcheckbox.c	1999/07/30 09:13:54	1.1.2.1
+++ xlwcheckbox.c	1999/08/31 14:51:53
@@ -38,8 +38,10 @@
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 #include <X11/Xaw/XawInit.h>
+#ifdef HAVE_XMU
 #include <X11/Xmu/Converters.h>
 #include <X11/Xmu/Misc.h>
+#endif
 #include "xlwcheckboxP.h"
 
 
Index: xlwgauge.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/lwlib/Attic/xlwgauge.c,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 xlwgauge.c
--- xlwgauge.c	1999/07/30 09:13:55	1.1.2.1
+++ xlwgauge.c	1999/08/31 14:51:57
@@ -49,14 +49,16 @@
 #include <X11/Xatom.h>
 #include <X11/StringDefs.h>
 #include <X11/Xaw/XawInit.h>
+#ifdef HAVE_XMU
 #include <X11/Xmu/Misc.h>
+#endif
 #include "xlwgaugeP.h"
-
+#ifdef HAVE_XMU
 #include <X11/Xmu/Atoms.h>
 #include <X11/Xmu/Converters.h>
 #include <X11/Xmu/Drawing.h>
 #include <X11/Xmu/StdSel.h>
-
+#endif
 #include <stdio.h>
 #include <ctype.h>
 
@@ -220,8 +222,10 @@
 GaugeClassInit()
 {
     XawInitializeWidgetSet();
+#ifdef HAVE_XMU
     XtAddConverter(XtRString, XtROrientation, XmuCvtStringToOrientation,
     		NULL, 0) ;
+#endif
 }
 
 
@@ -639,6 +643,7 @@
 	    XGetAtomName(XtDisplay(w),*selection),
 	    XGetAtomName(XtDisplay(w),*target));
 
+#ifdef HAVE_XMU
 	if( *target == XA_TARGETS(XtDisplay(w)) )
 	{
 	  Atom *rval, *stdTargets ;
@@ -666,7 +671,9 @@
 	  return True ;
 	}
 
-	else if( *target == XA_INTEGER )
+	else 
+#endif
+	  if( *target == XA_INTEGER )
 	{
 	  *type = XA_INTEGER ;
 	  *length = 1 ;
@@ -688,12 +695,14 @@
 	else
 	{
 	  /* anything else, we just give it to XmuConvertStandardSelection() */
-
+#ifdef HAVE_XMU
 	  req = XtGetSelectionRequest(w, *selection, NULL) ;
 	  if( XmuConvertStandardSelection(w, req->time, selection, target,
 	  	type, value, length, format) )
 	    return True ;
-	  else {
+	  else 
+#endif
+	    {
 	    printf(
 		"Gauge: requestor is requesting unsupported selection %s:%s\n",
 	    	XGetAtomName(XtDisplay(w),*selection),
Index: xlwgcs.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/lwlib/Attic/xlwgcs.c,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 xlwgcs.c
--- xlwgcs.c	1999/07/30 09:13:55	1.1.2.1
+++ xlwgcs.c	1999/08/31 14:52:00
@@ -102,9 +102,10 @@
 #include	<X11/Xlib.h>
 #include	<X11/IntrinsicP.h>
 #include	<X11/StringDefs.h>
+#ifdef HAVE_XMU
 #include	<X11/Xmu/Drawing.h>
 #include	<X11/Xmu/Misc.h>
-
+#endif
 #include	"xlwgcs.h"
 
 	/* Color & GC allocation.
@@ -233,7 +234,7 @@
 	  dcmask = GCFont|GCSubwindowMode|GCDashOffset|
 		GCDashList|GCArcMode|GCGraphicsExposures ;
 	}
-
+#ifdef HAVE_XMU
 	if( be_nice_to_cmap || w->core.depth == 1)
 	{
 	  values.fill_style = FillStippled ;
@@ -243,6 +244,7 @@
 	  return XtAllocateGC(w, w->core.depth, vmask, &values, 0L, dcmask) ;
 	}
 	else
+#endif
 	{
 	  values.foreground =
 	  	AllocGreyPixel(w, fg, values.background, contrast) ;
@@ -313,7 +315,7 @@
 	/* Not clear exactly what we should do here.  Take a look at
 	 * Xaw3d to see what they do.
 	 */
-
+#ifdef HAVE_XMU
 	if( w->core.depth == 1 || be_nice_to_cmap )
 	{
 	  values.background = w->core.background_pixel ;
@@ -330,7 +332,9 @@
 	      GCFont|GCSubwindowMode|GCGraphicsExposures|
 		  GCDashOffset|GCDashList|GCArcMode) ;
 	}
-	else {
+	else 
+#endif
+	  {
 	  values.foreground = AllocShadowPixel(w, 100-contrast) ;
 	  return XtAllocateGC(w, w->core.depth,
 	      GCForeground, &values,
Index: xlwradio.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/lwlib/Attic/xlwradio.c,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 xlwradio.c
--- xlwradio.c	1999/07/30 09:13:56	1.1.2.1
+++ xlwradio.c	1999/08/31 14:52:00
@@ -53,8 +53,10 @@
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 #include <X11/Xaw/XawInit.h>
+#ifdef HAVE_XMU
 #include <X11/Xmu/Converters.h>
 #include <X11/Xmu/Misc.h>
+#endif
 #include "xlwradioP.h"
 
 #define	BOX_SIZE	13
Index: xlwtabs.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/lwlib/Attic/xlwtabs.c,v
retrieving revision 1.1.2.4
diff -u -r1.1.2.4 xlwtabs.c
--- xlwtabs.c	1999/08/29 20:57:19	1.1.2.4
+++ xlwtabs.c	1999/08/31 14:52:02
@@ -55,13 +55,15 @@
  *
  */
 
+#include	<config.h>
 #include	<stdio.h>
 
 #include	<X11/Xlib.h>
 #include	<X11/IntrinsicP.h>
 #include	<X11/StringDefs.h>
+#ifdef HAVE_XMU
 #include	<X11/Xmu/Misc.h>
-
+#endif
 #include	"xlwtabsP.h"
 #include	"xlwgcs.h"
 
@@ -1062,7 +1064,9 @@
 	XtReleaseGC(w, tw->tabs.backgroundGC) ;
 	XtReleaseGC(w, tw->tabs.topGC) ;
 	XtReleaseGC(w, tw->tabs.botGC) ;
+#ifdef HAVE_XMU
 	XmuReleaseStippledPixmap(XtScreen(w), tw->tabs.grey50) ;
+#endif
 }
 
 
@@ -1723,7 +1727,7 @@
 
 	values.background = tw->core.background_pixel ;
 	values.font = tw->tabs.font->fid ;
-
+#ifdef HAVE_XMU
 	if( tw->tabs.be_nice_to_cmap || w->core.depth == 1)
 	{
 	  values.fill_style = FillStippled ;
@@ -1738,6 +1742,7 @@
 		  GCDashList|GCArcMode) ;
 	}
 	else
+#endif
 	{
 	  tw->tabs.greyGC =
 	    XtAllocateGC(w, w->core.depth,