CVS gsasl/gl/m4

[gsasl-commit]

Update of /home/cvs/gsasl/gl/m4
In directory dopio:/tmp/cvs-serv17017/gl/m4

Modified Files:
        gnulib-comp.m4 gnulib-tool.m4 readline.m4 socklen.m4 
Log Message:
Update.

--- /home/cvs/gsasl/gl/m4/gnulib-comp.m4        2005/12/16 14:30:47     1.6
+++ /home/cvs/gsasl/gl/m4/gnulib-comp.m4        2006/01/10 15:47:17     1.7
@@ -18,6 +18,7 @@
 # any checks for libraries, header files, types and library functions.
 AC_DEFUN([gl_EARLY],
 [
+  AC_REQUIRE([AC_PROG_RANLIB])
   AC_REQUIRE([AC_GNU_SOURCE])
 ])
 
@@ -25,7 +26,7 @@
 # "Check for header files, types and library functions".
 AC_DEFUN([gl_INIT],
 [
-AM_CONDITIONAL([GL_COND_LIBTOOL], [true])
+  AM_CONDITIONAL([GL_COND_LIBTOOL], [true])
   gl_ERROR
   gl_EXITFAIL
   gl_GETADDRINFO
--- /home/cvs/gsasl/gl/m4/gnulib-tool.m4        2005/09/08 13:54:13     1.1
+++ /home/cvs/gsasl/gl/m4/gnulib-tool.m4        2006/01/10 15:47:17     1.2
@@ -1,5 +1,5 @@
-# gnulib-tool.m4 serial 1
-dnl Copyright (C) 2004-2005 Free Software Foundation, Inc.
+# gnulib-tool.m4 serial 2
+dnl Copyright (C) 2004-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.
@@ -20,6 +20,9 @@
 dnl Usage: gl_M4_BASE([DIR])
 AC_DEFUN([gl_M4_BASE], [])
 
+dnl Usage: gl_AUX_BASE([DIR])
+AC_DEFUN([gl_AUX_BASE], [])
+
 dnl Usage: gl_LIB([LIBNAME])
 AC_DEFUN([gl_LIB], [])
 
--- /home/cvs/gsasl/gl/m4/readline.m4   2005/08/12 08:05:09     1.7
+++ /home/cvs/gsasl/gl/m4/readline.m4   2006/01/10 15:47:17     1.8
@@ -1,4 +1,4 @@
-# readline.m4 serial 2
+# readline.m4 serial 3
 dnl Copyright (C) 2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -29,7 +29,12 @@
   AC_CACHE_CHECK(for readline, gl_cv_lib_readline, [
     gl_cv_lib_readline=no
     am_save_LIBS="$LIBS"
-    for extra_lib in "" termcap curses ncurses; do
+    dnl On some systems, -lreadline doesn't link without an additional
+    dnl -lncurses or -ltermcap.
+    dnl Try -lncurses before -ltermcap, because libtermcap is unsecure
+    dnl by design and obsolete since 1994. Try -lcurses last, because
+    dnl libcurses is unusable on some old Unices.
+    for extra_lib in "" ncurses termcap curses; do
       LIBS="$am_save_LIBS $LIBREADLINE"
       if test -n "$extra_lib"; then
         LIBS="$LIBS -l$extra_lib"
--- /home/cvs/gsasl/gl/m4/socklen.m4    2005/12/25 16:16:11     1.3
+++ /home/cvs/gsasl/gl/m4/socklen.m4    2006/01/10 15:47:17     1.4
@@ -1,5 +1,5 @@
 # socklen.m4 serial 3
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 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.
@@ -39,8 +39,7 @@
          done
       ])
       if test "$gl_cv_socklen_t_equiv" = ""; then
-       AC_MSG_WARN([Cannot find a type to use in place of socklen_t, using 
int...])
-       gl_cv_socklen_t_equiv=int
+       AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
       fi
       AC_MSG_RESULT([$gl_cv_socklen_t_equiv])
       AC_DEFINE_UNQUOTED([socklen_t], [$gl_cv_socklen_t_equiv],