striconveh: Simplify last commit.

[gnulib.git] / m4 / getusershell.m4

diff --git a/m4/getusershell.m4 b/m4/getusershell.m4
index fa13e86..b366486 100644 (file)
--- a/m4/getusershell.m4
+++ b/m4/getusershell.m4
@@ -1,4 +1,4 @@
-# getusershell.m4 serial 5
+# getusershell.m4 serial 6
 dnl Copyright (C) 2002-2003, 2006, 2008-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,
@@ -11,8 +11,17 @@ AC_DEFUN([gl_FUNC_GETUSERSHELL],
   dnl Persuade glibc <unistd.h> to declare {get,set,end}usershell().
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
-  AC_REPLACE_FUNCS([getusershell])
-  if test $ac_cv_func_getusershell = no; then
-    HAVE_GETUSERSHELL=0
+  dnl Check whether the getusershell function exists.
+  AC_CHECK_FUNCS_ONCE([getusershell])
+  if test $ac_cv_func_getusershell = yes; then
+    dnl Check whether getusershell is declared.
+    AC_CHECK_DECLS([getusershell])
+    if test $ac_cv_have_decl_getusershell = no; then
+      HAVE_DECL_GETUSERSHELL=0
+    fi
+  else
+    AC_LIBOBJ([getusershell])
+    dnl Assume that on platforms which declare it, the function exists.
+    HAVE_DECL_GETUSERSHELL=0
   fi
 ])