Remove last remaining vestiges of Xprint support

Occasionally I think I'm smart enough to commit without testing, then I
break the build.  Bad Daniel.  No biscuit.

3 files changed, 1 insertions, 75 deletions

diff --git a/Makefile.am b/Makefile.am
index afc0e08..82c3f5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,5 @@
 SUBDIRS = include src man
 
-aclocaldir = $(datadir)/aclocal
-aclocal_DATA = xaw.m4
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = 
 
@@ -23,7 +20,6 @@ endif
 EXTRA_DIST = xaw6.pc.in \
 	xaw7.pc.in \
 	autogen.sh \
-	xaw.m4 \
 	old-doc/Changelog \
 	old-doc/CHANGES \
 	ChangeLog
diff --git a/include/Makefile.am b/include/Makefile.am
index 53c4f7f..a62ec2a 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,9 +1,5 @@
 xawincludedir=${includedir}/X11/Xaw
 
-if BUILD_XAW8
-xaw8_headers = X11/Xaw/Print.h X11/Xaw/PrintSP.h
-endif
-
 xawinclude_HEADERS = \
 	X11/Xaw/AllWidgets.h \
 	X11/Xaw/AsciiSink.h \
@@ -75,5 +71,4 @@ xawinclude_HEADERS = \
 	X11/Xaw/Viewport.h \
 	X11/Xaw/ViewportP.h \
 	X11/Xaw/XawImP.h \
-	X11/Xaw/XawInit.h \
-        $(xaw8_headers)
+	X11/Xaw/XawInit.h
diff --git a/xaw.m4 b/xaw.m4
deleted file mode 100644
index 60404ae..0000000
--- a/xaw.m4
+++ /dev/null
@@ -1,65 +0,0 @@
-dnl Copyright 2005 Red Hat, Inc
-dnl 
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation.
-dnl 
-dnl The above copyright notice and this permission notice shall be included
-dnl in all copies or substantial portions of the Software.
-dnl 
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-dnl OTHER DEALINGS IN THE SOFTWARE.
-dnl 
-dnl Except as contained in this notice, the name of the copyright holders shall
-dnl not be used in advertising or otherwise to promote the sale, use or
-dnl other dealings in this Software without prior written authorization
-dnl from the copyright holders.
-dnl 
-
-# XAW_CHECK_XPRINT_SUPPORT()
-# --------------------------
-# Adds --enable/disable-xprint and selects the appropriate version of the Xaw 
-# library. If neither --enable-xprint nor --disable-xprint are given, 
-# the presence of an Xaw with Xprint support will be auto detected
-
-AC_DEFUN([XAW_CHECK_XPRINT_SUPPORT],[
-	AC_ARG_ENABLE(xprint, AC_HELP_STRING([--enable-xprint], [Enable XPrint support]),
-			[use_xprint=$enableval],[use_xprint=auto])
-	if test "x$use_xprint" = "xyes"; then
-		TMP_CHECK1=xaw8
-		TMP_CHECK2=
-		xaw_use_xprint=yes
-	elif test "x$use_xprint" = "xno"; then
-		TMP_CHECK1=xaw7
-		TMP_CHECK2=
-		xaw_use_xprint=no
-	else
-		TMP_CHECK1=xaw8
-		TMP_CHECK2=xaw7
-		xaw_use_xprint=yes
-	fi
-
-	PKG_CHECK_MODULES(TMP_XAW, $TMP_CHECK1, success=yes, success=no)
-	if [[ ! -z $TMP_CHECK2 ]] ; then
-		if test $success = no ; then
-			PKG_CHECK_MODULES(TMP_XAW, $TMP_CHECK2, success=yes, success=no)
-			xaw_use_xprint=no
-		fi
-	fi
-
-	if test "x$success" = "xyes"; then
-		$1_CFLAGS=$TMP_XAW_CFLAGS
-		$1_LIBS=$TMP_XAW_LIBS
-
-		AM_CONDITIONAL([XAW_USE_XPRINT], [test "x$xaw_use_xprint" = "xyes"])
-	else
-		AC_MSG_ERROR([No suitable version of Xaw found])
-	fi
-])