X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetndelim2.m4;h=404b36d4f92778401de3a98a3f9511dd6ece99b4;hb=523067dbfb281d3cc27f65007a3893bd694c257d;hp=6715c53cd862366b1780eb07c2fd7c2723addf86;hpb=046192904daa36bfbe30eb7e263dd976346b9bd5;p=gnulib.git

diff --git a/m4/getndelim2.m4 b/m4/getndelim2.m4
index 6715c53cd..404b36d4f 100644
--- a/m4/getndelim2.m4
+++ b/m4/getndelim2.m4
@@ -1,14 +1,18 @@
-# getndelim2.m4 serial 1
+# getndelim2.m4 serial 4
 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.
+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],
 [
-  AC_LIBOBJ(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
 ])
 
@@ -17,6 +21,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.
 ])