X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetndelim2.m4;h=950d230b2c74265a477993a167017b207d472694;hb=e69a17d02ee0bc09acf4498515fd6934160c9923;hp=404b36d4f92778401de3a98a3f9511dd6ece99b4;hpb=44d7c1c1f004fa9bfb8ec3948de2671a7958cf5b;p=gnulib.git

diff --git a/m4/getndelim2.m4 b/m4/getndelim2.m4
index 404b36d4f..950d230b2 100644
--- a/m4/getndelim2.m4
+++ b/m4/getndelim2.m4
@@ -1,19 +1,15 @@
-# getndelim2.m4 serial 4
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+# 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.