merge libXaw 1.0.4

8 files changed, 247 insertions, 240 deletions

diff --git a/lib/libXaw/Makefile.am b/lib/libXaw/Makefile.am
index dfb3e7ac5..a83ed57af 100644
--- a/lib/libXaw/Makefile.am
+++ b/lib/libXaw/Makefile.am
@@ -33,4 +33,19 @@ EXTRA_DIST = xaw6.pc.in \
 	autogen.sh \
 	xaw.m4 \
 	old-doc/Changelog \
-	old-doc/CHANGES
+	old-doc/CHANGES \
+	ChangeLog
+
+if !PLATFORM_WIN32
+install-exec-hook:
+	cd $(DESTDIR)$(libdir) && rm -f libXaw.so && ln -s $(DEFAULT_LIB) libXaw.so
+endif
+
+MAINTAINERCLEANFILES=ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
diff --git a/lib/libXaw/Makefile.in b/lib/libXaw/Makefile.in
index 903584f30..a23db5ff8 100644
--- a/lib/libXaw/Makefile.in
+++ b/lib/libXaw/Makefile.in
@@ -233,8 +233,10 @@ EXTRA_DIST = xaw6.pc.in \
 	autogen.sh \
 	xaw.m4 \
 	old-doc/Changelog \
-	old-doc/CHANGES
+	old-doc/CHANGES \
+	ChangeLog
 
+MAINTAINERCLEANFILES = ChangeLog
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -517,6 +519,9 @@ distdir: $(DISTFILES)
 	      || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -646,6 +651,8 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+@PLATFORM_WIN32_TRUE@install-exec-hook:
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool mostlyclean-am
@@ -669,6 +676,8 @@ info-am:
 install-data-am: install-aclocalDATA install-pkgconfigDATA
 
 install-exec-am:
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
 install-info: install-info-recursive
 
@@ -702,13 +711,13 @@ uninstall-info: uninstall-info-recursive
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
 	check-am clean clean-generic clean-libtool clean-recursive \
 	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-shar dist-tarZ dist-zip distcheck distclean \
+	dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
 	distclean-generic distclean-hdr distclean-libtool \
 	distclean-recursive distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-aclocalDATA install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-pkgconfigDATA \
+	install-data-am install-exec install-exec-am install-exec-hook \
+	install-info install-info-am install-man install-pkgconfigDATA \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
@@ -716,6 +725,16 @@ uninstall-info: uninstall-info-recursive
 	tags tags-recursive uninstall uninstall-aclocalDATA \
 	uninstall-am uninstall-info-am uninstall-pkgconfigDATA
 
+
+@PLATFORM_WIN32_FALSE@install-exec-hook:
+@PLATFORM_WIN32_FALSE@	cd $(DESTDIR)$(libdir) && rm -f libXaw.so && ln -s $(DEFAULT_LIB) libXaw.so
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/lib/libXaw/compile b/lib/libXaw/compile
deleted file mode 100644
index 1b1d23216..000000000
--- a/lib/libXaw/compile
+++ /dev/null
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.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, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-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'.
-	# So we strip `-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/lib/libXaw/config.h.in b/lib/libXaw/config.h.in
index 331ab6899..2f553dc42 100644
--- a/lib/libXaw/config.h.in
+++ b/lib/libXaw/config.h.in
@@ -12,6 +12,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the `iswalnum' function. */
+#undef HAVE_ISWALNUM
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
diff --git a/lib/libXaw/configure b/lib/libXaw/configure
index ffd7cd5f6..ed242f520 100644
--- a/lib/libXaw/configure
+++ b/lib/libXaw/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for libXaw 1.0.2.
+# Generated by GNU Autoconf 2.59 for libXaw 1.0.4.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='libXaw'
 PACKAGE_TARNAME='libXaw'
-PACKAGE_VERSION='1.0.2'
-PACKAGE_STRING='libXaw 1.0.2'
+PACKAGE_VERSION='1.0.4'
+PACKAGE_STRING='libXaw 1.0.4'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 # Factoring default headers for most tests.
@@ -464,7 +464,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PLATFORM_WIN32_TRUE PLATFORM_WIN32_FALSE SHARED_LIBS_TRUE SHARED_LIBS_FALSE PKG_CONFIG ac_pt_PKG_CONFIG XAW6_CFLAGS XAW6_LIBS XAW7_CFLAGS XAW7_LIBS XPRINT_CFLAGS XPRINT_LIBS XAW8_CFLAGS XAW8_LIBS BUILD_XAW6_TRUE BUILD_XAW6_FALSE BUILD_XAW7_TRUE BUILD_XAW7_FALSE BUILD_XAW8_TRUE BUILD_XAW8_FALSE APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG PLATFORM_WIN32_TRUE PLATFORM_WIN32_FALSE SHARED_LIBS_TRUE SHARED_LIBS_FALSE XAW6_CFLAGS XAW6_LIBS XAW7_CFLAGS XAW7_LIBS XPRINT_CFLAGS XPRINT_LIBS XAW8_CFLAGS XAW8_LIBS BUILD_XAW6_TRUE BUILD_XAW6_FALSE BUILD_XAW7_TRUE BUILD_XAW7_FALSE BUILD_XAW8_TRUE BUILD_XAW8_FALSE APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -989,7 +989,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.2 to adapt to many kinds of systems.
+\`configure' configures libXaw 1.0.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1055,7 +1055,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libXaw 1.0.2:";;
+     short | recursive ) echo "Configuration of libXaw 1.0.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1211,7 +1211,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-libXaw configure 1.0.2
+libXaw configure 1.0.4
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1225,7 +1225,7 @@ cat >&5 <<_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.2, which was
+It was created by libXaw $as_me 1.0.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1869,7 +1869,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libXaw'
- VERSION='1.0.2'
+ VERSION='1.0.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18607,71 +18607,8 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
-#
-# fix libtool to set SONAME to libXaw.so.$major
-#
-echo "$as_me:$LINENO: checking hacks in libtool for libXaw SONAME" >&5
-echo $ECHO_N "checking hacks in libtool for libXaw SONAME... $ECHO_C" >&6
-if grep "xorglibxawname" libtool > /dev/null ; then
-	echo "$as_me:$LINENO: result: already done" >&5
-echo "${ECHO_T}already done" >&6
-else
-	ed libtool << \EOF
-/^soname_spec/i
-# X.Org hack to match monolithic Xaw SONAME
-xorglibxawname="libXaw"
-.
-/^soname_spec/s/libname/xorglibxawname/
-w
-q
-EOF
-	echo "$as_me:$LINENO: result: fixed" >&5
-echo "${ECHO_T}fixed" >&6
-fi
-
-# Win32 DLL rules are different.
-case $host_os in
-    cygwin*|mingw*)
-	platform_win32=yes
-	;;
-    *)
-	platform_win32=no
-	;;
-esac
-
-
-if test "x$platform_win32" = "xyes"; then
-  PLATFORM_WIN32_TRUE=
-  PLATFORM_WIN32_FALSE='#'
-else
-  PLATFORM_WIN32_TRUE='#'
-  PLATFORM_WIN32_FALSE=
-fi
-
-
-# some platforms don't even have shared libs
-
-
-if test -f /usr/libexec/ld.so; then
-  SHARED_LIBS_TRUE=
-  SHARED_LIBS_FALSE='#'
-else
-  SHARED_LIBS_TRUE='#'
-  SHARED_LIBS_FALSE=
-fi
-
-
-# Whether to build Xaw6
-
-# Check whether --enable-xaw6 or --disable-xaw6 was given.
-if test "${enable_xaw6+set}" = set; then
-  enableval="$enable_xaw6"
-  build_v6=$enableval
-else
-  build_v6=yes
-fi;
-
-# if test "x$build_v6" = xyes; then
+# Need to call this explicitly since the first call to PKG_CHECK_MODULES
+# is in an if statement, and later calls would break if it's skipped.
 
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -18778,6 +18715,72 @@ echo "${ECHO_T}no" >&6
 
 fi
 
+#
+# fix libtool to set SONAME to libXaw.so.$major
+#
+echo "$as_me:$LINENO: checking hacks in libtool for libXaw SONAME" >&5
+echo $ECHO_N "checking hacks in libtool for libXaw SONAME... $ECHO_C" >&6
+if grep "xorglibxawname" libtool > /dev/null ; then
+	echo "$as_me:$LINENO: result: already done" >&5
+echo "${ECHO_T}already done" >&6
+else
+	ed libtool << \EOF
+/^soname_spec/i
+# X.Org hack to match monolithic Xaw SONAME
+xorglibxawname="libXaw"
+.
+/^soname_spec/s/libname/xorglibxawname/
+w
+q
+EOF
+	echo "$as_me:$LINENO: result: fixed" >&5
+echo "${ECHO_T}fixed" >&6
+fi
+
+# Win32 DLL rules are different.
+case $host_os in
+    cygwin*|mingw*)
+	platform_win32=yes
+	;;
+    *)
+	platform_win32=no
+	;;
+esac
+
+
+if test "x$platform_win32" = "xyes"; then
+  PLATFORM_WIN32_TRUE=
+  PLATFORM_WIN32_FALSE='#'
+else
+  PLATFORM_WIN32_TRUE='#'
+  PLATFORM_WIN32_FALSE=
+fi
+
+
+# some platforms don't even have shared libs
+
+
+if test -f /usr/libexec/ld.so; then
+  SHARED_LIBS_TRUE=
+  SHARED_LIBS_FALSE='#'
+else
+  SHARED_LIBS_TRUE='#'
+  SHARED_LIBS_FALSE=
+fi
+
+
+# Whether to build Xaw6
+
+# Check whether --enable-xaw6 or --disable-xaw6 was given.
+if test "${enable_xaw6+set}" = set; then
+  enableval="$enable_xaw6"
+  build_v6=$enableval
+else
+  build_v6=yes
+fi;
+
+# if test "x$build_v6" = xyes; then
+
 pkg_failed=no
 echo "$as_me:$LINENO: checking for XAW6" >&5
 echo $ECHO_N "checking for XAW6... $ECHO_C" >&6
@@ -19875,6 +19878,110 @@ fi
 
 
 
+# Checks for functions
+
+for ac_func in iswalnum
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
 
 
 
@@ -20412,7 +20519,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by libXaw $as_me 1.0.2, which was
+This file was extended by libXaw $as_me 1.0.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20475,7 +20582,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-libXaw config.status 1.0.2
+libXaw config.status 1.0.4
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -20744,12 +20851,12 @@ s,@F77@,$F77,;t t
 s,@FFLAGS@,$FFLAGS,;t t
 s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
+s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
 s,@PLATFORM_WIN32_TRUE@,$PLATFORM_WIN32_TRUE,;t t
 s,@PLATFORM_WIN32_FALSE@,$PLATFORM_WIN32_FALSE,;t t
 s,@SHARED_LIBS_TRUE@,$SHARED_LIBS_TRUE,;t t
 s,@SHARED_LIBS_FALSE@,$SHARED_LIBS_FALSE,;t t
-s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
 s,@XAW6_CFLAGS@,$XAW6_CFLAGS,;t t
 s,@XAW6_LIBS@,$XAW6_LIBS,;t t
 s,@XAW7_CFLAGS@,$XAW7_CFLAGS,;t t
@@ -21921,7 +22028,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by libXaw $as_me 1.0.2, which was
+This file was extended by libXaw $as_me 1.0.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21984,7 +22091,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-libXaw config.status 1.0.2
+libXaw config.status 1.0.4
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -22254,12 +22361,12 @@ s,@F77@,$F77,;t t
 s,@FFLAGS@,$FFLAGS,;t t
 s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
+s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
 s,@PLATFORM_WIN32_TRUE@,$PLATFORM_WIN32_TRUE,;t t
 s,@PLATFORM_WIN32_FALSE@,$PLATFORM_WIN32_FALSE,;t t
 s,@SHARED_LIBS_TRUE@,$SHARED_LIBS_TRUE,;t t
 s,@SHARED_LIBS_FALSE@,$SHARED_LIBS_FALSE,;t t
-s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
 s,@XAW6_CFLAGS@,$XAW6_CFLAGS,;t t
 s,@XAW6_LIBS@,$XAW6_LIBS,;t t
 s,@XAW7_CFLAGS@,$XAW7_CFLAGS,;t t
@@ -23432,7 +23539,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by libXaw $as_me 1.0.2, which was
+This file was extended by libXaw $as_me 1.0.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23495,7 +23602,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-libXaw config.status 1.0.2
+libXaw config.status 1.0.4
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -23766,12 +23873,12 @@ s,@F77@,$F77,;t t
 s,@FFLAGS@,$FFLAGS,;t t
 s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
+s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
 s,@PLATFORM_WIN32_TRUE@,$PLATFORM_WIN32_TRUE,;t t
 s,@PLATFORM_WIN32_FALSE@,$PLATFORM_WIN32_FALSE,;t t
 s,@SHARED_LIBS_TRUE@,$SHARED_LIBS_TRUE,;t t
 s,@SHARED_LIBS_FALSE@,$SHARED_LIBS_FALSE,;t t
-s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
 s,@XAW6_CFLAGS@,$XAW6_CFLAGS,;t t
 s,@XAW6_LIBS@,$XAW6_LIBS,;t t
 s,@XAW7_CFLAGS@,$XAW7_CFLAGS,;t t
@@ -24944,7 +25051,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by libXaw $as_me 1.0.2, which was
+This file was extended by libXaw $as_me 1.0.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25007,7 +25114,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-libXaw config.status 1.0.2
+libXaw config.status 1.0.4
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -25279,12 +25386,12 @@ s,@F77@,$F77,;t t
 s,@FFLAGS@,$FFLAGS,;t t
 s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
+s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
 s,@PLATFORM_WIN32_TRUE@,$PLATFORM_WIN32_TRUE,;t t
 s,@PLATFORM_WIN32_FALSE@,$PLATFORM_WIN32_FALSE,;t t
 s,@SHARED_LIBS_TRUE@,$SHARED_LIBS_TRUE,;t t
 s,@SHARED_LIBS_FALSE@,$SHARED_LIBS_FALSE,;t t
-s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
 s,@XAW6_CFLAGS@,$XAW6_CFLAGS,;t t
 s,@XAW6_LIBS@,$XAW6_LIBS,;t t
 s,@XAW7_CFLAGS@,$XAW7_CFLAGS,;t t
diff --git a/lib/libXaw/configure.ac b/lib/libXaw/configure.ac
index 5d25ed03e..86d6a6b7f 100644
--- a/lib/libXaw/configure.ac
+++ b/lib/libXaw/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to create configure.
 AC_PREREQ([2.57])
 
 AC_INIT([libXaw],
-	1.0.2,
+	1.0.4,
 	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 	libXaw)
 
@@ -15,6 +15,10 @@ AM_CONFIG_HEADER(config.h)
 AC_PROG_CC
 AC_PROG_LIBTOOL
 
+# Need to call this explicitly since the first call to PKG_CHECK_MODULES
+# is in an if statement, and later calls would break if it's skipped.
+PKG_PROG_PKG_CONFIG
+
 #
 # fix libtool to set SONAME to libXaw.so.$major
 #
@@ -117,6 +121,9 @@ AC_CHECK_HEADER(widec.h, [],
        	AC_DEFINE([NO_WIDEC_H],1,
 			[Define to 1 if you DO NOT have the <widec.h> header file.]))
 
+# Checks for functions
+AC_CHECK_FUNCS([iswalnum])
+
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
 
diff --git a/lib/libXaw/man/Makefile.am b/lib/libXaw/man/Makefile.am
index 3d9dd0e59..a804c4eb1 100644
--- a/lib/libXaw/man/Makefile.am
+++ b/lib/libXaw/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Xorg: Makefile.am,v 1.5 2005/11/28 22:03:05 alanc Exp $
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # 
diff --git a/lib/libXaw/man/Makefile.in b/lib/libXaw/man/Makefile.in
index ef149a5e1..4a806ff16 100644
--- a/lib/libXaw/man/Makefile.in
+++ b/lib/libXaw/man/Makefile.in
@@ -14,7 +14,6 @@
 
 @SET_MAKE@
 
-# $Xorg: Makefile.am,v 1.5 2005/11/28 22:03:05 alanc Exp $
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 #