--- a/m4/sysexits.m4
+++ b/m4/sysexits.m4
@@ -1,13 +1,45 @@
-# sysexits.m4 serial 2
-dnl Copyright (C) 2003,2005 Free Software Foundation, Inc.
+# sysexits.m4 serial 3
+dnl Copyright (C) 2003, 2005, 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_SYSEXITS],
 [
-  AC_CHECK_HEADERS(sysexits.h,
-    [SYSEXITS_H=],
-    [SYSEXITS_H=sysexits.h])
+  AC_CHECK_HEADERS_ONCE([sysexits.h])
+  if test $ac_cv_header_sysexits_h = yes; then
+    HAVE_SYSEXITS_H=1
+    gl_ABSOLUTE_HEADER([sysexits.h])
+    ABSOLUTE_SYSEXITS_H=\"$gl_cv_absolute_sysexits_h\"
+    AC_TRY_COMPILE([#include <sysexits.h>],
+      [switch (0)
+       {
+       case EX_OK:
+       case EX_USAGE:
+       case EX_DATAERR:
+       case EX_NOINPUT:
+       case EX_NOUSER:
+       case EX_NOHOST:
+       case EX_UNAVAILABLE:
+       case EX_SOFTWARE:
+       case EX_OSERR:
+       case EX_OSFILE:
+       case EX_CANTCREAT:
+       case EX_IOERR:
+       case EX_TEMPFAIL:
+       case EX_PROTOCOL:
+       case EX_NOPERM:
+       case EX_CONFIG:
+         break;
+       }
+      ],
+      [SYSEXITS_H=],
+      [SYSEXITS_H=sysexits.h])
+  else
+    HAVE_SYSEXITS_H=0
+    SYSEXITS_H=sysexits.h
+  fi
+  AC_SUBST([HAVE_SYSEXITS_H])
+  AC_SUBST([ABSOLUTE_SYSEXITS_H])
   AC_SUBST([SYSEXITS_H])
 ])