X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fgetsubopt.m4;h=8adf311565173978551896d02a4c88e2beee7311;hb=8308b9eb6f9aac709f37c0ef5bd136ec9effe0ad;hp=9b87e7c83a2b10b24e19d273c9bcd9f95e50a20a;hpb=0d2a1de66874d543cd0d9bec1a799da3faf33813;p=gnulib.git

diff --git a/m4/getsubopt.m4 b/m4/getsubopt.m4
index 9b87e7c83..8adf31156 100644
--- a/m4/getsubopt.m4
+++ b/m4/getsubopt.m4
@@ -1,18 +1,19 @@
-# getsubopt.m4 serial 1
-dnl Copyright (C) 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# getsubopt.m4 serial 4
+dnl Copyright (C) 2004, 2007, 2009, 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,
+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
+    HAVE_GETSUBOPT=0
+    AC_LIBOBJ([getsubopt])
     gl_PREREQ_GETSUBOPT
   fi
 ])