X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fmkfifo.m4;h=3c88e622eba32b65b5268a5d1bdb2a1f42fa7538;hb=80a029602f5b2707ca8d2487843ecb9e0df74a6a;hp=fc8044ea39143186994dc28cc3112f8c1b3bc497;hpb=08166afd7322d40407cf62e3c98b97782d7d1af0;p=gnulib.git

diff --git a/m4/mkfifo.m4 b/m4/mkfifo.m4
index fc8044ea3..3c88e622e 100644
--- a/m4/mkfifo.m4
+++ b/m4/mkfifo.m4
@@ -1,7 +1,7 @@
-# serial 1
+# serial 3
 # See if we need to provide mkfifo replacement.
 
-dnl Copyright (C) 2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2012 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.
@@ -14,7 +14,6 @@ AC_DEFUN([gl_FUNC_MKFIFO],
   AC_CHECK_FUNCS_ONCE([mkfifo])
   if test $ac_cv_func_mkfifo = no; then
     HAVE_MKFIFO=0
-    AC_LIBOBJ([mkfifo])
   else
     dnl Check for Solaris 9 and FreeBSD bug with trailing slash.
     AC_CHECK_FUNCS_ONCE([lstat])
@@ -27,10 +26,15 @@ AC_DEFUN([gl_FUNC_MKFIFO],
        AC_RUN_IFELSE(
          [AC_LANG_PROGRAM(
            [[#include <sys/stat.h>
-]], [[if (!mkfifo ("conftest.tmp/", 0600)) return 1;
+           ]],
+           [[int result = 0;
+             if (!mkfifo ("conftest.tmp/", 0600))
+               result |= 1;
 #if HAVE_LSTAT
-      if (!mkfifo ("conftest.lnk/", 0600)) return 2;
+             if (!mkfifo ("conftest.lnk/", 0600))
+               result |= 2;
 #endif
+             return result;
            ]])],
          [gl_cv_func_mkfifo_works=yes], [gl_cv_func_mkfifo_works=no],
          [gl_cv_func_mkfifo_works="guessing no"])
@@ -39,7 +43,6 @@ AC_DEFUN([gl_FUNC_MKFIFO],
       AC_DEFINE([MKFIFO_TRAILING_SLASH_BUG], [1], [Define to 1 if mkfifo
         does not reject trailing slash])
       REPLACE_MKFIFO=1
-      AC_LIBOBJ([mkfifo])
     fi
   fi
 ])