X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fpopen.m4;h=c958f1950e7f624e13ead79db1a7dd1635b42e5f;hb=531e3287a33c005edeeba10b0ab0910c6686e049;hp=5a12b87f0a13f5ad2a76334e036d4d83cf11df7d;hpb=136edbc25f2c86265b6931a58eb4ad0bf290945a;p=gnulib.git

diff --git a/m4/popen.m4 b/m4/popen.m4
index 5a12b87f0..c958f1950 100644
--- a/m4/popen.m4
+++ b/m4/popen.m4
@@ -1,5 +1,5 @@
-# popen.m4 serial 2
-dnl Copyright (C) 2009 Free Software Foundation, Inc.
+# popen.m4 serial 5
+dnl Copyright (C) 2009-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.
@@ -7,23 +7,35 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_POPEN],
 [
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-  AC_CACHE_CHECK([whether popen works with closed stdin],
-    [gl_cv_func_popen_works],
-    [
-      AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
-]], [FILE *child;
-     fclose (stdin);
-     fclose (stdout);
-     child = popen ("echo a", "r");
-     return !(fgetc (child) == 'a' && pclose (child) == 0);
-])], [gl_cv_func_popen_works=yes], [gl_cv_func_popen_works=no],
-     dnl For now, only cygwin 1.5 or older is known to be broken.
-     [gl_cv_func_popen_works='guessing yes'])
-  ])
-  if test "$gl_cv_func_popen_works" = no; then
-    REPLACE_POPEN=1
-    AC_LIBOBJ([popen])
-    gl_PREREQ_POPEN
+  AC_CHECK_FUNCS_ONCE([popen])
+  if test $ac_cv_func_popen = no; then
+    HAVE_POPEN=0
+  else
+    AC_CACHE_CHECK([whether popen works with closed stdin],
+      [gl_cv_func_popen_works],
+      [
+        AC_RUN_IFELSE(
+          [AC_LANG_PROGRAM(
+             [[#include <stdio.h>]],
+             [[int result = 0;
+               FILE *child;
+               fclose (stdin);
+               fclose (stdout);
+               child = popen ("echo a", "r");
+               if (fgetc (child) != 'a')
+                 result |= 1;
+               if (pclose (child) != 0)
+                 result |= 2;
+               return result;
+             ]])],
+          [gl_cv_func_popen_works=yes],
+          [gl_cv_func_popen_works=no],
+          dnl For now, only cygwin 1.5 or older is known to be broken.
+          [gl_cv_func_popen_works='guessing yes'])
+      ])
+    if test "$gl_cv_func_popen_works" = no; then
+      REPLACE_POPEN=1
+    fi
   fi
 ])