Update to libXmu 1.1.0. No functional change.

46 files changed, 21 insertions, 144 deletions

diff --git a/lib/libXmu/src/AllCmap.c b/lib/libXmu/src/AllCmap.c
index 09ae52aa4..1daa8de7c 100644
--- a/lib/libXmu/src/AllCmap.c
+++ b/lib/libXmu/src/AllCmap.c
@@ -1,5 +1,3 @@
-/* $Xorg: AllCmap.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */
-
 /* 
  
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/AllCmap.c,v 1.7 2001/01/17 19:42:53 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXmu/src/Atoms.c b/lib/libXmu/src/Atoms.c
index dcdf497a5..48e243194 100644
--- a/lib/libXmu/src/Atoms.c
+++ b/lib/libXmu/src/Atoms.c
@@ -1,5 +1,3 @@
-/* $Xorg: Atoms.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */
- 
 /* 
 
 Copyright 1988, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/Atoms.c,v 3.7 2001/07/25 15:04:50 dawes Exp $ */
 
 /*
  * This file contains routines to cache atoms, avoiding multiple
diff --git a/lib/libXmu/src/ClientWin.c b/lib/libXmu/src/ClientWin.c
index 7fc273f1f..3af323e0a 100644
--- a/lib/libXmu/src/ClientWin.c
+++ b/lib/libXmu/src/ClientWin.c
@@ -1,5 +1,3 @@
-/* $Xorg: ClientWin.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */
-
 /* 
  
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/ClientWin.c,v 1.7 2001/12/14 19:55:34 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXmu/src/Clip.c b/lib/libXmu/src/Clip.c
index 121a69f23..ff87a80c0 100644
--- a/lib/libXmu/src/Clip.c
+++ b/lib/libXmu/src/Clip.c
@@ -24,7 +24,6 @@
  * dealings in this Software without prior written authorization from the
  * XFree86 Project.
  */
-/* $XFree86: xc/lib/Xmu/Clip.c,v 1.1 1998/08/16 10:25:03 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXmu/src/CloseHook.c b/lib/libXmu/src/CloseHook.c
index 5e66d0cad..ca9d9def6 100644
--- a/lib/libXmu/src/CloseHook.c
+++ b/lib/libXmu/src/CloseHook.c
@@ -1,5 +1,3 @@
-/* $Xorg: CloseHook.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */
-
 /* 
 Copyright 1989, 1998  The Open Group
 
@@ -24,7 +22,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/CloseHook.c,v 3.5 2001/07/25 15:04:50 dawes Exp $ */
 
 /*
  * CloseDisplayHook package - provide callback on XCloseDisplay
diff --git a/lib/libXmu/src/CmapAlloc.c b/lib/libXmu/src/CmapAlloc.c
index 1f27f1eef..0bccb829c 100644
--- a/lib/libXmu/src/CmapAlloc.c
+++ b/lib/libXmu/src/CmapAlloc.c
@@ -1,5 +1,3 @@
-/* $Xorg: CmapAlloc.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */
-
 /* 
 
 Copyright 1989, 1994, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/CmapAlloc.c,v 1.6 2001/01/17 19:42:53 dawes Exp $ */
 
 /*
  * Author:  Donna Converse, MIT X Consortium
diff --git a/lib/libXmu/src/CrCmap.c b/lib/libXmu/src/CrCmap.c
index 011c71465..4343f5f0f 100644
--- a/lib/libXmu/src/CrCmap.c
+++ b/lib/libXmu/src/CrCmap.c
@@ -1,5 +1,3 @@
-/* $Xorg: CrCmap.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */
-
 /* 
 
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/CrCmap.c,v 3.6 2001/01/17 19:42:53 dawes Exp $ */
 
 /*
  * Author:  Donna Converse, MIT X Consortium
diff --git a/lib/libXmu/src/CrPixFBit.c b/lib/libXmu/src/CrPixFBit.c
index c7ff6caf2..9489a19a0 100644
--- a/lib/libXmu/src/CrPixFBit.c
+++ b/lib/libXmu/src/CrPixFBit.c
@@ -1,5 +1,3 @@
-/* $Xorg: CrPixFBit.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */
-
 /*
 
 Copyright 1988, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/CrPixFBit.c,v 1.6 2001/01/17 19:42:53 dawes Exp $ */
 
 /*
  * This file contains miscellaneous utility routines and is not part of the
diff --git a/lib/libXmu/src/CursorName.c b/lib/libXmu/src/CursorName.c
index 17f390246..8867e8fa4 100644
--- a/lib/libXmu/src/CursorName.c
+++ b/lib/libXmu/src/CursorName.c
@@ -1,5 +1,3 @@
-/* $Xorg: CursorName.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */
-
 /*
  
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/CursorName.c,v 3.7tsi Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXmu/src/CvtCache.c b/lib/libXmu/src/CvtCache.c
index 8dd4602ea..39a5d0caf 100644
--- a/lib/libXmu/src/CvtCache.c
+++ b/lib/libXmu/src/CvtCache.c
@@ -1,5 +1,3 @@
-/* $Xorg: CvtCache.c,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /*
  
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/CvtCache.c,v 3.6 2001/08/23 00:03:21 dawes Exp $ */
 
 /* 
  * Author:  Jim Fulton, MIT X Consortium
diff --git a/lib/libXmu/src/CvtStdSel.c b/lib/libXmu/src/CvtStdSel.c
index a6f206ade..81d1a8474 100644
--- a/lib/libXmu/src/CvtStdSel.c
+++ b/lib/libXmu/src/CvtStdSel.c
@@ -1,6 +1,3 @@
-/* $Xorg: CvtStdSel.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-/* $XdotOrg: xc/lib/Xmu/CvtStdSel.c,v 1.5 2005/05/22 04:36:38 alanc Exp $ */
-
 /*
  
 Copyright 1988, 1998  The Open Group
@@ -26,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/CvtStdSel.c,v 3.19 2001/11/21 16:22:59 tsi Exp $ */
 
 /*
  * This file contains routines to handle common selection targets.
diff --git a/lib/libXmu/src/DefErrMsg.c b/lib/libXmu/src/DefErrMsg.c
index d1aa9ad9a..37fe0aa31 100644
--- a/lib/libXmu/src/DefErrMsg.c
+++ b/lib/libXmu/src/DefErrMsg.c
@@ -1,5 +1,3 @@
-/* $Xorg: DefErrMsg.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /*
 
 Copyright 1988, 1998  The Open Group
@@ -25,13 +23,11 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/DefErrMsg.c,v 1.7 2001/01/17 19:42:54 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 #include <stdio.h>
-#define NEED_EVENTS
 #include <X11/Xlibint.h>
 #include <X11/Xproto.h>
 #include <X11/Xmu/Error.h>
diff --git a/lib/libXmu/src/DelCmap.c b/lib/libXmu/src/DelCmap.c
index 1f2c6abe8..f29ae00f0 100644
--- a/lib/libXmu/src/DelCmap.c
+++ b/lib/libXmu/src/DelCmap.c
@@ -1,5 +1,3 @@
-/* $Xorg: DelCmap.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /* 
  
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/DelCmap.c,v 1.6 2001/01/17 19:42:54 dawes Exp $ */
 
 /*
  * Author:  Donna Converse, MIT X Consortium
diff --git a/lib/libXmu/src/DisplayQue.c b/lib/libXmu/src/DisplayQue.c
index ae9f92e1d..de76a69c4 100644
--- a/lib/libXmu/src/DisplayQue.c
+++ b/lib/libXmu/src/DisplayQue.c
@@ -1,5 +1,3 @@
-/* $Xorg: DisplayQue.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /*
  
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/DisplayQue.c,v 3.4 2001/07/25 15:04:50 dawes Exp $ */
 
 /*
  * Author:  Jim Fulton, MIT X Consortium
diff --git a/lib/libXmu/src/Distinct.c b/lib/libXmu/src/Distinct.c
index f00b00b5a..9d31494ec 100644
--- a/lib/libXmu/src/Distinct.c
+++ b/lib/libXmu/src/Distinct.c
@@ -1,5 +1,3 @@
-/* $Xorg: Distinct.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /*
 
 Copyright 1990, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/Distinct.c,v 3.5 2001/07/25 15:04:50 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXmu/src/DrRndRect.c b/lib/libXmu/src/DrRndRect.c
index 7fe5489d0..1373de07d 100644
--- a/lib/libXmu/src/DrRndRect.c
+++ b/lib/libXmu/src/DrRndRect.c
@@ -1,5 +1,3 @@
-/* $Xorg: DrRndRect.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /*
 
 Copyright 1988, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/DrRndRect.c,v 1.6 2001/01/17 19:42:54 dawes Exp $ */
 
 /*
  * XmuDrawRoundedRectangle, XmuFillRoundedRectangle
diff --git a/lib/libXmu/src/DrawLogo.c b/lib/libXmu/src/DrawLogo.c
index 74e64d866..4af89b530 100644
--- a/lib/libXmu/src/DrawLogo.c
+++ b/lib/libXmu/src/DrawLogo.c
@@ -1,5 +1,3 @@
-/* $Xorg: DrawLogo.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /*
 
 Copyright 1988, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/DrawLogo.c,v 1.7 2001/01/17 19:42:54 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXmu/src/EditresCom.c b/lib/libXmu/src/EditresCom.c
index 51ac24895..0208cdfe8 100644
--- a/lib/libXmu/src/EditresCom.c
+++ b/lib/libXmu/src/EditresCom.c
@@ -1,5 +1,3 @@
-/* $Xorg: EditresCom.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /*
 
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/EditresCom.c,v 1.21 2003/10/24 15:44:05 tsi Exp $ */
 
 /*
  * Author:  Chris D. Peterson, Dave Sternlicht, MIT X Consortium
diff --git a/lib/libXmu/src/ExtAgent.c b/lib/libXmu/src/ExtAgent.c
index 27955678f..6b0dfdbd8 100644
--- a/lib/libXmu/src/ExtAgent.c
+++ b/lib/libXmu/src/ExtAgent.c
@@ -1,5 +1,3 @@
-/* $Xorg: ExtAgent.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /*
 
 Copyright 1994, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/ExtAgent.c,v 1.6 2001/01/17 19:42:55 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXmu/src/FToCback.c b/lib/libXmu/src/FToCback.c
index 6da4826f7..4ca8d459a 100644
--- a/lib/libXmu/src/FToCback.c
+++ b/lib/libXmu/src/FToCback.c
@@ -1,5 +1,3 @@
-/* $Xorg: FToCback.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /* 
  
 Copyright 1988,1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/FToCback.c,v 1.6 2001/01/17 19:42:55 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXmu/src/GetHost.c b/lib/libXmu/src/GetHost.c
index 19793fd7f..2f0bccded 100644
--- a/lib/libXmu/src/GetHost.c
+++ b/lib/libXmu/src/GetHost.c
@@ -1,5 +1,3 @@
-/* $Xorg: GetHost.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /*
 
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/GetHost.c,v 3.7 2001/07/25 15:04:50 dawes Exp $ */
 
 /*
  * Author:  Jim Fulton, MIT X Consortium
diff --git a/lib/libXmu/src/GrayPixmap.c b/lib/libXmu/src/GrayPixmap.c
index 478269f8a..ccea46116 100644
--- a/lib/libXmu/src/GrayPixmap.c
+++ b/lib/libXmu/src/GrayPixmap.c
@@ -1,5 +1,3 @@
-/* $Xorg: GrayPixmap.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /*
 
 Copyright 1987, 1988, 1998  The Open Group
@@ -49,7 +47,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xmu/GrayPixmap.c,v 1.5 2001/01/17 19:42:55 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXmu/src/Initer.c b/lib/libXmu/src/Initer.c
index f18492f69..bd7678480 100644
--- a/lib/libXmu/src/Initer.c
+++ b/lib/libXmu/src/Initer.c
@@ -1,5 +1,3 @@
-/* $Xorg: Initer.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /* 
  
 Copyright 1988, 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/Initer.c,v 1.6 2001/01/17 19:42:56 dawes Exp $ */
 
 /* Created By:  Chris D. Peterson
  *              MIT X Consortium
diff --git a/lib/libXmu/src/LocBitmap.c b/lib/libXmu/src/LocBitmap.c
index 112f3cff4..0cfbdaa23 100644
--- a/lib/libXmu/src/LocBitmap.c
+++ b/lib/libXmu/src/LocBitmap.c
@@ -1,5 +1,3 @@
-/* $Xorg: LocBitmap.c,v 1.7 2001/02/09 02:03:52 xorgcvs Exp $ */
-
 /*
  
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/LocBitmap.c,v 3.9 2001/12/14 19:55:47 dawes Exp $ */
 
 /*
  * Author:  Jim Fulton, MIT X Consortium
diff --git a/lib/libXmu/src/Lookup.c b/lib/libXmu/src/Lookup.c
index 27676c1da..75b546df4 100644
--- a/lib/libXmu/src/Lookup.c
+++ b/lib/libXmu/src/Lookup.c
@@ -1,5 +1,3 @@
-/* $Xorg: Lookup.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /* 
  
 Copyright 1988, 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/Lookup.c,v 3.7 2001/01/17 19:42:56 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXmu/src/LookupCmap.c b/lib/libXmu/src/LookupCmap.c
index e7d7008e5..5756b83ec 100644
--- a/lib/libXmu/src/LookupCmap.c
+++ b/lib/libXmu/src/LookupCmap.c
@@ -1,5 +1,3 @@
-/* $Xorg: LookupCmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /* 
  
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/LookupCmap.c,v 1.7 2001/07/25 15:04:50 dawes Exp $ */
 
 /*
  * Author:  Donna Converse, MIT X Consortium
diff --git a/lib/libXmu/src/Lower.c b/lib/libXmu/src/Lower.c
index 06ad31a29..4e44be148 100644
--- a/lib/libXmu/src/Lower.c
+++ b/lib/libXmu/src/Lower.c
@@ -1,5 +1,3 @@
-/* $Xorg: Lower.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /* 
  
 Copyright 1988, 1998  The Open Group
@@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-/* $XFree86: xc/lib/Xmu/Lower.c,v 1.11 2001/07/25 15:04:50 dawes Exp $ */
-
 #define  XK_LATIN1
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXmu/src/Makefile.in b/lib/libXmu/src/Makefile.in
index 04aab9d91..aed8438d8 100644
--- a/lib/libXmu/src/Makefile.in
+++ b/lib/libXmu/src/Makefile.in
@@ -97,6 +97,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AR = @AR@
@@ -126,13 +127,25 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@
+ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+FOP = @FOP@
 GREP = @GREP@
 HAS_SNPRINTF = @HAS_SNPRINTF@
+HAVE_FOP_FALSE = @HAVE_FOP_FALSE@
+HAVE_FOP_TRUE = @HAVE_FOP_TRUE@
+HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@
+HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@
+HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
+HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
+HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
+HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -157,6 +170,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
 MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
+MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 NMEDIT = @NMEDIT@
@@ -174,11 +188,16 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 VERSION = @VERSION@
+XMLTO = @XMLTO@
 XMUU_CFLAGS = @XMUU_CFLAGS@
 XMUU_LIBS = @XMUU_LIBS@
 XMU_CFLAGS = @XMU_CFLAGS@
 XMU_LIBS = @XMU_LIBS@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XORG_SGML_PATH = @XORG_SGML_PATH@
+XSL_STYLESHEET = @XSL_STYLESHEET@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
@@ -199,7 +218,6 @@ build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
 datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -307,9 +325,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/Makefile
+	  $(AUTOMAKE) --foreign  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/lib/libXmu/src/RdBitF.c b/lib/libXmu/src/RdBitF.c
index 073e3dfbd..9402159b3 100644
--- a/lib/libXmu/src/RdBitF.c
+++ b/lib/libXmu/src/RdBitF.c
@@ -1,5 +1,3 @@
-/* $Xorg: RdBitF.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /*
 
 Copyright 1988, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/RdBitF.c,v 3.12 2001/12/14 19:55:48 dawes Exp $ */
 
 /*
  * This file contains miscellaneous utility routines and is not part of the
diff --git a/lib/libXmu/src/ScrOfWin.c b/lib/libXmu/src/ScrOfWin.c
index dbba3c65b..b8fc09ad9 100644
--- a/lib/libXmu/src/ScrOfWin.c
+++ b/lib/libXmu/src/ScrOfWin.c
@@ -1,5 +1,3 @@
-/* $Xorg: ScrOfWin.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /*
 
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/ScrOfWin.c,v 1.6 2001/01/17 19:42:56 dawes Exp $ */
 
 /*
  * Author:  Jim Fulton, MIT X Consortium
diff --git a/lib/libXmu/src/ShapeWidg.c b/lib/libXmu/src/ShapeWidg.c
index 732018c92..bb8c4fbb3 100644
--- a/lib/libXmu/src/ShapeWidg.c
+++ b/lib/libXmu/src/ShapeWidg.c
@@ -1,5 +1,3 @@
-/* $Xorg: ShapeWidg.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /* 
  
 Copyright 1988, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/ShapeWidg.c,v 1.7 2001/01/17 19:42:56 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXmu/src/StdCmap.c b/lib/libXmu/src/StdCmap.c
index 3fb3f25dd..5d2ce6160 100644
--- a/lib/libXmu/src/StdCmap.c
+++ b/lib/libXmu/src/StdCmap.c
@@ -1,5 +1,3 @@
-/* $Xorg: StdCmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /* 
 
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/StdCmap.c,v 1.5 2001/01/17 19:42:56 dawes Exp $ */
 
 /*
  * Author:  Donna Converse, MIT X Consortium
diff --git a/lib/libXmu/src/StrToBS.c b/lib/libXmu/src/StrToBS.c
index 79fbedda6..0dd0be519 100644
--- a/lib/libXmu/src/StrToBS.c
+++ b/lib/libXmu/src/StrToBS.c
@@ -1,5 +1,3 @@
-/* $Xorg: StrToBS.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /* 
  
 Copyright 1988, 1998  The Open Group
@@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-/* $XFree86: xc/lib/Xmu/StrToBS.c,v 1.6 2001/01/17 19:42:56 dawes Exp $ */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/lib/libXmu/src/StrToBmap.c b/lib/libXmu/src/StrToBmap.c
index f46a99a1a..80df74bc7 100644
--- a/lib/libXmu/src/StrToBmap.c
+++ b/lib/libXmu/src/StrToBmap.c
@@ -1,5 +1,3 @@
-/* $Xorg: StrToBmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /*
 
 Copyright 1987, 1988, 1998  The Open Group
@@ -49,7 +47,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xmu/StrToBmap.c,v 1.5 2001/01/17 19:42:57 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXmu/src/StrToCurs.c b/lib/libXmu/src/StrToCurs.c
index 7f13c0d4e..53d98f511 100644
--- a/lib/libXmu/src/StrToCurs.c
+++ b/lib/libXmu/src/StrToCurs.c
@@ -1,5 +1,3 @@
-/* $Xorg: StrToCurs.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /*
 
 Copyright 1987, 1988, 1998  The Open Group
@@ -50,8 +48,6 @@ SOFTWARE.
 
 ******************************************************************/
 
-/* $XFree86: xc/lib/Xmu/StrToCurs.c,v 1.11 2002/09/19 13:21:58 tsi Exp $ */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/lib/libXmu/src/StrToGrav.c b/lib/libXmu/src/StrToGrav.c
index a0c99687c..8d86fe51d 100644
--- a/lib/libXmu/src/StrToGrav.c
+++ b/lib/libXmu/src/StrToGrav.c
@@ -1,5 +1,3 @@
-/* $Xorg: StrToGrav.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /* 
 
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/StrToGrav.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXmu/src/StrToJust.c b/lib/libXmu/src/StrToJust.c
index f3b4b7828..03b38545d 100644
--- a/lib/libXmu/src/StrToJust.c
+++ b/lib/libXmu/src/StrToJust.c
@@ -1,5 +1,3 @@
-/* $Xorg: StrToJust.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /* 
  
 Copyright 1988, 1998  The Open Group
@@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-/* $XFree86: xc/lib/Xmu/StrToJust.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/lib/libXmu/src/StrToLong.c b/lib/libXmu/src/StrToLong.c
index 6a7539aa9..c0663f5ce 100644
--- a/lib/libXmu/src/StrToLong.c
+++ b/lib/libXmu/src/StrToLong.c
@@ -1,5 +1,3 @@
-/* $Xorg: StrToLong.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /*
  
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/StrToLong.c,v 1.8 2001/08/23 00:03:21 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXmu/src/StrToOrnt.c b/lib/libXmu/src/StrToOrnt.c
index 209b13a19..0c41c116c 100644
--- a/lib/libXmu/src/StrToOrnt.c
+++ b/lib/libXmu/src/StrToOrnt.c
@@ -1,5 +1,3 @@
-/* $Xorg: StrToOrnt.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /* 
  
 Copyright 1988, 1998  The Open Group
@@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-/* $XFree86: xc/lib/Xmu/StrToOrnt.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/lib/libXmu/src/StrToShap.c b/lib/libXmu/src/StrToShap.c
index 3f17c01e9..298c91522 100644
--- a/lib/libXmu/src/StrToShap.c
+++ b/lib/libXmu/src/StrToShap.c
@@ -1,5 +1,3 @@
-/* $Xorg: StrToShap.c,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /* 
  
 Copyright 1988, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/StrToShap.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXmu/src/StrToWidg.c b/lib/libXmu/src/StrToWidg.c
index 190e91f56..c22b82764 100644
--- a/lib/libXmu/src/StrToWidg.c
+++ b/lib/libXmu/src/StrToWidg.c
@@ -1,5 +1,3 @@
-/* $Xorg: StrToWidg.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /*
 
 Copyright 1994, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/StrToWidg.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */
 
 /*
  * XmuCvtStringToWidget
diff --git a/lib/libXmu/src/UpdMapHint.c b/lib/libXmu/src/UpdMapHint.c
index aeba3037f..389b80213 100644
--- a/lib/libXmu/src/UpdMapHint.c
+++ b/lib/libXmu/src/UpdMapHint.c
@@ -1,5 +1,3 @@
-/* $Xorg: UpdMapHint.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /*
 
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/UpdMapHint.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */
 
 /*
  * Author:  Jim Fulton, MIT X Consortium
diff --git a/lib/libXmu/src/VisCmap.c b/lib/libXmu/src/VisCmap.c
index 54022cc9a..0a35713ba 100644
--- a/lib/libXmu/src/VisCmap.c
+++ b/lib/libXmu/src/VisCmap.c
@@ -1,5 +1,3 @@
-/* $Xorg: VisCmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /* 
 
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/VisCmap.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */
 
 /*
  * Author:  Donna Converse, MIT X Consortium
diff --git a/lib/libXmu/src/WidgetNode.c b/lib/libXmu/src/WidgetNode.c
index e157ccc10..ac6c9ec9d 100644
--- a/lib/libXmu/src/WidgetNode.c
+++ b/lib/libXmu/src/WidgetNode.c
@@ -1,5 +1,3 @@
-/* $Xorg: WidgetNode.c,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /*
  
 Copyright 1989, 1998  The Open Group
@@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-/* $XFree86: xc/lib/Xmu/WidgetNode.c,v 1.12 2002/09/19 13:21:58 tsi Exp $ */
-
 /*
  * Author:  Jim Fulton, MIT X Consortium
  */
diff --git a/lib/libXmu/src/Xct.c b/lib/libXmu/src/Xct.c
index b186d27d7..1db470ebb 100644
--- a/lib/libXmu/src/Xct.c
+++ b/lib/libXmu/src/Xct.c
@@ -1,5 +1,3 @@
-/* $Xorg: Xct.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /* 
 
 Copyright 1989, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/Xct.c,v 1.8 2001/07/25 15:04:50 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXmu/src/sharedlib.c b/lib/libXmu/src/sharedlib.c
index 0ef5e3ce9..4bb8c3b5f 100644
--- a/lib/libXmu/src/sharedlib.c
+++ b/lib/libXmu/src/sharedlib.c
@@ -1,5 +1,3 @@
-/* $Xorg: sharedlib.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xmu/sharedlib.c,v 3.4 2001/07/25 15:04:51 dawes Exp $ */
 
 #if defined(SUNSHLIB) && !defined(SHAREDCODE)