gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / m4 / getsubopt.m4

diff --git a/m4/getsubopt.m4 b/m4/getsubopt.m4
index a390a93..4bcfd7f 100644 (file)
--- a/m4/getsubopt.m4
+++ b/m4/getsubopt.m4
@@ -1,5 +1,5 @@
-# getsubopt.m4 serial 3
-dnl Copyright (C) 2004, 2007 Free Software Foundation, Inc.
+# getsubopt.m4 serial 5
+dnl Copyright (C) 2004, 2007, 2009-2013 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,14 +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_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
 ])