X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetsubopt.m4;h=55389414d1bae49cf1466b696cf2ffa43e8e0349;hb=dcf27bef48c9800d5a2be8349226f73f1b8ff2e5;hp=4c479e0a5da3b0069d105bf29ad37cec2572d3cc;hpb=44d7c1c1f004fa9bfb8ec3948de2671a7958cf5b;p=gnulib.git

diff --git a/m4/getsubopt.m4 b/m4/getsubopt.m4
index 4c479e0a5..55389414d 100644
--- a/m4/getsubopt.m4
+++ b/m4/getsubopt.m4
@@ -1,5 +1,5 @@
-# getsubopt.m4 serial 2
-dnl Copyright (C) 2004 Free Software Foundation, Inc.
+# getsubopt.m4 serial 5
+dnl Copyright (C) 2004, 2007, 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.
@@ -7,11 +7,12 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_GETSUBOPT],
 [
   dnl Persuade glibc <stdlib.h> to declare getsubopt().
-  AC_REQUIRE([AC_GNU_SOURCE])
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
-  AC_REPLACE_FUNCS(getsubopt)
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_CHECK_FUNCS_ONCE([getsubopt])
   if test $ac_cv_func_getsubopt = no; then
-    gl_PREREQ_GETSUBOPT
+    HAVE_GETSUBOPT=0
   fi
 ])