gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / m4 / getndelim2.m4

diff --git a/m4/getndelim2.m4 b/m4/getndelim2.m4
index 404b36d..910cfaa 100644 (file)
--- a/m4/getndelim2.m4
+++ b/m4/getndelim2.m4
@@ -1,19 +1,14 @@
-# getndelim2.m4 serial 4
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+# getndelim2.m4 serial 8
+dnl Copyright (C) 2003, 2006, 2008-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.
 
 AC_DEFUN([gl_GETNDELIM2],
 [
-  # Avoid multiple inclusions of getndelim2.o into LIBOBJS.
-  # This hack won't be needed after gnulib requires Autoconf 2.58 or later.
-  case " $LIB@&t@OBJS " in
-  *" getndelim2.$ac_objext "* ) ;;
-  *) AC_LIBOBJ(getndelim2);;
-  esac
-
   gl_PREREQ_GETNDELIM2
+  AC_CHECK_FUNCS_ONCE([flockfile])
+  AC_CHECK_FUNCS_ONCE([funlockfile])
 ])
 
 # Prerequisites of lib/getndelim2.h and lib/getndelim2.c.