X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fsysexits.m4;h=b3baa51ca863a05662118774c9c9a2f1dd54304e;hb=89d7698a351cd36d0e7baa44ee4bea3cf56cf459;hp=17d5aeef0950021336324634776eb39840942f34;hpb=af7308e5e6af8afd55c64386f23977070f8aa657;p=gnulib.git

diff --git a/m4/sysexits.m4 b/m4/sysexits.m4
index 17d5aeef0..b3baa51ca 100644
--- a/m4/sysexits.m4
+++ b/m4/sysexits.m4
@@ -1,5 +1,5 @@
-# sysexits.m4 serial 3
-dnl Copyright (C) 2003, 2005, 2007 Free Software Foundation, Inc.
+# sysexits.m4 serial 5
+dnl Copyright (C) 2003, 2005, 2007, 2009, 2010 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.
@@ -9,30 +9,29 @@ AC_DEFUN([gl_SYSEXITS],
   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;
-       }
-      ],
+    gl_CHECK_NEXT_HEADERS([sysexits.h])
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#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
@@ -40,6 +39,5 @@ AC_DEFUN([gl_SYSEXITS],
     SYSEXITS_H=sysexits.h
   fi
   AC_SUBST([HAVE_SYSEXITS_H])
-  AC_SUBST([ABSOLUTE_SYSEXITS_H])
   AC_SUBST([SYSEXITS_H])
 ])