X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetline.m4;h=697a82ee47403923a3f0e9870e65aa31e5c71c11;hb=d892db3d13ca813a724b0a508dde06de6efd424c;hp=3564472606e0272610bfb46913bddcd50b0f8553;hpb=409d8f2d902cc6e12e40b08200f5dac27d0e98cb;p=gnulib.git

diff --git a/m4/getline.m4 b/m4/getline.m4
index 356447260..697a82ee4 100644
--- a/m4/getline.m4
+++ b/m4/getline.m4
@@ -1,20 +1,20 @@
-#serial 1
+#serial 3
 
 dnl See if there's a working, system-supplied version of the getline function.
-dnl We can't just to AC_REPLACE_FUNCS(getline) because some systems
+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,
 [dnl
   am_getline_needs_run_time_check=no
-  am_cv_func_working_getline=yes
   AC_CHECK_FUNC(getline,
 		dnl Found it in some library.  Verify that it works.
 		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>
@@ -26,7 +26,7 @@ AC_DEFUN(AM_FUNC_GETLINE,
       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 +39,7 @@ AC_DEFUN(AM_FUNC_GETLINE,
   fi
 
   if test $am_cv_func_working_getline = no; then
-    LIBOBJS="$LIBOBJS getline.o"
+    LIBOBJS="$LIBOBJS getline.$ac_objext"
     AC_SUBST(LIBOBJS)dnl
   fi
 ])