Remove 2003-10-23 hack.

diff --git a/ChangeLog b/ChangeLog
index 0724447c3b1504e62b2bdeae37641447d8a58163..8403d30ce3c4829311e45e7c71b7ead8bd5578e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-16  Bruno Haible  <bruno@clisp.org>
+
+       * getndelim2.m4 (gl_GETNDELIM2): Remove 2003-10-23 hack.
+
 2006-10-16  Bruno Haible  <bruno@clisp.org>
 
        * m4/signalblocking.m4 (gl_PREREQ_SIGPROCMASK): Also test for sigset_t.

diff --git a/m4/getndelim2.m4 b/m4/getndelim2.m4
index 404b36d4f92778401de3a98a3f9511dd6ece99b4..f0e7ae2c5f7956f31fcad1f1879d4a0a7ebe4fe6 100644 (file)
--- a/m4/getndelim2.m4
+++ b/m4/getndelim2.m4
@@ -1,18 +1,12 @@
-# getndelim2.m4 serial 4
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+# getndelim2.m4 serial 5
+dnl Copyright (C) 2003, 2006 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
 ])