X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetline.m4;h=d19e56386717afbdee1c9feb180190da15c7c38e;hb=ca72a0103a972623842c3933a2e5a30d2622e6d7;hp=697a82ee47403923a3f0e9870e65aa31e5c71c11;hpb=a5bf0f66ca5303ae33d787e8e4942fb28806df7c;p=gnulib.git

diff --git a/m4/getline.m4 b/m4/getline.m4
index 697a82ee4..d19e56386 100644
--- a/m4/getline.m4
+++ b/m4/getline.m4
@@ -1,10 +1,10 @@
-#serial 3
+#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,15 +12,12 @@ 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' > 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;
@@ -39,7 +36,6 @@ AC_DEFUN(AM_FUNC_GETLINE,
   fi
 
   if test $am_cv_func_working_getline = no; then
-    LIBOBJS="$LIBOBJS getline.$ac_objext"
-    AC_SUBST(LIBOBJS)dnl
+    AC_LIBOBJ(getline)
   fi
 ])