X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetline.m4;h=d19e56386717afbdee1c9feb180190da15c7c38e;hb=6c402a170cdd5d7cc162a6344f86488821a02e25;hp=2fd393f0cbffa7b163f9477bf7905e3b83e1a4fc;hpb=06da13180bc1ed8a7ba481ab3308465fdedb649b;p=gnulib.git

diff --git a/m4/getline.m4 b/m4/getline.m4
index 2fd393f0c..d19e56386 100644
--- a/m4/getline.m4
+++ b/m4/getline.m4
@@ -1,10 +1,10 @@
-#serial 2
+#serial 5
 
 dnl See if there's a working, system-supplied version of the getline function.
 dnl We can't just do AC_REPLACE_FUNCS(getline) because some systems
 dnl have a function by that name in -linet that doesn't have anything
 dnl to do with the function we need.
-AC_DEFUN(AM_FUNC_GETLINE,
+AC_DEFUN([AM_FUNC_GETLINE],
 [dnl
   am_getline_needs_run_time_check=no
   AC_CHECK_FUNC(getline,
@@ -12,21 +12,18 @@ AC_DEFUN(AM_FUNC_GETLINE,
 		am_getline_needs_run_time_check=yes,
 		am_cv_func_working_getline=no)
   if test $am_getline_needs_run_time_check = yes; then
-    AC_CHECK_HEADERS(string.h)
     AC_CACHE_CHECK([for working getline function], am_cv_func_working_getline,
-    [echo fooN |tr -d '\012'|tr N '\012' > conftestdata
+    [echo fooN |tr -d '\012'|tr N '\012' > conftest.data
     AC_TRY_RUN([
 #    include <stdio.h>
 #    include <sys/types.h>
-#    if HAVE_STRING_H
-#     include <string.h>
-#    endif
+#    include <string.h>
     int main ()
     { /* Based on a test program from Karl Heuer.  */
       char *line = NULL;
       size_t siz = 0;
       int len;
-      FILE *in = fopen ("./conftestdata", "r");
+      FILE *in = fopen ("./conftest.data", "r");
       if (!in)
 	return 1;
       len = getline (&line, &siz, in);
@@ -39,7 +36,6 @@ AC_DEFUN(AM_FUNC_GETLINE,
   fi
 
   if test $am_cv_func_working_getline = no; then
-    LIBOBJS="$LIBOBJS getline.o"
-    AC_SUBST(LIBOBJS)dnl
+    AC_LIBOBJ(getline)
   fi
 ])