On Thu, Jan 15, 2004 at 09:51:22AM +0300, Alexander V. Lukyanov wrote:
> What's new:
Had some trouble building from CVS:
automake outputs:
Makefile.am:3: AM_GNU_GETTEXT in `configure.ac' but `intl' not in SUBDIRS
src/Makefile.am:42: variable `SOCKSLIBS' not defined
The second is just an AC_SUBST. I'm not sure about the first, but it's
apparently not fatal.
My system has socklen_t, and socklen.m4 is defining lftp_socklen_t to nothing,
instead of leaving it undefined.
buffer.cc is missing <errno.h>.
buffer.cc:307: error: invalid conversion from `const char**' to `char**'
iconv takes a char**, not const char**.
Now I'm getting
make: *** No rule to make target `libpty.la', needed by `all-am'. Stop.
I don't feel like stepping through libtool (this is why I hate libtool;
it's brittle and impossible to diagnose). If config.log or something
will help, let me know.
--
Glenn Maynard
Index: configure.ac
===================================================================
RCS file: /home/lav/cvsroot/lftp/configure.ac,v
retrieving revision 1.19
diff -p -u -r1.19 configure.ac
--- configure.ac 17 Dec 2003 08:33:52 -0000 1.19
+++ configure.ac 15 Jan 2004 08:22:10 -0000
@@ -162,6 +162,7 @@ if test x$with_socksdante = xyes; then
AC_CHECK_LIB(socks, main, [SOCKSLIBS=-lsocks],
[AC_MSG_ERROR(cannot find -lsocks library)])
fi
+AC_SUBST(SOCKSLIBS)
LIBS="$LIBS $SOCKSLIBS"
if test -n "$SOCKSLIBS"; then
AC_CHECK_FUNCS([Rpoll])
Index: m4/socklen.m4
===================================================================
RCS file: /home/lav/cvsroot/lftp/m4/socklen.m4,v
retrieving revision 1.3
diff -p -u -r1.3 socklen.m4
--- m4/socklen.m4 17 Dec 2003 06:37:42 -0000 1.3
+++ m4/socklen.m4 15 Jan 2004 08:22:10 -0000
@@ -44,7 +44,7 @@ AC_DEFUN(TYPE_SOCKLEN_T,
AC_LANG_POP(C++)
])
AC_MSG_RESULT($lftp_cv_socklen_t_equiv)
+ AC_DEFINE_UNQUOTED(lftp_socklen_t, $lftp_cv_socklen_t_equiv,
+ [type to use in place of socklen_t if not defined])
fi
- AC_DEFINE_UNQUOTED(lftp_socklen_t, $lftp_cv_socklen_t_equiv,
- [type to use in place of socklen_t if not defined])
])
Index: src/buffer.cc
===================================================================
RCS file: /home/lav/cvsroot/lftp/src/buffer.cc,v
retrieving revision 1.38
diff -p -u -r1.38 buffer.cc
--- src/buffer.cc 14 Jan 2004 16:16:59 -0000 1.38
+++ src/buffer.cc 15 Jan 2004 08:22:13 -0000
@@ -19,6 +19,7 @@
*/
#include <config.h>
+#include <errno.h>
#include "buffer.h"
#include "xmalloc.h"
#include "FileAccess.h"
@@ -303,7 +304,7 @@ try_again:
store_size=buffer_allocated-(store_buf-buffer);
const char *base_buf=put_buf;
// do the translation
- size_t res=iconv(backend_translate,&put_buf,&put_size,&store_buf,&store_size);
+ size_t
res=iconv(backend_translate,(char**)&put_buf,&put_size,&store_buf,&store_size);
in_buffer+=store_buf-(buffer+buffer_ptr+in_buffer);
if(from_untranslated)
untranslated->Skip(put_buf-base_buf);
