Merge remote-tracking branch 'origin/released'

Conflicts:
	freetype/src/raster/ftraster.c
	openssl/Makefile

103 files changed, 2204 insertions, 1612 deletions

diff --git a/libXaw/ChangeLog b/libXaw/ChangeLog
index acd1ca6d2..5e7e8f579 100644
--- a/libXaw/ChangeLog
+++ b/libXaw/ChangeLog
@@ -1,3 +1,95 @@
+commit ffaad7ee2ef6e06b4585567df04f6b64356fb6fe
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Fri Jun 1 20:31:30 2012 -0700
+
+    libXaw 1.0.11
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 52081b462ff7d1844d014bf9be887197caa88160
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat May 26 15:07:07 2012 -0700
+
+    Only call XawStackFree if XawStackAlloc was used for allocation
+    
+    In FormParagraph() in TextAction.c, the #if OLDXAW case always uses
+    fixed length buffers, while the !OLDXAW case uses XawStackAlloc &
+    XawStackFree to switch to dynamic allocations when the buffers aren't
+    large enough.
+    
+    A couple instances of XawStackFree slipped into the wrong side of
+    the #if checks though, so move them back where they belong.   Also
+    reset pos afterwards, in the case we continue and may use it again,
+    to avoid the chance of a double free.
+    
+    Found by the Parfait 0.5.0.1 bug checking tool:
+    
+    Error: Free memory not allocated dynamically by alloc (CWE 590)
+       Free() was called on a pointer 'buf' to the auto variable 'buf'. Free() must only be used on dynamically allocated memory
+            at line 3946 of TextAction.c in function 'FormParagraph'.
+              'buf' allocated at line 0 as auto variable.
+            at line 4000 of TextAction.c in function 'FormParagraph'.
+              'buf' allocated at line 0 as auto variable.
+    Error: Use after free (CWE 416)
+       Use after free of pointer '&buf'
+            at line 3995 of TextAction.c in function 'FormParagraph'.
+              Previously freed at line 3946 with XtFree.
+    Error: Use after free
+       Double free (CWE 415): Double free of pointer '&buf' in call to XtFree
+            at line 4000 of TextAction.c in function 'FormParagraph'.
+              Previously freed at line 3946 with XtFree.
+       Double free (CWE 415): Double free of pointer '<unknown>' in call to XtFree
+            at line 4000 of TextAction.c in function 'FormParagraph'.
+              Previously freed at line 3946 with XtFree.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Acked-by: pcpa <paulo.cesar.pereira.de.andrade@gmail.com>
+
+commit ca35cff72a3100c9367b7e7f4811117c8733b8be
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat May 26 14:44:26 2012 -0700
+
+    Correct order of arguments to XawStackFree()
+    
+    XawStackAlloc() & XawStackFree() are macros to automate the process of
+    using a fixed size stack buffer for strings smaller than the buffer size,
+    and allocating/freeing memory for larger strings.
+    
+    XawStackFree is defined in src/Private.h as taking (pointer, stk_buffer)
+    and freeing pointer if it's not pointing to the stack buffer.
+    
+    Most of the calls of this macro get the ordering right, but a couple
+    got it reversed, passing a stack buffer to free() instead of the
+    allocated pointer.
+    
+    Found by the Parfait 0.5.0.1 bug checking tool:
+    
+    Error: Free memory not allocated dynamically by alloc (CWE 590)
+       Free() was called on a pointer 'buf' to the auto variable 'buf'. Free() must only be used on dynamically allocated memory
+            at line 2281 of TextAction.c in function 'DoFormatText'.
+              'buf' allocated at line 0 as auto variable.
+            at line 2296 of TextAction.c in function 'DoFormatText'.
+              'buf' allocated at line 0 as auto variable.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Acked-by: pcpa <paulo.cesar.pereira.de.andrade@gmail.com>
+
+commit 11c3a104141e1a4946ad949dfb5514df0b66a031
+Author: pcpa <paulo.cesar.pereira.de.andrade@gmail.com>
+Date:   Tue May 22 20:42:32 2012 -0300
+
+    Correct undefined behavior access to out of scope pointer contents.
+    
+      This problem is triggered in gcc 4.7 DCE (dead code elimination).
+    In the Xaw code, the local constant "String" is not guaranteed to
+    have global scope.
+      The problem was found when debugging the reason xedit built with
+    gcc 4.7 would be very unstable, and that happens regardless of using
+    a libXaw built with gcc 4.6.
+    
+    Signed-off-by: pcpa <paulo.cesar.pereira.de.andrade@gmail.com>
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
 commit b16cc35e551860a0bff54c47b33317536ddeae52
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Thu Mar 22 19:51:33 2012 -0700
diff --git a/libXaw/Makefile.in b/libXaw/Makefile.in
index 5866142db..3e7b92287 100644
--- a/libXaw/Makefile.in
+++ b/libXaw/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -88,6 +88,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
 DATA = $(pkgconfig_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
@@ -133,6 +139,8 @@ am__relativize = \
 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
@@ -297,7 +305,7 @@ all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -333,10 +341,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -378,9 +384,7 @@ uninstall-pkgconfigDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
+	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -591,7 +595,7 @@ dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
 dist-lzma: distdir
@@ -599,7 +603,7 @@ dist-lzma: distdir
 	$(am__remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
@@ -617,7 +621,7 @@ dist-zip: distdir
 
 dist dist-all: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -650,6 +654,7 @@ distcheck: dist
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -678,8 +683,16 @@ distcheck: dist
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -713,10 +726,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/libXaw/aclocal.m4 b/libXaw/aclocal.m4
index 3950bbc1d..75a6234ac 100644
--- a/libXaw/aclocal.m4
+++ b/libXaw/aclocal.m4
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.2 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -19,12 +20,15 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -34,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.11.2], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -50,19 +54,21 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.2])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -144,14 +150,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
+# serial 12
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -191,6 +197,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -255,7 +262,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -320,10 +327,13 @@ AC_DEFUN([AM_DEP_TRACK],
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -545,12 +555,15 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -590,8 +603,8 @@ AC_SUBST([am__leading_dot])])
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
+# 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -611,7 +624,7 @@ AC_DEFUN([AM_MAINTAINER_MODE],
        [disable], [m4_define([am_maintainer_other], [enable])],
        [m4_define([am_maintainer_other], [enable])
         m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
   AC_ARG_ENABLE([maintainer-mode],
 [  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
@@ -757,12 +770,15 @@ else
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_MKDIR_P
 # ---------------
 # Check for `mkdir -p'.
@@ -785,13 +801,14 @@ esac
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -799,13 +816,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -908,12 +925,14 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
@@ -936,13 +955,13 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
@@ -951,7 +970,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
@@ -1051,167 +1070,11 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-		
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT
-])],
-		[AC_MSG_RESULT([no])
-                $4])
-elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-		[$4])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
-
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -1220,8 +1083,8 @@ fi[]dnl
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -1355,6 +1218,8 @@ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
 
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -1840,7 +1705,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -2004,6 +1869,7 @@ AC_DEFUN([LT_LANG],
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
   [Fortran],		[_LT_LANG(FC)],
@@ -2025,6 +1891,29 @@ m4_defun([_LT_LANG],
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_GO], [
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -2055,6 +1944,10 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -2157,7 +2050,13 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -2165,6 +2064,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi])
+
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
       [lt_cv_ld_exported_symbols_list=no
@@ -2176,6 +2076,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
     ])
+
     AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
       [lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
@@ -2193,7 +2094,9 @@ _LT_EOF
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -2238,8 +2141,8 @@ _LT_EOF
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -2250,6 +2153,8 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
   else
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   fi
@@ -2533,14 +2438,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -2617,13 +2535,13 @@ old_postuninstall_cmds=
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -2803,6 +2721,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -2842,7 +2765,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -3388,7 +3311,7 @@ need_version=unknown
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -3397,7 +3320,7 @@ aix3*)
   ;;
 
 aix[[4-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -3462,7 +3385,7 @@ beos*)
   ;;
 
 bsdi[[45]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -3601,7 +3524,7 @@ m4_if([$1], [],[
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -3609,10 +3532,6 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -3620,7 +3539,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -3638,7 +3557,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -3658,17 +3577,18 @@ freebsd* | dragonfly*)
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -3729,7 +3649,7 @@ hpux9* | hpux10* | hpux11*)
   ;;
 
 interix[[3-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -3745,7 +3665,7 @@ irix5* | irix6* | nonstopux*)
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -3782,9 +3702,9 @@ linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -3847,7 +3767,7 @@ netbsd*)
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -3916,7 +3836,7 @@ rdos*)
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -3941,7 +3861,7 @@ sunos4*)
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -3965,7 +3885,7 @@ sysv4 | sysv4.3*)
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -3996,7 +3916,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -4006,7 +3926,7 @@ tpf*)
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -4428,7 +4348,7 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -4848,6 +4768,7 @@ for ac_symprfx in "" "_"; do
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -5432,7 +5353,9 @@ m4_if([$1], [CXX], [
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
       ;;
     esac
   else
@@ -5524,18 +5447,33 @@ m4_if([$1], [CXX], [
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -5695,7 +5633,9 @@ m4_if([$1], [CXX], [
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
       _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -5720,7 +5660,6 @@ m4_if([$1], [CXX], [
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -5971,8 +5910,7 @@ _LT_EOF
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -6267,6 +6205,7 @@ _LT_EOF
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -6313,10 +6252,6 @@ _LT_EOF
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -6329,7 +6264,7 @@ _LT_EOF
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -6368,7 +6303,6 @@ _LT_EOF
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -6810,9 +6744,6 @@ _LT_TAGDECL([], [no_undefined_flag], [1],
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
     [Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
     [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -6966,7 +6897,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -7336,7 +7266,7 @@ if test "$_lt_caught_CXX_error" != yes; then
         esac
         ;;
 
-      freebsd[[12]]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -8097,12 +8027,18 @@ public class foo {
   }
 };
 _LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 ])
 
 _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 dnl Parse the compiler output and extract the necessary
@@ -8299,7 +8235,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -8432,7 +8367,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -8615,6 +8549,73 @@ CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -8684,6 +8685,13 @@ dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],
@@ -9348,9 +9356,24 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
     [pic_mode=default])
 
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
@@ -9522,15 +9545,15 @@ m4_define([lt_dict_filter],
 
 # @configure_input@
 
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
@@ -9634,6 +9657,162 @@ m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
 m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
 m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
 
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+		
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+		[AC_MSG_RESULT([no])
+                $4])
+elif test $pkg_failed = untried; then
+	ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+		[$4])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
+
 dnl xorg-macros.m4.  Generated from xorg-macros.m4.in xorgversion.m4 by configure.
 dnl
 dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
@@ -11190,7 +11369,7 @@ m4_foreach([flag], m4_cdr($@), [
 		PREFIX[FLAGS]="$PREFIX[FLAGS] ]flag["
 
 dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname
-		AC_MSG_CHECKING([if ]COMPILER[ supports]flag[])
+		AC_MSG_CHECKING([if ]COMPILER[ supports ]flag[])
 		cacheid=AS_TR_SH([xorg_cv_]CACHE_PREFIX[_flag_]flag[])
 		AC_CACHE_VAL($cacheid,
 			     [AC_LINK_IFELSE([AC_LANG_PROGRAM([int i;])],
diff --git a/libXaw/compile b/libXaw/compile
index c0096a7b5..bac481cdc 100644
--- a/libXaw/compile
+++ b/libXaw/compile
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2009-10-06.20; # UTC
+scriptversion=2010-11-15.09; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010 Free Software
 # Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
@@ -29,6 +29,171 @@ scriptversion=2009-10-06.20; # UTC
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Win32 hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as `compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l*)
+	  lib=${1#-l}
+	  found=no
+	  save_IFS=$IFS
+	  IFS=';'
+	  for dir in $lib_path $LIB
+	  do
+	    IFS=$save_IFS
+	    if $shared && test -f "$dir/$lib.dll.lib"; then
+	      found=yes
+	      set x "$@" "$dir/$lib.dll.lib"
+	      break
+	    fi
+	    if test -f "$dir/$lib.lib"; then
+	      found=yes
+	      set x "$@" "$dir/$lib.lib"
+	      break
+	    fi
+	  done
+	  IFS=$save_IFS
+
+	  test "$found" != yes && set x "$@" "$lib.lib"
+	  shift
+	  ;;
+	-L*)
+	  func_file_conv "${1#-L}"
+	  if test -z "$lib_path"; then
+	    lib_path=$file
+	  else
+	    lib_path="$lib_path;$file"
+	  fi
+	  linker_opts="$linker_opts -LIBPATH:$file"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
 case $1 in
   '')
      echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
@@ -53,11 +218,13 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
 esac
 
 ofile=
 cfile=
-eat=
 
 for arg
 do
diff --git a/libXaw/config.guess b/libXaw/config.guess
index 285237846..8152efd67 100644
--- a/libXaw/config.guess
+++ b/libXaw/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
 
-timestamp='2010-08-21'
+timestamp='2011-11-11'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@ GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
 Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -92,7 +92,7 @@ if test $# != 0; then
   exit 1
 fi
 
-trap 'exit 1' HUP INT TERM
+trap 'exit 1' 1 2 15
 
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
@@ -106,7 +106,7 @@ trap 'exit 1' HUP INT TERM
 
 set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
  { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
@@ -181,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -224,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -270,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -296,7 +299,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -395,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -481,8 +484,8 @@ EOF
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -495,7 +498,7 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -595,52 +598,52 @@ EOF
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
 
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -731,22 +734,22 @@ EOF
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -770,14 +773,14 @@ EOF
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -789,13 +792,12 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
@@ -804,15 +806,18 @@ EOF
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
     *:Interix*:*)
-    	case ${UNAME_MACHINE} in
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
@@ -867,7 +872,7 @@ EOF
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
+	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -879,7 +884,13 @@ EOF
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
@@ -892,7 +903,10 @@ EOF
 	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo frv-unknown-linux-gnu
+	exit ;;
+    hexagon:Linux:*:*)
+	echo hexagon-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
@@ -960,7 +974,7 @@ EOF
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -969,7 +983,7 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
@@ -978,7 +992,7 @@ EOF
 	echo x86_64-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -987,11 +1001,11 @@ EOF
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1023,7 +1037,7 @@ EOF
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1051,13 +1065,13 @@ EOF
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-        exit ;;
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1092,8 +1106,8 @@ EOF
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1136,10 +1150,10 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1165,11 +1179,11 @@ EOF
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1234,6 +1248,9 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
@@ -1279,13 +1296,13 @@ EOF
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1325,11 +1342,11 @@ main ()
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif
 
diff --git a/libXaw/config.sub b/libXaw/config.sub
index 320e30388..e76eaf472 100644
--- a/libXaw/config.sub
+++ b/libXaw/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
 
-timestamp='2010-09-11'
+timestamp='2011-11-11'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -76,7 +76,7 @@ version="\
 GNU config.sub ($timestamp)
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
 Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -158,8 +158,8 @@ case $os in
 		os=
 		basic_machine=$1
 		;;
-        -bluegene*)
-	        os=-cnk
+	-bluegene*)
+		os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
@@ -175,10 +175,10 @@ case $os in
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -251,13 +251,17 @@ case $basic_machine in
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 	| maxq | mb | microblaze | mcore | mep | metag \
@@ -286,22 +290,23 @@ case $basic_machine in
 	| nds32 | nds32le | nds32be \
 	| nios | nios2 \
 	| ns16k | ns32k \
+	| open8 \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rx \
+	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -325,6 +330,18 @@ case $basic_machine in
 		basic_machine=mt-unknown
 		;;
 
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -344,6 +361,7 @@ case $basic_machine in
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
@@ -352,8 +370,10 @@ case $basic_machine in
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -382,24 +402,26 @@ case $basic_machine in
 	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile-* | tilegx-* \
+	| tile*-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
@@ -424,7 +446,7 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -507,7 +529,7 @@ case $basic_machine in
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
+	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@@ -539,7 +561,7 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
+	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@@ -755,7 +777,7 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-        microblaze)
+	microblaze)
 		basic_machine=microblaze-xilinx
 		;;
 	mingw32)
@@ -794,10 +816,18 @@ case $basic_machine in
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -862,10 +892,10 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
-        neo-tandem)
+	neo-tandem)
 		basic_machine=neo-tandem
 		;;
-        nse-tandem)
+	nse-tandem)
 		basic_machine=nse-tandem
 		;;
 	nsr-tandem)
@@ -950,9 +980,10 @@ case $basic_machine in
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -1046,6 +1077,9 @@ case $basic_machine in
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1102,13 +1136,8 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-        # This must be matched before tile*.
-        tilegx*)
-		basic_machine=tilegx-unknown
-		os=-linux-gnu
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1178,6 +1207,9 @@ case $basic_machine in
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1275,11 +1307,11 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-        -auroraux)
-	        os=-auroraux
+	-auroraux)
+		os=-auroraux
 		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1315,7 +1347,7 @@ case $os in
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1364,7 +1396,7 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1413,7 +1445,7 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1458,8 +1490,8 @@ case $os in
 	-dicos*)
 		os=-dicos
 		;;
-        -nacl*)
-	        ;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1482,10 +1514,10 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1497,8 +1529,8 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
 		;;
 	tic54x-*)
 		os=-coff
@@ -1534,7 +1566,7 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1561,7 +1593,7 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
diff --git a/libXaw/configure b/libXaw/configure
index 76052e327..0adb4848b 100644
--- a/libXaw/configure
+++ b/libXaw/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libXaw 1.0.10.
+# Generated by GNU Autoconf 2.68 for libXaw 1.0.11.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -631,8 +631,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libXaw'
 PACKAGE_TARNAME='libXaw'
-PACKAGE_VERSION='1.0.10'
-PACKAGE_STRING='libXaw 1.0.10'
+PACKAGE_VERSION='1.0.11'
+PACKAGE_STRING='libXaw 1.0.11'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 PACKAGE_URL=''
 
@@ -754,6 +754,7 @@ SED
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -1421,7 +1422,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libXaw 1.0.10 to adapt to many kinds of systems.
+\`configure' configures libXaw 1.0.11 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1491,7 +1492,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libXaw 1.0.10:";;
+     short | recursive ) echo "Configuration of libXaw 1.0.11:";;
    esac
   cat <<\_ACEOF
 
@@ -1523,7 +1524,7 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects [default=use
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
@@ -1618,7 +1619,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libXaw configure 1.0.10
+libXaw configure 1.0.11
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2033,7 +2034,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libXaw $as_me 1.0.10, which was
+It was created by libXaw $as_me 1.0.11, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2853,7 +2854,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libXaw'
- VERSION='1.0.10'
+ VERSION='1.0.11'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2926,8 +2927,8 @@ esac
 
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -3135,6 +3136,7 @@ fi
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -3948,6 +3950,7 @@ else
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4007,7 +4010,7 @@ else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -4751,6 +4754,11 @@ else
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -4790,7 +4798,7 @@ else
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -5219,7 +5227,7 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -5860,13 +5868,13 @@ old_postuninstall_cmds=
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -6013,6 +6021,7 @@ for ac_symprfx in "" "_"; do
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -6401,7 +6410,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -6412,7 +6421,20 @@ sparc*-*solaris*)
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -7052,7 +7074,13 @@ else
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -7063,6 +7091,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -7095,6 +7124,7 @@ rm -f core conftest.err conftest.$ac_objext \
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
@@ -7116,7 +7146,9 @@ _LT_EOF
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
@@ -7521,7 +7553,22 @@ fi
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   pic_mode=default
 fi
@@ -7599,6 +7646,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -8054,7 +8105,9 @@ lt_prog_compiler_static=
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       lt_prog_compiler_wl='-Xlinker '
-      lt_prog_compiler_pic='-Xcompiler -fPIC'
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
       ;;
     esac
   else
@@ -8145,18 +8198,33 @@ lt_prog_compiler_static=
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -8518,7 +8586,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -8768,8 +8835,7 @@ _LT_EOF
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -9148,6 +9214,7 @@ fi
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
@@ -9193,6 +9260,7 @@ fi
   hardcode_shlibpath_var=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec=''
   fi
@@ -9221,10 +9289,6 @@ fi
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -9237,7 +9301,7 @@ fi
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -9276,7 +9340,6 @@ fi
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -9900,11 +9963,6 @@ esac
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -9994,7 +10052,7 @@ need_version=unknown
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -10003,7 +10061,7 @@ aix3*)
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -10068,7 +10126,7 @@ beos*)
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -10207,7 +10265,7 @@ darwin* | rhapsody*)
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -10215,10 +10273,6 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -10226,7 +10280,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -10244,7 +10298,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -10264,17 +10318,18 @@ freebsd* | dragonfly*)
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -10335,7 +10390,7 @@ hpux9* | hpux10* | hpux11*)
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -10351,7 +10406,7 @@ irix5* | irix6* | nonstopux*)
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -10388,9 +10443,9 @@ linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10472,7 +10527,7 @@ netbsd*)
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -10541,7 +10596,7 @@ rdos*)
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10566,7 +10621,7 @@ sunos4*)
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -10590,7 +10645,7 @@ sysv4 | sysv4.3*)
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -10621,7 +10676,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10631,7 +10686,7 @@ tpf*)
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -11413,6 +11468,8 @@ CC="$lt_save_CC"
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -11856,8 +11913,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wall"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wall" >&5
-$as_echo_n "checking if $CC supports-Wall... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wall" >&5
+$as_echo_n "checking if $CC supports -Wall... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wall
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -11974,8 +12031,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wpointer-arith"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wpointer-arith" >&5
-$as_echo_n "checking if $CC supports-Wpointer-arith... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-arith" >&5
+$as_echo_n "checking if $CC supports -Wpointer-arith... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wpointer_arith
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -12092,8 +12149,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wmissing-declarations"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wmissing-declarations" >&5
-$as_echo_n "checking if $CC supports-Wmissing-declarations... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-declarations" >&5
+$as_echo_n "checking if $CC supports -Wmissing-declarations... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wmissing_declarations
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -12210,8 +12267,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wformat=2"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wformat=2" >&5
-$as_echo_n "checking if $CC supports-Wformat=2... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat=2" >&5
+$as_echo_n "checking if $CC supports -Wformat=2... " >&6; }
 		cacheid=`$as_echo "xorg_cv_cc_flag_-Wformat=2" | $as_tr_sh`
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -12259,8 +12316,8 @@ $as_echo "$supported" >&6; }
 
 		CFLAGS="$CFLAGS -Wformat"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wformat" >&5
-$as_echo_n "checking if $CC supports-Wformat... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat" >&5
+$as_echo_n "checking if $CC supports -Wformat... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wformat
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -12379,8 +12436,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wstrict-prototypes"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wstrict-prototypes" >&5
-$as_echo_n "checking if $CC supports-Wstrict-prototypes... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wstrict-prototypes" >&5
+$as_echo_n "checking if $CC supports -Wstrict-prototypes... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wstrict_prototypes
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -12497,8 +12554,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wmissing-prototypes"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wmissing-prototypes" >&5
-$as_echo_n "checking if $CC supports-Wmissing-prototypes... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-prototypes" >&5
+$as_echo_n "checking if $CC supports -Wmissing-prototypes... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wmissing_prototypes
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -12615,8 +12672,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wnested-externs"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wnested-externs" >&5
-$as_echo_n "checking if $CC supports-Wnested-externs... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnested-externs" >&5
+$as_echo_n "checking if $CC supports -Wnested-externs... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wnested_externs
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -12733,8 +12790,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wbad-function-cast"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wbad-function-cast" >&5
-$as_echo_n "checking if $CC supports-Wbad-function-cast... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wbad-function-cast" >&5
+$as_echo_n "checking if $CC supports -Wbad-function-cast... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wbad_function_cast
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -12851,8 +12908,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wold-style-definition"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wold-style-definition" >&5
-$as_echo_n "checking if $CC supports-Wold-style-definition... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wold-style-definition" >&5
+$as_echo_n "checking if $CC supports -Wold-style-definition... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wold_style_definition
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -12969,8 +13026,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wdeclaration-after-statement"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wdeclaration-after-statement" >&5
-$as_echo_n "checking if $CC supports-Wdeclaration-after-statement... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wdeclaration-after-statement" >&5
+$as_echo_n "checking if $CC supports -Wdeclaration-after-statement... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wdeclaration_after_statement
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -13091,8 +13148,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wunused"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wunused" >&5
-$as_echo_n "checking if $CC supports-Wunused... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wunused" >&5
+$as_echo_n "checking if $CC supports -Wunused... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wunused
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -13209,8 +13266,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wuninitialized"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wuninitialized" >&5
-$as_echo_n "checking if $CC supports-Wuninitialized... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wuninitialized" >&5
+$as_echo_n "checking if $CC supports -Wuninitialized... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wuninitialized
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -13327,8 +13384,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wshadow"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wshadow" >&5
-$as_echo_n "checking if $CC supports-Wshadow... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wshadow" >&5
+$as_echo_n "checking if $CC supports -Wshadow... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wshadow
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -13445,8 +13502,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wcast-qual"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wcast-qual" >&5
-$as_echo_n "checking if $CC supports-Wcast-qual... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wcast-qual" >&5
+$as_echo_n "checking if $CC supports -Wcast-qual... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wcast_qual
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -13563,8 +13620,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wmissing-noreturn"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wmissing-noreturn" >&5
-$as_echo_n "checking if $CC supports-Wmissing-noreturn... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-noreturn" >&5
+$as_echo_n "checking if $CC supports -Wmissing-noreturn... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wmissing_noreturn
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -13681,8 +13738,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wmissing-format-attribute"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wmissing-format-attribute" >&5
-$as_echo_n "checking if $CC supports-Wmissing-format-attribute... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-format-attribute" >&5
+$as_echo_n "checking if $CC supports -Wmissing-format-attribute... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wmissing_format_attribute
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -13799,8 +13856,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wredundant-decls"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wredundant-decls" >&5
-$as_echo_n "checking if $CC supports-Wredundant-decls... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wredundant-decls" >&5
+$as_echo_n "checking if $CC supports -Wredundant-decls... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wredundant_decls
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -13929,8 +13986,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=implicit"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=implicit" >&5
-$as_echo_n "checking if $CC supports-Werror=implicit... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=implicit" >&5
+$as_echo_n "checking if $CC supports -Werror=implicit... " >&6; }
 		cacheid=`$as_echo "xorg_cv_cc_flag_-Werror=implicit" | $as_tr_sh`
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -13978,8 +14035,8 @@ $as_echo "$supported" >&6; }
 
 		CFLAGS="$CFLAGS -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5
-$as_echo_n "checking if $CC supports-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5
+$as_echo_n "checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; }
 		cacheid=`$as_echo "xorg_cv_cc_flag_-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" | $as_tr_sh`
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -14096,8 +14153,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=nonnull"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=nonnull" >&5
-$as_echo_n "checking if $CC supports-Werror=nonnull... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=nonnull" >&5
+$as_echo_n "checking if $CC supports -Werror=nonnull... " >&6; }
 		cacheid=`$as_echo "xorg_cv_cc_flag_-Werror=nonnull" | $as_tr_sh`
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -14214,8 +14271,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=init-self"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=init-self" >&5
-$as_echo_n "checking if $CC supports-Werror=init-self... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=init-self" >&5
+$as_echo_n "checking if $CC supports -Werror=init-self... " >&6; }
 		cacheid=`$as_echo "xorg_cv_cc_flag_-Werror=init-self" | $as_tr_sh`
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -14332,8 +14389,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=main"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=main" >&5
-$as_echo_n "checking if $CC supports-Werror=main... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=main" >&5
+$as_echo_n "checking if $CC supports -Werror=main... " >&6; }
 		cacheid=`$as_echo "xorg_cv_cc_flag_-Werror=main" | $as_tr_sh`
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -14450,8 +14507,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=missing-braces"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=missing-braces" >&5
-$as_echo_n "checking if $CC supports-Werror=missing-braces... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=missing-braces" >&5
+$as_echo_n "checking if $CC supports -Werror=missing-braces... " >&6; }
 		cacheid=`$as_echo "xorg_cv_cc_flag_-Werror=missing-braces" | $as_tr_sh`
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -14568,8 +14625,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=sequence-point"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=sequence-point" >&5
-$as_echo_n "checking if $CC supports-Werror=sequence-point... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=sequence-point" >&5
+$as_echo_n "checking if $CC supports -Werror=sequence-point... " >&6; }
 		cacheid=`$as_echo "xorg_cv_cc_flag_-Werror=sequence-point" | $as_tr_sh`
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -14686,8 +14743,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=return-type"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=return-type" >&5
-$as_echo_n "checking if $CC supports-Werror=return-type... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=return-type" >&5
+$as_echo_n "checking if $CC supports -Werror=return-type... " >&6; }
 		cacheid=`$as_echo "xorg_cv_cc_flag_-Werror=return-type" | $as_tr_sh`
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -14735,8 +14792,8 @@ $as_echo "$supported" >&6; }
 
 		CFLAGS="$CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5
-$as_echo_n "checking if $CC supports-errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5
+$as_echo_n "checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; }
 		cacheid=`$as_echo "xorg_cv_cc_flag_-errwarn=E_FUNC_HAS_NO_RETURN_STMT" | $as_tr_sh`
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -14853,8 +14910,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=trigraphs"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=trigraphs" >&5
-$as_echo_n "checking if $CC supports-Werror=trigraphs... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=trigraphs" >&5
+$as_echo_n "checking if $CC supports -Werror=trigraphs... " >&6; }
 		cacheid=`$as_echo "xorg_cv_cc_flag_-Werror=trigraphs" | $as_tr_sh`
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -14971,8 +15028,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=array-bounds"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=array-bounds" >&5
-$as_echo_n "checking if $CC supports-Werror=array-bounds... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=array-bounds" >&5
+$as_echo_n "checking if $CC supports -Werror=array-bounds... " >&6; }
 		cacheid=`$as_echo "xorg_cv_cc_flag_-Werror=array-bounds" | $as_tr_sh`
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -15089,8 +15146,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=write-strings"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=write-strings" >&5
-$as_echo_n "checking if $CC supports-Werror=write-strings... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=write-strings" >&5
+$as_echo_n "checking if $CC supports -Werror=write-strings... " >&6; }
 		cacheid=`$as_echo "xorg_cv_cc_flag_-Werror=write-strings" | $as_tr_sh`
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -15207,8 +15264,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=address"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=address" >&5
-$as_echo_n "checking if $CC supports-Werror=address... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=address" >&5
+$as_echo_n "checking if $CC supports -Werror=address... " >&6; }
 		cacheid=`$as_echo "xorg_cv_cc_flag_-Werror=address" | $as_tr_sh`
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -15325,8 +15382,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=int-to-pointer-cast"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=int-to-pointer-cast" >&5
-$as_echo_n "checking if $CC supports-Werror=int-to-pointer-cast... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=int-to-pointer-cast" >&5
+$as_echo_n "checking if $CC supports -Werror=int-to-pointer-cast... " >&6; }
 		cacheid=`$as_echo "xorg_cv_cc_flag_-Werror=int-to-pointer-cast" | $as_tr_sh`
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -15374,8 +15431,8 @@ $as_echo "$supported" >&6; }
 
 		CFLAGS="$CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-errwarn=E_BAD_PTR_INT_COMBINATION" >&5
-$as_echo_n "checking if $CC supports-errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION" >&5
+$as_echo_n "checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; }
 		cacheid=`$as_echo "xorg_cv_cc_flag_-errwarn=E_BAD_PTR_INT_COMBINATION" | $as_tr_sh`
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -15492,8 +15549,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=pointer-to-int-cast"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=pointer-to-int-cast" >&5
-$as_echo_n "checking if $CC supports-Werror=pointer-to-int-cast... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=pointer-to-int-cast" >&5
+$as_echo_n "checking if $CC supports -Werror=pointer-to-int-cast... " >&6; }
 		cacheid=`$as_echo "xorg_cv_cc_flag_-Werror=pointer-to-int-cast" | $as_tr_sh`
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -15613,8 +15670,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wimplicit"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wimplicit" >&5
-$as_echo_n "checking if $CC supports-Wimplicit... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wimplicit" >&5
+$as_echo_n "checking if $CC supports -Wimplicit... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wimplicit
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -15731,8 +15788,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wnonnull"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wnonnull" >&5
-$as_echo_n "checking if $CC supports-Wnonnull... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnonnull" >&5
+$as_echo_n "checking if $CC supports -Wnonnull... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wnonnull
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -15849,8 +15906,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Winit-self"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Winit-self" >&5
-$as_echo_n "checking if $CC supports-Winit-self... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Winit-self" >&5
+$as_echo_n "checking if $CC supports -Winit-self... " >&6; }
 		cacheid=xorg_cv_cc_flag__Winit_self
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -15967,8 +16024,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wmain"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wmain" >&5
-$as_echo_n "checking if $CC supports-Wmain... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmain" >&5
+$as_echo_n "checking if $CC supports -Wmain... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wmain
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -16085,8 +16142,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wmissing-braces"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wmissing-braces" >&5
-$as_echo_n "checking if $CC supports-Wmissing-braces... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-braces" >&5
+$as_echo_n "checking if $CC supports -Wmissing-braces... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wmissing_braces
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -16203,8 +16260,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wsequence-point"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wsequence-point" >&5
-$as_echo_n "checking if $CC supports-Wsequence-point... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wsequence-point" >&5
+$as_echo_n "checking if $CC supports -Wsequence-point... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wsequence_point
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -16321,8 +16378,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wreturn-type"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wreturn-type" >&5
-$as_echo_n "checking if $CC supports-Wreturn-type... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wreturn-type" >&5
+$as_echo_n "checking if $CC supports -Wreturn-type... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wreturn_type
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -16439,8 +16496,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wtrigraphs"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wtrigraphs" >&5
-$as_echo_n "checking if $CC supports-Wtrigraphs... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wtrigraphs" >&5
+$as_echo_n "checking if $CC supports -Wtrigraphs... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wtrigraphs
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -16557,8 +16614,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Warray-bounds"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Warray-bounds" >&5
-$as_echo_n "checking if $CC supports-Warray-bounds... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Warray-bounds" >&5
+$as_echo_n "checking if $CC supports -Warray-bounds... " >&6; }
 		cacheid=xorg_cv_cc_flag__Warray_bounds
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -16675,8 +16732,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wwrite-strings"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wwrite-strings" >&5
-$as_echo_n "checking if $CC supports-Wwrite-strings... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wwrite-strings" >&5
+$as_echo_n "checking if $CC supports -Wwrite-strings... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wwrite_strings
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -16793,8 +16850,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Waddress"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Waddress" >&5
-$as_echo_n "checking if $CC supports-Waddress... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Waddress" >&5
+$as_echo_n "checking if $CC supports -Waddress... " >&6; }
 		cacheid=xorg_cv_cc_flag__Waddress
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -16911,8 +16968,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wint-to-pointer-cast"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wint-to-pointer-cast" >&5
-$as_echo_n "checking if $CC supports-Wint-to-pointer-cast... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wint-to-pointer-cast" >&5
+$as_echo_n "checking if $CC supports -Wint-to-pointer-cast... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wint_to_pointer_cast
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -17029,8 +17086,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Wpointer-to-int-cast"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wpointer-to-int-cast" >&5
-$as_echo_n "checking if $CC supports-Wpointer-to-int-cast... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-to-int-cast" >&5
+$as_echo_n "checking if $CC supports -Wpointer-to-int-cast... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wpointer_to_int_cast
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -17180,8 +17237,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -pedantic"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-pedantic" >&5
-$as_echo_n "checking if $CC supports-pedantic... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -pedantic" >&5
+$as_echo_n "checking if $CC supports -pedantic... " >&6; }
 		cacheid=xorg_cv_cc_flag__pedantic
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -17298,8 +17355,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror" >&5
-$as_echo_n "checking if $CC supports-Werror... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror" >&5
+$as_echo_n "checking if $CC supports -Werror... " >&6; }
 		cacheid=xorg_cv_cc_flag__Werror
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -17347,8 +17404,8 @@ $as_echo "$supported" >&6; }
 
 		CFLAGS="$CFLAGS -errwarn"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-errwarn" >&5
-$as_echo_n "checking if $CC supports-errwarn... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn" >&5
+$as_echo_n "checking if $CC supports -errwarn... " >&6; }
 		cacheid=xorg_cv_cc_flag__errwarn
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -17468,8 +17525,8 @@ found="no"
 
 		CFLAGS="$CFLAGS -Werror=attributes"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=attributes" >&5
-$as_echo_n "checking if $CC supports-Werror=attributes... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=attributes" >&5
+$as_echo_n "checking if $CC supports -Werror=attributes... " >&6; }
 		cacheid=`$as_echo "xorg_cv_cc_flag_-Werror=attributes" | $as_tr_sh`
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -19319,7 +19376,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libXaw $as_me 1.0.10, which was
+This file was extended by libXaw $as_me 1.0.11, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19385,7 +19442,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libXaw config.status 1.0.10
+libXaw config.status 1.0.11
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -19522,6 +19579,7 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -19604,7 +19662,6 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -19660,6 +19717,7 @@ _LTECHO_EOF'
 # Quote evaled strings.
 for var in SHELL \
 ECHO \
+PATH_SEPARATOR \
 SED \
 GREP \
 EGREP \
@@ -19710,7 +19768,6 @@ with_gnu_ld \
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
 exclude_expsyms \
 include_expsyms \
@@ -20513,8 +20570,8 @@ $as_echo X"$file" |
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -20568,6 +20625,9 @@ SHELL=$lt_SHELL
 # An echo program that protects backslashes.
 ECHO=$lt_ECHO
 
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -20869,10 +20929,6 @@ no_undefined_flag=$lt_no_undefined_flag
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
diff --git a/libXaw/configure.ac b/libXaw/configure.ac
index 24232638e..3ed625e7d 100644
--- a/libXaw/configure.ac
+++ b/libXaw/configure.ac
@@ -1,7 +1,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([libXaw], [1.0.10],
+AC_INIT([libXaw], [1.0.11],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXaw])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
diff --git a/libXaw/depcomp b/libXaw/depcomp
index df8eea7e4..bd0ac0895 100644
--- a/libXaw/depcomp
+++ b/libXaw/depcomp
@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-12-04.11; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@ Environment variables:
   object      Object file output by `PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -90,10 +90,18 @@ if test "$depmode" = msvcmsys; then
    # This is just like msvisualcpp but w/o cygpath translation.
    # Just convert the backslash-escaped backslashes to single forward
    # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
+   cygpath_u='sed s,\\\\,/,g'
    depmode=msvisualcpp
 fi
 
+if test "$depmode" = msvc7msys; then
+   # This is just like msvc7 but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvc7
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -158,10 +166,12 @@ gcc)
 ' < "$tmpdepfile" |
 ## Some versions of gcc put a space before the `:'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -405,6 +415,52 @@ tru64)
    rm -f "$tmpdepfile"
    ;;
 
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test "$stat" = 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/	\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/	/
+  G
+  p
+}' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
   # dependency tracking mechanisms from slower ones.
@@ -503,7 +559,9 @@ makedepend)
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
   sed '1,2d' "$tmpdepfile" | tr ' ' '
 ' | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
diff --git a/libXaw/include/Makefile.in b/libXaw/include/Makefile.in
index 2ba3df9e2..47f07b459 100644
--- a/libXaw/include/Makefile.in
+++ b/libXaw/include/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -74,6 +74,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(xawincludedir)"
 HEADERS = $(xawinclude_HEADERS)
 ETAGS = etags
@@ -355,9 +361,7 @@ uninstall-xawincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(xawinclude_HEADERS)'; test -n "$(xawincludedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(xawincludedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(xawincludedir)" && rm -f $$files
+	dir='$(DESTDIR)$(xawincludedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -458,10 +462,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/libXaw/include/X11/Xaw/AsciiSink.h b/libXaw/include/X11/Xaw/AsciiSink.h
index be1343345..27d8f48c5 100644
--- a/libXaw/include/X11/Xaw/AsciiSink.h
+++ b/libXaw/include/X11/Xaw/AsciiSink.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/libXaw/include/X11/Xaw/AsciiSinkP.h b/libXaw/include/X11/Xaw/AsciiSinkP.h
index ec6c212bd..4bf440acb 100644
--- a/libXaw/include/X11/Xaw/AsciiSinkP.h
+++ b/libXaw/include/X11/Xaw/AsciiSinkP.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -51,8 +51,8 @@ SOFTWARE.
 /*
  * AsciiSink Object Private Data
  */
-#include <X11/Xaw/TextSinkP.h> 
-#include <X11/Xaw/AsciiSink.h> 
+#include <X11/Xaw/TextSinkP.h>
+#include <X11/Xaw/AsciiSink.h>
 
 /* New fields for the AsciiSink object class record */
 typedef struct _AsciiSinkClassPart {
diff --git a/libXaw/include/X11/Xaw/AsciiSrc.h b/libXaw/include/X11/Xaw/AsciiSrc.h
index 0bd14b40e..08c5f8c26 100644
--- a/libXaw/include/X11/Xaw/AsciiSrc.h
+++ b/libXaw/include/X11/Xaw/AsciiSrc.h
@@ -35,7 +35,7 @@ in this Software without prior written authorization from The Open Group.
  * Date:    June 29, 1989
  *
  * By:      Chris D. Peterson
- *          MIT X Consortium 
+ *          MIT X Consortium
  *          kit@expo.lcs.mit.edu
  */
 
@@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group.
  useStringInPlace    UseStringInPlace	Boolean		False
 
 */
- 
+
 extern WidgetClass asciiSrcObjectClass;
 
 typedef struct _AsciiSrcClassRec *AsciiSrcObjectClass;
diff --git a/libXaw/include/X11/Xaw/AsciiSrcP.h b/libXaw/include/X11/Xaw/AsciiSrcP.h
index 2668f0685..1f3f06eec 100644
--- a/libXaw/include/X11/Xaw/AsciiSrcP.h
+++ b/libXaw/include/X11/Xaw/AsciiSrcP.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -55,7 +55,7 @@ SOFTWARE.
  * Date:    June 29, 1989
  *
  * By:      Chris D. Peterson
- *          MIT X Consortium 
+ *          MIT X Consortium
  *          kit@expo.lcs.mit.edu
  */
 
@@ -75,10 +75,10 @@ SOFTWARE.
 #endif
 #endif
 
-typedef struct _Piece {		/* Piece of the text file of BUFSIZ allocated 
+typedef struct _Piece {		/* Piece of the text file of BUFSIZ allocated
 				   characters */
     char *text;			/* The text in this buffer */
-    XawTextPosition used;	/* The number of characters of this buffer 
+    XawTextPosition used;	/* The number of characters of this buffer
 				   that have been used */
     struct _Piece *prev, *next;	/* linked list pointers */
 } Piece;
@@ -122,7 +122,7 @@ typedef struct _AsciiSrcPart {
 #endif
     Boolean allocated_string;	/* Have I allocated the
 				   string in ascii_src->string? */
-    XawTextPosition length; 	/* length of file */
+    XawTextPosition length;	/* length of file */
     Piece *first_piece;		/* first piece of the text */
 #ifndef OLDXAW
     XtPointer pad[4];	/* for future use and keep binary compatability */
@@ -136,4 +136,4 @@ typedef struct _AsciiSrcRec {
     AsciiSrcPart  ascii_src;
 } AsciiSrcRec;
 
-#endif /* _XawAsciiSrcP_h */ 
+#endif /* _XawAsciiSrcP_h */
diff --git a/libXaw/include/X11/Xaw/AsciiText.h b/libXaw/include/X11/Xaw/AsciiText.h
index 0c38f9c3c..b0b3cd9a6 100644
--- a/libXaw/include/X11/Xaw/AsciiText.h
+++ b/libXaw/include/X11/Xaw/AsciiText.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -48,13 +48,13 @@ SOFTWARE.
 /*
  * AsciiText.h - Public header file for AsciiText Widget
  *
- * This Widget is intended to be used as a simple front end to the 
+ * This Widget is intended to be used as a simple front end to the
  * text widget with an ascii source and ascii sink attached to it
  *
  * Date:    June 29, 1989
  *
  * By:      Chris D. Peterson
- *          MIT X Consortium 
+ *          MIT X Consortium
  *          kit@expo.lcs.mit.edu
  */
 #ifndef _AsciiText_h
diff --git a/libXaw/include/X11/Xaw/AsciiTextP.h b/libXaw/include/X11/Xaw/AsciiTextP.h
index 52863e534..f91c36241 100644
--- a/libXaw/include/X11/Xaw/AsciiTextP.h
+++ b/libXaw/include/X11/Xaw/AsciiTextP.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -48,13 +48,13 @@ SOFTWARE.
 /*
  * AsciiText.c - Private header file for AsciiText Widget.
  *
- * This Widget is intended to be used as a simple front end to the 
+ * This Widget is intended to be used as a simple front end to the
  * text widget with an ascii source and ascii sink attached to it.
  *
  * Date:    June 29, 1989
  *
  * By:      Chris D. Peterson
- *          MIT X Consortium 
+ *          MIT X Consortium
  *          kit@expo.lcs.mit.edu
  */
 
diff --git a/libXaw/include/X11/Xaw/Box.h b/libXaw/include/X11/Xaw/Box.h
index 19e9a6573..9eb1884d9 100644
--- a/libXaw/include/X11/Xaw/Box.h
+++ b/libXaw/include/X11/Xaw/Box.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -63,11 +63,11 @@ SOFTWARE.
  borderWidth	     BorderWidth	Dimension	1
  destroyCallback     Callback		Pointer		NULL
  displayList	     DisplayList	XawDisplayList*	NULL
- hSpace 	     HSpace		Dimension	4
+ hSpace		     HSpace		Dimension	4
  height		     Height		Dimension	0
  mappedWhenManaged   MappedWhenManaged	Boolean		True
  orientation	     Orientation	XtOrientation	vertical
- vSpace 	     VSpace		Dimension	4
+ vSpace		     VSpace		Dimension	4
  width		     Width		Dimension	0
  x		     Position		Position	0
  y		     Position		Position	0
@@ -83,7 +83,7 @@ SOFTWARE.
 #ifndef XawNdisplayList
 #define XawNdisplayList "displayList"
 #endif
- 
+
 #ifndef XawCDisplayList
 #define XawCDisplayList "DisplayList"
 #endif
diff --git a/libXaw/include/X11/Xaw/BoxP.h b/libXaw/include/X11/Xaw/BoxP.h
index 87f2ac4d5..b3c2573b1 100644
--- a/libXaw/include/X11/Xaw/BoxP.h
+++ b/libXaw/include/X11/Xaw/BoxP.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -91,7 +91,7 @@ typedef struct {
 typedef struct _BoxRec {
     CorePart	    core;
     CompositePart   composite;
-    BoxPart 	    box;
+    BoxPart	    box;
 } BoxRec;
 
 #endif /* _XawBoxP_h */
diff --git a/libXaw/include/X11/Xaw/Command.h b/libXaw/include/X11/Xaw/Command.h
index 7bfac2ef6..7011fde6e 100644
--- a/libXaw/include/X11/Xaw/Command.h
+++ b/libXaw/include/X11/Xaw/Command.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/libXaw/include/X11/Xaw/CommandP.h b/libXaw/include/X11/Xaw/CommandP.h
index 9d9d1dc87..d0be64edf 100644
--- a/libXaw/include/X11/Xaw/CommandP.h
+++ b/libXaw/include/X11/Xaw/CommandP.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -57,7 +57,7 @@ SOFTWARE.
 typedef enum {
     HighlightNone,		/* Do not highlight */
     HighlightWhenUnset,		/* Highlight only when unset, this is
-				   to preserve current command widget 
+				   to preserve current command widget
 				   functionality */
     HighlightAlways		/* Always highlight, lets the toggle widget
 				   and other subclasses do the right thing */
@@ -85,14 +85,14 @@ typedef struct {
     XtCallbackList callbacks;
 
     /* private state */
-    Pixmap      	gray_pixmap;
-    GC          	normal_GC;
-    GC          	inverse_GC;
-    Boolean     	set;
+    Pixmap	gray_pixmap;
+    GC		normal_GC;
+    GC		inverse_GC;
+    Boolean	set;
     XtCommandHighlight	highlighted;
 
     /* more resources */
-    int			shape_style;    
+    int			shape_style;
     Dimension		corner_round;
 
 #ifndef OLDXAW
diff --git a/libXaw/include/X11/Xaw/Dialog.h b/libXaw/include/X11/Xaw/Dialog.h
index d4442c382..442d2d2f7 100644
--- a/libXaw/include/X11/Xaw/Dialog.h
+++ b/libXaw/include/X11/Xaw/Dialog.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/libXaw/include/X11/Xaw/DialogP.h b/libXaw/include/X11/Xaw/DialogP.h
index 755d9bdd1..8fb47353c 100644
--- a/libXaw/include/X11/Xaw/DialogP.h
+++ b/libXaw/include/X11/Xaw/DialogP.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/libXaw/include/X11/Xaw/Form.h b/libXaw/include/X11/Xaw/Form.h
index bc818e9f5..71a0bccee 100644
--- a/libXaw/include/X11/Xaw/Form.h
+++ b/libXaw/include/X11/Xaw/Form.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -135,7 +135,7 @@ typedef enum {
 #ifndef XawNdisplayList
 #define XawNdisplayList "displayList"
 #endif
- 
+
 #ifndef XawCDisplayList
 #define XawCDisplayList "DisplayList"
 #endif
@@ -163,5 +163,5 @@ void XawFormDoLayout
  );
 
 _XFUNCPROTOEND
- 
+
 #endif /* _XawForm_h */
diff --git a/libXaw/include/X11/Xaw/FormP.h b/libXaw/include/X11/Xaw/FormP.h
index fe658b59e..43a58e9d3 100644
--- a/libXaw/include/X11/Xaw/FormP.h
+++ b/libXaw/include/X11/Xaw/FormP.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/libXaw/include/X11/Xaw/Grip.h b/libXaw/include/X11/Xaw/Grip.h
index 131cf2394..e8892ae60 100644
--- a/libXaw/include/X11/Xaw/Grip.h
+++ b/libXaw/include/X11/Xaw/Grip.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/libXaw/include/X11/Xaw/GripP.h b/libXaw/include/X11/Xaw/GripP.h
index bc7f96fd2..427948afd 100644
--- a/libXaw/include/X11/Xaw/GripP.h
+++ b/libXaw/include/X11/Xaw/GripP.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/libXaw/include/X11/Xaw/Label.h b/libXaw/include/X11/Xaw/Label.h
index 1ce32bcc8..175f1c120 100644
--- a/libXaw/include/X11/Xaw/Label.h
+++ b/libXaw/include/X11/Xaw/Label.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/libXaw/include/X11/Xaw/LabelP.h b/libXaw/include/X11/Xaw/LabelP.h
index 755e1714a..e8cc611a0 100644
--- a/libXaw/include/X11/Xaw/LabelP.h
+++ b/libXaw/include/X11/Xaw/LabelP.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -56,7 +56,7 @@ SOFTWARE.
 
 /* New fields for the Label widget class record */
 typedef struct {
-  XtPointer extension;
+    XtPointer extension;
 } LabelClassPart;
 
 /* Full class record declaration */
@@ -73,7 +73,7 @@ typedef struct {
     /* resources */
     Pixel	foreground;
     XFontStruct	*font;
-    XFontSet 	fontset;
+    XFontSet	fontset;
     char	*label;
     XtJustify	justify;
     Dimension	internal_width;
diff --git a/libXaw/include/X11/Xaw/List.h b/libXaw/include/X11/Xaw/List.h
index e00569c20..7fc59f4fe 100644
--- a/libXaw/include/X11/Xaw/List.h
+++ b/libXaw/include/X11/Xaw/List.h
@@ -23,11 +23,11 @@ in this Software without prior written authorization from The Open Group.
 */
 
 /*  This is the List widget, it is useful to display a list, without the
- *  overhead of having a widget for each item in the list.  It allows 
+ *  overhead of having a widget for each item in the list.  It allows
  *  the user to select an item in a list and notifies the application through
  *  a callback function.
  *
- *	Created: 	8/13/88
+ *	Created:	8/13/88
  *	By:		Chris D. Peterson
  *                      MIT X Consortium
  */
@@ -49,7 +49,7 @@ in this Software without prior written authorization from The Open Group.
  cursor		     Cursor		Cursor		left_ptr
  cursorName	     Cursor		String		NULL
  defaultColumns      Columns            int             2          **5
- destroyCallback     Callback		Pointer		NULL 
+ destroyCallback     Callback		Pointer		NULL
  font		     Font		XFontStruct*	XtDefaultFont
  forceColumns        Columns            Boolean         False      **5
  foreground	     Foreground		Pixel		XtDefaultForeground
@@ -75,28 +75,28 @@ in this Software without prior written authorization from The Open Group.
        is set to the minimum size necessay to fit the entire list.
 
        If both Width and Height are zero then they are adjusted to fit the
-       entire list that is created width the number of default columns 
+       entire list that is created width the number of default columns
        specified in the defaultColumns resource.
 
  **2 - This is an array of strings the specify elements of the list.
-       This resource must be specified. 
+       This resource must be specified.
        (What good is a list widget without a list??  :-)
 
  **3 - Longest is the length of the widest string in pixels.
 
  **4 - If either of these values are zero (0) then the list widget calculates
-       the correct value. 
+       the correct value.
 
-       (This allows you to make startup faster if you already have 
+       (This allows you to make startup faster if you already have
         this information calculated)
 
-       NOTE: If the numberStrings value is zero the list must 
+       NOTE: If the numberStrings value is zero the list must
              be NULL terminated.
 
  **5 - By setting the List.Columns resource you can force the application to
-       have a given number of columns.	     
-        
- **6 - This returns the name and index of the item selected in an 
+       have a given number of columns.
+
+ **6 - This returns the name and index of the item selected in an
        XawListReturnStruct that is pointed to by the client_data
        in the CallbackProc.
 
@@ -105,7 +105,7 @@ in this Software without prior written authorization from The Open Group.
 /*
  * Value returned when there are no highlighted objects
  */
-#define XAW_LIST_NONE -1	
+#define XAW_LIST_NONE -1
 
 #define XtCList "List"
 #define XtCSpacing "Spacing"
@@ -124,7 +124,7 @@ in this Software without prior written authorization from The Open Group.
 #define XtNrowSpacing "rowSpacing"
 #define XtNverticalList "verticalList"
 #define XtNshowCurrent "showCurrent"
- 
+
 #ifndef XtNfontSet
 #define XtNfontSet "fontSet"
 #endif
diff --git a/libXaw/include/X11/Xaw/ListP.h b/libXaw/include/X11/Xaw/ListP.h
index 4a83c9a9b..5f5398223 100644
--- a/libXaw/include/X11/Xaw/ListP.h
+++ b/libXaw/include/X11/Xaw/ListP.h
@@ -23,11 +23,11 @@ in this Software without prior written authorization from The Open Group.
 */
 
 
-/* 
+/*
  * This is a List widget.  It allows the user to select an item in a list and
  * notifies the application through a callback function.
  *
- *	Created: 	8/13/88
+ *	Created:	8/13/88
  *	By:		Chris D. Peterson
  *                      MIT - Project Athena
  */
diff --git a/libXaw/include/X11/Xaw/MenuButtoP.h b/libXaw/include/X11/Xaw/MenuButtoP.h
index 277cdfceb..8ee3195c5 100644
--- a/libXaw/include/X11/Xaw/MenuButtoP.h
+++ b/libXaw/include/X11/Xaw/MenuButtoP.h
@@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group.
  * Date:    May 2, 1989
  *
  * By:      Chris D. Peterson
- *          MIT X Consortium 
+ *          MIT X Consortium
  *          kit@expo.lcs.mit.edu
  */
 
diff --git a/libXaw/include/X11/Xaw/MenuButton.h b/libXaw/include/X11/Xaw/MenuButton.h
index 2df6191d3..93f096306 100644
--- a/libXaw/include/X11/Xaw/MenuButton.h
+++ b/libXaw/include/X11/Xaw/MenuButton.h
@@ -38,7 +38,7 @@ in this Software without prior written authorization from The Open Group.
  * Date:    May 2, 1989
  *
  * By:      Chris D. Peterson
- *          MIT X Consortium 
+ *          MIT X Consortium
  *          kit@expo.lcs.mit.edu
  */
 
diff --git a/libXaw/include/X11/Xaw/MultiSink.h b/libXaw/include/X11/Xaw/MultiSink.h
index 72ba28963..3519acc7a 100644
--- a/libXaw/include/X11/Xaw/MultiSink.h
+++ b/libXaw/include/X11/Xaw/MultiSink.h
@@ -51,13 +51,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/libXaw/include/X11/Xaw/MultiSinkP.h b/libXaw/include/X11/Xaw/MultiSinkP.h
index a2867b620..019f5f4b8 100644
--- a/libXaw/include/X11/Xaw/MultiSinkP.h
+++ b/libXaw/include/X11/Xaw/MultiSinkP.h
@@ -52,13 +52,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -78,8 +78,8 @@ SOFTWARE.
 /*
  * MultiSink Object Private Data
  */
-#include <X11/Xaw/TextSinkP.h> 
-#include <X11/Xaw/MultiSink.h> 
+#include <X11/Xaw/TextSinkP.h>
+#include <X11/Xaw/MultiSink.h>
 
 /* new fields for the MultiSink object class */
 typedef struct _MultiSinkClassPart {
diff --git a/libXaw/include/X11/Xaw/MultiSrc.h b/libXaw/include/X11/Xaw/MultiSrc.h
index 7c8a1c476..628da0cc8 100644
--- a/libXaw/include/X11/Xaw/MultiSrc.h
+++ b/libXaw/include/X11/Xaw/MultiSrc.h
@@ -71,7 +71,7 @@ in this Software without prior written authorization from The Open Group.
  useStringInPlace    UseStringInPlace	Boolean		False
 
 */
- 
+
 extern WidgetClass multiSrcObjectClass;
 
 typedef struct _MultiSrcClassRec *MultiSrcObjectClass;
diff --git a/libXaw/include/X11/Xaw/MultiSrcP.h b/libXaw/include/X11/Xaw/MultiSrcP.h
index a3609ccd0..95642a43b 100644
--- a/libXaw/include/X11/Xaw/MultiSrcP.h
+++ b/libXaw/include/X11/Xaw/MultiSrcP.h
@@ -52,13 +52,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -80,11 +80,11 @@ SOFTWARE.
  * Date:    June 29, 1989
  *
  * By:      Chris D. Peterson
- *          MIT X Consortium 
+ *          MIT X Consortium
  *          kit@expo.lcs.mit.edu
  */
 
-/* 
+/*
  * This file was changed from AsciiSrcP.h.
  *
  * By Li Yuhong, Sept. 18, 1990
@@ -107,10 +107,10 @@ SOFTWARE.
 #endif
 #endif
 
-typedef struct _MultiPiece {	/* Piece of the text file of BUFSIZ allocated 
+typedef struct _MultiPiece {	/* Piece of the text file of BUFSIZ allocated
 				   characters */
     wchar_t* text;		/* The text in this buffer */
-    XawTextPosition used;	/* The number of characters of this buffer 
+    XawTextPosition used;	/* The number of characters of this buffer
 				   that have been used */
     struct _MultiPiece *prev, *next;	/* linked list pointers */
 } MultiPiece;
@@ -153,7 +153,7 @@ typedef struct _MultiSrcPart {
 #endif
     Boolean allocated_string;	/* Have I allocated the
 				   string in multi_src->string? */
-    XawTextPosition length; 	/* length of file - IN CHARACTERS, NOT BYTES */
+    XawTextPosition length;	/* length of file - IN CHARACTERS, NOT BYTES */
     MultiPiece *first_piece;	/* first piece of the text */
 #ifndef OLDXAW
     XtPointer pad[4];	/* for future use and keep binary compatability */
diff --git a/libXaw/include/X11/Xaw/Paned.h b/libXaw/include/X11/Xaw/Paned.h
index c5b96b5e4..4b7e1158f 100644
--- a/libXaw/include/X11/Xaw/Paned.h
+++ b/libXaw/include/X11/Xaw/Paned.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -92,7 +92,7 @@ SOFTWARE.
  verticalGripCursor      Cursor	           Cursor           sb_v_double_arrow
  width		         Width	           Dimension	    0
  x		         Position	   Position	    0
- y		         Position	   Position    	    0
+ y		         Position	   Position	    0
 
 ** These resources now are set to the vertical or horizontal cursor
    depending upon orientation, by default.  If a value is specified here
@@ -107,7 +107,7 @@ CONSTRAINT RESOURCES:
  max		      Max	        Dimension	unlimited
  min		      Min		Dimension	Grip Size
  preferredPaneSize    PreferredPaneSize Dimension	PANED_ASK_CHILD
- resizeToPreferred    Boolean		Boolean	 	False
+ resizeToPreferred    Boolean		Boolean		False
  showGrip	      ShowGrip		Boolean		True
  skipAdjust	      Boolean	        Boolean         False
 
@@ -152,7 +152,7 @@ typedef struct _PanedClassRec	*PanedWidgetClass;
 typedef struct _PanedRec	*PanedWidget;
 
 /*
- *  Public Procedures 
+ *  Public Procedures
  */
 
 _XFUNCPROTOBEGIN
diff --git a/libXaw/include/X11/Xaw/PanedP.h b/libXaw/include/X11/Xaw/PanedP.h
index 08dcd3b25..4e40eafb6 100644
--- a/libXaw/include/X11/Xaw/PanedP.h
+++ b/libXaw/include/X11/Xaw/PanedP.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -90,7 +90,7 @@ typedef struct _PanedConstraintsPart {
     Dimension   preferred_size;	/* The Preferred size of the pane.
 				   If this is zero then ask child for size*/
     Boolean     resize_to_pref;	/* resize this pane to its preferred size
-				   on a resize or change managed after 
+				   on a resize or change managed after
 				   realize */
 
     /* Private state */
@@ -98,7 +98,7 @@ typedef struct _PanedConstraintsPart {
     Position	olddelta;	/* The last value of dy */
     Boolean     paned_adjusted_me; /* Has the vpaned adjusted this widget w/o
 				     user interaction to make things fit? */
-    Dimension	wp_size;	/* widget's preferred size */ 
+    Dimension	wp_size;	/* widget's preferred size */
     int size;			/* the size the widget will actually get */
     Widget	grip;		/* The grip for this child */
 } PanedConstraintsPart, *Pane;
@@ -120,9 +120,9 @@ typedef struct _PaneStack {
 /* New Fields for the Paned widget record */
 typedef struct {
     /* resources */
-    Position    grip_indent;               /* Location of grips (offset	
+    Position    grip_indent;               /* Location of grips (offset
 					      from right margin) */
-    Boolean     refiguremode;              /* Whether to refigure changes 
+    Boolean     refiguremode;              /* Whether to refigure changes
 					      right now */
     XtTranslations grip_translations;      /* grip translation table */
     Pixel	internal_bp;		/* color of internal borders */
diff --git a/libXaw/include/X11/Xaw/Panner.h b/libXaw/include/X11/Xaw/Panner.h
index 02482922f..dd376027e 100644
--- a/libXaw/include/X11/Xaw/Panner.h
+++ b/libXaw/include/X11/Xaw/Panner.h
@@ -32,16 +32,16 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xaw/Reports.h>
 
 /*****************************************************************************
- * 
+ *
  * Panner Widget (subclass of Simple)
- * 
+ *
  * This widget is used to represent navigation in a 2d coordinate system
- * 
+ *
  * Resources:
- * 
+ *
  *  Name		Class		Type		Default
  *  ----		-----		----		-------
- * 
+ *
  *  allowOff		AllowOff	Boolean		FALSE
  *  background		Background	Pixel		XtDefaultBackground
  *  backgroundStipple	BackgroundStipple	String	NULL
@@ -60,7 +60,7 @@ in this Software without prior written authorization from The Open Group.
  *  sliderY		SliderY		Position	0
  *  sliderWidth		SliderWidth	Dimension	0
  *  sliderHeight	SliderHeight	Dimension	0
- * 
+ *
  *****************************************************************************/
 
 #ifndef _XtStringDefs_h_
diff --git a/libXaw/include/X11/Xaw/Porthole.h b/libXaw/include/X11/Xaw/Porthole.h
index d7c260cba..2dbcf1890 100644
--- a/libXaw/include/X11/Xaw/Porthole.h
+++ b/libXaw/include/X11/Xaw/Porthole.h
@@ -32,26 +32,26 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xaw/Reports.h>
 
 /*****************************************************************************
- * 
+ *
  * Porthole Widget (subclass of Composite)
- * 
+ *
  * This widget is similar to a viewport without scrollbars.  Child movement
  * is done by external panners or scrollbars.
- * 
+ *
  * Parameters:
- * 
+ *
  *  Name		Class		Type		Default
  *  ----		-----		----		-------
- * 
+ *
  *  background		Background	Pixel		XtDefaultBackground
  *  border	        BorderColor	Pixel		XtDefaultForeground
  *  borderWidth		BorderWidth	Dimension	1
  *  height		Height		Dimension	0
  *  reportCallback	ReportCallback	Pointer		NULL
  *  width		Width		Dimension	0
- *  x 			Position	Position	0
+ *  x			Position	Position	0
  *  y			Position	Position	0
- * 
+ *
  *****************************************************************************/
 
 extern WidgetClass portholeWidgetClass;
diff --git a/libXaw/include/X11/Xaw/Repeater.h b/libXaw/include/X11/Xaw/Repeater.h
index f09af2d5a..6b712cace 100644
--- a/libXaw/include/X11/Xaw/Repeater.h
+++ b/libXaw/include/X11/Xaw/Repeater.h
@@ -31,16 +31,16 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xaw/Command.h>
 
 /*****************************************************************************
- * 
+ *
  * Repeater Widget (subclass of Command)
- * 
+ *
  * This widget is a push button that repeatedly fires when held down
- * 
+ *
  * Parameters:
- * 
+ *
  *  Name		Class		Type		Default
  *  ----		-----		----		-------
- * 
+ *
  *  decay		Decay		int		5 milliseconds
  *  flash		Boolean		Boolean		FALSE
  *  initialDelay	Delay		int		200 milliseconds
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
  *  repeatDelay		Delay		int		50 milliseconds
  *  startCallback	StartCallback	XtCallbackList	NULL
  *  stopCallback	StopCallback	XtCallbackList	NULL
- * 
+ *
  *****************************************************************************/
 
 #define XtNdecay "decay"
diff --git a/libXaw/include/X11/Xaw/Scrollbar.h b/libXaw/include/X11/Xaw/Scrollbar.h
index 1a8ef6a83..904aad908 100644
--- a/libXaw/include/X11/Xaw/Scrollbar.h
+++ b/libXaw/include/X11/Xaw/Scrollbar.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -125,7 +125,7 @@ void XawScrollbarSetThumb
 #else
  float			top,
  float			shown
-#endif		 
+#endif
  );
 
 _XFUNCPROTOEND
diff --git a/libXaw/include/X11/Xaw/ScrollbarP.h b/libXaw/include/X11/Xaw/ScrollbarP.h
index ed77d2bad..b36472d4d 100644
--- a/libXaw/include/X11/Xaw/ScrollbarP.h
+++ b/libXaw/include/X11/Xaw/ScrollbarP.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/libXaw/include/X11/Xaw/Simple.h b/libXaw/include/X11/Xaw/Simple.h
index 52b2970a2..ff38f16cc 100644
--- a/libXaw/include/X11/Xaw/Simple.h
+++ b/libXaw/include/X11/Xaw/Simple.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/libXaw/include/X11/Xaw/SimpleMenP.h b/libXaw/include/X11/Xaw/SimpleMenP.h
index 34ee86a55..e01c151ea 100644
--- a/libXaw/include/X11/Xaw/SimpleMenP.h
+++ b/libXaw/include/X11/Xaw/SimpleMenP.h
@@ -73,7 +73,7 @@ typedef struct _SimpleMenuPart {
 
     /* private */
     Boolean	recursive_set_values; /* contain a possible infinite loop */
-    Boolean	menu_width;	/* If true then force width to remain 
+    Boolean	menu_width;	/* If true then force width to remain
 				   core.width */
     Boolean	menu_height;	/* Just like menu_width, but for height */
     SmeObject	entry_set;	/* The entry that is currently set or
@@ -90,7 +90,7 @@ typedef struct _SimpleMenuPart {
 
 typedef struct _SimpleMenuRec {
     CorePart		core;
-    CompositePart 	composite;
+    CompositePart	composite;
     ShellPart		shell;
     OverrideShellPart	override;
     SimpleMenuPart	simple_menu;
diff --git a/libXaw/include/X11/Xaw/SimpleMenu.h b/libXaw/include/X11/Xaw/SimpleMenu.h
index 633fb1771..79f7216ef 100644
--- a/libXaw/include/X11/Xaw/SimpleMenu.h
+++ b/libXaw/include/X11/Xaw/SimpleMenu.h
@@ -38,7 +38,7 @@ in this Software without prior written authorization from The Open Group.
  * Date:    April 3, 1989
  *
  * By:      Chris D. Peterson
- *          MIT X Consortium 
+ *          MIT X Consortium
  *          kit@expo.lcs.mit.edu
  */
 
diff --git a/libXaw/include/X11/Xaw/SimpleP.h b/libXaw/include/X11/Xaw/SimpleP.h
index d69aa69f8..d8011621a 100644
--- a/libXaw/include/X11/Xaw/SimpleP.h
+++ b/libXaw/include/X11/Xaw/SimpleP.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/libXaw/include/X11/Xaw/Sme.h b/libXaw/include/X11/Xaw/Sme.h
index 758b53d50..b395ae7b8 100644
--- a/libXaw/include/X11/Xaw/Sme.h
+++ b/libXaw/include/X11/Xaw/Sme.h
@@ -25,12 +25,12 @@ in this Software without prior written authorization from The Open Group.
 
 /*
  * This is the public header file for the Athena Sme object.
- * It is intended to be used with the simple menu widget.  
+ * It is intended to be used with the simple menu widget.
  *
  * Date:    April 3, 1989
  *
  * By:      Chris D. Peterson
- *          MIT X Consortium 
+ *          MIT X Consortium
  *          kit@expo.lcs.mit.edu
  */
 
diff --git a/libXaw/include/X11/Xaw/SmeBSB.h b/libXaw/include/X11/Xaw/SmeBSB.h
index 88bc15a40..ab6fda7a8 100644
--- a/libXaw/include/X11/Xaw/SmeBSB.h
+++ b/libXaw/include/X11/Xaw/SmeBSB.h
@@ -33,7 +33,7 @@ in this Software without prior written authorization from The Open Group.
  * Date:    April 3, 1989
  *
  * By:      Chris D. Peterson
- *          MIT X Consortium 
+ *          MIT X Consortium
  *          kit@expo.lcs.mit.edu
  */
 
diff --git a/libXaw/include/X11/Xaw/SmeLine.h b/libXaw/include/X11/Xaw/SmeLine.h
index 34e9595c4..af4406f3d 100644
--- a/libXaw/include/X11/Xaw/SmeLine.h
+++ b/libXaw/include/X11/Xaw/SmeLine.h
@@ -26,12 +26,12 @@ in this Software without prior written authorization from The Open Group.
 
 /*
  * This is the public header file for the Athena SmeLine object.
- * It is intended to be used with the simple menu widget.  
+ * It is intended to be used with the simple menu widget.
  *
  * Date:    April 3, 1989
  *
  * By:      Chris D. Peterson
- *          MIT X Consortium 
+ *          MIT X Consortium
  *          kit@expo.lcs.mit.edu
  */
 
diff --git a/libXaw/include/X11/Xaw/SmeP.h b/libXaw/include/X11/Xaw/SmeP.h
index ad355155d..bd4bd9da7 100644
--- a/libXaw/include/X11/Xaw/SmeP.h
+++ b/libXaw/include/X11/Xaw/SmeP.h
@@ -25,12 +25,12 @@ in this Software without prior written authorization from The Open Group.
 
 /*
  * This is the private header file for the Athena Sme object.
- * This object is intended to be used with the simple menu widget.  
+ * This object is intended to be used with the simple menu widget.
  *
  * Date:    April 3, 1989
  *
  * By:      Chris D. Peterson
- *          MIT X Consortium 
+ *          MIT X Consortium
  *          kit@expo.lcs.mit.edu
  */
 
diff --git a/libXaw/include/X11/Xaw/StripCharP.h b/libXaw/include/X11/Xaw/StripCharP.h
index 974291a5a..a0085b43d 100644
--- a/libXaw/include/X11/Xaw/StripCharP.h
+++ b/libXaw/include/X11/Xaw/StripCharP.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -63,7 +63,7 @@ typedef struct {
     Pixel hipixel;		/* color index for lines */
     GC fgGC;			/* graphics context for fgpixel */
     GC hiGC;			/* graphics context for hipixel */
-    
+
     /* private */
     int update;			/* update frequence */
     int scale;			/* scale factor */
diff --git a/libXaw/include/X11/Xaw/StripChart.h b/libXaw/include/X11/Xaw/StripChart.h
index 740416355..17e929991 100644
--- a/libXaw/include/X11/Xaw/StripChart.h
+++ b/libXaw/include/X11/Xaw/StripChart.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -61,7 +61,7 @@ SOFTWARE.
  Name		     Class		RepType		Default Value
  ----		     -----		-------		-------------
  accelerators	     Accelerators	AcceleratorTable NULL
- ancestorSensitive   AncestorSensitive	Boolean		True 
+ ancestorSensitive   AncestorSensitive	Boolean		True
  background	     Background		Pixel		XtDefaultBackground
  backgroundPixmap    Pixmap		Pixmap		XtUnspecifiedPixmap
  borderColor	     BorderColor	Pixel		XtDefaultForeground
@@ -107,7 +107,7 @@ SOFTWARE.
 #define XtNminScale "minScale"
 #define XtNscale "scale"
 #define XtNvmunix "vmunix"
- 
+
 typedef struct _StripChartRec *StripChartWidget;
 typedef struct _StripChartClassRec *StripChartWidgetClass;
 
diff --git a/libXaw/include/X11/Xaw/Text.h b/libXaw/include/X11/Xaw/Text.h
index c2153bfb7..78c147894 100644
--- a/libXaw/include/X11/Xaw/Text.h
+++ b/libXaw/include/X11/Xaw/Text.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -52,7 +52,7 @@ SOFTWARE.
 
 /*
 
- Class: 	textWidgetClass
+ Class:		textWidgetClass
  Class Name:	Text
  Superclass:	Simple
 
diff --git a/libXaw/include/X11/Xaw/TextP.h b/libXaw/include/X11/Xaw/TextP.h
index 2653500fb..60f462421 100644
--- a/libXaw/include/X11/Xaw/TextP.h
+++ b/libXaw/include/X11/Xaw/TextP.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -104,10 +104,10 @@ typedef struct {
 typedef struct _XawTextSelectionSalt {
     struct _XawTextSelectionSalt *next;
     XawTextSelection	s;
-    /* 
+    /*
      * The element "contents" stores the CT string which is gotten in the
      * function _XawTextSaltAwaySelection()
-    */ 
+    */
     char		*contents;
     int			length;
 } XawTextSelectionSalt;
@@ -158,11 +158,11 @@ struct SearchAndReplace {
     Widget search_popup;	/* The poppup widget that allows searches.*/
     Widget label1;		/* The label widgets for the search window. */
     Widget label2;
-    Widget left_toggle; 	/* The left search toggle radioGroup. */
+    Widget left_toggle;		/* The left search toggle radioGroup. */
     Widget right_toggle;	/* The right search toggle radioGroup. */
     Widget rep_label;		/* The Replace label string. */
     Widget rep_text;		/* The Replace text field. */
-    Widget search_text; 	/* The Search text field. */
+    Widget search_text;		/* The Search text field. */
     Widget rep_one;		/* The Replace one button. */
     Widget rep_all;		/* The Replace all button. */
 #ifndef OLDXAW
diff --git a/libXaw/include/X11/Xaw/TextSink.h b/libXaw/include/X11/Xaw/TextSink.h
index 1bbe92c34..f3dd96855 100644
--- a/libXaw/include/X11/Xaw/TextSink.h
+++ b/libXaw/include/X11/Xaw/TextSink.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -65,7 +65,7 @@ SOFTWARE.
  background          Background      Pixel              XtDefaultBackground
  cursorColor	     Color	      Pixel		XtDefaultForeground
 */
- 
+
 /* Class record constants */
 
 extern WidgetClass textSinkObjectClass;
@@ -103,7 +103,7 @@ _XFUNCPROTOBEGIN
  *	highlight - hightlight this text?
  *
  * Description:
- *	Stub function that in subclasses will display text. 
+ *	Stub function that in subclasses will display text.
  *
  * Note:
  *	  This function doesn't actually display anything, it is only a place
@@ -337,7 +337,7 @@ void XawTextSinkSetTabs
  int			tab_count,
  int			*tabs
 );
-						  
+
 /*
  * Function:
  *	XawTextSinkGetCursorBounds
diff --git a/libXaw/include/X11/Xaw/TextSinkP.h b/libXaw/include/X11/Xaw/TextSinkP.h
index c8cb2b8c5..78f41d29c 100644
--- a/libXaw/include/X11/Xaw/TextSinkP.h
+++ b/libXaw/include/X11/Xaw/TextSinkP.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/libXaw/include/X11/Xaw/TextSrc.h b/libXaw/include/X11/Xaw/TextSrc.h
index 89bd5c2a7..2c65e6677 100644
--- a/libXaw/include/X11/Xaw/TextSrc.h
+++ b/libXaw/include/X11/Xaw/TextSrc.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -60,7 +60,7 @@ SOFTWARE.
  sourceChanged	     Changed		Boolean		False
 
 */
- 
+
 /* Class record constants */
 extern WidgetClass textSrcObjectClass;
 
@@ -169,7 +169,7 @@ int XawTextSourceReplace
  *	dir	 - direction to scan
  *	count	 - which occurance if this thing to search for
  *	include	 - whether or not to include the character found in
- *		   the position that is returned. 
+ *		   the position that is returned.
  *
  * Description:
  *	Scans the text source for the number and type of item specified.
diff --git a/libXaw/include/X11/Xaw/TextSrcP.h b/libXaw/include/X11/Xaw/TextSrcP.h
index 023d73752..27514c218 100644
--- a/libXaw/include/X11/Xaw/TextSrcP.h
+++ b/libXaw/include/X11/Xaw/TextSrcP.h
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/libXaw/include/X11/Xaw/Toggle.h b/libXaw/include/X11/Xaw/Toggle.h
index 1e57d387e..f6c6b970e 100644
--- a/libXaw/include/X11/Xaw/Toggle.h
+++ b/libXaw/include/X11/Xaw/Toggle.h
@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group.
  * Author: Chris D. Peterson
  *         MIT X Consortium
  *         kit@expo.lcs.mit.edu
- *  
+ *
  * Date:   January 12, 1989
  */
 
@@ -105,7 +105,7 @@ typedef struct _ToggleRec        *ToggleWidget;
  */
 
 _XFUNCPROTOBEGIN
-   
+
 /*
  * Function:
  *	XawToggleChangeRadioGroup
diff --git a/libXaw/include/X11/Xaw/ToggleP.h b/libXaw/include/X11/Xaw/ToggleP.h
index 6735140b6..a81659801 100644
--- a/libXaw/include/X11/Xaw/ToggleP.h
+++ b/libXaw/include/X11/Xaw/ToggleP.h
@@ -24,11 +24,11 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-/* 
+/*
  * Author: Chris D. Peterson
  *         MIT X Consortium
  *         kit@expo.lcs.mit.edu
- *  
+ *
  * Date:   January 12, 1989
  *
  */
diff --git a/libXaw/include/X11/Xaw/Tree.h b/libXaw/include/X11/Xaw/Tree.h
index 57ca34a32..1747a7844 100644
--- a/libXaw/include/X11/Xaw/Tree.h
+++ b/libXaw/include/X11/Xaw/Tree.h
@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group.
  * purpose and without fee is hereby granted, provided that the above
  * copyright notice appear in all copies and that both the copyright notice
  * and this permission notice appear in supporting documentation.
- * 
+ *
  * Prentice Hall and the authors disclaim all warranties with regard
  * to this software, including all implied warranties of merchantability and
  * fitness.  In no event shall Prentice Hall or the authors be liable
@@ -37,12 +37,12 @@ in this Software without prior written authorization from The Open Group.
  * resulting from loss of use, data or profits, whether in an action of
  * contract, negligence or other tortious action, arising out of or in
  * connection with the use or performance of this software.
- * 
+ *
  * Authors:  Jim Fulton, MIT X Consortium,
  *           based on a version by Douglas Young, Prentice Hall
- * 
+ *
  * This widget is based on the Tree widget described on pages 397-419 of
- * Douglas Young's book "The X Window System, Programming and Applications 
+ * Douglas Young's book "The X Window System, Programming and Applications
  * with Xt OSF/Motif Edition."  The layout code has been rewritten to use
  * additional blank space to make the structure of the graph easier to see
  * as well as to support vertical trees.
@@ -54,16 +54,16 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xmu/Converters.h>
 
 /******************************************************************************
- * 
+ *
  * Tree Widget (subclass of ConstraintClass)
- * 
+ *
  ******************************************************************************
- * 
+ *
  * Parameters:
- * 
+ *
  *  Name                Class              Type            Default
  *  ----                -----              ----            -------
- * 
+ *
  *  autoReconfigure     AutoReconfigure    Boolean         FALSE
  *  background          Background         Pixel           XtDefaultBackground
  *  foreground          Foreground         Pixel           XtDefaultForeground
@@ -71,14 +71,14 @@ in this Software without prior written authorization from The Open Group.
  *  hSpace              HSpace             Dimension       20
  *  lineWidth           LineWidth          Dimension       0
  *  vSpace              VSpace             Dimension       6
- * 
- * 
+ *
+ *
  * Constraint Resources attached to children:
- * 
+ *
  *  treeGC              TreeGC             GC              NULL
  *  treeParent          TreeParent         Widget          NULL
- * 
- * 
+ *
+ *
  *****************************************************************************/
 
                                         /* new instance field names */
@@ -108,7 +108,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef XawNdisplayList
 #define XawNdisplayList "displayList"
 #endif
- 
+
 #ifndef XawCDisplayList
 #define XawCDisplayList "DisplayList"
 #endif
diff --git a/libXaw/include/X11/Xaw/TreeP.h b/libXaw/include/X11/Xaw/TreeP.h
index 8776e7899..01d2bdc88 100644
--- a/libXaw/include/X11/Xaw/TreeP.h
+++ b/libXaw/include/X11/Xaw/TreeP.h
@@ -28,7 +28,7 @@ in this Software without prior written authorization from The Open Group.
  * purpose and without fee is hereby granted, provided that the above
  * copyright notice appear in all copies and that both the copyright notice
  * and this permission notice appear in supporting documentation.
- * 
+ *
  * Prentice Hall and the authors disclaim all warranties with regard
  * to this software, including all implied warranties of merchantability and
  * fitness.  In no event shall Prentice Hall or the authors be liable
@@ -36,12 +36,12 @@ in this Software without prior written authorization from The Open Group.
  * resulting from loss of use, data or profits, whether in an action of
  * contract, negligence or other tortious action, arising out of or in
  * connection with the use or performance of this software.
- * 
+ *
  * Authors:  Jim Fulton, MIT X Consortium,
  *           based on a version by Douglas Young, Prentice Hall
- * 
+ *
  * This widget is based on the Tree widget described on pages 397-419 of
- * Douglas Young's book "The X Window System, Programming and Applications 
+ * Douglas Young's book "The X Window System, Programming and Applications
  * with Xt OSF/Motif Edition."  The layout code has been rewritten to use
  * additional blank space to make the structure of the graph easier to see
  * as well as to support vertical trees.
diff --git a/libXaw/include/X11/Xaw/VendorEP.h b/libXaw/include/X11/Xaw/VendorEP.h
index 1ac09548b..b91f10a81 100644
--- a/libXaw/include/X11/Xaw/VendorEP.h
+++ b/libXaw/include/X11/Xaw/VendorEP.h
@@ -17,12 +17,12 @@
  * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
  * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTUOUS ACTION,
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE. 
+ * SOFTWARE.
  *
  *	Author:	Seiji Kuwari	OMRON Corporation
  *				kuwa@omron.co.jp
  *				kuwa%omron.co.jp@uunet.uu.net
- */				
+ */
 
 /*
 
diff --git a/libXaw/include/X11/Xaw/Viewport.h b/libXaw/include/X11/Xaw/Viewport.h
index da08e6155..36fab4496 100644
--- a/libXaw/include/X11/Xaw/Viewport.h
+++ b/libXaw/include/X11/Xaw/Viewport.h
@@ -27,13 +27,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/libXaw/include/X11/Xaw/ViewportP.h b/libXaw/include/X11/Xaw/ViewportP.h
index 5dbadf058..2aeb8a5df 100644
--- a/libXaw/include/X11/Xaw/ViewportP.h
+++ b/libXaw/include/X11/Xaw/ViewportP.h
@@ -31,13 +31,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/libXaw/include/X11/Xaw/XawImP.h b/libXaw/include/X11/Xaw/XawImP.h
index 536e5b4f9..a03eef60e 100644
--- a/libXaw/include/X11/Xaw/XawImP.h
+++ b/libXaw/include/X11/Xaw/XawImP.h
@@ -17,12 +17,12 @@
  * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
  * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTUOUS ACTION,
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE. 
+ * SOFTWARE.
  *
  *	Author:	Seiji Kuwari	OMRON Corporation
  *				kuwa@omron.co.jp
  *				kuwa%omron.co.jp@uunet.uu.net
- */				
+ */
 
 /*
 
diff --git a/libXaw/install-sh b/libXaw/install-sh
index 6781b987b..a9244eb07 100644
--- a/libXaw/install-sh
+++ b/libXaw/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@ while test $# -ne 0; do
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for `test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -200,7 +208,11 @@ if test $# -eq 0; then
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@ fi
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for `test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=\(\)!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@ do
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -385,7 +392,7 @@ do
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	[-=\(\)!]*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@ do
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then
diff --git a/libXaw/ltmain.sh b/libXaw/ltmain.sh
index 3061e3c5a..63ae69dc6 100644
--- a/libXaw/ltmain.sh
+++ b/libXaw/ltmain.sh
@@ -1,9 +1,9 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -41,6 +41,7 @@
 #       --quiet, --silent    don't print informational messages
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
+#       --no-warn            don't display warning messages
 #       --tag=TAG            use configuration variables from tag TAG
 #   -v, --verbose            print more informational messages than default
 #       --no-verbose         don't print the extra informational messages
@@ -69,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4
+#         $progname:	(GNU libtool) 2.4.2
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4
+VERSION=2.4.2
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@ progpath="$0"
 
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="grep -E"}
-: ${FGREP="grep -F"}
-: ${GREP="grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@ case $progpath in
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@ func_help ()
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }
@@ -1052,6 +1048,7 @@ opt_finish=false
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1120,6 +1117,10 @@ esac
 			opt_silent=false
 func_append preserve_args " $opt"
 			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
       --no-verbose)
 			opt_verbose=false
 func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@ func_mode_compile ()
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -3201,11 +3202,13 @@ func_mode_install ()
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@ static const void *lt_preloaded_setup() {
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -3982,14 +3985,17 @@ func_exec_program_core ()
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
   func_exec_program_core \${1+\"\$@\"}
 }
 
@@ -5057,9 +5063,15 @@ void lt_dump_script (FILE* f)
 {
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/\([\\"]\)/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
 EOF
@@ -5643,7 +5655,8 @@ func_mode_link ()
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6147,7 +6160,8 @@ func_mode_link ()
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6831,7 +6845,7 @@ func_mode_link ()
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -7316,6 +7330,7 @@ func_mode_link ()
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
@@ -7432,7 +7447,7 @@ func_mode_link ()
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -8020,6 +8035,11 @@ EOF
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
@@ -8050,7 +8070,7 @@ EOF
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_apped perm_rpath " $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -8058,11 +8078,7 @@ EOF
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
@@ -9152,6 +9168,8 @@ EOF
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
@@ -9261,7 +9279,8 @@ EOF
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
diff --git a/libXaw/man/Makefile.in b/libXaw/man/Makefile.in
index 23fc3bd60..5ac1ad0ca 100644
--- a/libXaw/man/Makefile.in
+++ b/libXaw/man/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -96,6 +96,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libmandir)"
 DATA = $(libman_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -310,9 +316,7 @@ uninstall-libmanDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(libman_DATA)'; test -n "$(libmandir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(libmandir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(libmandir)" && rm -f $$files
+	dir='$(DESTDIR)$(libmandir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -367,10 +371,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/libXaw/old-doc/CHANGES b/libXaw/old-doc/CHANGES
index 2eb316abb..a6a95fd85 100644
--- a/libXaw/old-doc/CHANGES
+++ b/libXaw/old-doc/CHANGES
@@ -28,11 +28,11 @@ AsciiSrc (Text):
 	Memory leak when freeing pieces in a source of type "ascii String"
 	has been plugged.
 
-	Buffer is now updated whenever the "string" resource is	set using 
+	Buffer is now updated whenever the "string" resource is	set using
 	XtSetValues().  If type is file then the file is read in again.
 
 Box:
-	The public header file now includes Xmu/Converters.h for the 
+	The public header file now includes Xmu/Converters.h for the
 	orientation resources.
 
 Clock:
@@ -53,7 +53,7 @@ Form:
 	Fixed EdgeTypes to be Xaw* instead of Xt*, but left the
  	old definitions around with #define so that code will still work.
 
-	StringToWidget converter no longer caches resources.  
+	StringToWidget converter no longer caches resources.
 
 Logo:
 	Made subclass of simple instead of Core.
@@ -67,13 +67,13 @@ MenuButton:
 *	The MenuButton widget no longer places a server grab on itself.
 	Instead, PopupMenu is registered as a grab action.  As a result
 	of this, clients which popped up menus without using XtMenuPopup
-	or MenuPopup or PopupMenu in the menu button translations will 
-	fail to have a grab active.  They should make a call to 
-	XtRegisterGrabAction on the appropriate action in the application 
+	or MenuPopup or PopupMenu in the menu button translations will
+	fail to have a grab active.  They should make a call to
+	XtRegisterGrabAction on the appropriate action in the application
 	initialization routine, or use a different translation.
 
 Paned:
-	The public header file now includes Xmu/Converters.h for the 
+	The public header file now includes Xmu/Converters.h for the
 	orientation resources.
 
 Panner:	This widget is new in R5.
@@ -86,14 +86,14 @@ Scrollbar:
 	Made subclass of simple instead of Core
 
 	Type of thumb resource is XtRBitmap; it used to be XtRPixmap.
-	However, if applications provide the resource conversion, the 
+	However, if applications provide the resource conversion, the
 	Scrollbar's SetValues can still handle pixmaps of correct depth.
 
 Simple:
 	Added a color cursor converter. and the new resource types:
 		XtNpointerColor
 		XtNpointerColorBackground
-		XtNcursorName	
+		XtNcursorName
 
 SmeBSB:
 	Right bitmaps are now painted in the correct location.
@@ -132,7 +132,7 @@ TextP.h:
 		#define XawDEL	0x7f
 		#define XawBSLASH '\\'
 
-	
+
 Toggle:
 *	Toggle widget state is preserved across changes in sensitivity.
 
diff --git a/libXaw/old-doc/Changelog b/libXaw/old-doc/Changelog
index 263ae04d5..cabbb2cae 100644
--- a/libXaw/old-doc/Changelog
+++ b/libXaw/old-doc/Changelog
@@ -349,7 +349,7 @@ Moved the code clipping code I have put in Text.c in my previous patch to
   code is now heavily used by the TextWidget.
 
 
--- XEDIT -- 
+-- XEDIT --
 Removed a XDefineCursor in xedit.c:main(). There are several ways to specify
   a cursor for a program (most times inherited from the wm decoration window),
   so, it is better to let the user choose one.
@@ -358,7 +358,7 @@ Before starting the main loop, now xedit sets the keyboard focus to the
   none was especified in the command line (do not use the new xedit without
   the new Xaw library, or you will not be able to change the keyboard focus).
 Updated the Scrollbar configurations in Xedit.ad
-  
+
 
 #1788 12 July 1998
 
@@ -368,7 +368,7 @@ Updated the Scrollbar configurations in Xedit.ad
  + Automatic resize was removed, it is not required with automatic horizontal
    scroll, but I will look for programs that rely on it; the only program
    affected (that I know) is xmh, because it popups dialogs of a small size,
-   and expects that the text widget (with a warning message) do a geometry  
+   and expects that the text widget (with a warning message) do a geometry
    request.
  + Scroll mode set to "WhenNeeded" was removed. It generates several unespected
    conditions when editing text, and the new feature of automatic scrolling
@@ -432,7 +432,7 @@ Fixed problem with the default macro for type conversion, where it was
   possible to the code tell the wrong size of a string, since it was
   returning the string size with 'strlen' but making the copy with strcpy.
 Complete ansification of Xaw (and Xmu).
-Corrected some problems caused due to an alteration in the text code, to 
+Corrected some problems caused due to an alteration in the text code, to
   make the cursor always visible when the wrap mode is 'line' or 'word'.
 Text.c:VJump() was made a bit smarter and a problem that would cause it
   to jump incorrectly was also corrected so that now the jumping should be
@@ -510,7 +510,7 @@ also fixed a possible buffer overflow while searching the source of the
 
 #1945, 31 Aug 1998
 
--- XAW -- 
+-- XAW --
  + Corrected bug in Viewport.c:ComputeLayout(), that would put the scrollbar
    in the incorrect position, if w->viewport.useright == True
  + Corrected bug in Converters.c:_XawCvtCARD32ToString(), so that now it
@@ -531,7 +531,7 @@ also fixed a possible buffer overflow while searching the source of the
 
 #2028, 2033, 7 Oct 1998
 
--- Xaw -- 
+-- Xaw --
 Added a delete translation to the text widget, that deletes the current
   selection if any, else the backwards char.
 Corrected bug that would not update correctly the screen if page-up or
@@ -550,20 +550,20 @@ Added a 'hack' to be able to type ^U<any-numeric-sequence> to be able
 Corrected a nasty bug in Text.c:CvtStringToScrollMode(); XtConvertAndStore
   can't be called from a type converter!
 added UNDO/REDO to the text widget. Please try it, I think it is very nice.
-  Undo is enabled by the new resource 'enableUndo', and, by default is  
+  Undo is enabled by the new resource 'enableUndo', and, by default is
   triggered with 'Ctrl+_'.
 
 -- editres --
 Resubmitting a patch to editres/handler.c, to make editres work properly.
 
--- xedit -- 
+-- xedit --
 NOTE that with this patch, xedit probably will not work with Xaw3d, neXtaw...
   this surelly can be fixed, or in the xedit side or the *Xaw* side, but
   the patch seens to be necessary.
 Changed the defaults file to be more user friendly and previsible.
   Added some 'Emacs like' binding translations.
 Added file completion in the filename prompt. This is a very nice
-  feature, but I'm not sure if the code is portable to all the XFree86  
+  feature, but I'm not sure if the code is portable to all the XFree86
   supported platforms (surely it will not work 'as is' with OS/2).
 
 
@@ -577,7 +577,7 @@ Changed the functions {Ascii,Multi}Sink.c:CharWidth and PaintText, to
   surely be made faster (based on comparition with some popular X editors).
 Changed the way the AsciiSink prints characters with value bigger than
   126 decimal. Now it prints DEL as ^?, and the other characters as \XXX
-  where 'X' is an octal digit. The MultiSink widget was unchanged in this  
+  where 'X' is an octal digit. The MultiSink widget was unchanged in this
   respect, i.e. when calling xedit with something like:
   xedit -xrm '*international: true'
 Converted all calls to strncpy, in AsciiSrc.c to memcpy, so that the (ascii)
@@ -593,14 +593,14 @@ Changed Text.c:TextScroll() to be smarter when calculating the offset of
 Added a nice feature, to show the matching '(', '[' or '{', when a ')',
   ']' or '}' is typped.
 Changed TextAction.c:FormParagraph() to generate only one undo/redo step.
-  
+
 -- xedit --
 Changed the defaults file to enable backups and made the backup suffix
   the character '~'.
 Replaced all instances of sprintf by XmuSnprintf.
 Changed xedit to set the label when saving a file also, to reflect what
   is being edited correctly.
-Corrected a bug in the new action 'file-completion', to replace correctly  
+Corrected a bug in the new action 'file-completion', to replace correctly
   the home directory, and keep correctly whatever was after the '~'. This
   isn't the correct place to this code (xedit/commands.c), since there are
   several other file name prompt windows in Xaw, but since it is required
@@ -742,7 +742,7 @@ Added a 'hints' feature to xedit. Instead of a 'dead'
 
 
 #2544 12 Mar 1999
-  
+
 -- Xaw --
   Mostly changes to add support to latin-* languages in the text code, when not
   using the international resource.
@@ -826,7 +826,7 @@ xedit.c:
    without it. Just ifdef'ed again the code to avoid warnings or dead code.
 
 -- xedit --
- + Added a ispell interface to xedit. Sorry for not documenting enough about it 
+ + Added a ispell interface to xedit. Sorry for not documenting enough about it
    the man page, but here is a small explanation of the new funcionality:
     Replace:	Replace's the selected word.
     All (right side of Replace button): Replaces all occurrences of the selected
diff --git a/libXaw/specs/Makefile.in b/libXaw/specs/Makefile.in
index 1317760e4..6abad2d1f 100644
--- a/libXaw/specs/Makefile.in
+++ b/libXaw/specs/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -109,6 +109,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"
 DATA = $(dist_shelf_DATA) $(shelf_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -426,9 +432,7 @@ uninstall-dist_shelfDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_shelf_DATA)'; test -n "$(shelfdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(shelfdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(shelfdir)" && rm -f $$files
+	dir='$(DESTDIR)$(shelfdir)'; $(am__uninstall_files_from_dir)
 install-shelfDATA: $(shelf_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(shelfdir)" || $(MKDIR_P) "$(DESTDIR)$(shelfdir)"
@@ -446,9 +450,7 @@ uninstall-shelfDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(shelf_DATA)'; test -n "$(shelfdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(shelfdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(shelfdir)" && rm -f $$files
+	dir='$(DESTDIR)$(shelfdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -503,10 +505,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/libXaw/src/AsciiSink.c b/libXaw/src/AsciiSink.c
index 56f899c09..d77689518 100644
--- a/libXaw/src/AsciiSink.c
+++ b/libXaw/src/AsciiSink.c
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -331,7 +331,7 @@ void CalculateBearing(TextWidget ctx, XawTextPosition position, int x, int y,
  *	   |   ####	 |
  *	   |  ####	 |
  *	   | ####	 |
- *	   |### 	 |
+ *	   |###		 |
  *	 ####		 |
  *	   |		 |
  *
@@ -369,7 +369,7 @@ void CalculateBearing(TextWidget ctx, XawTextPosition position, int x, int y,
 		    c = ' ';
 	    }
 	    if (font->per_char &&
-	 	(c >= font->min_char_or_byte2 && c <= font->max_char_or_byte2))
+		(c >= font->min_char_or_byte2 && c <= font->max_char_or_byte2))
 		rbearing = font->per_char[c - font->min_char_or_byte2].rbearing -
 			   font->per_char[c - font->min_char_or_byte2].width;
 	    if (rbearing > 0) {
@@ -405,7 +405,7 @@ void CalculateBearing(TextWidget ctx, XawTextPosition position, int x, int y,
 		    c = ' ';
 	    }
 	    if (font->per_char &&
-	 	(c >= font->min_char_or_byte2 && c <= font->max_char_or_byte2))
+		(c >= font->min_char_or_byte2 && c <= font->max_char_or_byte2))
 		lbearing = font->per_char[c - font->min_char_or_byte2].lbearing;
 	    if (lbearing < 0) {
 		paint = XtNew(XawTextPaintStruct);
@@ -1707,7 +1707,7 @@ XawAsciiSinkInitialize(Widget request, Widget cnew,
     GetGC(sink);
 
     if (!sink->ascii_sink.font) XtError("Aborting: no font found\n");
-    
+
     sink->ascii_sink.cursor_position = 0;
     sink->ascii_sink.laststate = XawisOff;
     sink->ascii_sink.cursor_x = sink->ascii_sink.cursor_y = 0;
diff --git a/libXaw/src/AsciiSrc.c b/libXaw/src/AsciiSrc.c
index 245a65464..b28b2c4f3 100644
--- a/libXaw/src/AsciiSrc.c
+++ b/libXaw/src/AsciiSrc.c
@@ -164,7 +164,7 @@ static XtResource resources[] = {
     XtNcallback,
     XtCCallback,
     XtRCallback,
-    sizeof(XtPointer), 
+    sizeof(XtPointer),
     offset(callback),
     XtRCallback,
     (XtPointer)NULL
@@ -360,7 +360,7 @@ ReadText(Widget w, XawTextPosition pos, XawTextBlock *text, int length)
     AsciiSrcObject src = (AsciiSrcObject)w;
     XawTextPosition count, start;
     Piece *piece;
-#ifndef OLDXAW 
+#ifndef OLDXAW
     XawTextAnchor *anchor;
     XawTextEntity *entity;
     XawTextPosition offset, end = pos + length;
@@ -454,7 +454,7 @@ ReplaceText(Widget w, XawTextPosition startPos, XawTextPosition endPos,
     /*
      * Editing a read only source is not allowed
      */
-    if (src->text_src.edit_mode == XawtextRead) 
+    if (src->text_src.edit_mode == XawtextRead)
 	return (XawEditError);
 
     start_piece = FindPiece(src, startPos, &start_first);
@@ -561,7 +561,7 @@ ReplaceText(Widget w, XawTextPosition startPos, XawTextPosition endPos,
     src->ascii_src.length += -(endPos - startPos) + text->length;
 
     if ( text->length != 0) {
-	/* 
+	/*
 	 * Put in the New Stuff
 	 */
 	start_piece = FindPiece(src, startPos, &start_first);
@@ -834,7 +834,7 @@ Scan(Widget w, register XawTextPosition position, XawTextScanType type,
  * Returns:
  *	The position of the item found
  */
-static XawTextPosition 
+static XawTextPosition
 Search(Widget w, register XawTextPosition position, XawTextScanDirection dir,
        XawTextBlock *text)
 {
@@ -1078,7 +1078,7 @@ XawAsciiSrcDestroy(Widget w)
 }
 
 /*
- * Public routines 
+ * Public routines
  */
 /*
  * Function:
@@ -1146,7 +1146,7 @@ XawAsciiSave(Widget w)
      * If using the string in place then there is no need to play games
      * to get the internal info into a readable string.
      */
-    if (src->ascii_src.use_string_in_place) 
+    if (src->ascii_src.use_string_in_place)
 	return (True);
 
     if (src->ascii_src.type == XawAsciiFile) {
@@ -1211,7 +1211,7 @@ XawAsciiSaveAsFile(Widget w, _Xconst char *name)
     if (src->ascii_src.type == XawAsciiFile)
 	ret = WritePiecesToFile(src, (String)name);
     else {
-	String string = StorePiecesInString(src); 
+	String string = StorePiecesInString(src);
 
 	ret = WriteToFile(string, (String)name, src->ascii_src.length);
 	XtFree(string);
@@ -1258,7 +1258,7 @@ XawAsciiSourceChanged(Widget w)
  * Private Functions
  */
 static void
-RemoveOldStringOrFile(AsciiSrcObject src, Bool checkString) 
+RemoveOldStringOrFile(AsciiSrcObject src, Bool checkString)
 {
     FreeAllPieces(src);
 
@@ -1379,8 +1379,8 @@ StorePiecesInString(AsciiSrcObject src)
 
     string = XtMalloc((unsigned)(src->ascii_src.length + 1));
 
-    for (first = 0, piece = src->ascii_src.first_piece ; piece != NULL; 
-	 first += piece->used, piece = piece->next) 
+    for (first = 0, piece = src->ascii_src.first_piece ; piece != NULL;
+	 first += piece->used, piece = piece->next)
       memcpy(string + first, piece->text, (unsigned)piece->used);
 
     string[src->ascii_src.length] = '\0';
@@ -1661,7 +1661,7 @@ RemovePiece(AsciiSrcObject src, Piece *piece)
  * Parameters:
  *	src	 - AsciiSrc Widget
  *	position - position that we are searching for
- * 	first	 - position of the first character in this piece (return)
+ *	first	 - position of the first character in this piece (return)
  *
  * Description:
  *	Finds the piece containing the position indicated.
@@ -1686,7 +1686,7 @@ FindPiece(AsciiSrcObject src, XawTextPosition position, XawTextPosition *first)
 
     return (old_piece);	/* if we run off the end the return the last piece */
 }
-    
+
 /*
  * Function:
  *	BreakPiece
@@ -1874,9 +1874,9 @@ XawDiskSourceCreate(Widget parent, ArgList args, Cardinal num_args)
     ascii_args = XtMergeArgLists(temp, ONE, args, num_args);
     num_args++;
 
-    for (i = 0; i < num_args; i++) 
+    for (i = 0; i < num_args; i++)
 	if (streq(ascii_args[i].name, XtNfile)
-	    || streq(ascii_args[i].name, XtCFile)) 
+	    || streq(ascii_args[i].name, XtCFile))
 	    ascii_args[i].name = XtNstring;
 
     src = XtCreateWidget("genericAsciiDisk", asciiSrcObjectClass, parent,
diff --git a/libXaw/src/AsciiText.c b/libXaw/src/AsciiText.c
index 25cea9d18..8e2f0aa66 100644
--- a/libXaw/src/AsciiText.c
+++ b/libXaw/src/AsciiText.c
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -48,13 +48,13 @@ SOFTWARE.
 /*
  * AsciiText.c - Source code for AsciiText Widget
  *
- * This Widget is intended to be used as a simple front end to the 
+ * This Widget is intended to be used as a simple front end to the
  * text widget with an ascii source and ascii sink attached to it
  *
  * Date:    June 29, 1989
  *
  * By:      Chris D. Peterson
- *          MIT X Consortium 
+ *          MIT X Consortium
  *          kit@expo.lcs.mit.edu
  */
 
@@ -314,7 +314,7 @@ XawAsciiInitialize(Widget request, Widget cnew,
 
     for (i = 0, tab = 0; i < TAB_COUNT; i++)
 	tabs[i] = (tab += 8);
-  
+
     XawTextSinkSetTabs(w->text.sink, TAB_COUNT, tabs);
 
     XawTextDisableRedisplay(cnew);
@@ -336,7 +336,7 @@ XawAsciiInitialize(Widget request, Widget cnew,
     }
 }
 
-static void 
+static void
 XawAsciiDestroy(Widget w)
 {
     AsciiWidget ascii = (AsciiWidget)w;
diff --git a/libXaw/src/Command.c b/libXaw/src/Command.c
index 9ad1f15fa..4535423a0 100644
--- a/libXaw/src/Command.c
+++ b/libXaw/src/Command.c
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -110,7 +110,7 @@ static char defaultTranslations[] =
 ;
 
 #define offset(field) XtOffsetOf(CommandRec, field)
-static XtResource resources[] = { 
+static XtResource resources[] = {
   {
     XtNcallback,
     XtCCallback,
@@ -216,21 +216,21 @@ WidgetClass commandWidgetClass = (WidgetClass)&commandClassRec;
 /*
  * Implementation
  */
-static GC 
+static GC
 Get_GC(CommandWidget cbw, Pixel fg, Pixel bg)
 {
     XGCValues	values;
-  
+
     values.foreground	= fg;
     values.background	= bg;
     values.font		= cbw->label.font->fid;
     values.cap_style	= CapProjecting;
-  
+
     if (cbw->command.highlight_thickness > 1)
 	values.line_width = cbw->command.highlight_thickness;
-    else 
+    else
 	values.line_width = 0;
-  
+
     if (cbw->simple.international == True)
 	return (XtAllocateGC((Widget)cbw, 0,
 			     GCForeground | GCBackground | GCLineWidth |
@@ -242,7 +242,7 @@ Get_GC(CommandWidget cbw, Pixel fg, Pixel bg)
 }
 
 /*ARGSUSED*/
-static void 
+static void
 XawCommandInitialize(Widget request, Widget cnew,
 		     ArgList args, Cardinal *num_args)
 {
@@ -250,7 +250,7 @@ XawCommandInitialize(Widget request, Widget cnew,
     int shape_event_base, shape_error_base;
 
     if (!cbw->label.font) XtError("Aborting: no font found\n");
-    
+
     if (cbw->command.shape_style != XawShapeRectangle &&
 	!XShapeQueryExtension(XtDisplay(cnew), &shape_event_base,
 			      &shape_error_base))
@@ -263,9 +263,9 @@ XawCommandInitialize(Widget request, Widget cnew,
 	    cbw->command.highlight_thickness = DEFAULT_HIGHLIGHT_THICKNESS;
     }
 
-    cbw->command.normal_GC = Get_GC(cbw, cbw->label.foreground, 
+    cbw->command.normal_GC = Get_GC(cbw, cbw->label.foreground,
 				    cbw->core.background_pixel);
-    cbw->command.inverse_GC = Get_GC(cbw, cbw->core.background_pixel, 
+    cbw->command.inverse_GC = Get_GC(cbw, cbw->core.background_pixel,
 				     cbw->label.foreground);
     XtReleaseGC(cnew, cbw->label.normal_GC);
     cbw->label.normal_GC = cbw->command.normal_GC;
@@ -274,7 +274,7 @@ XawCommandInitialize(Widget request, Widget cnew,
     cbw->command.highlighted = HighlightNone;
 }
 
-static Region 
+static Region
 HighlightRegion(CommandWidget cbw)
 {
     static Region outerRegion = NULL, innerRegion, emptyRegion;
@@ -323,7 +323,7 @@ XawCommandToggle(Widget w)
 }
 
 /*ARGSUSED*/
-static void 
+static void
 Set(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
     CommandWidget cbw = (CommandWidget)w;
@@ -349,7 +349,7 @@ Unset(Widget w, XEvent *event, String *params, Cardinal *num_params)
 }
 
 /*ARGSUSED*/
-static void 
+static void
 Reset(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
     CommandWidget cbw = (CommandWidget)w;
@@ -363,7 +363,7 @@ Reset(Widget w, XEvent *event, String *params, Cardinal *num_params)
 }
 
 /*ARGSUSED*/
-static void 
+static void
 Highlight(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
     CommandWidget cbw = (CommandWidget)w;
@@ -389,7 +389,7 @@ Highlight(Widget w, XEvent *event, String *params, Cardinal *num_params)
 }
 
 /*ARGSUSED*/
-static void 
+static void
 Unhighlight(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
     CommandWidget cbw = (CommandWidget)w;
@@ -400,10 +400,10 @@ Unhighlight(Widget w, XEvent *event, String *params, Cardinal *num_params)
 }
 
 /*ARGSUSED*/
-static void 
+static void
 Notify(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
-    CommandWidget cbw = (CommandWidget)w; 
+    CommandWidget cbw = (CommandWidget)w;
 
     /* check to be sure state is still Set so that user can cancel
        the action (e.g. by moving outside the window, in the default
@@ -427,13 +427,13 @@ XawCommandRedisplay(Widget w, XEvent *event, Region region)
  *	region - region to paint (passed to the superclass)
  *                 change - did it change either set or highlight state?
  */
-static void 
+static void
 PaintCommandWidget(Widget w, XEvent *event, Region region, Bool change)
 {
     CommandWidget cbw = (CommandWidget)w;
     Bool very_thick;
     GC rev_gc;
-   
+
     very_thick = cbw->command.highlight_thickness
 		 > Min(XtWidth(cbw), XtHeight(cbw)) / 2;
 
@@ -485,7 +485,7 @@ PaintCommandWidget(Widget w, XEvent *event, Region region, Bool change)
 	    else {
 		int offset = cbw->command.highlight_thickness / 2;
 
-		XDrawRectangle(XtDisplay(w),XtWindow(w), rev_gc, offset, offset, 
+		XDrawRectangle(XtDisplay(w),XtWindow(w), rev_gc, offset, offset,
 			       XtWidth(cbw) - cbw->command.highlight_thickness,
 			      XtHeight(cbw) - cbw->command.highlight_thickness);
 	   }
@@ -495,7 +495,7 @@ PaintCommandWidget(Widget w, XEvent *event, Region region, Bool change)
     (*SuperClass->core_class.expose)(w, event, region);
 }
 
-static void 
+static void
 XawCommandDestroy(Widget w)
 {
     CommandWidget cbw = (CommandWidget)w;
@@ -505,7 +505,7 @@ XawCommandDestroy(Widget w)
 }
 
 /*ARGSUSED*/
-static Boolean 
+static Boolean
 XawCommandSetValues(Widget current, Widget request, Widget cnew,
 		    ArgList args, Cardinal *num_args)
 {
@@ -541,9 +541,9 @@ XawCommandSetValues(Widget current, Widget request, Widget cnew,
 	|| oldcbw->label.font != cbw->label.font) {
 	XtReleaseGC(cnew, cbw->command.inverse_GC);
 
-	cbw->command.normal_GC = Get_GC(cbw, cbw->label.foreground, 
+	cbw->command.normal_GC = Get_GC(cbw, cbw->label.foreground,
 					cbw->core.background_pixel);
-	cbw->command.inverse_GC = Get_GC(cbw, cbw->core.background_pixel, 
+	cbw->command.inverse_GC = Get_GC(cbw, cbw->core.background_pixel,
 					 cbw->label.foreground);
 	XtReleaseGC(cnew, cbw->label.normal_GC);
 	cbw->label.normal_GC = cbw->command.normal_GC;
@@ -619,7 +619,7 @@ XawCommandRealize(Widget w, Mask *valueMask, XSetWindowAttributes *attributes)
 static void
 XawCommandResize(Widget w)
 {
-    if (XtIsRealized(w)) 
+    if (XtIsRealized(w))
 	ShapeButton((CommandWidget)w, False);
 
     (*commandWidgetClass->core_class.superclass->core_class.resize)(w);
diff --git a/libXaw/src/Dialog.c b/libXaw/src/Dialog.c
index 7accb8caa..9c98d3696 100644
--- a/libXaw/src/Dialog.c
+++ b/libXaw/src/Dialog.c
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -54,7 +54,7 @@ SOFTWARE.
 #include <X11/Xmu/Misc.h>
 #include <X11/Xaw/AsciiText.h>
 #include <X11/Xaw/Cardinals.h>
-#include <X11/Xaw/Command.h>	
+#include <X11/Xaw/Command.h>
 #include <X11/Xaw/Label.h>
 #include <X11/Xaw/DialogP.h>
 #include <X11/Xaw/XawInit.h>
@@ -220,7 +220,7 @@ XawDialogInitialize(Widget request, Widget cnew,
 	XtSetArg(arglist[0], XtNheight, XtHeight(dw->dialog.iconW));
 	XtSetValues(dw->dialog.labelW, arglist, 1);
     }
-    if (dw->dialog.value != NULL) 
+    if (dw->dialog.value != NULL)
 	CreateDialogValueWidget((Widget)dw);
     else
         dw->dialog.valueW = NULL;
@@ -238,7 +238,7 @@ XawDialogConstraintInitialize(Widget request, Widget cnew,
 	return;					 /* then just use defaults */
 
     constraint->form.left = constraint->form.right = XtChainLeft;
-    if (dw->dialog.valueW == NULL) 
+    if (dw->dialog.valueW == NULL)
 	constraint->form.vert_base = dw->dialog.labelW;
     else
 	constraint->form.vert_base = dw->dialog.valueW;
@@ -360,7 +360,7 @@ XawDialogGetValuesHook(Widget w, ArgList args, Cardinal *num_args)
     String s;
     DialogWidget src = (DialogWidget)w;
     unsigned int i;
-  
+
     for (i = 0; i < *num_args; i++)
 	if (streq(args[i].name, XtNvalue)) {
 	    XtSetArg(a[0], XtNstring, &s);
diff --git a/libXaw/src/Form.c b/libXaw/src/Form.c
index 58723e845..dcc26f3a6 100644
--- a/libXaw/src/Form.c
+++ b/libXaw/src/Form.c
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/libXaw/src/Grip.c b/libXaw/src/Grip.c
index 93ddfbeda..85f021b9c 100644
--- a/libXaw/src/Grip.c
+++ b/libXaw/src/Grip.c
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/libXaw/src/Label.c b/libXaw/src/Label.c
index 5ce3b7dca..25a26a111 100644
--- a/libXaw/src/Label.c
+++ b/libXaw/src/Label.c
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -468,7 +468,7 @@ GetGrayGC(LabelWidget lw)
     values.font	      = lw->label.font->fid;
     values.fill_style = FillTiled;
     values.tile       = XmuCreateStippledPixmap(XtScreen((Widget)lw),
-						lw->label.foreground, 
+						lw->label.foreground,
 						lw->core.background_pixel,
 						lw->core.depth);
     values.graphics_exposures = False;
@@ -482,7 +482,7 @@ GetGrayGC(LabelWidget lw)
 					 GCGraphicsExposures,
 					 &values, GCFont, 0);
 	else
-	    lw->label.gray_GC = XtGetGC((Widget)lw, 
+	    lw->label.gray_GC = XtGetGC((Widget)lw,
 					GCForeground | GCBackground |
 					GCFont | GCTile | GCFillStyle |
 					GCGraphicsExposures,
@@ -493,7 +493,7 @@ static void
 compute_bitmap_offsets(LabelWidget lw)
 {
     /*
-     * bitmap will be eventually be displayed at 
+     * bitmap will be eventually be displayed at
      * (internal_width, internal_height + lbm_y)
      */
     if (lw->label.lbm_height != 0)
@@ -527,10 +527,10 @@ XawLabelInitialize(Widget request, Widget cnew,
     LabelWidget lw = (LabelWidget)cnew;
 
     if (!lw->label.font) XtError("Aborting: no font found\n");
-    if (lw->simple.international && !lw->label.fontset) 
+    if (lw->simple.international && !lw->label.fontset)
 	XtError("Aborting: no fontset found\n");
-    
-    if (lw->label.label == NULL) 
+
+    if (lw->label.label == NULL)
 	lw->label.label = XtNewString(lw->core.name);
     else
 	lw->label.label = XtNewString(lw->label.label);
@@ -615,7 +615,7 @@ XawLabelRedisplay(Widget gw, XEvent *event, Region region)
 		    else
 			XDrawString(XtDisplay(gw), XtWindow(gw), gc,
 				    w->label.label_x, y, label, (int)(nl - label));
-		    y += w->label.font->max_bounds.ascent + 
+		    y += w->label.font->max_bounds.ascent +
 			 w->label.font->max_bounds.descent;
 		    label = nl + 1;
 		}
@@ -724,7 +724,7 @@ XawLabelSetValues(Widget current, Widget request, Widget cnew,
     if (curlw->label.encoding != newlw->label.encoding)
 	was_resized = True;
 
-    if (curlw->simple.international 
+    if (curlw->simple.international
 	&& curlw->label.fontset != newlw->label.fontset)
 	was_resized = True;
 
diff --git a/libXaw/src/List.c b/libXaw/src/List.c
index 287151d50..ce0ab5f23 100644
--- a/libXaw/src/List.c
+++ b/libXaw/src/List.c
@@ -28,7 +28,7 @@ in this Software without prior written authorization from The Open Group.
  * This is a List widget.  It allows the user to select an item in a list and
  * notifies the application through a callback function.
  *
- *	Created: 	8/13/88
+ *	Created:	8/13/88
  *	By:		Chris D. Peterson
  *                      MIT X Consortium
  */
@@ -81,7 +81,7 @@ static Bool Layout(Widget, Bool, Bool, Dimension*, Dimension*);
 static void PaintItemName(Widget, int);
 static void ResetList(Widget, Bool, Bool);
 
-/* 
+/*
  * Actions
  */
 static void Notify(Widget, XEvent*, String*, Cardinal*);
@@ -91,7 +91,7 @@ static void Unset(Widget, XEvent*, String*, Cardinal*);
 /*
  * Initialization
  */
-static char defaultTranslations[] =  
+static char defaultTranslations[] =
 "<Btn1Down>:"	"Set()\n"
 "<Btn1Up>:"	"Notify()\n"
 ;
@@ -337,7 +337,7 @@ GetGCs(Widget w)
     else
 	lw->list.revgc = XtGetGC(w, GCForeground | GCFont, &values);
 
-    values.tile       = XmuCreateStippledPixmap(XtScreen(w), 
+    values.tile       = XmuCreateStippledPixmap(XtScreen(w),
 						lw->list.foreground,
 						lw->core.background_pixel,
 						lw->core.depth);
@@ -374,10 +374,10 @@ CalculatedValues(Widget w)
 	for (i = 0 ; i < lw->list.nitems; i++) {
 	    if (lw->simple.international == True)
 		len = XmbTextEscapement(lw->list.fontset, lw->list.list[i],
-			 		strlen(lw->list.list[i]));
+					strlen(lw->list.list[i]));
 	    else
 		len = XTextWidth(lw->list.font, lw->list.list[i],
-			 	 strlen(lw->list.list[i]));
+				 strlen(lw->list.list[i]));
 	    if (len > lw->list.longest)
 		lw->list.longest = len;
 	}
@@ -466,15 +466,15 @@ ChangeSize(Widget w, unsigned int width, unsigned int height)
 }
 
 /*ARGSUSED*/
-static void 
+static void
 XawListInitialize(Widget temp1, Widget cnew, ArgList args, Cardinal *num_args)
 {
     ListWidget lw = (ListWidget)cnew;
 
     if (!lw->list.font) XtError("Aborting: no font found\n");
-    if (lw->simple.international && !lw->list.fontset) 
+    if (lw->simple.international && !lw->list.fontset)
 	XtError("Aborting: no fontset found\n");
-    
+
     /*
      * Initialize all private resources
      */
@@ -538,10 +538,10 @@ CvtToItem(Widget w, int xloc, int yloc, int *item)
 	/* If in right margin handle things right */
 	another = (xloc - (int)lw->list.internal_width) / lw->list.col_width;
 	if (another >= lw->list.ncols) {
-	    another = lw->list.ncols - 1; 
+	    another = lw->list.ncols - 1;
 	    ret_val = OUT_OF_RANGE;
 	}
-    }  
+    }
     if (xloc < 0 || yloc < 0)
 	ret_val = OUT_OF_RANGE;
     if (one < 0)
@@ -600,8 +600,8 @@ ItemInRectangle(Widget w, int ul, int lr, int item)
     ListWidget lw = (ListWidget)w;
     int mod_item;
     int things;
-    
-    if (item < ul || item > lr) 
+
+    if (item < ul || item > lr)
       return (False);
     if (lw->list.vertical_cols)
 	things = lw->list.nrows;
@@ -716,7 +716,7 @@ PaintItemName(Widget w, int item)
 	    HighlightBackground(w, x, y, lw->list.normgc);
 	}
 	else {
-	    if (XtIsSensitive(w)) 
+	    if (XtIsSensitive(w))
 		gc = lw->list.normgc;
 	    else
 		gc = lw->list.graygc;
@@ -731,7 +731,7 @@ PaintItemName(Widget w, int item)
 	    lw->list.is_highlighted = item;
 	}
 	else {
-	    if (XtIsSensitive(w)) 
+	    if (XtIsSensitive(w))
 		gc = lw->list.normgc;
 	    else
 		gc = lw->list.graygc;
@@ -759,7 +759,7 @@ PaintItemName(Widget w, int item)
     XSetClipMask(XtDisplay(w), gc, None);
 }
 
-static void 
+static void
 XawListRedisplay(Widget w, XEvent *event, Region region)
 {
     int item;			/* an item to work with */
@@ -776,7 +776,7 @@ XawListRedisplay(Widget w, XEvent *event, Region region)
 
     if (Superclass->core_class.expose)
     (Superclass->core_class.expose)(w, event, region);
-    
+
     for (item = ul_item; item <= lr_item && item < lw->list.nitems; item++)
 	if (ItemInRectangle(w, ul_item, lr_item, item))
 	    PaintItemName(w, item);
@@ -789,13 +789,13 @@ XawListRedisplay(Widget w, XEvent *event, Region region)
  * w - the widget.
  * intended - what the parent intends to do with us.
  * requested - what we want to happen */
-static XtGeometryResult 
+static XtGeometryResult
 XawListQueryGeometry(Widget w, XtWidgetGeometry *intended,
 		     XtWidgetGeometry *requested)
 {
     Dimension new_width, new_height;
     Bool change, width_req, height_req;
-    
+
     width_req = intended->request_mode & CWWidth;
     height_req = intended->request_mode & CWHeight;
 
@@ -810,13 +810,13 @@ XawListQueryGeometry(Widget w, XtWidgetGeometry *intended,
 	new_height = XtHeight(w);
 
     requested->request_mode = 0;
-    
+
    /*
     * We only care about our height and width
     */
     if (!width_req && !height_req)
 	return (XtGeometryYes);
-    
+
     change = Layout(w, !width_req, !height_req, &new_width, &new_height);
 
     requested->request_mode |= CWWidth;
@@ -853,7 +853,7 @@ XawListResize(Widget w)
  * width, height- the is the current width and height that we are going
  *		we are going to layout the list widget to,
  *		depending on xfree and yfree of course.
- *			       
+ *
  * Return:
  *	True if width or height have been changed */
 static Bool
@@ -877,7 +877,7 @@ Layout(Widget w, Bool xfree, Bool yfree, Dimension *width, Dimension *height)
 	       of inter-column column_space 's as columns.  There should thus
 	       be a half column_space margin on each side of each column...*/
 	    width2 = lw->list.ncols * lw->list.col_width +
-	    	     (lw->list.internal_width << 1);
+		     (lw->list.internal_width << 1);
 	    change = True;
 	}
 	if (yfree) {
@@ -948,7 +948,7 @@ Layout(Widget w, Bool xfree, Bool yfree, Dimension *width, Dimension *height)
 	while (1) {
 	    lw->list.nrows = ((lw->list.nitems - 1) / lw->list.ncols) + 1;
 	    width2 = lw->list.ncols * lw->list.col_width +
-	    	     (lw->list.internal_width << 1);
+		     (lw->list.internal_width << 1);
 	    height2 = lw->list.nrows * lw->list.row_height +
 		      (lw->list.internal_height << 1);
 	    if (width2 >= MaxSize && height2 >= MaxSize)
@@ -984,7 +984,7 @@ Notify(Widget w, XEvent *event, String *params, Cardinal *num_params)
 
     /*
      * Find item and if out of range then unhighlight and return
-     * 
+     *
      * If the current item is unhighlighted then the user has aborted the
      * notify, so unhighlight and return
      */
@@ -1014,7 +1014,7 @@ Notify(Widget w, XEvent *event, String *params, Cardinal *num_params)
      */
     ret_value.string = lw->list.list[item];
     ret_value.list_index = item;
-    
+
     XtCallCallbacks(w, XtNcallback, (XtPointer)&ret_value);
 }
 
@@ -1051,7 +1051,7 @@ Set(Widget w, XEvent *event, String *params, Cardinal *num_params)
  * Set specified arguments into widget
  */
 /*ARGSUSED*/
-static Boolean 
+static Boolean
 XawListSetValues(Widget current, Widget request, Widget cnew,
 		 ArgList args, Cardinal *num_args)
 {
@@ -1142,7 +1142,7 @@ XawListSetValues(Widget current, Widget request, Widget cnew,
 	nl->list.highlight = NO_HIGHLIGHT;
 	redraw = True;
     }
-    
+
     return (redraw);
 }
 
@@ -1151,7 +1151,7 @@ XawListDestroy(Widget w)
 {
     ListWidget lw = (ListWidget)w;
     XGCValues values;
-    
+
     XGetGCValues(XtDisplay(w), lw->list.graygc, GCTile, &values);
     XmuReleaseStippledPixmap(XtScreen(w), values.tile);
     XtReleaseGC(w, lw->list.graygc);
@@ -1233,7 +1233,7 @@ void
 XawListHighlight(Widget w, int item)
 {
     ListWidget lw = (ListWidget)w;
-    
+
     if (XtIsSensitive(w)) {
 	lw->list.highlight = item;
 	if (lw->list.is_highlighted != NO_HIGHLIGHT)
@@ -1259,7 +1259,7 @@ XawListShowCurrent(Widget w)
     XawListReturnStruct *ret_val;
 
     ret_val = (XawListReturnStruct *)XtMalloc(sizeof(XawListReturnStruct));
-    
+
     ret_val->list_index = lw->list.highlight;
     if (ret_val->list_index == XAW_LIST_NONE)
 	ret_val->string = "";
diff --git a/libXaw/src/Makefile.in b/libXaw/src/Makefile.in
index b54d62d43..2cfcdd6c4 100644
--- a/libXaw/src/Makefile.in
+++ b/libXaw/src/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -67,6 +67,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
@@ -582,722 +588,632 @@ distclean-compile:
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 libXaw6_la-Actions.lo: Actions.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-Actions.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-Actions.Tpo -c -o libXaw6_la-Actions.lo `test -f 'Actions.c' || echo '$(srcdir)/'`Actions.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-Actions.Tpo $(DEPDIR)/libXaw6_la-Actions.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Actions.c' object='libXaw6_la-Actions.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Actions.c' object='libXaw6_la-Actions.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Actions.lo `test -f 'Actions.c' || echo '$(srcdir)/'`Actions.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Actions.lo `test -f 'Actions.c' || echo '$(srcdir)/'`Actions.c
 
 libXaw6_la-AllWidgets.lo: AllWidgets.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-AllWidgets.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-AllWidgets.Tpo -c -o libXaw6_la-AllWidgets.lo `test -f 'AllWidgets.c' || echo '$(srcdir)/'`AllWidgets.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-AllWidgets.Tpo $(DEPDIR)/libXaw6_la-AllWidgets.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='AllWidgets.c' object='libXaw6_la-AllWidgets.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='AllWidgets.c' object='libXaw6_la-AllWidgets.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-AllWidgets.lo `test -f 'AllWidgets.c' || echo '$(srcdir)/'`AllWidgets.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-AllWidgets.lo `test -f 'AllWidgets.c' || echo '$(srcdir)/'`AllWidgets.c
 
 libXaw6_la-AsciiSink.lo: AsciiSink.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-AsciiSink.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-AsciiSink.Tpo -c -o libXaw6_la-AsciiSink.lo `test -f 'AsciiSink.c' || echo '$(srcdir)/'`AsciiSink.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-AsciiSink.Tpo $(DEPDIR)/libXaw6_la-AsciiSink.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='AsciiSink.c' object='libXaw6_la-AsciiSink.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='AsciiSink.c' object='libXaw6_la-AsciiSink.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-AsciiSink.lo `test -f 'AsciiSink.c' || echo '$(srcdir)/'`AsciiSink.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-AsciiSink.lo `test -f 'AsciiSink.c' || echo '$(srcdir)/'`AsciiSink.c
 
 libXaw6_la-AsciiSrc.lo: AsciiSrc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-AsciiSrc.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-AsciiSrc.Tpo -c -o libXaw6_la-AsciiSrc.lo `test -f 'AsciiSrc.c' || echo '$(srcdir)/'`AsciiSrc.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-AsciiSrc.Tpo $(DEPDIR)/libXaw6_la-AsciiSrc.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='AsciiSrc.c' object='libXaw6_la-AsciiSrc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='AsciiSrc.c' object='libXaw6_la-AsciiSrc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-AsciiSrc.lo `test -f 'AsciiSrc.c' || echo '$(srcdir)/'`AsciiSrc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-AsciiSrc.lo `test -f 'AsciiSrc.c' || echo '$(srcdir)/'`AsciiSrc.c
 
 libXaw6_la-AsciiText.lo: AsciiText.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-AsciiText.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-AsciiText.Tpo -c -o libXaw6_la-AsciiText.lo `test -f 'AsciiText.c' || echo '$(srcdir)/'`AsciiText.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-AsciiText.Tpo $(DEPDIR)/libXaw6_la-AsciiText.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='AsciiText.c' object='libXaw6_la-AsciiText.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='AsciiText.c' object='libXaw6_la-AsciiText.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-AsciiText.lo `test -f 'AsciiText.c' || echo '$(srcdir)/'`AsciiText.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-AsciiText.lo `test -f 'AsciiText.c' || echo '$(srcdir)/'`AsciiText.c
 
 libXaw6_la-Box.lo: Box.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-Box.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-Box.Tpo -c -o libXaw6_la-Box.lo `test -f 'Box.c' || echo '$(srcdir)/'`Box.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-Box.Tpo $(DEPDIR)/libXaw6_la-Box.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Box.c' object='libXaw6_la-Box.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Box.c' object='libXaw6_la-Box.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Box.lo `test -f 'Box.c' || echo '$(srcdir)/'`Box.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Box.lo `test -f 'Box.c' || echo '$(srcdir)/'`Box.c
 
 libXaw6_la-Command.lo: Command.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-Command.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-Command.Tpo -c -o libXaw6_la-Command.lo `test -f 'Command.c' || echo '$(srcdir)/'`Command.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-Command.Tpo $(DEPDIR)/libXaw6_la-Command.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Command.c' object='libXaw6_la-Command.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Command.c' object='libXaw6_la-Command.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Command.lo `test -f 'Command.c' || echo '$(srcdir)/'`Command.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Command.lo `test -f 'Command.c' || echo '$(srcdir)/'`Command.c
 
 libXaw6_la-Converters.lo: Converters.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-Converters.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-Converters.Tpo -c -o libXaw6_la-Converters.lo `test -f 'Converters.c' || echo '$(srcdir)/'`Converters.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-Converters.Tpo $(DEPDIR)/libXaw6_la-Converters.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Converters.c' object='libXaw6_la-Converters.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Converters.c' object='libXaw6_la-Converters.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Converters.lo `test -f 'Converters.c' || echo '$(srcdir)/'`Converters.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Converters.lo `test -f 'Converters.c' || echo '$(srcdir)/'`Converters.c
 
 libXaw6_la-Dialog.lo: Dialog.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-Dialog.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-Dialog.Tpo -c -o libXaw6_la-Dialog.lo `test -f 'Dialog.c' || echo '$(srcdir)/'`Dialog.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-Dialog.Tpo $(DEPDIR)/libXaw6_la-Dialog.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Dialog.c' object='libXaw6_la-Dialog.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Dialog.c' object='libXaw6_la-Dialog.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Dialog.lo `test -f 'Dialog.c' || echo '$(srcdir)/'`Dialog.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Dialog.lo `test -f 'Dialog.c' || echo '$(srcdir)/'`Dialog.c
 
 libXaw6_la-DisplayList.lo: DisplayList.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-DisplayList.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-DisplayList.Tpo -c -o libXaw6_la-DisplayList.lo `test -f 'DisplayList.c' || echo '$(srcdir)/'`DisplayList.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-DisplayList.Tpo $(DEPDIR)/libXaw6_la-DisplayList.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='DisplayList.c' object='libXaw6_la-DisplayList.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='DisplayList.c' object='libXaw6_la-DisplayList.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-DisplayList.lo `test -f 'DisplayList.c' || echo '$(srcdir)/'`DisplayList.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-DisplayList.lo `test -f 'DisplayList.c' || echo '$(srcdir)/'`DisplayList.c
 
 libXaw6_la-Form.lo: Form.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-Form.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-Form.Tpo -c -o libXaw6_la-Form.lo `test -f 'Form.c' || echo '$(srcdir)/'`Form.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-Form.Tpo $(DEPDIR)/libXaw6_la-Form.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Form.c' object='libXaw6_la-Form.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Form.c' object='libXaw6_la-Form.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Form.lo `test -f 'Form.c' || echo '$(srcdir)/'`Form.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Form.lo `test -f 'Form.c' || echo '$(srcdir)/'`Form.c
 
 libXaw6_la-Grip.lo: Grip.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-Grip.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-Grip.Tpo -c -o libXaw6_la-Grip.lo `test -f 'Grip.c' || echo '$(srcdir)/'`Grip.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-Grip.Tpo $(DEPDIR)/libXaw6_la-Grip.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Grip.c' object='libXaw6_la-Grip.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Grip.c' object='libXaw6_la-Grip.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Grip.lo `test -f 'Grip.c' || echo '$(srcdir)/'`Grip.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Grip.lo `test -f 'Grip.c' || echo '$(srcdir)/'`Grip.c
 
 libXaw6_la-Label.lo: Label.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-Label.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-Label.Tpo -c -o libXaw6_la-Label.lo `test -f 'Label.c' || echo '$(srcdir)/'`Label.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-Label.Tpo $(DEPDIR)/libXaw6_la-Label.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Label.c' object='libXaw6_la-Label.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Label.c' object='libXaw6_la-Label.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Label.lo `test -f 'Label.c' || echo '$(srcdir)/'`Label.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Label.lo `test -f 'Label.c' || echo '$(srcdir)/'`Label.c
 
 libXaw6_la-List.lo: List.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-List.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-List.Tpo -c -o libXaw6_la-List.lo `test -f 'List.c' || echo '$(srcdir)/'`List.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-List.Tpo $(DEPDIR)/libXaw6_la-List.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='List.c' object='libXaw6_la-List.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='List.c' object='libXaw6_la-List.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-List.lo `test -f 'List.c' || echo '$(srcdir)/'`List.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-List.lo `test -f 'List.c' || echo '$(srcdir)/'`List.c
 
 libXaw6_la-MenuButton.lo: MenuButton.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-MenuButton.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-MenuButton.Tpo -c -o libXaw6_la-MenuButton.lo `test -f 'MenuButton.c' || echo '$(srcdir)/'`MenuButton.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-MenuButton.Tpo $(DEPDIR)/libXaw6_la-MenuButton.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='MenuButton.c' object='libXaw6_la-MenuButton.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='MenuButton.c' object='libXaw6_la-MenuButton.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-MenuButton.lo `test -f 'MenuButton.c' || echo '$(srcdir)/'`MenuButton.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-MenuButton.lo `test -f 'MenuButton.c' || echo '$(srcdir)/'`MenuButton.c
 
 libXaw6_la-MultiSrc.lo: MultiSrc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-MultiSrc.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-MultiSrc.Tpo -c -o libXaw6_la-MultiSrc.lo `test -f 'MultiSrc.c' || echo '$(srcdir)/'`MultiSrc.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-MultiSrc.Tpo $(DEPDIR)/libXaw6_la-MultiSrc.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='MultiSrc.c' object='libXaw6_la-MultiSrc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='MultiSrc.c' object='libXaw6_la-MultiSrc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-MultiSrc.lo `test -f 'MultiSrc.c' || echo '$(srcdir)/'`MultiSrc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-MultiSrc.lo `test -f 'MultiSrc.c' || echo '$(srcdir)/'`MultiSrc.c
 
 libXaw6_la-MultiSink.lo: MultiSink.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-MultiSink.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-MultiSink.Tpo -c -o libXaw6_la-MultiSink.lo `test -f 'MultiSink.c' || echo '$(srcdir)/'`MultiSink.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-MultiSink.Tpo $(DEPDIR)/libXaw6_la-MultiSink.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='MultiSink.c' object='libXaw6_la-MultiSink.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='MultiSink.c' object='libXaw6_la-MultiSink.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-MultiSink.lo `test -f 'MultiSink.c' || echo '$(srcdir)/'`MultiSink.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-MultiSink.lo `test -f 'MultiSink.c' || echo '$(srcdir)/'`MultiSink.c
 
 libXaw6_la-OS.lo: OS.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-OS.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-OS.Tpo -c -o libXaw6_la-OS.lo `test -f 'OS.c' || echo '$(srcdir)/'`OS.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-OS.Tpo $(DEPDIR)/libXaw6_la-OS.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='OS.c' object='libXaw6_la-OS.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='OS.c' object='libXaw6_la-OS.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-OS.lo `test -f 'OS.c' || echo '$(srcdir)/'`OS.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-OS.lo `test -f 'OS.c' || echo '$(srcdir)/'`OS.c
 
 libXaw6_la-Paned.lo: Paned.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-Paned.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-Paned.Tpo -c -o libXaw6_la-Paned.lo `test -f 'Paned.c' || echo '$(srcdir)/'`Paned.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-Paned.Tpo $(DEPDIR)/libXaw6_la-Paned.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Paned.c' object='libXaw6_la-Paned.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Paned.c' object='libXaw6_la-Paned.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Paned.lo `test -f 'Paned.c' || echo '$(srcdir)/'`Paned.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Paned.lo `test -f 'Paned.c' || echo '$(srcdir)/'`Paned.c
 
 libXaw6_la-Panner.lo: Panner.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-Panner.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-Panner.Tpo -c -o libXaw6_la-Panner.lo `test -f 'Panner.c' || echo '$(srcdir)/'`Panner.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-Panner.Tpo $(DEPDIR)/libXaw6_la-Panner.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Panner.c' object='libXaw6_la-Panner.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Panner.c' object='libXaw6_la-Panner.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Panner.lo `test -f 'Panner.c' || echo '$(srcdir)/'`Panner.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Panner.lo `test -f 'Panner.c' || echo '$(srcdir)/'`Panner.c
 
 libXaw6_la-Pixmap.lo: Pixmap.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-Pixmap.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-Pixmap.Tpo -c -o libXaw6_la-Pixmap.lo `test -f 'Pixmap.c' || echo '$(srcdir)/'`Pixmap.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-Pixmap.Tpo $(DEPDIR)/libXaw6_la-Pixmap.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Pixmap.c' object='libXaw6_la-Pixmap.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Pixmap.c' object='libXaw6_la-Pixmap.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Pixmap.lo `test -f 'Pixmap.c' || echo '$(srcdir)/'`Pixmap.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Pixmap.lo `test -f 'Pixmap.c' || echo '$(srcdir)/'`Pixmap.c
 
 libXaw6_la-Porthole.lo: Porthole.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-Porthole.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-Porthole.Tpo -c -o libXaw6_la-Porthole.lo `test -f 'Porthole.c' || echo '$(srcdir)/'`Porthole.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-Porthole.Tpo $(DEPDIR)/libXaw6_la-Porthole.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Porthole.c' object='libXaw6_la-Porthole.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Porthole.c' object='libXaw6_la-Porthole.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Porthole.lo `test -f 'Porthole.c' || echo '$(srcdir)/'`Porthole.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Porthole.lo `test -f 'Porthole.c' || echo '$(srcdir)/'`Porthole.c
 
 libXaw6_la-Repeater.lo: Repeater.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-Repeater.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-Repeater.Tpo -c -o libXaw6_la-Repeater.lo `test -f 'Repeater.c' || echo '$(srcdir)/'`Repeater.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-Repeater.Tpo $(DEPDIR)/libXaw6_la-Repeater.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Repeater.c' object='libXaw6_la-Repeater.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Repeater.c' object='libXaw6_la-Repeater.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Repeater.lo `test -f 'Repeater.c' || echo '$(srcdir)/'`Repeater.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Repeater.lo `test -f 'Repeater.c' || echo '$(srcdir)/'`Repeater.c
 
 libXaw6_la-Scrollbar.lo: Scrollbar.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-Scrollbar.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-Scrollbar.Tpo -c -o libXaw6_la-Scrollbar.lo `test -f 'Scrollbar.c' || echo '$(srcdir)/'`Scrollbar.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-Scrollbar.Tpo $(DEPDIR)/libXaw6_la-Scrollbar.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Scrollbar.c' object='libXaw6_la-Scrollbar.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Scrollbar.c' object='libXaw6_la-Scrollbar.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Scrollbar.lo `test -f 'Scrollbar.c' || echo '$(srcdir)/'`Scrollbar.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Scrollbar.lo `test -f 'Scrollbar.c' || echo '$(srcdir)/'`Scrollbar.c
 
 libXaw6_la-Simple.lo: Simple.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-Simple.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-Simple.Tpo -c -o libXaw6_la-Simple.lo `test -f 'Simple.c' || echo '$(srcdir)/'`Simple.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-Simple.Tpo $(DEPDIR)/libXaw6_la-Simple.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Simple.c' object='libXaw6_la-Simple.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Simple.c' object='libXaw6_la-Simple.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Simple.lo `test -f 'Simple.c' || echo '$(srcdir)/'`Simple.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Simple.lo `test -f 'Simple.c' || echo '$(srcdir)/'`Simple.c
 
 libXaw6_la-SimpleMenu.lo: SimpleMenu.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-SimpleMenu.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-SimpleMenu.Tpo -c -o libXaw6_la-SimpleMenu.lo `test -f 'SimpleMenu.c' || echo '$(srcdir)/'`SimpleMenu.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-SimpleMenu.Tpo $(DEPDIR)/libXaw6_la-SimpleMenu.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='SimpleMenu.c' object='libXaw6_la-SimpleMenu.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='SimpleMenu.c' object='libXaw6_la-SimpleMenu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-SimpleMenu.lo `test -f 'SimpleMenu.c' || echo '$(srcdir)/'`SimpleMenu.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-SimpleMenu.lo `test -f 'SimpleMenu.c' || echo '$(srcdir)/'`SimpleMenu.c
 
 libXaw6_la-Sme.lo: Sme.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-Sme.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-Sme.Tpo -c -o libXaw6_la-Sme.lo `test -f 'Sme.c' || echo '$(srcdir)/'`Sme.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-Sme.Tpo $(DEPDIR)/libXaw6_la-Sme.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Sme.c' object='libXaw6_la-Sme.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Sme.c' object='libXaw6_la-Sme.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Sme.lo `test -f 'Sme.c' || echo '$(srcdir)/'`Sme.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Sme.lo `test -f 'Sme.c' || echo '$(srcdir)/'`Sme.c
 
 libXaw6_la-SmeBSB.lo: SmeBSB.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-SmeBSB.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-SmeBSB.Tpo -c -o libXaw6_la-SmeBSB.lo `test -f 'SmeBSB.c' || echo '$(srcdir)/'`SmeBSB.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-SmeBSB.Tpo $(DEPDIR)/libXaw6_la-SmeBSB.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='SmeBSB.c' object='libXaw6_la-SmeBSB.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='SmeBSB.c' object='libXaw6_la-SmeBSB.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-SmeBSB.lo `test -f 'SmeBSB.c' || echo '$(srcdir)/'`SmeBSB.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-SmeBSB.lo `test -f 'SmeBSB.c' || echo '$(srcdir)/'`SmeBSB.c
 
 libXaw6_la-SmeLine.lo: SmeLine.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-SmeLine.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-SmeLine.Tpo -c -o libXaw6_la-SmeLine.lo `test -f 'SmeLine.c' || echo '$(srcdir)/'`SmeLine.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-SmeLine.Tpo $(DEPDIR)/libXaw6_la-SmeLine.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='SmeLine.c' object='libXaw6_la-SmeLine.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='SmeLine.c' object='libXaw6_la-SmeLine.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-SmeLine.lo `test -f 'SmeLine.c' || echo '$(srcdir)/'`SmeLine.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-SmeLine.lo `test -f 'SmeLine.c' || echo '$(srcdir)/'`SmeLine.c
 
 libXaw6_la-StripChart.lo: StripChart.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-StripChart.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-StripChart.Tpo -c -o libXaw6_la-StripChart.lo `test -f 'StripChart.c' || echo '$(srcdir)/'`StripChart.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-StripChart.Tpo $(DEPDIR)/libXaw6_la-StripChart.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='StripChart.c' object='libXaw6_la-StripChart.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='StripChart.c' object='libXaw6_la-StripChart.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-StripChart.lo `test -f 'StripChart.c' || echo '$(srcdir)/'`StripChart.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-StripChart.lo `test -f 'StripChart.c' || echo '$(srcdir)/'`StripChart.c
 
 libXaw6_la-Text.lo: Text.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-Text.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-Text.Tpo -c -o libXaw6_la-Text.lo `test -f 'Text.c' || echo '$(srcdir)/'`Text.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-Text.Tpo $(DEPDIR)/libXaw6_la-Text.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Text.c' object='libXaw6_la-Text.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Text.c' object='libXaw6_la-Text.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Text.lo `test -f 'Text.c' || echo '$(srcdir)/'`Text.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Text.lo `test -f 'Text.c' || echo '$(srcdir)/'`Text.c
 
 libXaw6_la-TextSink.lo: TextSink.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-TextSink.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-TextSink.Tpo -c -o libXaw6_la-TextSink.lo `test -f 'TextSink.c' || echo '$(srcdir)/'`TextSink.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-TextSink.Tpo $(DEPDIR)/libXaw6_la-TextSink.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='TextSink.c' object='libXaw6_la-TextSink.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='TextSink.c' object='libXaw6_la-TextSink.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-TextSink.lo `test -f 'TextSink.c' || echo '$(srcdir)/'`TextSink.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-TextSink.lo `test -f 'TextSink.c' || echo '$(srcdir)/'`TextSink.c
 
 libXaw6_la-TextSrc.lo: TextSrc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-TextSrc.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-TextSrc.Tpo -c -o libXaw6_la-TextSrc.lo `test -f 'TextSrc.c' || echo '$(srcdir)/'`TextSrc.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-TextSrc.Tpo $(DEPDIR)/libXaw6_la-TextSrc.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='TextSrc.c' object='libXaw6_la-TextSrc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='TextSrc.c' object='libXaw6_la-TextSrc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-TextSrc.lo `test -f 'TextSrc.c' || echo '$(srcdir)/'`TextSrc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-TextSrc.lo `test -f 'TextSrc.c' || echo '$(srcdir)/'`TextSrc.c
 
 libXaw6_la-TextAction.lo: TextAction.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-TextAction.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-TextAction.Tpo -c -o libXaw6_la-TextAction.lo `test -f 'TextAction.c' || echo '$(srcdir)/'`TextAction.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-TextAction.Tpo $(DEPDIR)/libXaw6_la-TextAction.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='TextAction.c' object='libXaw6_la-TextAction.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='TextAction.c' object='libXaw6_la-TextAction.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-TextAction.lo `test -f 'TextAction.c' || echo '$(srcdir)/'`TextAction.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-TextAction.lo `test -f 'TextAction.c' || echo '$(srcdir)/'`TextAction.c
 
 libXaw6_la-TextPop.lo: TextPop.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-TextPop.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-TextPop.Tpo -c -o libXaw6_la-TextPop.lo `test -f 'TextPop.c' || echo '$(srcdir)/'`TextPop.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-TextPop.Tpo $(DEPDIR)/libXaw6_la-TextPop.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='TextPop.c' object='libXaw6_la-TextPop.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='TextPop.c' object='libXaw6_la-TextPop.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-TextPop.lo `test -f 'TextPop.c' || echo '$(srcdir)/'`TextPop.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-TextPop.lo `test -f 'TextPop.c' || echo '$(srcdir)/'`TextPop.c
 
 libXaw6_la-TextTr.lo: TextTr.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-TextTr.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-TextTr.Tpo -c -o libXaw6_la-TextTr.lo `test -f 'TextTr.c' || echo '$(srcdir)/'`TextTr.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-TextTr.Tpo $(DEPDIR)/libXaw6_la-TextTr.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='TextTr.c' object='libXaw6_la-TextTr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='TextTr.c' object='libXaw6_la-TextTr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-TextTr.lo `test -f 'TextTr.c' || echo '$(srcdir)/'`TextTr.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-TextTr.lo `test -f 'TextTr.c' || echo '$(srcdir)/'`TextTr.c
 
 libXaw6_la-Toggle.lo: Toggle.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-Toggle.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-Toggle.Tpo -c -o libXaw6_la-Toggle.lo `test -f 'Toggle.c' || echo '$(srcdir)/'`Toggle.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-Toggle.Tpo $(DEPDIR)/libXaw6_la-Toggle.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Toggle.c' object='libXaw6_la-Toggle.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Toggle.c' object='libXaw6_la-Toggle.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Toggle.lo `test -f 'Toggle.c' || echo '$(srcdir)/'`Toggle.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Toggle.lo `test -f 'Toggle.c' || echo '$(srcdir)/'`Toggle.c
 
 libXaw6_la-Tree.lo: Tree.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-Tree.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-Tree.Tpo -c -o libXaw6_la-Tree.lo `test -f 'Tree.c' || echo '$(srcdir)/'`Tree.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-Tree.Tpo $(DEPDIR)/libXaw6_la-Tree.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Tree.c' object='libXaw6_la-Tree.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Tree.c' object='libXaw6_la-Tree.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Tree.lo `test -f 'Tree.c' || echo '$(srcdir)/'`Tree.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Tree.lo `test -f 'Tree.c' || echo '$(srcdir)/'`Tree.c
 
 libXaw6_la-Vendor.lo: Vendor.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-Vendor.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-Vendor.Tpo -c -o libXaw6_la-Vendor.lo `test -f 'Vendor.c' || echo '$(srcdir)/'`Vendor.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-Vendor.Tpo $(DEPDIR)/libXaw6_la-Vendor.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Vendor.c' object='libXaw6_la-Vendor.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Vendor.c' object='libXaw6_la-Vendor.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Vendor.lo `test -f 'Vendor.c' || echo '$(srcdir)/'`Vendor.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Vendor.lo `test -f 'Vendor.c' || echo '$(srcdir)/'`Vendor.c
 
 libXaw6_la-Viewport.lo: Viewport.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-Viewport.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-Viewport.Tpo -c -o libXaw6_la-Viewport.lo `test -f 'Viewport.c' || echo '$(srcdir)/'`Viewport.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-Viewport.Tpo $(DEPDIR)/libXaw6_la-Viewport.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Viewport.c' object='libXaw6_la-Viewport.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Viewport.c' object='libXaw6_la-Viewport.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Viewport.lo `test -f 'Viewport.c' || echo '$(srcdir)/'`Viewport.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-Viewport.lo `test -f 'Viewport.c' || echo '$(srcdir)/'`Viewport.c
 
 libXaw6_la-XawIm.lo: XawIm.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-XawIm.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-XawIm.Tpo -c -o libXaw6_la-XawIm.lo `test -f 'XawIm.c' || echo '$(srcdir)/'`XawIm.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-XawIm.Tpo $(DEPDIR)/libXaw6_la-XawIm.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='XawIm.c' object='libXaw6_la-XawIm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='XawIm.c' object='libXaw6_la-XawIm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-XawIm.lo `test -f 'XawIm.c' || echo '$(srcdir)/'`XawIm.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-XawIm.lo `test -f 'XawIm.c' || echo '$(srcdir)/'`XawIm.c
 
 libXaw6_la-XawInit.lo: XawInit.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-XawInit.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-XawInit.Tpo -c -o libXaw6_la-XawInit.lo `test -f 'XawInit.c' || echo '$(srcdir)/'`XawInit.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-XawInit.Tpo $(DEPDIR)/libXaw6_la-XawInit.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='XawInit.c' object='libXaw6_la-XawInit.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='XawInit.c' object='libXaw6_la-XawInit.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-XawInit.lo `test -f 'XawInit.c' || echo '$(srcdir)/'`XawInit.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-XawInit.lo `test -f 'XawInit.c' || echo '$(srcdir)/'`XawInit.c
 
 libXaw6_la-XawI18n.lo: XawI18n.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -MT libXaw6_la-XawI18n.lo -MD -MP -MF $(DEPDIR)/libXaw6_la-XawI18n.Tpo -c -o libXaw6_la-XawI18n.lo `test -f 'XawI18n.c' || echo '$(srcdir)/'`XawI18n.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw6_la-XawI18n.Tpo $(DEPDIR)/libXaw6_la-XawI18n.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='XawI18n.c' object='libXaw6_la-XawI18n.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='XawI18n.c' object='libXaw6_la-XawI18n.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-XawI18n.lo `test -f 'XawI18n.c' || echo '$(srcdir)/'`XawI18n.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw6_la_CPPFLAGS) $(CPPFLAGS) $(libXaw6_la_CFLAGS) $(CFLAGS) -c -o libXaw6_la-XawI18n.lo `test -f 'XawI18n.c' || echo '$(srcdir)/'`XawI18n.c
 
 libXaw7_la-Actions.lo: Actions.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Actions.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Actions.Tpo -c -o libXaw7_la-Actions.lo `test -f 'Actions.c' || echo '$(srcdir)/'`Actions.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Actions.Tpo $(DEPDIR)/libXaw7_la-Actions.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Actions.c' object='libXaw7_la-Actions.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Actions.c' object='libXaw7_la-Actions.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Actions.lo `test -f 'Actions.c' || echo '$(srcdir)/'`Actions.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Actions.lo `test -f 'Actions.c' || echo '$(srcdir)/'`Actions.c
 
 libXaw7_la-AllWidgets.lo: AllWidgets.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-AllWidgets.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-AllWidgets.Tpo -c -o libXaw7_la-AllWidgets.lo `test -f 'AllWidgets.c' || echo '$(srcdir)/'`AllWidgets.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-AllWidgets.Tpo $(DEPDIR)/libXaw7_la-AllWidgets.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='AllWidgets.c' object='libXaw7_la-AllWidgets.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='AllWidgets.c' object='libXaw7_la-AllWidgets.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-AllWidgets.lo `test -f 'AllWidgets.c' || echo '$(srcdir)/'`AllWidgets.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-AllWidgets.lo `test -f 'AllWidgets.c' || echo '$(srcdir)/'`AllWidgets.c
 
 libXaw7_la-AsciiSink.lo: AsciiSink.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-AsciiSink.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-AsciiSink.Tpo -c -o libXaw7_la-AsciiSink.lo `test -f 'AsciiSink.c' || echo '$(srcdir)/'`AsciiSink.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-AsciiSink.Tpo $(DEPDIR)/libXaw7_la-AsciiSink.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='AsciiSink.c' object='libXaw7_la-AsciiSink.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='AsciiSink.c' object='libXaw7_la-AsciiSink.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-AsciiSink.lo `test -f 'AsciiSink.c' || echo '$(srcdir)/'`AsciiSink.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-AsciiSink.lo `test -f 'AsciiSink.c' || echo '$(srcdir)/'`AsciiSink.c
 
 libXaw7_la-AsciiSrc.lo: AsciiSrc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-AsciiSrc.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-AsciiSrc.Tpo -c -o libXaw7_la-AsciiSrc.lo `test -f 'AsciiSrc.c' || echo '$(srcdir)/'`AsciiSrc.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-AsciiSrc.Tpo $(DEPDIR)/libXaw7_la-AsciiSrc.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='AsciiSrc.c' object='libXaw7_la-AsciiSrc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='AsciiSrc.c' object='libXaw7_la-AsciiSrc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-AsciiSrc.lo `test -f 'AsciiSrc.c' || echo '$(srcdir)/'`AsciiSrc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-AsciiSrc.lo `test -f 'AsciiSrc.c' || echo '$(srcdir)/'`AsciiSrc.c
 
 libXaw7_la-AsciiText.lo: AsciiText.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-AsciiText.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-AsciiText.Tpo -c -o libXaw7_la-AsciiText.lo `test -f 'AsciiText.c' || echo '$(srcdir)/'`AsciiText.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-AsciiText.Tpo $(DEPDIR)/libXaw7_la-AsciiText.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='AsciiText.c' object='libXaw7_la-AsciiText.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='AsciiText.c' object='libXaw7_la-AsciiText.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-AsciiText.lo `test -f 'AsciiText.c' || echo '$(srcdir)/'`AsciiText.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-AsciiText.lo `test -f 'AsciiText.c' || echo '$(srcdir)/'`AsciiText.c
 
 libXaw7_la-Box.lo: Box.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Box.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Box.Tpo -c -o libXaw7_la-Box.lo `test -f 'Box.c' || echo '$(srcdir)/'`Box.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Box.Tpo $(DEPDIR)/libXaw7_la-Box.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Box.c' object='libXaw7_la-Box.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Box.c' object='libXaw7_la-Box.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Box.lo `test -f 'Box.c' || echo '$(srcdir)/'`Box.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Box.lo `test -f 'Box.c' || echo '$(srcdir)/'`Box.c
 
 libXaw7_la-Command.lo: Command.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Command.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Command.Tpo -c -o libXaw7_la-Command.lo `test -f 'Command.c' || echo '$(srcdir)/'`Command.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Command.Tpo $(DEPDIR)/libXaw7_la-Command.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Command.c' object='libXaw7_la-Command.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Command.c' object='libXaw7_la-Command.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Command.lo `test -f 'Command.c' || echo '$(srcdir)/'`Command.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Command.lo `test -f 'Command.c' || echo '$(srcdir)/'`Command.c
 
 libXaw7_la-Converters.lo: Converters.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Converters.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Converters.Tpo -c -o libXaw7_la-Converters.lo `test -f 'Converters.c' || echo '$(srcdir)/'`Converters.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Converters.Tpo $(DEPDIR)/libXaw7_la-Converters.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Converters.c' object='libXaw7_la-Converters.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Converters.c' object='libXaw7_la-Converters.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Converters.lo `test -f 'Converters.c' || echo '$(srcdir)/'`Converters.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Converters.lo `test -f 'Converters.c' || echo '$(srcdir)/'`Converters.c
 
 libXaw7_la-Dialog.lo: Dialog.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Dialog.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Dialog.Tpo -c -o libXaw7_la-Dialog.lo `test -f 'Dialog.c' || echo '$(srcdir)/'`Dialog.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Dialog.Tpo $(DEPDIR)/libXaw7_la-Dialog.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Dialog.c' object='libXaw7_la-Dialog.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Dialog.c' object='libXaw7_la-Dialog.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Dialog.lo `test -f 'Dialog.c' || echo '$(srcdir)/'`Dialog.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Dialog.lo `test -f 'Dialog.c' || echo '$(srcdir)/'`Dialog.c
 
 libXaw7_la-DisplayList.lo: DisplayList.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-DisplayList.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-DisplayList.Tpo -c -o libXaw7_la-DisplayList.lo `test -f 'DisplayList.c' || echo '$(srcdir)/'`DisplayList.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-DisplayList.Tpo $(DEPDIR)/libXaw7_la-DisplayList.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='DisplayList.c' object='libXaw7_la-DisplayList.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='DisplayList.c' object='libXaw7_la-DisplayList.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-DisplayList.lo `test -f 'DisplayList.c' || echo '$(srcdir)/'`DisplayList.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-DisplayList.lo `test -f 'DisplayList.c' || echo '$(srcdir)/'`DisplayList.c
 
 libXaw7_la-Form.lo: Form.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Form.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Form.Tpo -c -o libXaw7_la-Form.lo `test -f 'Form.c' || echo '$(srcdir)/'`Form.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Form.Tpo $(DEPDIR)/libXaw7_la-Form.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Form.c' object='libXaw7_la-Form.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Form.c' object='libXaw7_la-Form.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Form.lo `test -f 'Form.c' || echo '$(srcdir)/'`Form.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Form.lo `test -f 'Form.c' || echo '$(srcdir)/'`Form.c
 
 libXaw7_la-Grip.lo: Grip.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Grip.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Grip.Tpo -c -o libXaw7_la-Grip.lo `test -f 'Grip.c' || echo '$(srcdir)/'`Grip.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Grip.Tpo $(DEPDIR)/libXaw7_la-Grip.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Grip.c' object='libXaw7_la-Grip.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Grip.c' object='libXaw7_la-Grip.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Grip.lo `test -f 'Grip.c' || echo '$(srcdir)/'`Grip.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Grip.lo `test -f 'Grip.c' || echo '$(srcdir)/'`Grip.c
 
 libXaw7_la-Label.lo: Label.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Label.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Label.Tpo -c -o libXaw7_la-Label.lo `test -f 'Label.c' || echo '$(srcdir)/'`Label.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Label.Tpo $(DEPDIR)/libXaw7_la-Label.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Label.c' object='libXaw7_la-Label.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Label.c' object='libXaw7_la-Label.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Label.lo `test -f 'Label.c' || echo '$(srcdir)/'`Label.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Label.lo `test -f 'Label.c' || echo '$(srcdir)/'`Label.c
 
 libXaw7_la-List.lo: List.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-List.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-List.Tpo -c -o libXaw7_la-List.lo `test -f 'List.c' || echo '$(srcdir)/'`List.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-List.Tpo $(DEPDIR)/libXaw7_la-List.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='List.c' object='libXaw7_la-List.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='List.c' object='libXaw7_la-List.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-List.lo `test -f 'List.c' || echo '$(srcdir)/'`List.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-List.lo `test -f 'List.c' || echo '$(srcdir)/'`List.c
 
 libXaw7_la-MenuButton.lo: MenuButton.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-MenuButton.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-MenuButton.Tpo -c -o libXaw7_la-MenuButton.lo `test -f 'MenuButton.c' || echo '$(srcdir)/'`MenuButton.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-MenuButton.Tpo $(DEPDIR)/libXaw7_la-MenuButton.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='MenuButton.c' object='libXaw7_la-MenuButton.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='MenuButton.c' object='libXaw7_la-MenuButton.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-MenuButton.lo `test -f 'MenuButton.c' || echo '$(srcdir)/'`MenuButton.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-MenuButton.lo `test -f 'MenuButton.c' || echo '$(srcdir)/'`MenuButton.c
 
 libXaw7_la-MultiSrc.lo: MultiSrc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-MultiSrc.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-MultiSrc.Tpo -c -o libXaw7_la-MultiSrc.lo `test -f 'MultiSrc.c' || echo '$(srcdir)/'`MultiSrc.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-MultiSrc.Tpo $(DEPDIR)/libXaw7_la-MultiSrc.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='MultiSrc.c' object='libXaw7_la-MultiSrc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='MultiSrc.c' object='libXaw7_la-MultiSrc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-MultiSrc.lo `test -f 'MultiSrc.c' || echo '$(srcdir)/'`MultiSrc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-MultiSrc.lo `test -f 'MultiSrc.c' || echo '$(srcdir)/'`MultiSrc.c
 
 libXaw7_la-MultiSink.lo: MultiSink.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-MultiSink.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-MultiSink.Tpo -c -o libXaw7_la-MultiSink.lo `test -f 'MultiSink.c' || echo '$(srcdir)/'`MultiSink.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-MultiSink.Tpo $(DEPDIR)/libXaw7_la-MultiSink.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='MultiSink.c' object='libXaw7_la-MultiSink.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='MultiSink.c' object='libXaw7_la-MultiSink.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-MultiSink.lo `test -f 'MultiSink.c' || echo '$(srcdir)/'`MultiSink.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-MultiSink.lo `test -f 'MultiSink.c' || echo '$(srcdir)/'`MultiSink.c
 
 libXaw7_la-OS.lo: OS.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-OS.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-OS.Tpo -c -o libXaw7_la-OS.lo `test -f 'OS.c' || echo '$(srcdir)/'`OS.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-OS.Tpo $(DEPDIR)/libXaw7_la-OS.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='OS.c' object='libXaw7_la-OS.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='OS.c' object='libXaw7_la-OS.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-OS.lo `test -f 'OS.c' || echo '$(srcdir)/'`OS.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-OS.lo `test -f 'OS.c' || echo '$(srcdir)/'`OS.c
 
 libXaw7_la-Paned.lo: Paned.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Paned.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Paned.Tpo -c -o libXaw7_la-Paned.lo `test -f 'Paned.c' || echo '$(srcdir)/'`Paned.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Paned.Tpo $(DEPDIR)/libXaw7_la-Paned.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Paned.c' object='libXaw7_la-Paned.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Paned.c' object='libXaw7_la-Paned.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Paned.lo `test -f 'Paned.c' || echo '$(srcdir)/'`Paned.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Paned.lo `test -f 'Paned.c' || echo '$(srcdir)/'`Paned.c
 
 libXaw7_la-Panner.lo: Panner.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Panner.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Panner.Tpo -c -o libXaw7_la-Panner.lo `test -f 'Panner.c' || echo '$(srcdir)/'`Panner.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Panner.Tpo $(DEPDIR)/libXaw7_la-Panner.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Panner.c' object='libXaw7_la-Panner.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Panner.c' object='libXaw7_la-Panner.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Panner.lo `test -f 'Panner.c' || echo '$(srcdir)/'`Panner.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Panner.lo `test -f 'Panner.c' || echo '$(srcdir)/'`Panner.c
 
 libXaw7_la-Pixmap.lo: Pixmap.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Pixmap.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Pixmap.Tpo -c -o libXaw7_la-Pixmap.lo `test -f 'Pixmap.c' || echo '$(srcdir)/'`Pixmap.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Pixmap.Tpo $(DEPDIR)/libXaw7_la-Pixmap.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Pixmap.c' object='libXaw7_la-Pixmap.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Pixmap.c' object='libXaw7_la-Pixmap.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Pixmap.lo `test -f 'Pixmap.c' || echo '$(srcdir)/'`Pixmap.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Pixmap.lo `test -f 'Pixmap.c' || echo '$(srcdir)/'`Pixmap.c
 
 libXaw7_la-Porthole.lo: Porthole.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Porthole.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Porthole.Tpo -c -o libXaw7_la-Porthole.lo `test -f 'Porthole.c' || echo '$(srcdir)/'`Porthole.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Porthole.Tpo $(DEPDIR)/libXaw7_la-Porthole.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Porthole.c' object='libXaw7_la-Porthole.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Porthole.c' object='libXaw7_la-Porthole.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Porthole.lo `test -f 'Porthole.c' || echo '$(srcdir)/'`Porthole.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Porthole.lo `test -f 'Porthole.c' || echo '$(srcdir)/'`Porthole.c
 
 libXaw7_la-Repeater.lo: Repeater.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Repeater.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Repeater.Tpo -c -o libXaw7_la-Repeater.lo `test -f 'Repeater.c' || echo '$(srcdir)/'`Repeater.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Repeater.Tpo $(DEPDIR)/libXaw7_la-Repeater.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Repeater.c' object='libXaw7_la-Repeater.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Repeater.c' object='libXaw7_la-Repeater.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Repeater.lo `test -f 'Repeater.c' || echo '$(srcdir)/'`Repeater.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Repeater.lo `test -f 'Repeater.c' || echo '$(srcdir)/'`Repeater.c
 
 libXaw7_la-Scrollbar.lo: Scrollbar.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Scrollbar.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Scrollbar.Tpo -c -o libXaw7_la-Scrollbar.lo `test -f 'Scrollbar.c' || echo '$(srcdir)/'`Scrollbar.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Scrollbar.Tpo $(DEPDIR)/libXaw7_la-Scrollbar.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Scrollbar.c' object='libXaw7_la-Scrollbar.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Scrollbar.c' object='libXaw7_la-Scrollbar.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Scrollbar.lo `test -f 'Scrollbar.c' || echo '$(srcdir)/'`Scrollbar.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Scrollbar.lo `test -f 'Scrollbar.c' || echo '$(srcdir)/'`Scrollbar.c
 
 libXaw7_la-Simple.lo: Simple.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Simple.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Simple.Tpo -c -o libXaw7_la-Simple.lo `test -f 'Simple.c' || echo '$(srcdir)/'`Simple.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Simple.Tpo $(DEPDIR)/libXaw7_la-Simple.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Simple.c' object='libXaw7_la-Simple.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Simple.c' object='libXaw7_la-Simple.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Simple.lo `test -f 'Simple.c' || echo '$(srcdir)/'`Simple.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Simple.lo `test -f 'Simple.c' || echo '$(srcdir)/'`Simple.c
 
 libXaw7_la-SimpleMenu.lo: SimpleMenu.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-SimpleMenu.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-SimpleMenu.Tpo -c -o libXaw7_la-SimpleMenu.lo `test -f 'SimpleMenu.c' || echo '$(srcdir)/'`SimpleMenu.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-SimpleMenu.Tpo $(DEPDIR)/libXaw7_la-SimpleMenu.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='SimpleMenu.c' object='libXaw7_la-SimpleMenu.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='SimpleMenu.c' object='libXaw7_la-SimpleMenu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-SimpleMenu.lo `test -f 'SimpleMenu.c' || echo '$(srcdir)/'`SimpleMenu.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-SimpleMenu.lo `test -f 'SimpleMenu.c' || echo '$(srcdir)/'`SimpleMenu.c
 
 libXaw7_la-Sme.lo: Sme.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Sme.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Sme.Tpo -c -o libXaw7_la-Sme.lo `test -f 'Sme.c' || echo '$(srcdir)/'`Sme.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Sme.Tpo $(DEPDIR)/libXaw7_la-Sme.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Sme.c' object='libXaw7_la-Sme.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Sme.c' object='libXaw7_la-Sme.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Sme.lo `test -f 'Sme.c' || echo '$(srcdir)/'`Sme.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Sme.lo `test -f 'Sme.c' || echo '$(srcdir)/'`Sme.c
 
 libXaw7_la-SmeBSB.lo: SmeBSB.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-SmeBSB.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-SmeBSB.Tpo -c -o libXaw7_la-SmeBSB.lo `test -f 'SmeBSB.c' || echo '$(srcdir)/'`SmeBSB.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-SmeBSB.Tpo $(DEPDIR)/libXaw7_la-SmeBSB.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='SmeBSB.c' object='libXaw7_la-SmeBSB.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='SmeBSB.c' object='libXaw7_la-SmeBSB.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-SmeBSB.lo `test -f 'SmeBSB.c' || echo '$(srcdir)/'`SmeBSB.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-SmeBSB.lo `test -f 'SmeBSB.c' || echo '$(srcdir)/'`SmeBSB.c
 
 libXaw7_la-SmeLine.lo: SmeLine.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-SmeLine.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-SmeLine.Tpo -c -o libXaw7_la-SmeLine.lo `test -f 'SmeLine.c' || echo '$(srcdir)/'`SmeLine.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-SmeLine.Tpo $(DEPDIR)/libXaw7_la-SmeLine.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='SmeLine.c' object='libXaw7_la-SmeLine.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='SmeLine.c' object='libXaw7_la-SmeLine.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-SmeLine.lo `test -f 'SmeLine.c' || echo '$(srcdir)/'`SmeLine.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-SmeLine.lo `test -f 'SmeLine.c' || echo '$(srcdir)/'`SmeLine.c
 
 libXaw7_la-StripChart.lo: StripChart.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-StripChart.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-StripChart.Tpo -c -o libXaw7_la-StripChart.lo `test -f 'StripChart.c' || echo '$(srcdir)/'`StripChart.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-StripChart.Tpo $(DEPDIR)/libXaw7_la-StripChart.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='StripChart.c' object='libXaw7_la-StripChart.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='StripChart.c' object='libXaw7_la-StripChart.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-StripChart.lo `test -f 'StripChart.c' || echo '$(srcdir)/'`StripChart.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-StripChart.lo `test -f 'StripChart.c' || echo '$(srcdir)/'`StripChart.c
 
 libXaw7_la-Text.lo: Text.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Text.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Text.Tpo -c -o libXaw7_la-Text.lo `test -f 'Text.c' || echo '$(srcdir)/'`Text.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Text.Tpo $(DEPDIR)/libXaw7_la-Text.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Text.c' object='libXaw7_la-Text.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Text.c' object='libXaw7_la-Text.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Text.lo `test -f 'Text.c' || echo '$(srcdir)/'`Text.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Text.lo `test -f 'Text.c' || echo '$(srcdir)/'`Text.c
 
 libXaw7_la-TextSink.lo: TextSink.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-TextSink.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-TextSink.Tpo -c -o libXaw7_la-TextSink.lo `test -f 'TextSink.c' || echo '$(srcdir)/'`TextSink.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-TextSink.Tpo $(DEPDIR)/libXaw7_la-TextSink.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='TextSink.c' object='libXaw7_la-TextSink.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='TextSink.c' object='libXaw7_la-TextSink.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-TextSink.lo `test -f 'TextSink.c' || echo '$(srcdir)/'`TextSink.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-TextSink.lo `test -f 'TextSink.c' || echo '$(srcdir)/'`TextSink.c
 
 libXaw7_la-TextSrc.lo: TextSrc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-TextSrc.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-TextSrc.Tpo -c -o libXaw7_la-TextSrc.lo `test -f 'TextSrc.c' || echo '$(srcdir)/'`TextSrc.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-TextSrc.Tpo $(DEPDIR)/libXaw7_la-TextSrc.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='TextSrc.c' object='libXaw7_la-TextSrc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='TextSrc.c' object='libXaw7_la-TextSrc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-TextSrc.lo `test -f 'TextSrc.c' || echo '$(srcdir)/'`TextSrc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-TextSrc.lo `test -f 'TextSrc.c' || echo '$(srcdir)/'`TextSrc.c
 
 libXaw7_la-TextAction.lo: TextAction.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-TextAction.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-TextAction.Tpo -c -o libXaw7_la-TextAction.lo `test -f 'TextAction.c' || echo '$(srcdir)/'`TextAction.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-TextAction.Tpo $(DEPDIR)/libXaw7_la-TextAction.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='TextAction.c' object='libXaw7_la-TextAction.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='TextAction.c' object='libXaw7_la-TextAction.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-TextAction.lo `test -f 'TextAction.c' || echo '$(srcdir)/'`TextAction.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-TextAction.lo `test -f 'TextAction.c' || echo '$(srcdir)/'`TextAction.c
 
 libXaw7_la-TextPop.lo: TextPop.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-TextPop.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-TextPop.Tpo -c -o libXaw7_la-TextPop.lo `test -f 'TextPop.c' || echo '$(srcdir)/'`TextPop.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-TextPop.Tpo $(DEPDIR)/libXaw7_la-TextPop.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='TextPop.c' object='libXaw7_la-TextPop.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='TextPop.c' object='libXaw7_la-TextPop.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-TextPop.lo `test -f 'TextPop.c' || echo '$(srcdir)/'`TextPop.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-TextPop.lo `test -f 'TextPop.c' || echo '$(srcdir)/'`TextPop.c
 
 libXaw7_la-TextTr.lo: TextTr.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-TextTr.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-TextTr.Tpo -c -o libXaw7_la-TextTr.lo `test -f 'TextTr.c' || echo '$(srcdir)/'`TextTr.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-TextTr.Tpo $(DEPDIR)/libXaw7_la-TextTr.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='TextTr.c' object='libXaw7_la-TextTr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='TextTr.c' object='libXaw7_la-TextTr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-TextTr.lo `test -f 'TextTr.c' || echo '$(srcdir)/'`TextTr.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-TextTr.lo `test -f 'TextTr.c' || echo '$(srcdir)/'`TextTr.c
 
 libXaw7_la-Toggle.lo: Toggle.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Toggle.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Toggle.Tpo -c -o libXaw7_la-Toggle.lo `test -f 'Toggle.c' || echo '$(srcdir)/'`Toggle.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Toggle.Tpo $(DEPDIR)/libXaw7_la-Toggle.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Toggle.c' object='libXaw7_la-Toggle.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Toggle.c' object='libXaw7_la-Toggle.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Toggle.lo `test -f 'Toggle.c' || echo '$(srcdir)/'`Toggle.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Toggle.lo `test -f 'Toggle.c' || echo '$(srcdir)/'`Toggle.c
 
 libXaw7_la-Tree.lo: Tree.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Tree.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Tree.Tpo -c -o libXaw7_la-Tree.lo `test -f 'Tree.c' || echo '$(srcdir)/'`Tree.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Tree.Tpo $(DEPDIR)/libXaw7_la-Tree.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Tree.c' object='libXaw7_la-Tree.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Tree.c' object='libXaw7_la-Tree.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Tree.lo `test -f 'Tree.c' || echo '$(srcdir)/'`Tree.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Tree.lo `test -f 'Tree.c' || echo '$(srcdir)/'`Tree.c
 
 libXaw7_la-Vendor.lo: Vendor.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Vendor.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Vendor.Tpo -c -o libXaw7_la-Vendor.lo `test -f 'Vendor.c' || echo '$(srcdir)/'`Vendor.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Vendor.Tpo $(DEPDIR)/libXaw7_la-Vendor.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Vendor.c' object='libXaw7_la-Vendor.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Vendor.c' object='libXaw7_la-Vendor.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Vendor.lo `test -f 'Vendor.c' || echo '$(srcdir)/'`Vendor.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Vendor.lo `test -f 'Vendor.c' || echo '$(srcdir)/'`Vendor.c
 
 libXaw7_la-Viewport.lo: Viewport.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Viewport.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Viewport.Tpo -c -o libXaw7_la-Viewport.lo `test -f 'Viewport.c' || echo '$(srcdir)/'`Viewport.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Viewport.Tpo $(DEPDIR)/libXaw7_la-Viewport.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Viewport.c' object='libXaw7_la-Viewport.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Viewport.c' object='libXaw7_la-Viewport.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Viewport.lo `test -f 'Viewport.c' || echo '$(srcdir)/'`Viewport.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Viewport.lo `test -f 'Viewport.c' || echo '$(srcdir)/'`Viewport.c
 
 libXaw7_la-XawIm.lo: XawIm.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-XawIm.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-XawIm.Tpo -c -o libXaw7_la-XawIm.lo `test -f 'XawIm.c' || echo '$(srcdir)/'`XawIm.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-XawIm.Tpo $(DEPDIR)/libXaw7_la-XawIm.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='XawIm.c' object='libXaw7_la-XawIm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='XawIm.c' object='libXaw7_la-XawIm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-XawIm.lo `test -f 'XawIm.c' || echo '$(srcdir)/'`XawIm.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-XawIm.lo `test -f 'XawIm.c' || echo '$(srcdir)/'`XawIm.c
 
 libXaw7_la-XawInit.lo: XawInit.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-XawInit.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-XawInit.Tpo -c -o libXaw7_la-XawInit.lo `test -f 'XawInit.c' || echo '$(srcdir)/'`XawInit.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-XawInit.Tpo $(DEPDIR)/libXaw7_la-XawInit.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='XawInit.c' object='libXaw7_la-XawInit.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='XawInit.c' object='libXaw7_la-XawInit.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-XawInit.lo `test -f 'XawInit.c' || echo '$(srcdir)/'`XawInit.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-XawInit.lo `test -f 'XawInit.c' || echo '$(srcdir)/'`XawInit.c
 
 libXaw7_la-XawI18n.lo: XawI18n.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-XawI18n.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-XawI18n.Tpo -c -o libXaw7_la-XawI18n.lo `test -f 'XawI18n.c' || echo '$(srcdir)/'`XawI18n.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-XawI18n.Tpo $(DEPDIR)/libXaw7_la-XawI18n.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='XawI18n.c' object='libXaw7_la-XawI18n.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='XawI18n.c' object='libXaw7_la-XawI18n.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-XawI18n.lo `test -f 'XawI18n.c' || echo '$(srcdir)/'`XawI18n.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-XawI18n.lo `test -f 'XawI18n.c' || echo '$(srcdir)/'`XawI18n.c
 
 libXaw7_la-Tip.lo: Tip.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -MT libXaw7_la-Tip.lo -MD -MP -MF $(DEPDIR)/libXaw7_la-Tip.Tpo -c -o libXaw7_la-Tip.lo `test -f 'Tip.c' || echo '$(srcdir)/'`Tip.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libXaw7_la-Tip.Tpo $(DEPDIR)/libXaw7_la-Tip.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='Tip.c' object='libXaw7_la-Tip.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='Tip.c' object='libXaw7_la-Tip.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Tip.lo `test -f 'Tip.c' || echo '$(srcdir)/'`Tip.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libXaw7_la_CPPFLAGS) $(CPPFLAGS) $(libXaw7_la_CFLAGS) $(CFLAGS) -c -o libXaw7_la-Tip.lo `test -f 'Tip.c' || echo '$(srcdir)/'`Tip.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -1404,10 +1320,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/libXaw/src/MultiSink.c b/libXaw/src/MultiSink.c
index 129624e01..77eb42fd9 100644
--- a/libXaw/src/MultiSink.c
+++ b/libXaw/src/MultiSink.c
@@ -51,13 +51,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -662,7 +662,7 @@ GetGC(MultiSinkObject sink)
     values.clip_x_origin = (long)sink;
     values.clip_mask = None;
     values.graphics_exposures = False;
-    
+
     values.foreground = sink->text_sink.foreground;
     values.background = sink->text_sink.background;
 
diff --git a/libXaw/src/MultiSrc.c b/libXaw/src/MultiSrc.c
index e9e4bda12..148a17889 100644
--- a/libXaw/src/MultiSrc.c
+++ b/libXaw/src/MultiSrc.c
@@ -170,7 +170,7 @@ static XtResource resources[] = {
     XtNcallback,
     XtCCallback,
     XtRCallback,
-    sizeof(XtPointer), 
+    sizeof(XtPointer),
     offset(callback),
     XtRCallback,
     (XtPointer)NULL
@@ -331,7 +331,7 @@ ReadText(Widget w, XawTextPosition pos, XawTextBlock *text, int length)
     MultiSrcObject src = (MultiSrcObject)w;
     XawTextPosition count, start;
     MultiPiece *piece = FindPiece(src, pos, &start);
-    
+
     text->format = XawFmtWide;
     text->firstPos = pos;
     text->ptr = (char *)(piece->text + (pos - start));
@@ -358,7 +358,7 @@ ReadText(Widget w, XawTextPosition pos, XawTextBlock *text, int length)
  *	XawEditDone on success, XawEditError otherwise
  */
 /*ARGSUSED*/
-static int 
+static int
 ReplaceText(Widget w, XawTextPosition startPos, XawTextPosition endPos,
 	    XawTextBlock *u_text_p)
 {
@@ -370,9 +370,9 @@ ReplaceText(Widget w, XawTextPosition startPos, XawTextPosition endPos,
     Bool local_artificial_block = False;
     XawTextBlock text;
 
-    /* STEP 1: The user handed me a text block called `u_text' that may be 
-     * in either FMTWIDE or FMT8BIT (ie MB.)  Later code needs the block 
-     * `text' to hold FMTWIDE.	So, this copies `u_text' to `text', and if 
+    /* STEP 1: The user handed me a text block called `u_text' that may be
+     * in either FMTWIDE or FMT8BIT (ie MB.)  Later code needs the block
+     * `text' to hold FMTWIDE.	So, this copies `u_text' to `text', and if
      * `u_text' was MB, I knock it up to WIDE
      */
     if (u_text_p->length == 0)	/* if so, the block contents never ref'd */
@@ -406,7 +406,7 @@ ReplaceText(Widget w, XawTextPosition startPos, XawTextPosition endPos,
     }
 
     /* STEP 2: some initialization... */
-    if (src->text_src.edit_mode == XawtextRead) 
+    if (src->text_src.edit_mode == XawtextRead)
 	return (XawEditError);
 
     start_piece = FindPiece(src, startPos, &start_first);
@@ -455,11 +455,11 @@ ReplaceText(Widget w, XawTextPosition startPos, XawTextPosition endPos,
         start_piece = FindPiece(src, startPos, &start_first);
         length = text.length;
         firstPos = text.firstPos;
-    
+
 	while (length > 0) {
 	    wchar_t *ptr;
 	    int fill;
-      
+
 	    if (src->multi_src.use_string_in_place) {
 		if (start_piece->used == src->multi_src.piece_size - 1)  {
 
@@ -481,13 +481,13 @@ ReplaceText(Widget w, XawTextPosition startPos, XawTextPosition endPos,
 	    }
 
 	    fill = Min((int)(src->multi_src.piece_size - start_piece->used), length);
-      
+
 	    ptr = start_piece->text + (startPos - start_first);
 	    memmove(ptr + fill, ptr, (start_piece->used -
 		    (startPos - start_first)) * sizeof(wchar_t));
 	    wptr =(wchar_t *)text.ptr;
 	    (void)wcsncpy(ptr, wptr + firstPos, fill);
-      
+
 	    startPos += fill;
 	    firstPos += fill;
 	    start_piece->used += fill;
@@ -681,7 +681,7 @@ Scan(Widget w, register XawTextPosition position, XawTextScanType type,
  * Returns:
  *	The position of the item found
  */
-static XawTextPosition 
+static XawTextPosition
 Search(Widget w, register XawTextPosition position, XawTextScanDirection dir,
        XawTextBlock *text)
 {
@@ -752,7 +752,7 @@ Search(Widget w, register XawTextPosition position, XawTextScanDirection dir,
 
 	ptr += inc;
 	position += inc;
-    
+
 	while (ptr < piece->text) {
 	    cnt = piece->text - ptr;
 
@@ -763,7 +763,7 @@ Search(Widget w, register XawTextPosition position, XawTextScanDirection dir,
 	    }
 	    ptr = piece->text + piece->used - cnt;
 	}
-   
+
 	while (ptr >= piece->text + piece->used) {
 	    cnt = ptr - (piece->text + piece->used);
 
@@ -816,7 +816,7 @@ XawMultiSrcSetValues(Widget current, Widget request, Widget cnew,
 	XtAppWarning(app_con,
 		     "MultiSrc: The XtNuseStringInPlace resources "
 		     "may not be changed.");
-	src->multi_src.use_string_in_place = 
+	src->multi_src.use_string_in_place =
 	    old_src->multi_src.use_string_in_place;
     }
 
@@ -825,7 +825,7 @@ XawMultiSrcSetValues(Widget current, Widget request, Widget cnew,
 	    string_set = True;
 	    break;
 	}
-  
+
     if (string_set || old_src->multi_src.type != src->multi_src.type) {
 	RemoveOldStringOrFile(old_src, string_set);
 	src->multi_src.allocated_string = old_src->multi_src.allocated_string;
@@ -890,14 +890,14 @@ XawMultiSrcGetValuesHook(Widget w, ArgList args, Cardinal *num_args)
     }
 }
 
-static void 
+static void
 XawMultiSrcDestroy(Widget w)
 {
     RemoveOldStringOrFile((MultiSrcObject) w, True);
 }
 
 /*
- * Public routines 
+ * Public routines
  */
 /*
  * Function:
@@ -952,14 +952,14 @@ _XawMultiSave(Widget w)
      * If using the string in place then there is no need to play games
      * to get the internal info into a readable string
      */
-    if (src->multi_src.use_string_in_place) 
+    if (src->multi_src.use_string_in_place)
 	return (True);
 
     if (src->multi_src.type == XawAsciiFile) {
 #ifdef OLDXAW
 	 if (!src->multi_src.changes)
 #else
-	if (!src->text_src.changed) 		/* No changes to save */
+	if (!src->text_src.changed)		/* No changes to save */
 #endif
 	    return (True);
 
@@ -1006,7 +1006,7 @@ _XawMultiSave(Widget w)
 	    XtFree((char *)src->multi_src.string);
 	else
 	    src->multi_src.allocated_string = True;
-    
+
         src->multi_src.string = mb_string;
     }
 #ifdef OLDXAW
@@ -1092,7 +1092,7 @@ static Bool
 WriteToFile(String string, String name)
 {
     int fd;
-  
+
     if (((fd = creat(name, 0666)) == -1)
 	|| (write(fd, string, strlen(string)) == -1))
 	return (False);
@@ -1197,12 +1197,12 @@ InitStringOrFile(MultiSrcObject src, Bool newString)
 	    if (src->multi_src.length > src->multi_src.multi_length)
 		src->multi_src.multi_length = src->multi_src.length;
 
-	    if (src->multi_src.multi_length == MAGIC_VALUE) 
+	    if (src->multi_src.multi_length == MAGIC_VALUE)
 		src->multi_src.piece_size = src->multi_src.length;
 	    else
 		src->multi_src.piece_size = src->multi_src.multi_length + 1;
 	}
-		
+
 	return (NULL);
     }
 
@@ -1252,7 +1252,7 @@ InitStringOrFile(MultiSrcObject src, Bool newString)
 	src->multi_src.string = temp;
 	src->multi_src.allocated_string = True;
     }
-    
+
     if (!src->multi_src.is_tempfile) {
 	if ((fd = open((char *)src->multi_src.string, open_mode, 0666)) != -1) {
 	    if ((file = fdopen(fd, fdopen_mode)) != NULL) {
@@ -1264,7 +1264,7 @@ InitStringOrFile(MultiSrcObject src, Bool newString)
 	{
 	    String params[2];
 	    Cardinal num_params = 2;
-	    
+
 	    params[0] = (String)src->multi_src.string;
 	    params[1] = strerror(errno);
 	    XtAppWarningMsg(XtWidgetToApplicationContext((Widget)src),
@@ -1294,25 +1294,25 @@ LoadPieces(MultiSrcObject src, FILE *file, char *string)
     int bytes = sizeof(wchar_t);
     char* temp_mb_holder = NULL;
 
-    /* 
-     * This is tricky - the _XawTextMBtoWC converter uses its 3rd arg 
-     * in as MB length, out as WC length.  We want local_length to be 
-     * WC count. 
+    /*
+     * This is tricky - the _XawTextMBtoWC converter uses its 3rd arg
+     * in as MB length, out as WC length.  We want local_length to be
+     * WC count.
      */
     int local_length = src->multi_src.length;
 
     if (string != NULL) {
-	/* 
-	 * ASSERT: IF our caller passed a non-null string, THEN 
-	 * src->multi_src.length is currently string's * byte count, 
+	/*
+	 * ASSERT: IF our caller passed a non-null string, THEN
+	 * src->multi_src.length is currently string's * byte count,
 	 * AND string is in a MB format
 	*/
 	local_str = _XawTextMBToWC(d, (char *)string, &local_length);
 	src->multi_src.length = (XawTextPosition) local_length;
     }
     else if (src->multi_src.type != XawAsciiFile) {
-	/* 
-	 * here, we are not changing the contents, just reloading, 
+	/*
+	 * here, we are not changing the contents, just reloading,
 	 * so don't change len...
 	 */
 	local_length = src->multi_src.string ?
@@ -1322,13 +1322,13 @@ LoadPieces(MultiSrcObject src, FILE *file, char *string)
     }
     else {
 	if (src->multi_src.length != 0) {
-	    temp_mb_holder = 
+	    temp_mb_holder =
 		XtMalloc((src->multi_src.length + 1) * sizeof(unsigned char));
 	    fseek(file, 0, 0);
 	    src->multi_src.length = fread(temp_mb_holder,
-					  (Size_t)sizeof(unsigned char), 
+					  (Size_t)sizeof(unsigned char),
 					  (Size_t)src->multi_src.length, file);
-	    if (src->multi_src.length <= 0) 
+	    if (src->multi_src.length <= 0)
 		XtAppErrorMsg(XtWidgetToApplicationContext ((Widget) src),
 			      "readError", "multiSource", "XawError",
 			      "fread returned error.", NULL, NULL);
@@ -1339,7 +1339,7 @@ LoadPieces(MultiSrcObject src, FILE *file, char *string)
 	    if (local_str == 0) {
 		String params[2];
 		Cardinal num_params;
-		static char err_text[] = 
+		static char err_text[] =
 		    "<<< FILE CONTENTS NOT REPRESENTABLE IN THIS LOCALE >>>";
 
 		params[0] = XtName(XtParent((Widget)src));
@@ -1353,7 +1353,7 @@ LoadPieces(MultiSrcObject src, FILE *file, char *string)
 				params, &num_params);
 		src->multi_src.length = sizeof err_text;
 		local_length = src->multi_src.length;
-        	local_str = _XawTextMBToWC(d, err_text, &local_length);
+		local_str = _XawTextMBToWC(d, err_text, &local_length);
 		src->multi_src.length = local_length;
 	    }
 	}
@@ -1420,7 +1420,7 @@ AllocNewPiece(MultiSrcObject src, MultiPiece *prev)
 	piece->next = prev->next;
 	prev->next = piece;
     }
-  
+
     piece->prev = prev;
 
     return (piece);
@@ -1436,7 +1436,7 @@ AllocNewPiece(MultiSrcObject src, MultiPiece *prev)
  * Description:
  *	Frees all the pieces
  */
-static void 
+static void
 FreeAllPieces(MultiSrcObject src)
 {
     MultiPiece *next, *first = src->multi_src.first_piece;
@@ -1451,7 +1451,7 @@ FreeAllPieces(MultiSrcObject src)
 	RemovePiece(src, first);
     }
 }
-  
+
 /*
  * Function:
  *	RemovePiece
@@ -1511,7 +1511,7 @@ FindPiece(MultiSrcObject src, XawTextPosition position, XawTextPosition *first)
 
     return (old_piece);	  /* if we run off the end the return the last piece */
 }
-    
+
 /*
  * Function:
  *	BreakPiece
@@ -1528,7 +1528,7 @@ static void
 BreakPiece(MultiSrcObject src, MultiPiece *piece)
 {
     MultiPiece *cnew = AllocNewPiece(src, piece);
-  
+
     cnew->text = (wchar_t *)
 	XtMalloc(src->multi_src.piece_size * sizeof(wchar_t));
     (void)wcsncpy(cnew->text, piece->text + HALF_PIECE,
diff --git a/libXaw/src/Panner.c b/libXaw/src/Panner.c
index 2ab88f5ed..aa902336e 100644
--- a/libXaw/src/Panner.c
+++ b/libXaw/src/Panner.c
@@ -635,7 +635,7 @@ parse_page_string(char *s, int pagesize, int canvassize, Bool *relative)
 XmuLocatePixmapFile(pw->core.screen, pw->panner.stipple_name,		\
 		    pw->panner.shadow_color, pw->core.background_pixel,	\
 		    pw->core.depth, NULL, 0, NULL, NULL, NULL, NULL)
-    
+
 #define PIXMAP_OKAY(pm) ((pm) != None && (pm) != XtUnspecifiedPixmap)
 
 /*ARGSUSED*/
@@ -663,7 +663,7 @@ XawPannerInitialize(Widget greq, Widget gnew, ArgList args, Cardinal *num_args)
     cnew->panner.slider_gc = NULL;
     reset_slider_gc(cnew);		/* foreground */
     cnew->panner.xor_gc = NULL;
-    reset_xor_gc(cnew); 		/* foreground ^ background */
+    reset_xor_gc(cnew);			/* foreground ^ background */
 
     rescale(cnew);			/* does a position check */
     cnew->panner.shadow_valid = False;
@@ -822,7 +822,7 @@ XawPannerSetValues(Widget gcur, Widget greq, Widget gnew,
 	Bool loc = cur->panner.slider_x != cnew->panner.slider_x ||
 		   cur->panner.slider_y != cnew->panner.slider_y;
 	Bool siz = cur->panner.slider_width != cnew->panner.slider_width ||
-	 	   cur->panner.slider_height != cnew->panner.slider_height;
+		   cur->panner.slider_height != cnew->panner.slider_height;
 	if (loc || siz || (cur->panner.allow_off != cnew->panner.allow_off
 			   && cnew->panner.allow_off)) {
 	    scale_knob(cnew, loc, siz);
diff --git a/libXaw/src/Pixmap.c b/libXaw/src/Pixmap.c
index b1718b50f..718d25dae 100644
--- a/libXaw/src/Pixmap.c
+++ b/libXaw/src/Pixmap.c
@@ -10,7 +10,7 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- *  
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -675,7 +675,7 @@ GetResourcePixmapPath(Display *display)
     xrm_class[1] = NULLQUARK;
     if (!XrmGetDatabase(display))
 	(void) XGetDefault(display, "", "");
-    if (XrmQGetResource(XrmGetDatabase(display), xrm_name, xrm_class, 
+    if (XrmQGetResource(XrmGetDatabase(display), xrm_name, xrm_class,
 			&rep_type, &value) &&
 			rep_type == XrmPermStringToQuark("String")) {
 	int length = 0;
@@ -863,7 +863,7 @@ GradientLoader(XawParams *params, Screen *screen, Colormap colormap, int depth,
     return (False);
 
   ired   = (double)(end.red   - start.red)   / (double)steps;
-  igreen = (double)(end.green - start.green) / (double)steps; 
+  igreen = (double)(end.green - start.green) / (double)steps;
   iblue  = (double)(end.blue  - start.blue)  / (double)steps;
 
   red   = color.red   = start.red;
diff --git a/libXaw/src/Porthole.c b/libXaw/src/Porthole.c
index e94d21360..4842e70d7 100644
--- a/libXaw/src/Porthole.c
+++ b/libXaw/src/Porthole.c
@@ -23,7 +23,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  *
  * Author:  Jim Fulton, MIT X Consortium
- * 
+ *
  * This widget is a trivial clipping widget.  It is typically used with a
  * panner or scrollbar to navigate.
  */
@@ -112,7 +112,7 @@ PortholeClassRec portholeClassRec = {
     NULL,				/* extension */
   },
   /* composite */
-  { 
+  {
     XawPortholeGeometryManager,		/* geometry_manager */
     XawPortholeChangeManaged,		/* change_managed */
     XtInheritInsertChild,		/* insert_child */
@@ -367,7 +367,7 @@ XawPortholeChangeManaged(Widget gw)
 		== XtGeometryAlmost)
 		(void)XtMakeGeometryRequest(gw, &retgeom, NULL);
 	}
-	
+
 	XtResizeWidget(child, Max(XtWidth(child), XtWidth(pw)),
 		       Max(XtHeight(child), XtHeight(pw)), 0);
 
diff --git a/libXaw/src/Private.h b/libXaw/src/Private.h
index 382df3a37..7ae465a3d 100644
--- a/libXaw/src/Private.h
+++ b/libXaw/src/Private.h
@@ -10,7 +10,7 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- *  
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
diff --git a/libXaw/src/Repeater.c b/libXaw/src/Repeater.c
index e99a978f2..9b16ced7c 100644
--- a/libXaw/src/Repeater.c
+++ b/libXaw/src/Repeater.c
@@ -23,7 +23,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  *
  * Author:  Jim Fulton, MIT X Consortium
- * 
+ *
  * This widget is used for press-and-hold style buttons.
  */
 
@@ -278,7 +278,7 @@ ActionStart(Widget gw, XEvent *event, String *params, Cardinal *num_params)
     RepeaterWidget rw = (RepeaterWidget)gw;
 
     CLEAR_TIMEOUT(rw);
-    if (rw->repeater.start_callbacks) 
+    if (rw->repeater.start_callbacks)
 	XtCallCallbackList(gw, rw->repeater.start_callbacks, NULL);
 
     DO_CALLBACK(rw);
@@ -293,6 +293,6 @@ ActionStop(Widget gw, XEvent *event, String *params, Cardinal *num_params)
     RepeaterWidget rw = (RepeaterWidget)gw;
 
     CLEAR_TIMEOUT((RepeaterWidget)gw);
-    if (rw->repeater.stop_callbacks) 
+    if (rw->repeater.stop_callbacks)
 	XtCallCallbackList(gw, rw->repeater.stop_callbacks, NULL);
 }
diff --git a/libXaw/src/Scrollbar.c b/libXaw/src/Scrollbar.c
index 6413f0bf6..894a945d2 100644
--- a/libXaw/src/Scrollbar.c
+++ b/libXaw/src/Scrollbar.c
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -372,7 +372,7 @@ FillArea(ScrollbarWidget w, int top, int bottom, int thumb)
     Dimension length;
 
     top = XawMax(1, top);
-    if (w->scrollbar.orientation == XtorientHorizontal) 
+    if (w->scrollbar.orientation == XtorientHorizontal)
     bottom = XawMin(bottom, XtWidth(w) - 1);
     else
     bottom = XawMin(bottom, XtHeight(w) - 1);
@@ -385,7 +385,7 @@ FillArea(ScrollbarWidget w, int top, int bottom, int thumb)
     switch(thumb) {
 	/* Fill the new Thumb location */
 	case 1:
-	    if (w->scrollbar.orientation == XtorientHorizontal) 
+	    if (w->scrollbar.orientation == XtorientHorizontal)
 		XFillRectangle(XtDisplay(w), XtWindow(w), w->scrollbar.gc,
 			       top, 1, length, XtHeight(w) - 2);
 	    else
@@ -394,7 +394,7 @@ FillArea(ScrollbarWidget w, int top, int bottom, int thumb)
 	    break;
 	/* Clear the old Thumb location */
 	case 0:
-	    if (w->scrollbar.orientation == XtorientHorizontal) 
+	    if (w->scrollbar.orientation == XtorientHorizontal)
 		XClearArea(XtDisplay(w), XtWindow(w),
 			   top, 1, length, XtHeight(w) - 2, False);
 	    else
@@ -417,7 +417,7 @@ PaintThumb(ScrollbarWidget w)
     oldbot = oldtop + w->scrollbar.shownLength;
     newtop = w->scrollbar.length * w->scrollbar.top;
     newbot = newtop + (int)(w->scrollbar.length * w->scrollbar.shown);
-    if (newbot < newtop + (int)w->scrollbar.min_thumb) 
+    if (newbot < newtop + (int)w->scrollbar.min_thumb)
 	newbot = newtop + w->scrollbar.min_thumb;
     w->scrollbar.topLoc = newtop;
     w->scrollbar.shownLength = newbot - newtop;
@@ -451,7 +451,7 @@ static void
 XawScrollbarDestroy(Widget w)
 {
     ScrollbarWidget sbw = (ScrollbarWidget)w;
-    
+
     XtReleaseGC(w, sbw->scrollbar.gc);
 }
 
@@ -529,7 +529,7 @@ XawScrollbarRealize(Widget gw, Mask *valueMask,
 
     XtVaSetValues(gw, XtNcursor, w->scrollbar.inactiveCursor, NULL);
 
-    /* 
+    /*
      * The Simple widget actually stuffs the value in the valuemask
      */
     (*scrollbarWidgetClass->core_class.superclass->core_class.realize)
@@ -537,7 +537,7 @@ XawScrollbarRealize(Widget gw, Mask *valueMask,
 }
 
 /*ARGSUSED*/
-static Boolean 
+static Boolean
 XawScrollbarSetValues(Widget current, Widget request, Widget desired,
 		      ArgList args, Cardinal *num_args)
 {
diff --git a/libXaw/src/Sme.c b/libXaw/src/Sme.c
index b01a81c6c..24d4fedb2 100644
--- a/libXaw/src/Sme.c
+++ b/libXaw/src/Sme.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
  * Date:    September 26, 1989
  *
  * By:      Chris D. Peterson
- *          MIT X Consortium 
+ *          MIT X Consortium
  *          kit@expo.lcs.mit.edu
  */
 
@@ -75,7 +75,7 @@ static XtResource resources[] = {
     XtRImmediate,
     (XtPointer)False
   },
-};   
+};
 #undef offset
 
 #define Superclass	(&rectObjClassRec)
@@ -147,13 +147,13 @@ XawSmeClassPartInitialize(WidgetClass cclass)
     m_ent = (SmeObjectClass)cclass;
     superC = (SmeObjectClass)m_ent->rect_class.superclass;
 
-    if (m_ent->sme_class.highlight == XtInheritHighlight) 
+    if (m_ent->sme_class.highlight == XtInheritHighlight)
 	m_ent->sme_class.highlight = superC->sme_class.highlight;
 
     if (m_ent->sme_class.unhighlight == XtInheritUnhighlight)
 	m_ent->sme_class.unhighlight = superC->sme_class.unhighlight;
 
-    if (m_ent->sme_class.notify == XtInheritNotify) 
+    if (m_ent->sme_class.notify == XtInheritNotify)
 	m_ent->sme_class.notify = superC->sme_class.notify;
 }
 
@@ -164,7 +164,7 @@ XawSmeClassPartInitialize(WidgetClass cclass)
  * Parameters:
  *	request - widget requested by the argument list
  *	cnew	- new widget with both resource and non  resource values
- * 
+ *
  * Description:
  *	Initializes the simple menu widget entry
  */
@@ -234,7 +234,7 @@ Notify(Widget w)
  *	w	   - menu entry object
  *	itended	   - intended and return geometry info
  *	return_val -
- * 
+ *
  * Description:
  *	Returns the preferred geometry for this widget.
  *
@@ -259,7 +259,7 @@ XawSmeQueryGeometry(Widget w, XtWidgetGeometry *intended,
 	return_val->request_mode |= CWWidth;
 	return_val->width = width;
 	mode = return_val->request_mode;
-	
+
 	if ((mode & CWWidth) && width == XtWidth(entry))
 	    return (XtGeometryNo);
 	return (XtGeometryAlmost);
diff --git a/libXaw/src/SmeLine.c b/libXaw/src/SmeLine.c
index 80de18ed4..801134267 100644
--- a/libXaw/src/SmeLine.c
+++ b/libXaw/src/SmeLine.c
@@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group.
  * Date:    September 26, 1989
  *
  * By:      Chris D. Peterson
- *          MIT X Consortium 
+ *          MIT X Consortium
  *          kit@expo.lcs.mit.edu
  */
 
@@ -183,17 +183,17 @@ CreateGC(Widget w)
     SmeLineObject entry = (SmeLineObject)w;
     XGCValues values;
     XtGCMask mask = GCForeground | GCGraphicsExposures | GCLineWidth;
-    
+
     values.foreground = entry->sme_line.foreground;
     values.graphics_exposures = False;
     values.line_width = entry->sme_line.line_width;
-    
+
     if (entry->sme_line.stipple != XtUnspecifiedPixmap) {
 	values.stipple = entry->sme_line.stipple;
-	values.fill_style = FillStippled; 
+	values.fill_style = FillStippled;
 	mask |= GCStipple | GCFillStyle;
-	
-	entry->sme_line.gc = XCreateGC(XtDisplayOfObject(w), 
+
+	entry->sme_line.gc = XCreateGC(XtDisplayOfObject(w),
 				      RootWindowOfScreen(XtScreenOfObject(w)),
 				      mask, &values);
     }
@@ -212,7 +212,7 @@ DestroyGC(Widget w)
 {
     SmeLineObject entry = (SmeLineObject)w;
 
-    if (entry->sme_line.stipple != XtUnspecifiedPixmap) 
+    if (entry->sme_line.stipple != XtUnspecifiedPixmap)
 	XFreeGC(XtDisplayOfObject(w), entry->sme_line.gc);
     else
 	XtReleaseGC(w, entry->sme_line.gc);
@@ -225,7 +225,7 @@ XawSmeLineRedisplay(Widget w, XEvent *event, Region region)
     SmeLineObject entry = (SmeLineObject)w;
     int y = XtY(w) + (((int)XtHeight(w) - entry->sme_line.line_width) >> 1);
 
-    if (entry->sme_line.stipple != XtUnspecifiedPixmap) 
+    if (entry->sme_line.stipple != XtUnspecifiedPixmap)
 	XSetTSOrigin(XtDisplayOfObject(w), entry->sme_line.gc, 0, y);
 
     XFillRectangle(XtDisplayOfObject(w), XtWindowOfObject(w),
@@ -252,7 +252,7 @@ XawSmeLineSetValues(Widget current, Widget request, Widget cnew,
 {
     SmeLineObject entry = (SmeLineObject)cnew;
     SmeLineObject old_entry = (SmeLineObject)current;
-  
+
     if (entry->sme_line.line_width != old_entry->sme_line.line_width &&
 	entry->sme_line.stipple != old_entry->sme_line.stipple) {
 	DestroyGC(current);
diff --git a/libXaw/src/StripChart.c b/libXaw/src/StripChart.c
index 237cf66a5..fa7357cea 100644
--- a/libXaw/src/StripChart.c
+++ b/libXaw/src/StripChart.c
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -247,10 +247,10 @@ CreateGC(StripChartWidget w, unsigned int which)
 static void
 DestroyGC(StripChartWidget w, unsigned int which)
 {
-    if (which & FOREGROUND) 
+    if (which & FOREGROUND)
 	XtReleaseGC((Widget)w, w->strip_chart.fgGC);
 
-    if (which & HIGHLIGHT) 
+    if (which & HIGHLIGHT)
 	XtReleaseGC((Widget)w, w->strip_chart.hiGC);
 }
 
@@ -264,7 +264,7 @@ XawStripChartInitialize(Widget greq, Widget gnew,
     if (w->strip_chart.update > 0)
     w->strip_chart.interval_id =
     XtAppAddTimeOut(XtWidgetToApplicationContext(gnew),
-		    w->strip_chart.update * MS_PER_SEC, 
+		    w->strip_chart.update * MS_PER_SEC,
 		    draw_it, (XtPointer)gnew);
     CreateGC(w, ALL_GCS);
 
@@ -274,7 +274,7 @@ XawStripChartInitialize(Widget greq, Widget gnew,
     w->strip_chart.points = NULL;
     XawStripChartResize(gnew);
 }
- 
+
 static void
 XawStripChartDestroy(Widget gw)
 {
@@ -288,7 +288,7 @@ XawStripChartDestroy(Widget gw)
 }
 
 /*
- * NOTE: This function really needs to recieve graphics exposure 
+ * NOTE: This function really needs to recieve graphics exposure
  *       events, but since this is not easily supported until R4 I am
  *       going to hold off until then.
  */
@@ -305,12 +305,12 @@ XawStripChartRedisplay(Widget w, XEvent *event, Region region)
 }
 
 /*ARGSUSED*/
-static void 
+static void
 draw_it(XtPointer client_data, XtIntervalId *id)
 {
     StripChartWidget w = (StripChartWidget)client_data;
     double value;
-   
+
     if (w->strip_chart.update > 0)
 	w->strip_chart.interval_id =
 	    XtAppAddTimeOut(XtWidgetToApplicationContext((Widget)w),
@@ -326,8 +326,8 @@ draw_it(XtPointer client_data, XtIntervalId *id)
 
     XtCallCallbacks((Widget)w, XtNgetValue, (XtPointer)&value);
 
-    /* 
-     * Keep w->strip_chart.max_value up to date, and if this data 
+    /*
+     * Keep w->strip_chart.max_value up to date, and if this data
      * point is off the graph, change the scale to make it fit
      */
     if (value > w->strip_chart.max_value) {
@@ -345,7 +345,7 @@ draw_it(XtPointer client_data, XtIntervalId *id)
 		     / w->strip_chart.scale);
 
 	XFillRectangle(XtDisplay(w), XtWindow(w), w->strip_chart.fgGC,
-		       w->strip_chart.interval, y, 
+		       w->strip_chart.interval, y,
 		       1, XtHeight(w) - y);
 
 	/*
@@ -372,7 +372,7 @@ draw_it(XtPointer client_data, XtIntervalId *id)
  * changed, then w->strip_chart.max_value is updated to reflect the
  * largest data point
  */
-static int 
+static int
 repaint_window(StripChartWidget w, int left, int width)
 {
     int i, j;
@@ -415,7 +415,7 @@ repaint_window(StripChartWidget w, int left, int width)
 	    int y = XtHeight(w) - (XtHeight(w) * w->strip_chart.valuedata[i])
 				   / w->strip_chart.scale;
 
-	    XFillRectangle(dpy, win, w->strip_chart.fgGC, 
+	    XFillRectangle(dpy, win, w->strip_chart.fgGC,
 			   i, y, 1, XtHeight(w) - y);
 	}
 
@@ -463,15 +463,15 @@ MoveChart(StripChartWidget w, Bool blit)
 		  (char *)(w->strip_chart.valuedata + next - j),
 		  j * sizeof(double));
     next = w->strip_chart.interval = j;
-	
+
     /*
-     * Since we just lost some data, recompute the 
+     * Since we just lost some data, recompute the
      * w->strip_chart.max_value
      */
     old_max = w->strip_chart.max_value;
     w->strip_chart.max_value = 0.0;
     for (i = 0; i < next; i++) {
-	if (w->strip_chart.valuedata[i] > w->strip_chart.max_value) 
+	if (w->strip_chart.valuedata[i] > w->strip_chart.max_value)
 	    w->strip_chart.max_value = w->strip_chart.valuedata[i];
     }
 
@@ -487,7 +487,7 @@ MoveChart(StripChartWidget w, Bool blit)
     XCopyArea(XtDisplay((Widget)w), XtWindow((Widget)w), XtWindow((Widget)w),
 	      w->strip_chart.hiGC, (int)XtWidth(w) - j, 0, j, XtHeight(w), 0, 0);
 
-    XClearArea(XtDisplay((Widget)w), XtWindow((Widget)w), 
+    XClearArea(XtDisplay((Widget)w), XtWindow((Widget)w),
 	       j, 0, XtWidth(w) - j, XtHeight(w), False);
 
     /* Draw graph reference lines */
@@ -521,17 +521,17 @@ XawStripChartSetValues(Widget current, Widget request, Widget cnew,
 
     if (w->strip_chart.min_scale > w->strip_chart.max_value + 1)
 	ret_val = True;
-     
+
     if (w->strip_chart.fgpixel != old->strip_chart.fgpixel) {
 	new_gc |= FOREGROUND;
 	ret_val = True;
     }
-    
+
     if (w->strip_chart.hipixel != old->strip_chart.hipixel) {
 	new_gc |= HIGHLIGHT;
 	ret_val = True;
     }
-    
+
     DestroyGC(old, new_gc);
     CreateGC(w, new_gc);
 
@@ -561,7 +561,7 @@ XawStripChartResize(Widget widget)
 	w->strip_chart.points = NULL;
 	return;
     }
-    
+
     size = sizeof(XPoint) * (w->strip_chart.scale - 1);
 
     points = (XPoint *)XtRealloc((XtPointer)w->strip_chart.points, size);
diff --git a/libXaw/src/Text.c b/libXaw/src/Text.c
index 72387e919..a1ae74a6b 100644
--- a/libXaw/src/Text.c
+++ b/libXaw/src/Text.c
@@ -3146,7 +3146,7 @@ _XawTextSetSelection(TextWidget ctx, XawTextPosition l, XawTextPosition r,
     if (nelems == 1 && !strcmp (list[0], "none"))
 	return;
     if (nelems == 0) {
-	String defaultSel = "PRIMARY";
+	static String defaultSel = "PRIMARY";
 	list = &defaultSel;
 	nelems = 1;
     }
diff --git a/libXaw/src/TextAction.c b/libXaw/src/TextAction.c
index 772f08d12..de34ce863 100644
--- a/libXaw/src/TextAction.c
+++ b/libXaw/src/TextAction.c
@@ -2282,7 +2282,7 @@ DoFormatText(TextWidget ctx, XawTextPosition left, Bool force, int level,
 			    text.length = bytes;
 			bytes -= text.length;
 			if (_XawTextReplace(ctx, tmp, tmp, &text)) {
-			    XawStackFree(buf, text.ptr);
+			    XawStackFree(text.ptr, buf);
 			    return (XawEditError);
 			}
 			if (num_pos) {
@@ -2297,7 +2297,7 @@ DoFormatText(TextWidget ctx, XawTextPosition left, Bool force, int level,
 		    }
 		    position += count;
 		    right += count;
-		    XawStackFree(buf, text.ptr);
+		    XawStackFree(text.ptr, buf);
 		}
 		break;
 	}
@@ -3939,6 +3939,8 @@ FormParagraph(Widget w, XEvent *event, String *params, Cardinal *num_params)
     }
 
     if (FormRegion(ctx, from, to, pos, src->textSrc.num_text) == XawReplaceError) {
+	XawStackFree(pos, buf);
+	pos = buf;
 #else
     from =  SrcScan(ctx->text.source, ctx->text.insertPos,
 		    XawstParagraph, XawsdLeft, 1, False);
@@ -3947,7 +3949,6 @@ FormParagraph(Widget w, XEvent *event, String *params, Cardinal *num_params)
 
     if (FormRegion(ctx, from, to, pos, 1) == XawReplaceError) {
 #endif
-	XawStackFree(pos, buf);
 	XBell(XtDisplay(w), 0);
 #ifndef OLDXAW
 	if (undo) {
@@ -3995,13 +3996,13 @@ FormParagraph(Widget w, XEvent *event, String *params, Cardinal *num_params)
 			       XawsdLeft, 1, False), False);
 	tw->text.clear_to_eol = True;
     }
+    XawStackFree(pos, buf);
 #else
     ctx->text.old_insert = ctx->text.insertPos = *pos;
     _XawTextBuildLineTable(ctx, SrcScan(ctx->text.source, ctx->text.lt.top,
 			   XawstEOL, XawsdLeft, 1, False), False);
     ctx->text.clear_to_eol = True;
 #endif
-    XawStackFree(pos, buf);
     ctx->text.showposition = True;
 
     EndAction(ctx);
diff --git a/libXaw/src/TextSrc.c b/libXaw/src/TextSrc.c
index 118361ea5..26ce47416 100644
--- a/libXaw/src/TextSrc.c
+++ b/libXaw/src/TextSrc.c
@@ -245,7 +245,7 @@ static wchar_t SrcWNL[2];
 /*
  * Implementation
  */
-static void 
+static void
 XawTextSrcClassInitialize(void)
 {
     XawInitializeWidgetSet();
@@ -274,22 +274,22 @@ XawTextSrcClassPartInitialize(WidgetClass wc)
      * We don't need to check for null super since we'll get to TextSrc
      * eventually
      */
-    if (t_src->textSrc_class.Read == XtInheritRead) 
+    if (t_src->textSrc_class.Read == XtInheritRead)
 	t_src->textSrc_class.Read = superC->textSrc_class.Read;
 
-    if (t_src->textSrc_class.Replace == XtInheritReplace) 
+    if (t_src->textSrc_class.Replace == XtInheritReplace)
 	t_src->textSrc_class.Replace = superC->textSrc_class.Replace;
 
-    if (t_src->textSrc_class.Scan == XtInheritScan) 
+    if (t_src->textSrc_class.Scan == XtInheritScan)
 	t_src->textSrc_class.Scan = superC->textSrc_class.Scan;
 
-    if (t_src->textSrc_class.Search == XtInheritSearch) 
+    if (t_src->textSrc_class.Search == XtInheritSearch)
 	t_src->textSrc_class.Search = superC->textSrc_class.Search;
 
-    if (t_src->textSrc_class.SetSelection == XtInheritSetSelection) 
+    if (t_src->textSrc_class.SetSelection == XtInheritSetSelection)
 	t_src->textSrc_class.SetSelection = superC->textSrc_class.SetSelection;
 
-    if (t_src->textSrc_class.ConvertSelection == XtInheritConvertSelection) 
+    if (t_src->textSrc_class.ConvertSelection == XtInheritConvertSelection)
 	t_src->textSrc_class.ConvertSelection =
 	    superC->textSrc_class.ConvertSelection;
 }
@@ -430,7 +430,7 @@ Read(Widget w, XawTextPosition pos, XawTextBlock *text, int length)
  *	Replaces a block of text with new text.
  */
 /*ARGSUSED*/
-static int 
+static int
 Replace(Widget w, XawTextPosition startPos, XawTextPosition endPos,
 	XawTextBlock *text)
 {
@@ -454,7 +454,7 @@ Replace(Widget w, XawTextPosition startPos, XawTextPosition endPos,
  *	Scans the text source for the number and type of item specified.
  */
 /*ARGSUSED*/
-static XawTextPosition 
+static XawTextPosition
 Scan(Widget w, XawTextPosition position, XawTextScanType type,
      XawTextScanDirection dir, int count, Bool include)
 {
@@ -498,14 +498,14 @@ SetSelection(Widget w, XawTextPosition left, XawTextPosition right,
 }
 
 /*ARGSUSED*/
-static void 
+static void
 CvtStringToEditMode(XrmValuePtr args, Cardinal *num_args,
 		    XrmValuePtr fromVal, XrmValuePtr toVal)
 {
     static XawTextEditType editType;
     XrmQuark	q;
     char name[7];
- 
+
     XmuNCopyISOLatin1Lowered(name, (char *)fromVal->addr, sizeof(name));
     q = XrmStringToQuark(name);
 
@@ -1401,7 +1401,7 @@ UndoGC(XawTextUndo *undo)
  *	dir	 - direction to scan
  *	count	 - which occurance if this thing to search for
  *	include  - whether or not to include the character found in
- *		   the position that is returned. 
+ *		   the position that is returned.
  *
  * Description:
  *	Scans the text source for the number and type of item specified.
@@ -1441,7 +1441,7 @@ XawTextSourceScan(Widget w, XawTextPosition position,
  * Description:
  *	Searchs the text source for the text block passed
  */
-XawTextPosition 
+XawTextPosition
 XawTextSourceSearch(Widget w, XawTextPosition position,
 #if NeedWidePrototypes
 		    int dir,
@@ -1472,7 +1472,7 @@ XawTextSourceSearch(Widget w, XawTextPosition position,
  *	True if the selection has been converted
  */
 Boolean
-XawTextSourceConvertSelection(Widget w, Atom *selection, Atom *target, 
+XawTextSourceConvertSelection(Widget w, Atom *selection, Atom *target,
 			      Atom *type, XtPointer *value,
 			      unsigned long *length, int *format)
 {
@@ -1496,7 +1496,7 @@ XawTextSourceConvertSelection(Widget w, Atom *selection, Atom *target,
  *	Allows special setting of the selection.
  */
 void
-XawTextSourceSetSelection(Widget w, XawTextPosition left, 
+XawTextSourceSetSelection(Widget w, XawTextPosition left,
 			  XawTextPosition right, Atom selection)
 {
     TextSrcObjectClass cclass = (TextSrcObjectClass)w->core.widget_class;
@@ -1508,7 +1508,7 @@ XawTextSourceSetSelection(Widget w, XawTextPosition left,
  * External Functions for Multi Text
  */
 /*
- * TextFormat(): 
+ * TextFormat():
  *	returns the format of text: FMT8BIT or FMTWIDE
  */
 XrmQuark
@@ -1546,7 +1546,7 @@ _XawTextWCToMB(Display *d, wchar_t *wstr, int *len_in_out)
 /* _XawTextMBToWC():
  *	Convert the string to internal processing codeset WC.
  *   The caller is responsible for freeing both the source and ret string.
- * 
+ *
  *	str	   - source string
  *	len_in_out - lengh of string
  *		     As In, it is length of source string
diff --git a/libXaw/src/Tip.c b/libXaw/src/Tip.c
index 9f8b32ad3..8328aace3 100644
--- a/libXaw/src/Tip.c
+++ b/libXaw/src/Tip.c
@@ -247,7 +247,7 @@ XawTipInitialize(Widget req, Widget w, ArgList args, Cardinal *num_args)
     if (!tip->tip.font) XtError("Aborting: no font found\n");
     if (tip->tip.international && !tip->tip.fontset)
 	XtError("Aborting: no fontset found\n");
-    
+
     tip->tip.timer = 0;
 
     values.foreground = tip->tip.foreground;
@@ -352,7 +352,7 @@ XawTipExpose(Widget w, XEvent *event, Region region)
 	    else
 		XDrawString(XtDisplay(w), XtWindow(w), gc,
 			    tip->tip.left_margin, y, label, (int)(nl - label));
-	    y += tip->tip.font->max_bounds.ascent + 
+	    y += tip->tip.font->max_bounds.ascent +
 		 tip->tip.font->max_bounds.descent;
 	    label = nl + 1;
 	}
diff --git a/libXaw/src/Tree.c b/libXaw/src/Tree.c
index 9dd9b7f53..f4781bfd1 100644
--- a/libXaw/src/Tree.c
+++ b/libXaw/src/Tree.c
@@ -28,7 +28,7 @@ in this Software without prior written authorization from The Open Group.
  * purpose and without fee is hereby granted, provided that the above
  * copyright notice appear in all copies and that both the copyright notice
  * and this permission notice appear in supporting documentation.
- * 
+ *
  * Prentice Hall and the authors disclaim all warranties with regard
  * to this software, including all implied warranties of merchantability and
  * fitness.  In no event shall Prentice Hall or the authors be liable
@@ -36,12 +36,12 @@ in this Software without prior written authorization from The Open Group.
  * resulting from loss of use, data or profits, whether in an action of
  * contract, negligence or other tortious action, arising out of or in
  * connection with the use or performance of this software.
- * 
+ *
  * Authors:  Jim Fulton, MIT X Consortium,
  *           based on a version by Douglas Young, Prentice Hall
- * 
+ *
  * This widget is based on the Tree widget described on pages 397-419 of
- * Douglas Young's book "The X Window System, Programming and Applications 
+ * Douglas Young's book "The X Window System, Programming and Applications
  * with Xt OSF/Motif Edition."  The layout code has been rewritten to use
  * additional blank space to make the structure of the graph easier to see
  * as well as to support vertical trees.
@@ -142,31 +142,31 @@ TreeClassRec treeClassRec = {
     sizeof(TreeRec),			/* widget_size        */
     XawTreeClassInitialize,		/* class_init         */
     NULL,				/* class_part_init    */
-    FALSE,				/* class_inited       */	
+    FALSE,				/* class_inited       */
     XawTreeInitialize,			/* initialize         */
-    NULL,				/* initialize_hook    */	
+    NULL,				/* initialize_hook    */
     XtInheritRealize,			/* realize            */
     NULL,				/* actions            */
-    0,					/* num_actions        */	
+    0,					/* num_actions        */
     resources,				/* resources          */
     XtNumber(resources),		/* num_resources      */
     NULLQUARK,				/* xrm_class          */
-    TRUE,				/* compress_motion    */	
-    TRUE,				/* compress_exposure  */	
-    TRUE,				/* compress_enterleave*/	
+    TRUE,				/* compress_motion    */
+    TRUE,				/* compress_exposure  */
+    TRUE,				/* compress_enterleave*/
     TRUE,				/* visible_interest   */
     XawTreeDestroy,			/* destroy            */
     NULL,				/* resize             */
     XawTreeRedisplay,			/* expose             */
     XawTreeSetValues,			/* set_values         */
-    NULL,				/* set_values_hook    */	
+    NULL,				/* set_values_hook    */
     XtInheritSetValuesAlmost,		/* set_values_almost  */
-    NULL,				/* get_values_hook    */	
+    NULL,				/* get_values_hook    */
     NULL,				/* accept_focus       */
-    XtVersion,				/* version            */	
+    XtVersion,				/* version            */
     NULL,				/* callback_private   */
     NULL,				/* tm_table           */
-    XawTreeQueryGeometry,		/* query_geometry     */	
+    XawTreeQueryGeometry,		/* query_geometry     */
     NULL,				/* display_accelerator*/
     NULL,				/* extension          */
   },
@@ -174,11 +174,11 @@ TreeClassRec treeClassRec = {
 					/* composite_class fields */
     XawTreeGeometryManager,		/* geometry_manager    */
     XawTreeChangeManaged,		/* change_managed      */
-    XtInheritInsertChild,		/* insert_child        */	
-    XtInheritDeleteChild,		/* delete_child        */	
+    XtInheritInsertChild,		/* insert_child        */
+    XtInheritDeleteChild,		/* delete_child        */
     NULL,				/* extension           */
   },
-  { 
+  {
 					/* constraint_class fields */
    treeConstraintResources,		/* subresources        */
    XtNumber(treeConstraintResources),	/* subresource_count   */
@@ -190,7 +190,7 @@ TreeClassRec treeClassRec = {
    },
   {
 					/* Tree class fields */
-    NULL,				/* ignore              */	
+    NULL,				/* ignore              */
   }
 };
 
@@ -250,28 +250,28 @@ insert_node(Widget parent, Widget node)
     TreeConstraints pc;
     TreeConstraints nc = TREE_CONSTRAINT(node);
     int nindex;
-  
+
     nc->tree.parent = parent;
 
     if (parent == NULL) return;
 
     /*
-     * If there isn't more room in the children array, 
+     * If there isn't more room in the children array,
      * allocate additional space.
-     */  
+     */
     pc = TREE_CONSTRAINT(parent);
     nindex = pc->tree.n_children;
-  
+
     if (pc->tree.n_children == pc->tree.max_children) {
 	pc->tree.max_children += (pc->tree.max_children / 2) + 2;
-	pc->tree.children = (WidgetList) XtRealloc ((char *)pc->tree.children, 
+	pc->tree.children = (WidgetList) XtRealloc ((char *)pc->tree.children,
 						    (unsigned int)
 						    ((pc->tree.max_children) *
 						    sizeof(Widget)));
-    } 
+    }
 
     /*
-     * Add the sub_node in the next available slot and 
+     * Add the sub_node in the next available slot and
      * increment the counter.
      */
     pc->tree.children[nindex] = node;
@@ -287,8 +287,8 @@ delete_node(Widget parent, Widget node)
     /*
      * Make sure the parent exists.
      */
-    if (!parent) return;  
-  
+    if (!parent) return;
+
     pc = TREE_CONSTRAINT(parent);
 
     /*
@@ -301,14 +301,14 @@ delete_node(Widget parent, Widget node)
 
     /*
      * Decrement the number of children
-     */  
+     */
     pc->tree.n_children--;
 
     /*
      * Fill in the gap left by the sub_node.
      * Zero the last slot for good luck.
      */
-    for (i = pos; i < pc->tree.n_children; i++) 
+    for (i = pos; i < pc->tree.n_children; i++)
       pc->tree.children[i] = pc->tree.children[i+1];
 
     pc->tree.children[pc->tree.n_children] = NULL;
@@ -329,7 +329,7 @@ check_gravity(TreeWidget tw, XtGravity grav)
 
 /*****************************************************************************
  *                                                                           *
- * 			      tree class methods                             *
+ *			      tree class methods                             *
  *                                                                           *
  *****************************************************************************/
 
@@ -352,7 +352,7 @@ XawTreeInitialize(Widget grequest, Widget gnew,
     Arg arglist[2];
 
     /*
-     * Make sure the widget's width and height are 
+     * Make sure the widget's width and height are
      * greater than zero.
      */
     if (request->core.width <= 0) cnew->core.width = 5;
@@ -390,14 +390,14 @@ XawTreeInitialize(Widget grequest, Widget gnew,
      */
     cnew->tree.largest = NULL;
     cnew->tree.n_largest = 0;
-    initialize_dimensions (&cnew->tree.largest, &cnew->tree.n_largest, 
+    initialize_dimensions (&cnew->tree.largest, &cnew->tree.n_largest,
 			   TREE_INITIAL_DEPTH);
 
     /*
      * make sure that our gravity is one of the acceptable values
      */
     check_gravity (cnew, WestGravity);
-} 
+}
 
 
 /* ARGSUSED */
@@ -414,21 +414,21 @@ XawTreeConstraintInitialize(Widget request, Widget cnew,
     tc->tree.n_children = 0;
     tc->tree.max_children = 0;
     tc->tree.children = (Widget *) NULL;
-    tc->tree.x = tc->tree.y = 0; 
+    tc->tree.x = tc->tree.y = 0;
     tc->tree.bbsubwidth = 0;
     tc->tree.bbsubheight = 0;
 
 
     /*
-     * If this widget has a super-node, add it to that 
-     * widget' sub-nodes list. Otherwise make it a sub-node of 
+     * If this widget has a super-node, add it to that
+     * widget' sub-nodes list. Otherwise make it a sub-node of
      * the tree_root widget.
      */
     if (tc->tree.parent)
       insert_node (tc->tree.parent, cnew);
     else if (tw->tree.tree_root)
       insert_node (tw->tree.tree_root, cnew);
-} 
+}
 
 
 /* ARGSUSED */
@@ -448,7 +448,7 @@ XawTreeSetValues(Widget gcurrent, Widget grequest, Widget gnew,
 	cnew->tree.line_width != current->tree.line_width) {
 	XtReleaseGC (gnew, cnew->tree.gc);
 	cnew->tree.gc = get_tree_gc (cnew);
-	redraw = TRUE;     
+	redraw = TRUE;
     }
 
     /*
@@ -499,7 +499,7 @@ XawTreeConstraintSetValues(Widget current, Widget request, Widget cnew,
 	  insert_node(newc->tree.parent, cnew);
 
 	/*
-	 * If the Tree widget has been realized, 
+	 * If the Tree widget has been realized,
 	 * compute new layout.
 	 */
 	if (XtIsRealized((Widget)tw))
@@ -511,16 +511,16 @@ XawTreeConstraintSetValues(Widget current, Widget request, Widget cnew,
 
 static void
 XawTreeConstraintDestroy(Widget w)
-{ 
+{
     TreeConstraints tc = TREE_CONSTRAINT(w);
     TreeWidget tw = (TreeWidget) XtParent(w);
     int i;
 
-    /* 
+    /*
      * Remove the widget from its parent's sub-nodes list and
      * make all this widget's sub-nodes sub-nodes of the parent.
      */
-  
+
     if (tw->tree.tree_root == w) {
 	if (tc->tree.n_children > 0)
 	  tw->tree.tree_root = tc->tree.children[0];
@@ -748,8 +748,8 @@ compute_bounding_box_subtree(TreeWidget tree, Widget w, int depth)
     if (tc->tree.n_children == 0) return;
 
     /*
-     * Figure the size of the opposite dimension (vertical if tree is 
-     * horizontal, else vice versa).  The other dimension will be set 
+     * Figure the size of the opposite dimension (vertical if tree is
+     * horizontal, else vice versa).  The other dimension will be set
      * in the second pass once we know the maximum dimensions.
      */
     newwidth = 0;
@@ -757,7 +757,7 @@ compute_bounding_box_subtree(TreeWidget tree, Widget w, int depth)
     for (i = 0; i < tc->tree.n_children; i++) {
 	Widget child = tc->tree.children[i];
 	TreeConstraints cc = TREE_CONSTRAINT(child);
-	    
+
 	compute_bounding_box_subtree (tree, child, depth + 1);
 
 	if (horiz) {
@@ -793,7 +793,7 @@ static void
 set_positions(TreeWidget tw, Widget w, int level)
 {
     int i;
-  
+
     if (w) {
 	TreeConstraints tc = TREE_CONSTRAINT(w);
 
@@ -915,9 +915,9 @@ arrange_subtree(TreeWidget tree, Widget w, int depth, int x, int y)
 	if (horiz) {
 	    tc->tree.x = x;
 	    adjusted = firstcc->tree.y +
-	      ((lastcc->tree.y + (Position) child->core.height + 
+	      ((lastcc->tree.y + (Position) child->core.height +
 		(Position) child->core.border_width * 2 -
-		firstcc->tree.y - (Position) w->core.height - 
+		firstcc->tree.y - (Position) w->core.height -
 		(Position) w->core.border_width * 2 + 1) / 2);
 	    if (adjusted > tc->tree.y) tc->tree.y = adjusted;
 	} else {
@@ -973,7 +973,7 @@ layout_tree(TreeWidget tw, Bool insetvalues)
     tw->tree.maxwidth = tw->tree.maxheight = 0;
     for (i = 0, dp = tw->tree.largest; i < tw->tree.n_largest; i++, dp++)
       *dp = 0;
-    initialize_dimensions (&tw->tree.largest, &tw->tree.n_largest, 
+    initialize_dimensions (&tw->tree.largest, &tw->tree.n_largest,
 			   tw->tree.n_largest);
     compute_bounding_box_subtree (tw, tw->tree.tree_root, 0);
 
@@ -1002,7 +1002,7 @@ layout_tree(TreeWidget tw, Bool insetvalues)
 
 /*****************************************************************************
  *                                                                           *
- * 				Public Routines                              *
+ *				Public Routines                              *
  *                                                                           *
  *****************************************************************************/
 
diff --git a/libXaw/src/Vendor.c b/libXaw/src/Vendor.c
index c73d17fe7..dd6a117c6 100644
--- a/libXaw/src/Vendor.c
+++ b/libXaw/src/Vendor.c
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -174,7 +174,7 @@ externaldef(vendorshellclassrec) VendorShellClassRec vendorShellClassRec = {
     /* class_part_init	  */	XawVendorShellClassPartInit,
     /* Class init'ed ?	  */	FALSE,
     /* initialize         */	XawVendorShellInitialize,
-    /* initialize_hook	  */	NULL,		
+    /* initialize_hook	  */	NULL,
     /* realize		  */	XawVendorShellRealize,
     /* actions		  */	NULL,
     /* num_actions	  */	0,
@@ -189,8 +189,8 @@ externaldef(vendorshellclassrec) VendorShellClassRec vendorShellClassRec = {
     /* resize		  */	XawVendorShellExtResize,
     /* expose		  */	NULL,
     /* set_values	  */	XawVendorShellSetValues,
-    /* set_values_hook	  */	NULL,			
-    /* set_values_almost  */	XtInheritSetValuesAlmost,  
+    /* set_values_hook	  */	NULL,
+    /* set_values_almost  */	XtInheritSetValuesAlmost,
     /* get_values_hook	  */	NULL,
     /* accept_focus	  */	NULL,
     /* intrinsics version */	XtVersion,
@@ -250,7 +250,7 @@ externaldef(vendorshellextclassrec) XawVendorShellExtClassRec
     /* class_part_initialize*/	NULL,
     /* Class init'ed ?	  */	FALSE,
     /* initialize	  */	XawVendorShellExtInitialize,
-    /* initialize_hook	  */	NULL,		
+    /* initialize_hook	  */	NULL,
     /* pad		  */	NULL,
     /* pad		  */	NULL,
     /* pad		  */	0,
@@ -265,8 +265,8 @@ externaldef(vendorshellextclassrec) XawVendorShellExtClassRec
     /* pad		  */	NULL,
     /* pad		  */	NULL,
     /* set_values	  */	XawVendorShellExtSetValues,
-    /* set_values_hook	  */	NULL,			
-    /* pad		  */	NULL,  
+    /* set_values_hook	  */	NULL,
+    /* pad		  */	NULL,
     /* get_values_hook	  */	NULL,
     /* pad		  */	NULL,
     /* version		  */	XtVersion,
@@ -324,7 +324,7 @@ XawVendorShellClassInitialize(void)
 	     sizeof(Screen *)}
     };
 
-    XtAddConverter(XtRString, XtRCursor, XmuCvtStringToCursor,      
+    XtAddConverter(XtRString, XtRCursor, XmuCvtStringToCursor,
 		   screenConvertArg, XtNumber(screenConvertArg));
 
     XtAddConverter(XtRString, XtRBitmap, XmuCvtStringToBitmap,
@@ -340,9 +340,9 @@ XawVendorShellClassPartInit(WidgetClass cclass)
     CompositeClassExtension ext;
     VendorShellWidgetClass vsclass = (VendorShellWidgetClass)cclass;
 
-    if ((ext = (CompositeClassExtension) 
+    if ((ext = (CompositeClassExtension)
 	    XtGetClassExtension (cclass,
-				 XtOffsetOf(CompositeClassRec, 
+				 XtOffsetOf(CompositeClassRec,
 					    composite_class.extension),
 				 NULLQUARK, 1L, (Cardinal) 0)) == NULL) {
 	ext = (CompositeClassExtension) XtNew (CompositeClassExtensionRec);
@@ -495,7 +495,7 @@ XawVendorShellGeometryManager(Widget wid, XtWidgetGeometry *request,
 	     * so, whatever the WM sized us to (if the Shell requested
 	     * only one of the two) is now the correct child size
 	     */
-	    
+
 	    wid->core.width = shell->core.width;
 	    wid->core.height = shell->core.height;
 	    if (request->request_mode & CWBorderWidth) {
diff --git a/libXaw/src/Viewport.c b/libXaw/src/Viewport.c
index 68bd1682b..082682f82 100644
--- a/libXaw/src/Viewport.c
+++ b/libXaw/src/Viewport.c
@@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -313,12 +313,12 @@ XawViewportInitialize(Widget request, Widget cnew,
     w->viewport.clip = XtCreateManagedWidget("clip", widgetClass, cnew,
 					     clip_args, arg_cnt);
 
-    if (!w->viewport.forcebars) 
+    if (!w->viewport.forcebars)
 	return;		 /* If we are not forcing the bars then we are done */
 
-    if (w->viewport.allowhoriz) 
+    if (w->viewport.allowhoriz)
 	(void)CreateScrollbar(w, True);
-    if (w->viewport.allowvert) 
+    if (w->viewport.allowvert)
 	(void)CreateScrollbar(w, False);
 
     h_bar = w->viewport.horiz_bar;
@@ -538,7 +538,7 @@ ComputeLayout(Widget widget, Bool query, Bool destroy_scrollbars)
     if (w->viewport.forcebars) {
 	needsvert = w->viewport.allowvert;
 	needshoriz = w->viewport.allowhoriz;
-	ComputeWithForceBars(widget, query, &intended, 
+	ComputeWithForceBars(widget, query, &intended,
 			     &clip_width, &clip_height);
     }
     else {
@@ -553,7 +553,7 @@ ComputeLayout(Widget widget, Bool query, Bool destroy_scrollbars)
 	 * but we don't set the mode bits until after we decide that the
 	 * child's preferences are not acceptable
 	 */
-	if (!w->viewport.allowhoriz) 
+	if (!w->viewport.allowhoriz)
 	    intended.request_mode |= CWWidth;
 
 	if (XtWidth(child) < clip_width)
@@ -566,7 +566,7 @@ ComputeLayout(Widget widget, Bool query, Bool destroy_scrollbars)
 	else
 	    intended.height = XtHeight(child);
 
-	if (!w->viewport.allowvert) 
+	if (!w->viewport.allowvert)
 	    intended.request_mode |= CWHeight;
 
 	if (!query) {
@@ -645,7 +645,7 @@ ComputeLayout(Widget widget, Bool query, Bool destroy_scrollbars)
 		 XtHeight(w->viewport.horiz_bar)
 		 + XtBorderWidth(w->viewport.horiz_bar) : 0);
     XtResizeWidget(clip, clip_width, clip_height, 0);
-	
+
     if (w->viewport.horiz_bar != NULL) {
 	Widget bar = w->viewport.horiz_bar;
 
@@ -728,7 +728,7 @@ ComputeWithForceBars(Widget widget, Bool query, XtWidgetGeometry *intended,
      * Thus if needsvert is set it MUST have a scrollbar
      */
     if (w->viewport.allowvert) {
-	if (w->viewport.vert_bar == NULL) 
+	if (w->viewport.vert_bar == NULL)
 	    w->viewport.vert_bar = CreateScrollbar(w, False);
 
 	*clip_width -= XtWidth(w->viewport.vert_bar) +
@@ -736,7 +736,7 @@ ComputeWithForceBars(Widget widget, Bool query, XtWidgetGeometry *intended,
     }
 
     if (w->viewport.allowhoriz) {
-	if (w->viewport.horiz_bar == NULL) 
+	if (w->viewport.horiz_bar == NULL)
 	    w->viewport.horiz_bar = CreateScrollbar(w, True);
 
 	*clip_height -= XtHeight(w->viewport.horiz_bar) +
@@ -758,7 +758,7 @@ ComputeWithForceBars(Widget widget, Bool query, XtWidgetGeometry *intended,
     if (query) {
 	if (w->viewport.allowvert || w->viewport.allowhoriz) {
 	    XtQueryGeometry(child, intended, &preferred);
-	  
+
 	    if (!(intended->request_mode & CWWidth)) {
 		if (preferred.request_mode & CWWidth)
 		    intended->width = preferred.width;
@@ -874,11 +874,11 @@ GeometryRequestPlusScrollbar(ViewportWidget w, Bool horizontal,
 
 #define WidthChange()	(request->width != XtWidth(w))
 #define HeightChange()	(request->height != XtHeight(w))
-static XtGeometryResult 
+static XtGeometryResult
 QueryGeometry(ViewportWidget w, XtWidgetGeometry *request,
 	      XtWidgetGeometry *reply_return)
-{	
-    if (w->viewport.allowhoriz && w->viewport.allowvert) 
+{
+    if (w->viewport.allowhoriz && w->viewport.allowvert)
 	return (TestSmaller(w, request, reply_return));
 
     else if (w->viewport.allowhoriz && !w->viewport.allowvert) {
@@ -942,7 +942,7 @@ XawViewportGeometryManager(Widget child, XtWidgetGeometry *request,
     if (rWidth && XtWidth(w) != request->width) {
 	if (w->viewport.allowhoriz && request->width > XtWidth(w)) {
 	    /* horizontal scrollbar will be needed so possibly reduce height */
-	    Widget bar; 
+	    Widget bar;
 
 	    if ((bar = w->viewport.horiz_bar) == NULL)
 		bar = CreateScrollbar(w, True);
@@ -1058,12 +1058,12 @@ XawViewportSetLocation
 
     if (xoff > 1.0)			/* scroll to right */
 	x = XtWidth(child);
-    else if (xoff < 0.0)		/* if the offset is < 0.0 nothing */ 
+    else if (xoff < 0.0)		/* if the offset is < 0.0 nothing */
 	x = XtX(child);
     else
 	x = (float)XtWidth(child) * xoff;
 
-    if (yoff > 1.0) 
+    if (yoff > 1.0)
 	y = XtHeight(child);
     else if (yoff < 0.0)
 	y = XtY(child);
diff --git a/libXaw/src/XawI18n.c b/libXaw/src/XawI18n.c
index 9a49521a9..99ed2ca18 100644
--- a/libXaw/src/XawI18n.c
+++ b/libXaw/src/XawI18n.c
@@ -18,7 +18,7 @@
  * OMRON, NTT SOFTWARE, AND NTT, DISCLAIM ALL WARRANTIES WITH REGARD
  * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  * AND FITNESS, IN NO EVENT SHALL OMRON, NTT SOFTWARE, OR NTT BE
- * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
+ * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -101,5 +101,5 @@ _Xaw_iswalnum(wchar_t ch)
     wctomb((char*)mb, ch);
 
     return (isalnum(*mb));
-#endif    
+#endif
 }
diff --git a/libXaw/src/XawInit.c b/libXaw/src/XawInit.c
index c10a9b64b..5ca1ef88a 100644
--- a/libXaw/src/XawInit.c
+++ b/libXaw/src/XawInit.c
@@ -22,10 +22,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
- * 
- * 
- * 			    XawInitializeWidgetSet
- * 
+ *
+ *
+ *			    XawInitializeWidgetSet
+ *
  * This routine forces a reference to vendor shell so that the one in this
  * widget is installed.  Any other cross-widget set initialization should be
  * done here as well.  All Athena widgets should include "XawInit.h" and
@@ -76,7 +76,7 @@ Widget XawOpenApplication(XtAppContext *app_context_return,
     *app_context_return = XtCreateApplicationContext();
     if( *app_context_return == NULL )
         return NULL;
-      
+
     XtDisplayInitialize(*app_context_return, dpy,
                         application_name, application_class,
                         NULL, 0,
@@ -86,7 +86,7 @@ Widget XawOpenApplication(XtAppContext *app_context_return,
     if (screen) {
         XtSetArg(args[n], XtNscreen, screen); n++;
     }
-    toplevel = XtAppCreateShell(application_name, 
+    toplevel = XtAppCreateShell(application_name,
                                 application_class,
                                 widget_class,
                                 dpy,