X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetline.m4;h=56960c9371c2c774436b055be9cf670f9e283e4c;hb=2544ecc3ffdc44a0209c951cac5267d134352780;hp=b5943918c78534aa5d438145cfe9fad9e8c147eb;hpb=a6d083f4c5eee3caf460558c16090cc0e340aa78;p=gnulib.git

diff --git a/m4/getline.m4 b/m4/getline.m4
index b5943918c..56960c937 100644
--- a/m4/getline.m4
+++ b/m4/getline.m4
@@ -1,4 +1,4 @@
-# getline.m4 serial 8
+# getline.m4 serial 10
 
 dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software
 dnl Foundation, Inc.
@@ -56,13 +56,21 @@ AC_DEFUN([AM_FUNC_GETLINE],
     AC_DEFINE([getline], [gnu_getline],
       [Define to a replacement function name for getline().])
     AC_LIBOBJ(getline)
+
+    # 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_GETLINE
+    gl_PREREQ_GETNDELIM2
   fi
 ])
 
 # Prerequisites of lib/getline.c.
 AC_DEFUN([gl_PREREQ_GETLINE],
 [
-  AC_REQUIRE([AC_HEADER_STDC])
   AC_CHECK_FUNCS(getdelim)
 ])