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

diff --git a/m4/getsubopt.m4 b/m4/getsubopt.m4
index 4c479e0a5..2c52c754d 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 4
+dnl Copyright (C) 2004, 2007 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,10 +7,13 @@ 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
 ])