X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetndelim2.m4;h=950d230b2c74265a477993a167017b207d472694;hb=1629006348e1f66f07ce3ddcf3ebd2d14556cfce;hp=cd4ef4b671a716676af8558767682cfee7ee2350;hpb=cb0ff6fd5914e7b0e9272324422fe7c725bfd5a0;p=gnulib.git

diff --git a/m4/getndelim2.m4 b/m4/getndelim2.m4
index cd4ef4b67..950d230b2 100644
--- a/m4/getndelim2.m4
+++ b/m4/getndelim2.m4
@@ -1,21 +1,15 @@
-# getndelim2.m4 serial 3
-dnl Copyright (C) 2003 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.
+# getndelim2.m4 serial 7
+dnl Copyright (C) 2003, 2006, 2008, 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_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
-
+  AC_LIBOBJ([getndelim2])
   gl_PREREQ_GETNDELIM2
+  AC_CHECK_FUNCS_ONCE([flockfile])
+  AC_CHECK_FUNCS_ONCE([funlockfile])
 ])
 
 # Prerequisites of lib/getndelim2.h and lib/getndelim2.c.