X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Funlink-busy.m4;h=f5739c2a9af59df5253c71b1e761e3d6d1abe2bb;hb=9f60473985e5f20c3efabadf2c1756b5ff560458;hp=cdc5f74a0a367b2e2171e5971c50f3e9c43f5639;hpb=bde2cf6e66fb33fe07638ec0045d6c04d110a226;p=gnulib.git

diff --git a/m4/unlink-busy.m4 b/m4/unlink-busy.m4
index cdc5f74a0..f5739c2a9 100644
--- a/m4/unlink-busy.m4
+++ b/m4/unlink-busy.m4
@@ -1,10 +1,10 @@
-#serial 10
+#serial 12
 
 dnl From J. David Anglin.
 
 dnl HPUX and other systems can't unlink shared text that is being executed.
 
-# Copyright (C) 2000, 2001, 2004, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2004, 2007, 2009-2011 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -12,24 +12,29 @@ dnl HPUX and other systems can't unlink shared text that is being executed.
 AC_DEFUN([gl_FUNC_UNLINK_BUSY_TEXT],
 [dnl
   AC_CACHE_CHECK([whether a running program can be unlinked],
-    jm_cv_func_unlink_busy_text,
+    gl_cv_func_unlink_busy_text,
     [
       AC_RUN_IFELSE(
         [AC_LANG_SOURCE(
-           [AC_INCLUDES_DEFAULT
-	    int
-	    main (int argc, char **argv)
-	    {
-	      return !argc || unlink (argv[0]) != 0;
-	    }])],
-      jm_cv_func_unlink_busy_text=yes,
-      jm_cv_func_unlink_busy_text=no,
-      jm_cv_func_unlink_busy_text=no
+           [AC_INCLUDES_DEFAULT[
+            int
+            main (int argc, char **argv)
+            {
+              int result = 0;
+              if (argc == 0)
+                result |= 1;
+              else if (unlink (argv[0]) != 0)
+                result |= 2;
+              return result;
+            }]])],
+      gl_cv_func_unlink_busy_text=yes,
+      gl_cv_func_unlink_busy_text=no,
+      gl_cv_func_unlink_busy_text=no
       )
     ]
   )
 
-  if test $jm_cv_func_unlink_busy_text = no; then
+  if test $gl_cv_func_unlink_busy_text = no; then
     INSTALL=$ac_install_sh
   fi
 ])