X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetndelim2.m4;h=cd4ef4b671a716676af8558767682cfee7ee2350;hb=ea9f84c5f1468ca1204077db881ef9f7d25205b6;hp=db483281e1c4afe193fa32209314553505163c70;hpb=a77fc1328324ba9f5b8466376aa668d76d4972e0;p=gnulib.git

diff --git a/m4/getndelim2.m4 b/m4/getndelim2.m4
index db483281e..cd4ef4b67 100644
--- a/m4/getndelim2.m4
+++ b/m4/getndelim2.m4
@@ -1,4 +1,4 @@
-# getndelim2.m4 serial 1
+# 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
@@ -8,6 +8,13 @@ dnl the same distribution terms as the rest of that program.
 
 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
 ])
 
@@ -16,6 +23,5 @@ AC_DEFUN([gl_PREREQ_GETNDELIM2],
 [
   dnl Prerequisites of lib/getndelim2.h.
   AC_REQUIRE([gt_TYPE_SSIZE_T])
-  dnl Prerequisites of lib/getndelim2.c.
-  AC_REQUIRE([AC_HEADER_STDC])
+  dnl No prerequisites of lib/getndelim2.c.
 ])