--- embedaddon/libiconv/srcm4/signalblocking.m4	2012/02/21 22:57:49	1.1.1.1
+++ embedaddon/libiconv/srcm4/signalblocking.m4	2012/05/29 09:29:44	1.1.1.2
@@ -1,5 +1,5 @@
-# signalblocking.m4 serial 10
-dnl Copyright (C) 2001-2002, 2006-2009 Free Software Foundation, Inc.
+# signalblocking.m4 serial 12
+dnl Copyright (C) 2001-2002, 2006-2011 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.
@@ -12,31 +12,14 @@ dnl with or without modifications, as long as this not
 AC_DEFUN([gl_SIGNALBLOCKING],
 [
   AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
-  signals_not_posix=
-  AC_EGREP_HEADER([sigset_t], [signal.h], , [signals_not_posix=1])
-  if test -z "$signals_not_posix"; then
+  AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T])
+  if test $gl_cv_type_sigset_t = yes; then
     AC_CHECK_FUNC([sigprocmask], [gl_cv_func_sigprocmask=1])
   fi
   if test -z "$gl_cv_func_sigprocmask"; then
     HAVE_POSIX_SIGNALBLOCKING=0
-    AC_LIBOBJ([sigprocmask])
-    gl_PREREQ_SIGPROCMASK
   fi
 ])
 
-# Prerequisites of the part of lib/signal.in.h and of lib/sigprocmask.c.
-AC_DEFUN([gl_PREREQ_SIGPROCMASK],
-[
-  AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
-  AC_CHECK_TYPES([sigset_t],
-    [gl_cv_type_sigset_t=yes], [gl_cv_type_sigset_t=no],
-    [#include <signal.h>
-/* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.  */
-#include <sys/types.h>])
-  if test $gl_cv_type_sigset_t != yes; then
-    HAVE_SIGSET_T=0
-  fi
-  dnl HAVE_SIGSET_T is 1 if the system lacks the sigprocmask function but has
-  dnl the sigset_t type.
-  AC_SUBST([HAVE_SIGSET_T])
-])
+# Prerequisites of lib/sigprocmask.c.
+AC_DEFUN([gl_PREREQ_SIGPROCMASK], [:])