Re: getline AC_LIBOBJs

[Derek Robert Price]

Paul Eggert wrote:

>Derek Robert Price <address@hidden> writes:
>
>>Solution 1 is easiest and I would like to see it in GNULIB soon since an
>>Autoconf fix would take awhile to show up.  Does anyone have any better
>>ideas or would this be committed were I to implement it?  My paperwork
>>is done.
>
>
>Sounds reasonable.


Attached.

>>I'll volunteer to write solution 2
>
>
>That also sounds reasonable.  But wouldn't you modify AC_LIBOBJ directly?
>I don't see any reason for it to include the same object module twice.


Yeah.  I started writing this email for GNULIB and then chopped it up 
and reorganized it without sufficient editing when I decided to CC autoconf.

In any case, it appears Akim handled the Autoconf fix using solution 3.  
I've noted that my changes to GNULIB won't be required after GNULIB 
requires Autoconf 2.58 in comments.


2003-10-23  Derek Robert Price  <address@hidden>

   * getndelim2.m4 (gl_GETNDELIM2): Only allow AC_LIBOBJ(getndelim2) to 
be called
   once.
   * getline.m4 (gl_GETLINE): Use gl_GETNDELIM2 rather than calling
   AC_LIBOBJ(getndelim2) directly.


Index: m4/getline.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/getline.m4,v
retrieving revision 1.12
diff -u -r1.12 getline.m4
--- m4/getline.m4    18 Jul 2003 16:58:06 -0000    1.12
+++ m4/getline.m4    23 Oct 2003 15:05:56 -0000
@@ -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,9 +56,17 @@
    AC_DEFINE([getline], [gnu_getline],
      [Define to a replacement function name for getline().])
    AC_LIBOBJ(getline)
-    AC_LIBOBJ(getndelim2)
    gl_PREREQ_GETLINE
-    gl_PREREQ_GETNDELIM2
+    dnl The following lines used to be here:
+    dnl
+    dnl   AC_LIBOBJ(getndelim2)
+    dnl   gl_PREREQ_GETNDELIM2
+    dnl
+    dnl The fix to Autoconf that forbids multiple inclusions in LIBOBJ 
of the
+    dnl same filename went in before release 2.58, so after GNULIB requires
+    dnl Autoconf 2.58 or greater, the following line can be removed and the
+    dnl above two restored.
+    gl_GETNDELIM2
  fi
])

Index: m4/getndelim2.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/getndelim2.m4,v
retrieving revision 1.3
diff -u -r1.3 getndelim2.m4
--- m4/getndelim2.m4    9 Sep 2003 07:31:58 -0000    1.3
+++ m4/getndelim2.m4    23 Oct 2003 15:05:56 -0000
@@ -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,14 @@

AC_DEFUN([gl_GETNDELIM2],
[
-  AC_LIBOBJ(getndelim2)
+  dnl The fix to Autoconf that forbids multiple inclusions in LIBOBJ of the
+  dnl same filename went in before release 2.58, so after GNULIB requires
+  dnl Autoconf 2.58 or greater, the variable set below and check to prevent
+  dnl running AC_LIBOBJ twice will no longer be necessary.
+  if test -z "$gl_getndelim2_invoked"; then
+    gl_getndelim2_invoked=:
+    AC_LIBOBJ(getndelim2)
+  fi
  gl_PREREQ_GETNDELIM2
])




Derek

--
               *8^)

Email: address@hidden

Get CVS support at <http://ximbiot.com>!
--
I will not cut corners.
"   "   "   "     "
"   "   "   "     "   ...

         - Bart Simpson on chalkboard, _The Simpsons_