--- aclocal.m4.orig	Wed Jun  5 17:17:10 2002
+++ aclocal.m4	Wed Jun  5 19:20:49 2002
@@ -579,3 +579,28 @@
 			    `unsigned long long' if <inttypes.h> does not
 			    exist.])
 fi])dnl
+dnl
+dnl Test for working `long double'.
+dnl
+AC_DEFUN(GROFF_LONG_DOUBLE,
+[AC_LANG_PUSH(C++)
+AC_MSG_CHECKING([for long double])
+AC_TRY_LINK(,[long double ld; ld = 1.0L;],
+groff_cv_type_long_double=yes,
+groff_cv_type_long_double=no)
+AC_MSG_RESULT($groff_cv_type_long_double)
+AC_LANG_POP(C++)])dnl
+dnl
+dnl
+dnl Test for working `bool'.
+dnl
+AC_DEFUN(GROFF_BOOL,
+[AC_LANG_PUSH(C++)
+AC_MSG_CHECKING([for bool])
+AC_TRY_LINK(,[bool f; bool t;
+              f = (1==0); t = (1==1);
+              return (t == true) && (f == false);],
+groff_cv_type_bool=yes,
+groff_cv_type_bool=no)
+AC_MSG_RESULT($groff_cv_type_bool)
+AC_LANG_POP(C++)])dnl
--- configure.ac.orig	Sun May 26 11:32:24 2002
+++ configure.ac	Wed Jun  5 19:23:21 2002
@@ -25,6 +25,19 @@
 dnl checks for headers
 AC_CHECK_HEADERS(stdlib.h unistd.h dirent.h limits.h sys/dir.h \
                  string.h strings.h math.h stdint.h sys/time.h)
+dnl checks for further non-X header files
+AC_CHECK_HEADERS(assert.h config.h ctype.h errno.h fcntl.h getopt.h \
+                 gnu-versions.h groff-getopt.h io.h libintl.h osfcn.h \
+                 process.h signal.h stdarg.h stddef.h stdio.h \
+                 sys/mman.h sys/param.h sys/stat.h sys/types.h \
+                 sys/wait.h time.h unixlib.h wchar.h)
+dnl checks for X header files
+AC_CHECK_HEADERS(X11/Intrinsic.h X11/IntrinsicP.h X11/Shell.h \
+                 X11/StringDefs.h X11/Xatom.h X11/Xaw/Box.h \
+                 X11/Xaw/Command.h X11/Xaw/Dialog.h X11/Xaw/Label.h \
+                 X11/Xaw/Paned.h X11/Xaw/SimpleMenu.h X11/Xaw/SmeBSB.h \
+                 X11/Xaw/Viewport.h X11/Xlib.h X11/Xmu/Converters.h \
+                 X11/Xos.h,,HAVE_NOT_ALL_X_INCLUDES=1)
 GROFF_ISC_SYSV3
 GROFF_POSIX
 GROFF_SRAND
@@ -42,6 +55,8 @@
 GROFF_INTTYPES_H
 dnl checks for typedefs
 GROFF_UNSIGNED_LONG_LONG
+GROFF_LONG_DOUBLE
+GROFF_BOOL
 GROFF_UINTMAX_T
 GROFF_TIME_T
 AC_TYPE_SIGNAL