diff --git a/ChangeLog b/ChangeLog
index 0d19a5cf3..9168b112c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-14  David Shaw  <dshaw@jabberwocky.com>
+
+	* configure.ac: Check for sigset_t and struct sigaction.  This is
+	for Forte c89 on Solaris which seems to define only the function
+	call half of the two pairs by default.
+
 2003-05-28  David Shaw  <dshaw@jabberwocky.com>
 
 	* NEWS: Document --gnupg and the deprecation of --no-openpgp and
diff --git a/configure.ac b/configure.ac
index f1818a495..1283163f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -604,8 +604,12 @@ AC_CHECK_FUNCS(memmove gettimeofday getrusage setrlimit clock_gettime)
 AC_CHECK_FUNCS(atexit raise getpagesize strftime nl_langinfo setlocale)
 AC_CHECK_FUNCS(waitpid wait4 sigaction sigprocmask rand pipe stat)
 AC_REPLACE_FUNCS(mkdtemp)
+AC_CHECK_TYPES([struct sigaction, sigset_t],,,[#include <signal.h>])
+
+# See if getopt is in libiberty.  This is of course not optimal since
+# it might be somewhere other than libiberty, but does cover the
+# mingw32 case.
 
-dnl see if getopt is in libiberty
 AC_CHECK_FUNC(getopt,,AC_CHECK_LIB(iberty,getopt,AC_SUBST(GETOPT,"-liberty")))
 
 #