--- libXaw-1.0.4/xaw.m4.orig	2007-10-29 11:55:14.000000000 -0200
+++ libXaw-1.0.4/xaw.m4	2007-10-29 11:59:28.000000000 -0200
@@ -25,35 +25,22 @@ 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
+# Adds --enable/disable-xprint to select the appropriate version of the Xaw 
+# If neither --enable-xprint nor --disable-xprint are given, 
+# defaults to --disable-xprint
 
 AC_DEFUN([XAW_CHECK_XPRINT_SUPPORT],[
 	AC_ARG_ENABLE(xprint, AC_HELP_STRING([--enable-xprint], [Enable XPrint support]),
-			[use_xprint=$enableval],[use_xprint=auto])
+			[use_xprint=$enableval],[use_xprint=no])
 	if test "x$use_xprint" = "xyes"; then
-		TMP_CHECK1=xaw8
-		TMP_CHECK2=
+		TMP_CHECK=xaw8
 		xaw_use_xprint=yes
-	elif test "x$use_xprint" = "xno"; then
-		TMP_CHECK1=xaw7
-		TMP_CHECK2=
+	else
+		TMP_CHECK=xaw7
 		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
 
+	PKG_CHECK_MODULES(TMP_XAW, $TMP_CHECK, success=yes, success=no)
 	if test "x$success" = "xyes"; then
 		$1_CFLAGS=$TMP_XAW_CFLAGS
 		$1_LIBS=$TMP_XAW_LIBS