--- configure.orig	Tue Oct 20 15:42:09 1998
+++ configure	Tue Oct 20 15:42:47 1998
@@ -2067,11 +2067,11 @@
 ice_motif_save_LIBS="$LIBS"
 ice_motif_save_CFLAGS="$CFLAGS"
 ice_motif_save_CPPFLAGS="$CPPFLAGS"
 ice_motif_save_LDFLAGS="$LDFLAGS"
 #
-LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS"
+LIBS="$X_PRE_LIBS -lXm -lXp -lXext -lXt -lX11 $X_EXTRA_LIBS $LIBS"
 CFLAGS="$X_CFLAGS $CFLAGS"
 CPPFLAGS="$X_CFLAGS $CPPFLAGS"
 LDFLAGS="$X_LIBS $LDFLAGS"
 #
 cat > conftest.$ac_ext <<EOF
@@ -2141,11 +2141,11 @@
 ice_motif_save_LIBS="$LIBS"
 ice_motif_save_CFLAGS="$CFLAGS"
 ice_motif_save_CPPFLAGS="$CPPFLAGS"
 ice_motif_save_LDFLAGS="$LDFLAGS"
 #
-LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS"
+LIBS="$X_PRE_LIBS -lXm -lXp -lXext -lXt -lX11 $X_EXTRA_LIBS $LIBS"
 CFLAGS="$X_CFLAGS $CFLAGS"
 CPPFLAGS="$X_CFLAGS $CPPFLAGS"
 LDFLAGS="$X_LIBS $LDFLAGS"
 #
 # We use XtToolkitInitialize() here since it takes no arguments
@@ -2697,11 +2697,11 @@
 ac_lib_var=`echo Xm'_'XmRepTypeInstallTearOffModelConverter | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lXm ${X_PRE_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${XEXT_LIBS} ${X11_LIBS} $LIBS"
+LIBS="-lXm -lXp -lXext ${X_PRE_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${XEXT_LIBS} ${X11_LIBS} $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 2705 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2725,11 +2725,11 @@
 LIBS="$ac_save_LIBS"
 
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  XM_LIBS="-lXm"
+  XM_LIBS="-lXm -lXp -lXext"
 	cat >> confdefs.h <<\EOF
 #define HAVE_MOTIF 1
 EOF
 
 else
--- wlib/wlib/sanity.h.orig	Thu Aug 27 05:22:41 1998
+++ wlib/wlib/sanity.h	Sat Feb 22 13:52:34 2003
@@ -25,6 +25,7 @@
 #define	WLIB_SANITY_H
 MU_HID(wlib_sanity_h, "$Mu: wlib/wlib/sanity.h 1.6 1998/08/27 03:22:41 $")
 
+#include <stdio.h>
 #include <assert.h>
 
 #define	ARGSANITY(a,n)	assert((size_t)(n) <= sizeof(a)/sizeof((a)[0]))
--- doc/Makefile.in.orig	Mon Sep 28 11:54:02 1998
+++ doc/Makefile.in	Sat Feb 22 15:46:52 2003
@@ -88,7 +88,7 @@
 	mgv-21.html mgv-22.html mgv-23.html mgv-24.html mgv-25.html \
 	mgv-26.html mgv-27.html mgv-28.html mgv-29.html mgv-30.html
 
-helpdir = $(pkgdatadir)/$(VERSION)/help
+helpdir = $(pkgdatadir)/help
 help_DATA = mgv.html $(mu_htmlchunks) *.gif
 
 SUFFIXES = .gif .sgml-in .sgml .ps .eps
--- lib/toolbar/Makefile.in.orig	Mon Sep 28 11:54:02 1998
+++ lib/toolbar/Makefile.in	Sat Feb 22 15:47:54 2003
@@ -104,7 +104,7 @@
 	pageNext-i.xpm pageNext.xpm \
 	pagePrev-i.xpm pagePrev.xpm
 
-toolbardir = $(pkgdatadir)/$(VERSION)/toolbar
+toolbardir = $(pkgdatadir)/toolbar
 toolbar_DATA = $(mu_bitmaps) $(mu_pixmaps)
 mkinstalldirs = $(SHELL) $(top_srcdir)/tools/mkinstalldirs
 CONFIG_CLEAN_FILES = 
--- lib/Makefile.in.orig	Mon Sep 28 11:54:02 1998
+++ lib/Makefile.in	Sat Feb 22 15:50:41 2003
@@ -78,7 +78,7 @@
 
 SUBDIRS = toolbar
 
-mgvmiscdir = $(pkgdatadir)/$(VERSION)
+mgvmiscdir = $(pkgdatadir)
 mgvmisc_DATA = icon.xbm icon.xpm mask.xbm splash.xbm splash.xpm
 mkinstalldirs = $(SHELL) $(top_srcdir)/tools/mkinstalldirs
 CONFIG_CLEAN_FILES = 
--- Makefile.in.orig	Mon Sep 28 11:54:02 1998
+++ Makefile.in	Sat Feb 22 15:52:38 2003
@@ -85,7 +85,7 @@
 	@LIBHELP_LIBS@ @XM_LIBS@ @EDITRES_LIBS@ @XT_LIBS@ @XPM_LIBS@ \
 	@XEXT_LIBS@ @X11_LIBS@
 
-mgvresdir = $(pkgdatadir)/$(VERSION)
+mgvresdir = $(pkgdatadir)
 mgvres_DATA = MGv
 
 mgv_DEPENDENCIES = _bld.o wlib/libwlib.a
@@ -471,11 +471,11 @@
 	tools/ad2c -a bld_fallbacks MGv > _ad.c
 
 MGv: MGv.ad
-	sed -e 's;__DATADIR__;$(datadir)/mgv/$(VERSION);g' -e 's;__VERSION__;$(VERSION);g' < MGv.ad > MGv || (rm -f MGv; exit 1)
+	sed -e 's;__DATADIR__;$(datadir)/mgv;g' -e 's;__VERSION__;$(VERSION);g' < MGv.ad > MGv || (rm -f MGv; exit 1)
 
 mgv.1: mgv.man
 	sed -e 's;__VERSION__;$(VERSION);g' \
-		-e 's;__DATADIR__;@datadir@/mgv/$(VERSION)/help;g' \
+		-e 's;__DATADIR__;@datadir@/mgv/help;g' \
 		< mgv.man > mgv.1 || (rm -f mgv.1; exit 1)
 
 @MU_MAINTAINER_TRUE@res.m4: doc/mgv.sgml-in
Index: process.c
--- process.c.orig	1998-09-01 22:49:39 +0200
+++ process.c	2004-10-07 21:19:24 +0200
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <X11/Intrinsic.h>
+#include <Xm/Xm.h>
 #include <Xm/XmStrDefs.h>
 
 #include <wlib/wlib.h>
Index: scroll.c
--- scroll.c.orig	1998-09-01 22:49:39 +0200
+++ scroll.c	2004-10-07 21:19:33 +0200
@@ -26,6 +26,7 @@
 #include <assert.h>
 #include <string.h>
 #include <X11/IntrinsicP.h>
+#include <Xm/Xm.h>
 #include <Xm/XmStrDefs.h>
 
 #include <wlib/stdlib.h>
Index: wlib/icons.c
--- wlib/icons.c.orig	1998-08-24 00:26:25 +0200
+++ wlib/icons.c	2004-10-07 21:18:30 +0200
@@ -28,6 +28,7 @@
 #include <assert.h>
 #include <limits.h>
 #include <X11/Intrinsic.h>
+#include <Xm/Xm.h>
 #include <Xm/XmStrDefs.h>
 #include <X11/Shell.h>
 
Index: wlib/xbm.c
--- wlib/xbm.c.orig	1998-08-23 08:29:23 +0200
+++ wlib/xbm.c	2004-10-07 21:18:54 +0200
@@ -26,6 +26,7 @@
 
 #include <X11/Xlib.h>
 #include <X11/Intrinsic.h>
+#include <Xm/Xm.h>
 #include <Xm/XmStrDefs.h>
 
 #include <wlib/wlibP.h>
Index: wlib/xpm.c
--- wlib/xpm.c.orig	1998-09-11 04:41:48 +0200
+++ wlib/xpm.c	2004-10-07 21:19:08 +0200
@@ -28,6 +28,7 @@
 #include <X11/Xlib.h>
 #include <X11/Intrinsic.h>
 #include <X11/Shell.h>
+#include <Xm/Xm.h>
 #include <Xm/XmStrDefs.h>
 #if defined(HAVE_XPM) && HAVE_XPM
 #	if defined(HAVE_X11_XPM_H) && HAVE_X11_XPM_H