Don't include getndelim2.o twice into LIBOBJS.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 13f4349..3ea1e5d 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,12 @@
+2003-10-23  Paul Eggert  <eggert@twinsun.com>
+
+       * getline.m4 (AM_FUNC_GETLINE):
+       Don't include getndelim2.o twice into LIBOBJS; this breaks on some
+       hosts.  Problem reported by Derek Robert Price in
+       <http://mail.gnu.org/archive/html/bug-gnulib/2003-10/msg00092.html>.
+       This patch can be withdrawn after Autoconf 2.58 is required for gnulib.
+       * getndelim2.m4 (gl_GETNDELIM2): Likewise.
+
 2003-10-20  Bruno Haible  <bruno@clisp.org>
 
        * wait-process.m4: New file.
@@ -34,7 +43,7 @@
        Don't define stpncpy through config.h; it's now done through stpncpy.h.
 
 2003-09-25  Simon Josefsson  <jas@extundo.com>
-            Bruno Haible  <bruno@clisp.org>
+           Bruno Haible  <bruno@clisp.org>
 
        * getdomainname.m4: New file.
 
@@ -330,7 +339,7 @@
        * jm-winsz1.m4: Require AC_SYS_POSIX_TERMIOS, not AM_SYS_POSIX_TERMIOS.
        Reported by mkc@mathdogs.com.
        Also change use of $am_cv_sys_posix_termios
-       to $ac_cv_sys_posix_termios.   Reported by Andreas Schwab.
+       to $ac_cv_sys_posix_termios.  Reported by Andreas Schwab.
        * getgroups.m4 (jm_FUNC_GETGROUPS): Rewrite to use AC_FUNC_GETGROUPS
        and (if needed) to call AC_LIBOBJ and to set GETGROUPS_LIB.
        * fsusage.m4 [__GLIBC__]: GNU libc's statvfs stats each mount point in
@@ -1804,7 +1813,7 @@
 
 2001-03-20  Bruno Haible  <haible@clisp.cons.org>
 
-        * iconv.m4 (jm_ICONV): Recommend GNU libiconv.
+       * iconv.m4 (jm_ICONV): Recommend GNU libiconv.
 
 2001-03-17  Jim Meyering  <meyering@lucent.com>
 

diff --git a/m4/getline.m4 b/m4/getline.m4
index 606a989..56960c9 100644 (file)
--- a/m4/getline.m4
+++ b/m4/getline.m4
@@ -1,4 +1,4 @@
-# getline.m4 serial 9
+# getline.m4 serial 10
 
 dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software
 dnl Foundation, Inc.
@@ -56,7 +56,14 @@ AC_DEFUN([AM_FUNC_GETLINE],
     AC_DEFINE([getline], [gnu_getline],
       [Define to a replacement function name for getline().])
     AC_LIBOBJ(getline)
-    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_GETLINE
     gl_PREREQ_GETNDELIM2
   fi

diff --git a/m4/getndelim2.m4 b/m4/getndelim2.m4
index ce89321..cd4ef4b 100644 (file)
--- a/m4/getndelim2.m4
+++ b/m4/getndelim2.m4
@@ -1,4 +1,4 @@
-# getndelim2.m4 serial 2
+# 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,7 +8,13 @@ dnl the same distribution terms as the rest of that program.
 
 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
 ])